From ecd8b137e254bb5d5daf31f3f5c91e8eb7833d42 Mon Sep 17 00:00:00 2001 From: Clemens Wolff Date: Fri, 17 Aug 2018 10:32:31 -0400 Subject: [PATCH] De-nest models directory --- app/faceanalysis/auth.py | 4 ++-- app/faceanalysis/domain/docker.py | 10 +++++----- app/faceanalysis/domain/faceapi.py | 6 +++--- app/faceanalysis/face_matcher.py | 12 ++++++------ app/faceanalysis/{models => }/models.py | 8 ++++++++ app/faceanalysis/models/__init__.py | 0 app/faceanalysis/models/image_status_enum.py | 8 -------- app/main.py | 4 ++-- app/tests/test_api.py | 6 +++--- 9 files changed, 29 insertions(+), 29 deletions(-) rename app/faceanalysis/{models => }/models.py (96%) delete mode 100644 app/faceanalysis/models/__init__.py delete mode 100644 app/faceanalysis/models/image_status_enum.py diff --git a/app/faceanalysis/auth.py b/app/faceanalysis/auth.py index 881c194..414a3fb 100644 --- a/app/faceanalysis/auth.py +++ b/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 diff --git a/app/faceanalysis/domain/docker.py b/app/faceanalysis/domain/docker.py index 68db5b9..3a84c88 100644 --- a/app/faceanalysis/domain/docker.py +++ b/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__) diff --git a/app/faceanalysis/domain/faceapi.py b/app/faceanalysis/domain/faceapi.py index 2b808c1..d8c796e 100644 --- a/app/faceanalysis/domain/faceapi.py +++ b/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 diff --git a/app/faceanalysis/face_matcher.py b/app/faceanalysis/face_matcher.py index cc5cfda..400bc14 100644 --- a/app/faceanalysis/face_matcher.py +++ b/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 diff --git a/app/faceanalysis/models/models.py b/app/faceanalysis/models.py similarity index 96% rename from app/faceanalysis/models/models.py rename to app/faceanalysis/models.py index df341e5..b188b25 100644 --- a/app/faceanalysis/models/models.py +++ b/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) diff --git a/app/faceanalysis/models/__init__.py b/app/faceanalysis/models/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/app/faceanalysis/models/image_status_enum.py b/app/faceanalysis/models/image_status_enum.py deleted file mode 100644 index d62f960..0000000 --- a/app/faceanalysis/models/image_status_enum.py +++ /dev/null @@ -1,8 +0,0 @@ -from enum import Enum - - -class ImageStatusEnum(Enum): - finished_processing = 4 - processing = 3 - uploaded = 1 - face_vector_computed = 5 diff --git a/app/main.py b/app/main.py index f3abd61..54ab7ca 100644 --- a/app/main.py +++ b/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 diff --git a/app/tests/test_api.py b/app/tests/test_api.py index 04fa628..825c3a8 100644 --- a/app/tests/test_api.py +++ b/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