From 2d0aad07bbe3c76fd4e634a73056947e22b5b704 Mon Sep 17 00:00:00 2001 From: Onur Atakan ULUSOY Date: Sun, 8 May 2022 23:20:42 +0300 Subject: [PATCH 1/5] Save Operation for CLI --- deepface/DeepFace.py | 4 +++- setup.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deepface/DeepFace.py b/deepface/DeepFace.py index 40d353c..34c83c2 100644 --- a/deepface/DeepFace.py +++ b/deepface/DeepFace.py @@ -824,4 +824,6 @@ def detectFace(img_path, target_size = (224, 224), detector_backend = 'opencv', #main functions.initialize_folder() -fire.Fire() + +def cli(): + fire.Fire() diff --git a/setup.py b/setup.py index c2ebc51..c7c875d 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ setuptools.setup( ], entry_points={ "console_scripts": - ["DeepFace = deepface:DeepFace"], + ["deepface = deepface:DeepFace.cli"], }, python_requires='>=3.5.5', install_requires=["numpy>=1.14.0", "pandas>=0.23.4", "tqdm>=4.30.0", "gdown>=3.10.1", "Pillow>=5.2.0", "opencv-python>=3.4.4", "tensorflow>=1.9.0", "keras>=2.2.0", "Flask>=1.1.2", "mtcnn>=0.1.0", "retina-face>=0.0.1", "fire>=0.4.0"] From d3e8b41c4be1a52ef659656b0d1da9c118af6dba Mon Sep 17 00:00:00 2001 From: Onur Atakan ULUSOY <41792982+onuratakan@users.noreply.github.com> Date: Sun, 8 May 2022 23:23:51 +0300 Subject: [PATCH 2/5] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e133efa..a117b3e 100644 --- a/setup.py +++ b/setup.py @@ -24,5 +24,5 @@ setuptools.setup( ["deepface = deepface:DeepFace.cli"], }, python_requires='>=3.5.5', - install_requires=["numpy>=1.14.0", "pandas>=0.23.4", "tqdm>=4.30.0", "gdown>=3.10.1", "Pillow>=5.2.0", "opencv-python>=3.4.4", "tensorflow>=1.9.0", "keras>=2.2.0", "Flask>=1.1.2", "mtcnn>=0.1.0", "retina-face>=0.0.1"] + install_requires=["numpy>=1.14.0", "pandas>=0.23.4", "tqdm>=4.30.0", "gdown>=3.10.1", "Pillow>=5.2.0", "opencv-python>=3.4.4", "tensorflow>=1.9.0", "keras>=2.2.0", "Flask>=1.1.2", "mtcnn>=0.1.0", "retina-face>=0.0.1", "fire>=0.4.0"] ) From 4ad9dc739f83d235fcdf7ef6816b7d336a9c7d86 Mon Sep 17 00:00:00 2001 From: Onur Atakan ULUSOY <41792982+onuratakan@users.noreply.github.com> Date: Sun, 8 May 2022 23:24:59 +0300 Subject: [PATCH 3/5] Update requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 48b8aec..543a276 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,3 +13,4 @@ lightgbm>=2.3.1 dlib>=19.20.0 retina-face>=0.0.1 mediapipe>=0.8.7.3 +fire>=0.4.0 From 709cdc8109a422478ad98f94632f9fb10ed38b77 Mon Sep 17 00:00:00 2001 From: Onur Atakan ULUSOY <41792982+onuratakan@users.noreply.github.com> Date: Mon, 9 May 2022 00:13:53 +0300 Subject: [PATCH 4/5] Import fire --- deepface/DeepFace.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deepface/DeepFace.py b/deepface/DeepFace.py index e6fae4d..34c83c2 100644 --- a/deepface/DeepFace.py +++ b/deepface/DeepFace.py @@ -12,6 +12,8 @@ import pandas as pd from tqdm import tqdm import pickle +import fire + from deepface.basemodels import VGGFace, OpenFace, Facenet, Facenet512, FbDeepFace, DeepID, DlibWrapper, ArcFace, Boosting from deepface.extendedmodels import Age, Gender, Race, Emotion from deepface.commons import functions, realtime, distance as dst From 21aa03794918406da48926224e44da42c97db815 Mon Sep 17 00:00:00 2001 From: Sefik Ilkin Serengil Date: Mon, 9 May 2022 21:32:44 +0100 Subject: [PATCH 5/5] entry point bug --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a117b3e..df16773 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ setuptools.setup( ], entry_points={ "console_scripts": - ["deepface = deepface:DeepFace.cli"], + ["deepface = deepface.DeepFace:cli"], }, python_requires='>=3.5.5', install_requires=["numpy>=1.14.0", "pandas>=0.23.4", "tqdm>=4.30.0", "gdown>=3.10.1", "Pillow>=5.2.0", "opencv-python>=3.4.4", "tensorflow>=1.9.0", "keras>=2.2.0", "Flask>=1.1.2", "mtcnn>=0.1.0", "retina-face>=0.0.1", "fire>=0.4.0"]