From e643f56b75449c67b048459f9767332fa90eba70 Mon Sep 17 00:00:00 2001 From: Vincent STRAGIER Date: Tue, 23 May 2023 14:47:22 +0200 Subject: [PATCH] Unlinted changes --- .vscode/settings.json | 4 +++- deepface/DeepFace.py | 34 ++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f5d9a83..e223550 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,5 +9,7 @@ "python.formatting.provider": "black", "python.formatting.blackArgs": ["--line-length=100"], "editor.fontWeight": "normal", - "python.analysis.extraPaths": ["./deepface"] + "python.analysis.extraPaths": ["./deepface"], + "stylelint.autoFixOnSave": false, + "standard.autoFixOnSave": false } diff --git a/deepface/DeepFace.py b/deepface/DeepFace.py index b96becf..a68bd01 100644 --- a/deepface/DeepFace.py +++ b/deepface/DeepFace.py @@ -41,7 +41,6 @@ if tf_version == 2: def build_model(model_name): - """ This function builds a deepface model Parameters: @@ -96,7 +95,6 @@ def verify( align=True, normalization="base", ): - """ This function verifies an image pair is same person or different persons. In the background, verification function represents facial images as vectors and then calculates the similarity @@ -119,9 +117,9 @@ def verify( detector_backend (string): set face detector backend to opencv, retinaface, mtcnn, ssd, dlib or mediapipe - + align (boolean): alignment according to the eye positions. - + normalization (string): normalize the input image before feeding to model Returns: @@ -235,9 +233,8 @@ def analyze( align=True, silent=False, ): - """ - This function analyzes facial attributes including age, gender, emotion and race. + This function analyze facial attributes including age, gender, emotion and race. In the background, analysis function builds convolutional neural network models to classify age, gender, emotion and race of the input image. @@ -255,7 +252,7 @@ def analyze( detector_backend (string): set face detector backend to opencv, retinaface, mtcnn, ssd, dlib or mediapipe. - + align (boolean): alignment according to the eye positions. silent (boolean): disable (some) log messages @@ -300,6 +297,16 @@ def analyze( actions = (actions,) actions = list(actions) + + if not actions: + raise ValueError("`actions` must be a list of strings.") + + for action in actions: + if action not in ("emotion", "age", "gender", "race"): + raise ValueError( + f"Invalid action passed ({action})). " + "Valid actions are `emotion`, `age`, `gender`, `race`." + ) # --------------------------------- # build models models = {} @@ -398,7 +405,6 @@ def find( normalization="base", silent=False, ): - """ This function applies verification several times and find the identities in a database @@ -422,9 +428,9 @@ def find( detector_backend (string): set face detector backend to opencv, retinaface, mtcnn, ssd, dlib or mediapipe - + align (boolean): alignment according to the eye positions. - + normalization (string): normalize the input image before feeding to model silent (boolean): disable some logging and progress bars @@ -448,7 +454,6 @@ def find( file_name = file_name.replace("-", "_").lower() if path.exists(db_path + "/" + file_name): - if not silent: print( f"WARNING: Representations for images in {db_path} folder were previously stored" @@ -616,7 +621,6 @@ def represent( align=True, normalization="base", ): - """ This function represents facial images as vectors. The function uses convolutional neural networks models to generate vector embeddings. @@ -710,7 +714,6 @@ def stream( time_threshold=5, frame_threshold=5, ): - """ This function applies real time face recognition and facial attribute analysis @@ -765,7 +768,6 @@ def extract_faces( align=True, grayscale=False, ): - """ This function applies pre-processing stages of a face recognition pipeline including detection and alignment @@ -830,7 +832,7 @@ def detectFace( ): """ Deprecated function. Use extract_faces for same functionality. - + This function applies pre-processing stages of a face recognition pipeline including detection and alignment @@ -855,7 +857,7 @@ def detectFace( Returns: detected and aligned face as numpy array - + """ print("⚠️ Function detectFace is deprecated. Use extract_faces instead.") face_objs = extract_faces(