modules added into logger

This commit is contained in:
Sefik Ilkin Serengil 2023-12-06 20:55:00 +00:00
parent 5464ac511c
commit 125895398e
20 changed files with 26 additions and 21 deletions

View File

@ -30,7 +30,7 @@ from deepface.extendedmodels import Age, Gender, Race, Emotion
from deepface.commons import functions, realtime, distance as dst from deepface.commons import functions, realtime, distance as dst
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="DeepFace")
# ----------------------------------- # -----------------------------------
# configurations for dependencies # configurations for dependencies
@ -343,7 +343,11 @@ def analyze(
if img_content.shape[0] > 0 and img_content.shape[1] > 0: if img_content.shape[0] > 0 and img_content.shape[1] > 0:
obj = {} obj = {}
# facial attribute analysis # facial attribute analysis
pbar = tqdm(range(0, len(actions)), desc="Finding actions", disable=silent) pbar = tqdm(
range(0, len(actions)),
desc="Finding actions",
disable=silent if len(actions) > 1 else True,
)
for index in pbar: for index in pbar:
action = actions[index] action = actions[index]
pbar.set_description(f"Action: {action}") pbar.set_description(f"Action: {action}")

View File

@ -4,7 +4,7 @@ import tensorflow as tf
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="basemodels.ArcFace")
# pylint: disable=unsubscriptable-object # pylint: disable=unsubscriptable-object

View File

@ -4,7 +4,7 @@ import tensorflow as tf
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="basemodels.DeepID")
tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) tf_version = int(tf.__version__.split(".", maxsplit=1)[0])

View File

@ -5,7 +5,7 @@ import numpy as np
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="basemodels.DlibResNet")
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods

View File

@ -4,7 +4,7 @@ import tensorflow as tf
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="basemodels.Facenet")
# -------------------------------- # --------------------------------
# dependency configuration # dependency configuration

View File

@ -4,7 +4,7 @@ from deepface.basemodels import Facenet
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="basemodels.Facenet512")
def loadModel( def loadModel(
url="https://github.com/serengil/deepface_models/releases/download/v1.0/facenet512_weights.h5", url="https://github.com/serengil/deepface_models/releases/download/v1.0/facenet512_weights.h5",

View File

@ -5,7 +5,7 @@ import tensorflow as tf
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="basemodels.FbDeepFace")
# -------------------------------- # --------------------------------
# dependency configuration # dependency configuration

View File

@ -4,7 +4,7 @@ import tensorflow as tf
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="basemodels.OpenFace")
tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) tf_version = int(tf.__version__.split(".", maxsplit=1)[0])
if tf_version == 1: if tf_version == 1:

View File

@ -6,7 +6,7 @@ import gdown
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="basemodels.SFace")
# pylint: disable=line-too-long, too-few-public-methods # pylint: disable=line-too-long, too-few-public-methods

View File

@ -4,7 +4,7 @@ import tensorflow as tf
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="basemodels.VGGFace")
# --------------------------------------- # ---------------------------------------

View File

@ -14,7 +14,7 @@ from deprecated import deprecated
from deepface.detectors import FaceDetector from deepface.detectors import FaceDetector
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="commons.functions")
# -------------------------------------------------- # --------------------------------------------------
# configurations of dependencies # configurations of dependencies

View File

@ -3,7 +3,8 @@ import logging
# pylint: disable=broad-except # pylint: disable=broad-except
class Logger: class Logger:
def __init__(self): def __init__(self, module=None):
self.module = module
log_level = os.environ.get("DEEPFACE_LOG_LEVEL", str(logging.INFO)) log_level = os.environ.get("DEEPFACE_LOG_LEVEL", str(logging.INFO))
try: try:
self.log_level = int(log_level) self.log_level = int(log_level)

View File

@ -7,7 +7,7 @@ from deepface import DeepFace
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="commons.realtime")
# dependency configuration # dependency configuration
os.environ["TF_CPP_MIN_LOG_LEVEL"] = "2" os.environ["TF_CPP_MIN_LOG_LEVEL"] = "2"

View File

@ -4,7 +4,7 @@ import gdown
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="detectors.DlibWrapper")
def build_model(): def build_model():

View File

@ -6,7 +6,7 @@ from deepface.detectors import OpenCvWrapper
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="detectors.SsdWrapper")
# pylint: disable=line-too-long # pylint: disable=line-too-long

View File

@ -5,7 +5,7 @@ from deepface.detectors import FaceDetector
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="detectors.YunetWrapper")
def build_model(): def build_model():
# pylint: disable=C0301 # pylint: disable=C0301

View File

@ -6,7 +6,7 @@ from deepface.basemodels import VGGFace
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="extendedmodels.Age")
# ---------------------------------------- # ----------------------------------------
# dependency configurations # dependency configurations

View File

@ -4,7 +4,7 @@ import tensorflow as tf
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="extendedmodels.Emotion")
# ------------------------------------------- # -------------------------------------------
# pylint: disable=line-too-long # pylint: disable=line-too-long

View File

@ -5,7 +5,7 @@ from deepface.basemodels import VGGFace
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="extendedmodels.Gender")
# ------------------------------------- # -------------------------------------
# pylint: disable=line-too-long # pylint: disable=line-too-long

View File

@ -5,7 +5,7 @@ from deepface.basemodels import VGGFace
from deepface.commons import functions from deepface.commons import functions
from deepface.commons.logger import Logger from deepface.commons.logger import Logger
logger = Logger() logger = Logger(module="extendedmodels.Race")
# -------------------------- # --------------------------
# pylint: disable=line-too-long # pylint: disable=line-too-long