From dd1808726175179dc37bad80e709b914923e824b Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Fri, 25 Mar 2022 18:18:17 +0100 Subject: [PATCH] restructuring of modules --- .../estimator/{estimators => adapter}/__init__.py | 0 .../estimator/{estimator.py => adapter/adapter.py} | 2 +- .../adapter/adapters}/__init__.py | 0 .../{estimators => adapter/adapters}/keras.py | 4 ++-- .../estimator/{estimators => adapter/adapters}/mock.py | 4 ++-- .../estimator/preprocessor/preprocessor.py | 4 ++-- .../service_estimator.py | 3 ++- test/unit_tests/conftest.py | 10 +++++----- 8 files changed, 14 insertions(+), 13 deletions(-) rename image_prediction/estimator/{estimators => adapter}/__init__.py (100%) rename image_prediction/estimator/{estimator.py => adapter/adapter.py} (82%) rename image_prediction/{service_estimator => estimator/adapter/adapters}/__init__.py (100%) rename image_prediction/estimator/{estimators => adapter/adapters}/keras.py (59%) rename image_prediction/estimator/{estimators => adapter/adapters}/mock.py (67%) rename image_prediction/{service_estimator => estimator}/service_estimator.py (76%) diff --git a/image_prediction/estimator/estimators/__init__.py b/image_prediction/estimator/adapter/__init__.py similarity index 100% rename from image_prediction/estimator/estimators/__init__.py rename to image_prediction/estimator/adapter/__init__.py diff --git a/image_prediction/estimator/estimator.py b/image_prediction/estimator/adapter/adapter.py similarity index 82% rename from image_prediction/estimator/estimator.py rename to image_prediction/estimator/adapter/adapter.py index e1b6d96..8aef944 100644 --- a/image_prediction/estimator/estimator.py +++ b/image_prediction/estimator/adapter/adapter.py @@ -1,7 +1,7 @@ import abc -class Estimator(abc.ABC): +class EstimatorAdapter(abc.ABC): def __init__(self, estimator): self.estimator = estimator diff --git a/image_prediction/service_estimator/__init__.py b/image_prediction/estimator/adapter/adapters/__init__.py similarity index 100% rename from image_prediction/service_estimator/__init__.py rename to image_prediction/estimator/adapter/adapters/__init__.py diff --git a/image_prediction/estimator/estimators/keras.py b/image_prediction/estimator/adapter/adapters/keras.py similarity index 59% rename from image_prediction/estimator/estimators/keras.py rename to image_prediction/estimator/adapter/adapters/keras.py index 8661c85..294ddfd 100644 --- a/image_prediction/estimator/estimators/keras.py +++ b/image_prediction/estimator/adapter/adapters/keras.py @@ -1,9 +1,9 @@ import numpy as np -from image_prediction.estimator.estimator import Estimator +from image_prediction.estimator.adapter.adapter import EstimatorAdapter -class KerasEstimator(Estimator): +class KerasEstimatorAdapter(EstimatorAdapter): def __init__(self, estimator): super().__init__(estimator) diff --git a/image_prediction/estimator/estimators/mock.py b/image_prediction/estimator/adapter/adapters/mock.py similarity index 67% rename from image_prediction/estimator/estimators/mock.py rename to image_prediction/estimator/adapter/adapters/mock.py index c642489..a2d6d6d 100644 --- a/image_prediction/estimator/estimators/mock.py +++ b/image_prediction/estimator/adapter/adapters/mock.py @@ -1,4 +1,4 @@ -from image_prediction.estimator.estimator import Estimator +from image_prediction.estimator.adapter.adapter import EstimatorAdapter class DummyEstimator: @@ -7,7 +7,7 @@ class DummyEstimator: return True -class EstimatorMock(Estimator): +class EstimatorAdapterMock(EstimatorAdapter): def __init__(self, estimator): super().__init__(estimator=estimator) diff --git a/image_prediction/estimator/preprocessor/preprocessor.py b/image_prediction/estimator/preprocessor/preprocessor.py index 1808bb7..9cd13a4 100644 --- a/image_prediction/estimator/preprocessor/preprocessor.py +++ b/image_prediction/estimator/preprocessor/preprocessor.py @@ -1,8 +1,8 @@ -from image_prediction.estimator.estimator import Estimator +from image_prediction.estimator.adapter import EstimatorAdapter class EstimatorPreprocessor: - def __init__(self, estimator: Estimator): + def __init__(self, estimator: EstimatorAdapter): self.estimator = estimator def predict(self, batch): diff --git a/image_prediction/service_estimator/service_estimator.py b/image_prediction/estimator/service_estimator.py similarity index 76% rename from image_prediction/service_estimator/service_estimator.py rename to image_prediction/estimator/service_estimator.py index fc89cf3..1704fb1 100644 --- a/image_prediction/service_estimator/service_estimator.py +++ b/image_prediction/estimator/service_estimator.py @@ -2,13 +2,14 @@ from typing import Mapping, List import numpy as np +from image_prediction.estimator.adapter.adapter import EstimatorAdapter from image_prediction.utils import get_logger logger = get_logger() class ServiceEstimator: - def __init__(self, estimator_adapter, classes: Mapping[int, str]): + def __init__(self, estimator_adapter: EstimatorAdapter, classes: Mapping[int, str]): self.__estimator_adapter = estimator_adapter self.__classes = classes diff --git a/test/unit_tests/conftest.py b/test/unit_tests/conftest.py index 828f117..618d6e0 100644 --- a/test/unit_tests/conftest.py +++ b/test/unit_tests/conftest.py @@ -2,11 +2,11 @@ import numpy as np import pytest from PIL import Image -from image_prediction.estimator.estimators.keras import KerasEstimator -from image_prediction.estimator.estimators.mock import EstimatorMock, DummyEstimator +from image_prediction.estimator.adapter.adapters.keras import KerasEstimatorAdapter +from image_prediction.estimator.adapter.adapters.mock import DummyEstimator, EstimatorAdapterMock from image_prediction.exceptions import UnknownEstimatorAdapter from image_prediction.predictor.predictor import Predictor -from image_prediction.service_estimator.service_estimator import ServiceEstimator +from image_prediction.estimator.service_estimator import ServiceEstimator @pytest.fixture @@ -23,9 +23,9 @@ def service_estimator(estimator, classes): @pytest.fixture def estimator(estimator_type, keras_model, output_batch, monkeypatch): if estimator_type == "mock": - estimator = EstimatorMock(DummyEstimator()) + estimator = EstimatorAdapterMock(DummyEstimator()) elif estimator_type == "keras": - estimator = KerasEstimator(keras_model) + estimator = KerasEstimatorAdapter(keras_model) else: raise UnknownEstimatorAdapter(f"No adapter for estimator type {estimator_type} was specified.")