Merge pull request #1303 from serengil/feat-task-0808-refactoring-models

models refactored

deepface/models/demography/Age.py

@@ -1,7 +1,7 @@
 import os
 import gdown
 import numpy as np
-from deepface.basemodels import VGGFace
+from deepface.models.facial_recognition import VGGFace
 from deepface.commons import package_utils, folder_utils
 from deepface.models.Demography import Demography
 from deepface.commons.logger import Logger

deepface/models/demography/Gender.py

@@ -6,7 +6,7 @@ import gdown
 import numpy as np
 
 # project dependencies
-from deepface.basemodels import VGGFace
+from deepface.models.facial_recognition import VGGFace
 from deepface.commons import package_utils, folder_utils
 from deepface.models.Demography import Demography
 from deepface.commons.logger import Logger

deepface/models/demography/Race.py

@@ -6,7 +6,7 @@ import gdown
 import numpy as np
 
 # project dependencies
-from deepface.basemodels import VGGFace
+from deepface.models.facial_recognition import VGGFace
 from deepface.commons import package_utils, folder_utils
 from deepface.models.Demography import Demography
 from deepface.commons.logger import Logger

deepface/models/face_detection/Ssd.py

@@ -4,7 +4,7 @@ import gdown
 import cv2
 import pandas as pd
 import numpy as np
-from deepface.detectors import OpenCv
+from deepface.models.face_detection import OpenCv
 from deepface.commons import folder_utils
 from deepface.models.Detector import Detector, FacialAreaRegion
 from deepface.commons.logger import Logger

deepface/models/spoofing/FasNet.py

@@ -47,7 +47,7 @@ class Fasnet:
         )
 
         # guarantees Fasnet imported and torch installed
-        from deepface.spoofmodels import FasNetBackbone
+        from deepface.models.spoofing import FasNetBackbone
 
         # Fasnet will use 2 distinct models to predict, then it will find the sum of predictions
         # to make a final prediction

deepface/modules/demography.py

@@ -7,7 +7,7 @@ from tqdm import tqdm
 
 # project dependencies
 from deepface.modules import modeling, detection, preprocessing
-from deepface.extendedmodels import Gender, Race, Emotion
+from deepface.models.demography import Gender, Race, Emotion
 
 
 def analyze(

deepface/modules/modeling.py

@@ -2,7 +2,7 @@
 from typing import Any
 
 # project dependencies
-from deepface.basemodels import (
+from deepface.models.facial_recognition import (
     VGGFace,
     OpenFace,
     FbDeepFace,
@@ -13,7 +13,7 @@ from deepface.basemodels import (
     Facenet,
     GhostFaceNet,
 )
-from deepface.detectors import (
+from deepface.models.face_detection import (
     FastMtCnn,
     MediaPipe,
     MtCnn,
@@ -25,8 +25,8 @@ from deepface.detectors import (
     YuNet,
     CenterFace,
 )
-from deepface.extendedmodels import Age, Gender, Race, Emotion
+from deepface.models.demography import Age, Gender, Race, Emotion
-from deepface.spoofmodels import FasNet
+from deepface.models.spoofing import FasNet
 
 
 def build_model(task: str, model_name: str) -> Any: