restructuring of modules

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
 

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)
 

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)

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):

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
 

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.")