diff --git a/image_prediction/classifier/classifier.py b/image_prediction/classifier/classifier.py index d4cdf31..8e752cf 100644 --- a/image_prediction/classifier/classifier.py +++ b/image_prediction/classifier/classifier.py @@ -28,7 +28,7 @@ class Classifier: if isinstance(batch, np.ndarray) and batch.shape[0] == 0: return [] - return list(self.__pipe(batch)) # TODO: list? + return self.__pipe(batch) def __call__(self, batch: np.array) -> List[str]: logger.debug("Classifier.predict") diff --git a/image_prediction/pipeline.py b/image_prediction/pipeline.py index f37b6fa..89785bc 100644 --- a/image_prediction/pipeline.py +++ b/image_prediction/pipeline.py @@ -55,4 +55,4 @@ class Pipeline: ) def __call__(self, pdf: bytes, page_range: range = None): - yield from tqdm(self.pipe(pdf, page_range=page_range)) + yield from tqdm(self.pipe(pdf, page_range=page_range), desc="Processing images from document", unit=" images") diff --git a/test/unit_tests/classifier_test.py b/test/unit_tests/classifier_test.py index c0e2baf..eaea50b 100644 --- a/test/unit_tests/classifier_test.py +++ b/test/unit_tests/classifier_test.py @@ -4,7 +4,7 @@ import pytest @pytest.mark.parametrize("estimator_type", ["mock", "keras", "redai"]) @pytest.mark.parametrize("label_format", ["index", "probability"]) def test_classifier(classifier, input_batch, expected_predictions_mapped): - predictions = classifier(input_batch) + predictions = list(classifier(input_batch)) assert predictions == expected_predictions_mapped