From d97b47720816615542389ae20ff681cb5f228c85 Mon Sep 17 00:00:00 2001
From: Matthias Bisping <matthias.bisping@iqser.com>
Date: Fri, 25 Mar 2022 18:08:54 +0100
Subject: [PATCH] added estimator preprocessor and removed adapter and adapter
 patch

---
 image_prediction/estimator/adapter/adapter.py | 10 ---------
 image_prediction/estimator/adapter/patch.py   | 22 -------------------
 .../{adapter => preprocessor}/__init__.py     |  0
 .../estimator/preprocessor/preprocessor.py    |  9 ++++++++
 .../service_estimator/service_estimator.py    |  3 +--
 5 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 image_prediction/estimator/adapter/adapter.py
 delete mode 100644 image_prediction/estimator/adapter/patch.py
 rename image_prediction/estimator/{adapter => preprocessor}/__init__.py (100%)
 create mode 100644 image_prediction/estimator/preprocessor/preprocessor.py

diff --git a/image_prediction/estimator/adapter/adapter.py b/image_prediction/estimator/adapter/adapter.py
deleted file mode 100644
index 8aef944..0000000
--- a/image_prediction/estimator/adapter/adapter.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import abc
-
-
-class EstimatorAdapter(abc.ABC):
-    def __init__(self, estimator):
-        self.estimator = estimator
-
-    @abc.abstractmethod
-    def predict(self, batch):
-        pass
diff --git a/image_prediction/estimator/adapter/patch.py b/image_prediction/estimator/adapter/patch.py
deleted file mode 100644
index 6bbf40b..0000000
--- a/image_prediction/estimator/adapter/patch.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from image_prediction.estimator.adapter.adapter import EstimatorAdapter
-from image_prediction.estimator.estimator import Estimator
-
-
-class EstimatorAdapterPatch(EstimatorAdapter):
-    def __init__(self, estimator: Estimator):
-        super().__init__(estimator=estimator)
-        self.__output_batch = None
-
-    @property
-    def output_batch(self):
-        return self.__output_batch
-
-    @output_batch.setter
-    def output_batch(self, output_batch):
-        self.__output_batch = output_batch
-
-    def predict(self, batch):
-        # Call the internal estimator, so mechanical issues would surface
-        self.estimator.predict(batch)
-        # but discard the returned values for the purposes of testing the interface that calls the adapter
-        return self.__output_batch
diff --git a/image_prediction/estimator/adapter/__init__.py b/image_prediction/estimator/preprocessor/__init__.py
similarity index 100%
rename from image_prediction/estimator/adapter/__init__.py
rename to image_prediction/estimator/preprocessor/__init__.py
diff --git a/image_prediction/estimator/preprocessor/preprocessor.py b/image_prediction/estimator/preprocessor/preprocessor.py
new file mode 100644
index 0000000..1808bb7
--- /dev/null
+++ b/image_prediction/estimator/preprocessor/preprocessor.py
@@ -0,0 +1,9 @@
+from image_prediction.estimator.estimator import Estimator
+
+
+class EstimatorPreprocessor:
+    def __init__(self, estimator: Estimator):
+        self.estimator = estimator
+
+    def predict(self, batch):
+        return self.estimator.predict(batch)
diff --git a/image_prediction/service_estimator/service_estimator.py b/image_prediction/service_estimator/service_estimator.py
index 1704fb1..fc89cf3 100644
--- a/image_prediction/service_estimator/service_estimator.py
+++ b/image_prediction/service_estimator/service_estimator.py
@@ -2,14 +2,13 @@ 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: EstimatorAdapter, classes: Mapping[int, str]):
+    def __init__(self, estimator_adapter, classes: Mapping[int, str]):
         self.__estimator_adapter = estimator_adapter
         self.__classes = classes