diff --git a/deepface/DeepFace.py b/deepface/DeepFace.py index 59e3b99..f3228b9 100644 --- a/deepface/DeepFace.py +++ b/deepface/DeepFace.py @@ -30,7 +30,7 @@ from deepface.extendedmodels import Age, Gender, Race, Emotion from deepface.commons import functions, realtime, distance as dst from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="DeepFace") # ----------------------------------- # configurations for dependencies @@ -343,7 +343,11 @@ def analyze( if img_content.shape[0] > 0 and img_content.shape[1] > 0: obj = {} # 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: action = actions[index] pbar.set_description(f"Action: {action}") diff --git a/deepface/basemodels/ArcFace.py b/deepface/basemodels/ArcFace.py index bbdcd97..07044ee 100644 --- a/deepface/basemodels/ArcFace.py +++ b/deepface/basemodels/ArcFace.py @@ -4,7 +4,7 @@ import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="basemodels.ArcFace") # pylint: disable=unsubscriptable-object diff --git a/deepface/basemodels/DeepID.py b/deepface/basemodels/DeepID.py index ecafe80..870cce7 100644 --- a/deepface/basemodels/DeepID.py +++ b/deepface/basemodels/DeepID.py @@ -4,7 +4,7 @@ import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="basemodels.DeepID") tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) diff --git a/deepface/basemodels/DlibResNet.py b/deepface/basemodels/DlibResNet.py index 3d96f51..643b393 100644 --- a/deepface/basemodels/DlibResNet.py +++ b/deepface/basemodels/DlibResNet.py @@ -5,7 +5,7 @@ import numpy as np from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="basemodels.DlibResNet") # pylint: disable=too-few-public-methods diff --git a/deepface/basemodels/Facenet.py b/deepface/basemodels/Facenet.py index a97961c..bdf92a7 100644 --- a/deepface/basemodels/Facenet.py +++ b/deepface/basemodels/Facenet.py @@ -4,7 +4,7 @@ import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="basemodels.Facenet") # -------------------------------- # dependency configuration diff --git a/deepface/basemodels/Facenet512.py b/deepface/basemodels/Facenet512.py index 7f1b4d2..7e2b27c 100644 --- a/deepface/basemodels/Facenet512.py +++ b/deepface/basemodels/Facenet512.py @@ -4,7 +4,7 @@ from deepface.basemodels import Facenet from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="basemodels.Facenet512") def loadModel( url="https://github.com/serengil/deepface_models/releases/download/v1.0/facenet512_weights.h5", diff --git a/deepface/basemodels/FbDeepFace.py b/deepface/basemodels/FbDeepFace.py index 6d619b8..4d215aa 100644 --- a/deepface/basemodels/FbDeepFace.py +++ b/deepface/basemodels/FbDeepFace.py @@ -5,7 +5,7 @@ import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="basemodels.FbDeepFace") # -------------------------------- # dependency configuration diff --git a/deepface/basemodels/OpenFace.py b/deepface/basemodels/OpenFace.py index d4036e2..6555ee9 100644 --- a/deepface/basemodels/OpenFace.py +++ b/deepface/basemodels/OpenFace.py @@ -4,7 +4,7 @@ import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="basemodels.OpenFace") tf_version = int(tf.__version__.split(".", maxsplit=1)[0]) if tf_version == 1: diff --git a/deepface/basemodels/SFace.py b/deepface/basemodels/SFace.py index 85947cd..52ce05f 100644 --- a/deepface/basemodels/SFace.py +++ b/deepface/basemodels/SFace.py @@ -6,7 +6,7 @@ import gdown from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="basemodels.SFace") # pylint: disable=line-too-long, too-few-public-methods diff --git a/deepface/basemodels/VGGFace.py b/deepface/basemodels/VGGFace.py index 15b054d..a58b1f6 100644 --- a/deepface/basemodels/VGGFace.py +++ b/deepface/basemodels/VGGFace.py @@ -4,7 +4,7 @@ import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="basemodels.VGGFace") # --------------------------------------- diff --git a/deepface/commons/functions.py b/deepface/commons/functions.py index 2f6a5c9..7bf5cfa 100644 --- a/deepface/commons/functions.py +++ b/deepface/commons/functions.py @@ -14,7 +14,7 @@ from deprecated import deprecated from deepface.detectors import FaceDetector from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="commons.functions") # -------------------------------------------------- # configurations of dependencies diff --git a/deepface/commons/logger.py b/deepface/commons/logger.py index e3dc24d..b556430 100644 --- a/deepface/commons/logger.py +++ b/deepface/commons/logger.py @@ -3,7 +3,8 @@ import logging # pylint: disable=broad-except class Logger: - def __init__(self): + def __init__(self, module=None): + self.module = module log_level = os.environ.get("DEEPFACE_LOG_LEVEL", str(logging.INFO)) try: self.log_level = int(log_level) diff --git a/deepface/commons/realtime.py b/deepface/commons/realtime.py index a3a8d18..3edd5d8 100644 --- a/deepface/commons/realtime.py +++ b/deepface/commons/realtime.py @@ -7,7 +7,7 @@ from deepface import DeepFace from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="commons.realtime") # dependency configuration os.environ["TF_CPP_MIN_LOG_LEVEL"] = "2" diff --git a/deepface/detectors/DlibWrapper.py b/deepface/detectors/DlibWrapper.py index 03042b6..f1b9616 100644 --- a/deepface/detectors/DlibWrapper.py +++ b/deepface/detectors/DlibWrapper.py @@ -4,7 +4,7 @@ import gdown from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="detectors.DlibWrapper") def build_model(): diff --git a/deepface/detectors/SsdWrapper.py b/deepface/detectors/SsdWrapper.py index 4376c07..43a01be 100644 --- a/deepface/detectors/SsdWrapper.py +++ b/deepface/detectors/SsdWrapper.py @@ -6,7 +6,7 @@ from deepface.detectors import OpenCvWrapper from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="detectors.SsdWrapper") # pylint: disable=line-too-long diff --git a/deepface/detectors/YunetWrapper.py b/deepface/detectors/YunetWrapper.py index e89e3b2..caa65b5 100644 --- a/deepface/detectors/YunetWrapper.py +++ b/deepface/detectors/YunetWrapper.py @@ -5,7 +5,7 @@ from deepface.detectors import FaceDetector from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="detectors.YunetWrapper") def build_model(): # pylint: disable=C0301 diff --git a/deepface/extendedmodels/Age.py b/deepface/extendedmodels/Age.py index f286eb8..133e066 100644 --- a/deepface/extendedmodels/Age.py +++ b/deepface/extendedmodels/Age.py @@ -6,7 +6,7 @@ from deepface.basemodels import VGGFace from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="extendedmodels.Age") # ---------------------------------------- # dependency configurations diff --git a/deepface/extendedmodels/Emotion.py b/deepface/extendedmodels/Emotion.py index 4bf8c03..6cb7e87 100644 --- a/deepface/extendedmodels/Emotion.py +++ b/deepface/extendedmodels/Emotion.py @@ -4,7 +4,7 @@ import tensorflow as tf from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="extendedmodels.Emotion") # ------------------------------------------- # pylint: disable=line-too-long diff --git a/deepface/extendedmodels/Gender.py b/deepface/extendedmodels/Gender.py index 795059a..ab2d728 100644 --- a/deepface/extendedmodels/Gender.py +++ b/deepface/extendedmodels/Gender.py @@ -5,7 +5,7 @@ from deepface.basemodels import VGGFace from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="extendedmodels.Gender") # ------------------------------------- # pylint: disable=line-too-long diff --git a/deepface/extendedmodels/Race.py b/deepface/extendedmodels/Race.py index 384a10b..f0a0a84 100644 --- a/deepface/extendedmodels/Race.py +++ b/deepface/extendedmodels/Race.py @@ -5,7 +5,7 @@ from deepface.basemodels import VGGFace from deepface.commons import functions from deepface.commons.logger import Logger -logger = Logger() +logger = Logger(module="extendedmodels.Race") # -------------------------- # pylint: disable=line-too-long