De-nest models directory

app/faceanalysis/auth.py

@@ -3,8 +3,8 @@
 from itsdangerous import TimedJSONWebSignatureSerializer as Serializer
 from passlib.apps import custom_app_context as password_context
 
-from faceanalysis.models.models import User
-from faceanalysis.models.models import get_db_session
+from faceanalysis.models import User
+from faceanalysis.models import get_db_session
 from faceanalysis.settings import TOKEN_EXPIRATION
 from faceanalysis.settings import TOKEN_SECRET_KEY
 

app/faceanalysis/domain/docker.py

@@ -7,11 +7,11 @@
 from faceanalysis.domain.errors import ImageAlreadyProcessed
 from faceanalysis.domain.errors import ImageDoesNotExist
 from faceanalysis.log import get_logger
-from faceanalysis.models.image_status_enum import ImageStatusEnum
-from faceanalysis.models.models import Image
-from faceanalysis.models.models import ImageStatus
-from faceanalysis.models.models import Match
-from faceanalysis.models.models import get_db_session
+from faceanalysis.models import Image
+from faceanalysis.models import ImageStatus
+from faceanalysis.models import ImageStatusEnum
+from faceanalysis.models import Match
+from faceanalysis.models import get_db_session
 from faceanalysis.storage import store_image
 
 logger = get_logger(__name__)

app/faceanalysis/domain/faceapi.py

@@ -11,9 +11,9 @@
 from faceanalysis.domain.errors import DuplicateImage
 from faceanalysis.domain.errors import ImageDoesNotExist
 from faceanalysis.log import get_logger
-from faceanalysis.models.image_status_enum import ImageStatusEnum
-from faceanalysis.models.models import FaceApiMapping
-from faceanalysis.models.models import get_db_session
+from faceanalysis.models import FaceApiMapping
+from faceanalysis.models import ImageStatusEnum
+from faceanalysis.models import get_db_session
 from faceanalysis.settings import FACE_API_ACCESS_KEY
 from faceanalysis.settings import FACE_API_ENDPOINT
 from faceanalysis.settings import FACE_API_MODEL_ID

app/faceanalysis/face_matcher.py

@@ -10,12 +10,12 @@
 from faceanalysis.face_vectorizer import face_vector_to_text
 from faceanalysis.face_vectorizer import get_face_vectors
 from faceanalysis.log import get_logger
-from faceanalysis.models.image_status_enum import ImageStatusEnum
-from faceanalysis.models.models import FeatureMapping
-from faceanalysis.models.models import Image
-from faceanalysis.models.models import ImageStatus
-from faceanalysis.models.models import Match
-from faceanalysis.models.models import get_db_session
+from faceanalysis.models import FeatureMapping
+from faceanalysis.models import Image
+from faceanalysis.models import ImageStatus
+from faceanalysis.models import ImageStatusEnum
+from faceanalysis.models import Match
+from faceanalysis.models import get_db_session
 from faceanalysis.settings import DISTANCE_SCORE_THRESHOLD
 from faceanalysis.settings import FACE_VECTORIZE_ALGORITHM
 from faceanalysis.storage import StorageError

app/faceanalysis/models/models.py → app/faceanalysis/models.py

@@ -1,4 +1,5 @@
 from contextlib import contextmanager
+from enum import Enum
 from functools import lru_cache
 
 from sqlalchemy import Column
@@ -84,6 +85,13 @@ class FaceApiMapping(Base):  # type: ignore
 # pylint: enable=too-few-public-methods
 
 
+class ImageStatusEnum(Enum):
+    finished_processing = 4
+    processing = 3
+    uploaded = 1
+    face_vector_computed = 5
+
+
 @lru_cache(maxsize=1)
 def _connect():
     engine = create_engine(SQLALCHEMY_CONNECTION_STRING, pool_recycle=3600)

app/main.py

@@ -2,8 +2,8 @@
 
 from faceanalysis.api import app as application
 from faceanalysis.log import get_logger
-from faceanalysis.models.models import delete_models
-from faceanalysis.models.models import init_models
+from faceanalysis.models import delete_models
+from faceanalysis.models import init_models
 from faceanalysis.settings import FACE_VECTORIZE_ALGORITHM
 from faceanalysis.settings import IMAGE_PROCESSOR_CONCURRENCY
 from faceanalysis.settings import IMAGE_PROCESSOR_QUEUE

app/tests/test_api.py

@@ -10,9 +10,9 @@
 from unittest import skipIf
 
 from faceanalysis.api import app
-from faceanalysis.models.image_status_enum import ImageStatusEnum
-from faceanalysis.models.models import delete_models
-from faceanalysis.models.models import init_models
+from faceanalysis.models import ImageStatusEnum
+from faceanalysis.models import delete_models
+from faceanalysis.models import init_models
 from faceanalysis.settings import ALLOWED_EXTENSIONS
 from faceanalysis.settings import FACE_VECTORIZE_ALGORITHM
 from faceanalysis.tasks import celery