From 91dd467142bb04e23523259666bb642801ad10ad Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Wed, 30 Mar 2022 19:38:15 +0200 Subject: [PATCH] applied black --- image_prediction/estimator/preprocessor/preprocessor.py | 1 - .../estimator/preprocessor/preprocessors/identity.py | 1 - image_prediction/formatter/formatter.py | 1 - image_prediction/formatter/formatters/info_formatter.py | 1 - image_prediction/image_extractor/extractor.py | 1 - image_prediction/label_mapper/mapper.py | 1 - image_prediction/label_mapper/mappers/numeric.py | 4 +--- image_prediction/label_mapper/mappers/probability.py | 4 +++- image_prediction/model_loader/database/connector.py | 1 - image_prediction/model_loader/database/connectors/mock.py | 1 - image_prediction/model_loader/loader.py | 1 - image_prediction/model_loader/loaders/mlflow.py | 1 - image_prediction/pipeline.py | 1 - image_prediction/redai_adapter/mlflow.py | 1 - 14 files changed, 4 insertions(+), 16 deletions(-) diff --git a/image_prediction/estimator/preprocessor/preprocessor.py b/image_prediction/estimator/preprocessor/preprocessor.py index 6f39564..58af954 100644 --- a/image_prediction/estimator/preprocessor/preprocessor.py +++ b/image_prediction/estimator/preprocessor/preprocessor.py @@ -2,7 +2,6 @@ import abc class Preprocessor(abc.ABC): - @abc.abstractmethod def preprocess(self, batch): raise NotImplementedError diff --git a/image_prediction/estimator/preprocessor/preprocessors/identity.py b/image_prediction/estimator/preprocessor/preprocessors/identity.py index dc5b335..199b1b0 100644 --- a/image_prediction/estimator/preprocessor/preprocessors/identity.py +++ b/image_prediction/estimator/preprocessor/preprocessors/identity.py @@ -2,7 +2,6 @@ from image_prediction.estimator.preprocessor.preprocessor import Preprocessor class IdentityPreprocessor(Preprocessor): - @staticmethod def preprocess(images): return images diff --git a/image_prediction/formatter/formatter.py b/image_prediction/formatter/formatter.py index a22bc1d..ab1688b 100644 --- a/image_prediction/formatter/formatter.py +++ b/image_prediction/formatter/formatter.py @@ -2,7 +2,6 @@ import abc class Formatter(abc.ABC): - @abc.abstractmethod def format(self, info: dict): raise NotImplementedError diff --git a/image_prediction/formatter/formatters/info_formatter.py b/image_prediction/formatter/formatters/info_formatter.py index ad658af..dfacd58 100644 --- a/image_prediction/formatter/formatters/info_formatter.py +++ b/image_prediction/formatter/formatters/info_formatter.py @@ -5,7 +5,6 @@ from image_prediction.formatter.formatter import Formatter class EnumFormatter(Formatter): - def format(self, metadata: dict): return {key.value if isinstance(key, Enum) else key: val for key, val in metadata.items()} diff --git a/image_prediction/image_extractor/extractor.py b/image_prediction/image_extractor/extractor.py index fc318a8..6e5f23f 100644 --- a/image_prediction/image_extractor/extractor.py +++ b/image_prediction/image_extractor/extractor.py @@ -6,7 +6,6 @@ ImageMetadataPair = namedtuple("ImageMetadataPair", ["image", "metadata"]) class ImageExtractor(abc.ABC): - @abc.abstractmethod def extract(self, obj) -> Iterable[ImageMetadataPair]: raise NotImplementedError diff --git a/image_prediction/label_mapper/mapper.py b/image_prediction/label_mapper/mapper.py index 663de94..4cdff9e 100644 --- a/image_prediction/label_mapper/mapper.py +++ b/image_prediction/label_mapper/mapper.py @@ -2,7 +2,6 @@ import abc class LabelMapper(abc.ABC): - @abc.abstractmethod def map_labels(self, items): raise NotImplementedError diff --git a/image_prediction/label_mapper/mappers/numeric.py b/image_prediction/label_mapper/mappers/numeric.py index f08de75..93b08cd 100644 --- a/image_prediction/label_mapper/mappers/numeric.py +++ b/image_prediction/label_mapper/mappers/numeric.py @@ -10,9 +10,7 @@ class IndexMapper(LabelMapper): def __validate_index_label_format(self, index_label: int) -> None: if not 0 <= index_label < len(self.__labels): - raise UnexpectedLabelFormat( - f"Received index label '{index_label}' that has no associated string label." - ) + raise UnexpectedLabelFormat(f"Received index label '{index_label}' that has no associated string label.") def __map_label(self, index_label: int) -> str: self.__validate_index_label_format(index_label) diff --git a/image_prediction/label_mapper/mappers/probability.py b/image_prediction/label_mapper/mappers/probability.py index 354d0c4..cb2d3f8 100644 --- a/image_prediction/label_mapper/mappers/probability.py +++ b/image_prediction/label_mapper/mappers/probability.py @@ -24,7 +24,9 @@ class ProbabilityMapper(LabelMapper): def __map_array(self, probabilities: np.ndarray) -> dict: self.__validate_array_label_format(probabilities) - cls2prob = dict(sorted(zip(self.__labels, list(map(self.__rounder, probabilities))), key=itemgetter(1), reverse=True)) + cls2prob = dict( + sorted(zip(self.__labels, list(map(self.__rounder, probabilities))), key=itemgetter(1), reverse=True) + ) most_likely = [*cls2prob][0] return {"label": most_likely, "probabilities": cls2prob} diff --git a/image_prediction/model_loader/database/connector.py b/image_prediction/model_loader/database/connector.py index cbc4438..f265ad5 100644 --- a/image_prediction/model_loader/database/connector.py +++ b/image_prediction/model_loader/database/connector.py @@ -2,7 +2,6 @@ import abc class DatabaseConnector(abc.ABC): - @abc.abstractmethod def get_object(self, identifier): raise NotImplementedError diff --git a/image_prediction/model_loader/database/connectors/mock.py b/image_prediction/model_loader/database/connectors/mock.py index 6bf1199..9dfcc50 100644 --- a/image_prediction/model_loader/database/connectors/mock.py +++ b/image_prediction/model_loader/database/connectors/mock.py @@ -2,7 +2,6 @@ from image_prediction.model_loader.database.connector import DatabaseConnector class DatabaseConnectorMock(DatabaseConnector): - def __init__(self, store: dict): self.store = store diff --git a/image_prediction/model_loader/loader.py b/image_prediction/model_loader/loader.py index 41cc5c2..7130a8a 100644 --- a/image_prediction/model_loader/loader.py +++ b/image_prediction/model_loader/loader.py @@ -4,7 +4,6 @@ from image_prediction.model_loader.database.connector import DatabaseConnector class ModelLoader: - def __init__(self, database_connector: DatabaseConnector): self.database_connector = database_connector diff --git a/image_prediction/model_loader/loaders/mlflow.py b/image_prediction/model_loader/loaders/mlflow.py index 9b6a044..2bbd126 100644 --- a/image_prediction/model_loader/loaders/mlflow.py +++ b/image_prediction/model_loader/loaders/mlflow.py @@ -3,7 +3,6 @@ from image_prediction.redai_adapter.mlflow import MlflowModelReader class MlflowConnector(DatabaseConnector): - def __init__(self, mlflow_reader: MlflowModelReader): self.mlflow_reader = mlflow_reader diff --git a/image_prediction/pipeline.py b/image_prediction/pipeline.py index 92913b7..8718f0a 100644 --- a/image_prediction/pipeline.py +++ b/image_prediction/pipeline.py @@ -48,7 +48,6 @@ def get_formatter(): class Pipeline: - def __init__(self): self.pipe = rcompose(get_extractor_classifier(), get_formatter()) diff --git a/image_prediction/redai_adapter/mlflow.py b/image_prediction/redai_adapter/mlflow.py index 23231e0..db88c68 100644 --- a/image_prediction/redai_adapter/mlflow.py +++ b/image_prediction/redai_adapter/mlflow.py @@ -9,7 +9,6 @@ from image_prediction.redai_adapter.model import PredictionModelHandle class MlflowModelReader: - def __init__(self, mlruns_dir=None): self.mlruns_dir = mlruns_dir mlflow.set_tracking_uri(self.mlruns_dir)