From 37ee086b5d57736a24dab866a822f7f933626a82 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Tue, 5 Apr 2022 17:55:38 +0200 Subject: [PATCH] applied black --- .../image_extractor/extractors/parsable.py | 2 +- test/conftest.py | 8 +++++--- test/unit_tests/coordinate_transformer_test.py | 18 +++++++----------- test/unit_tests/image_stitcher_test.py | 2 -- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/image_prediction/image_extractor/extractors/parsable.py b/image_prediction/image_extractor/extractors/parsable.py index 9c2e10a..c5892ca 100644 --- a/image_prediction/image_extractor/extractors/parsable.py +++ b/image_prediction/image_extractor/extractors/parsable.py @@ -69,7 +69,7 @@ class ParsablePDFImageExtractor(ImageExtractor): image_metadata_pairs = chain.from_iterable( map( self.__process_images_on_page, - tqdm(pages, desc="Extracting", disable=not self.verbose, total=len(page_range) if page_range else None) + tqdm(pages, desc="Extracting", disable=not self.verbose, total=len(page_range) if page_range else None), ) ) diff --git a/test/conftest.py b/test/conftest.py index 81914ae..f6f7567 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -106,7 +106,7 @@ def label_format(request): @pytest.fixture def expected_predictions_mapped( - label_format, batch_of_expected_string_labels, batch_of_expected_label_to_probability_mappings + label_format, batch_of_expected_string_labels, batch_of_expected_label_to_probability_mappings ): if label_format == "index": return batch_of_expected_string_labels @@ -128,7 +128,7 @@ def expected_predictions(label_format, batch_of_expected_numeric_labels, batch_o @pytest.fixture def estimator_adapter( - estimator_type, estimator_mock, keras_model, model_handle_mock, output_batch_generator, monkeypatch + estimator_type, estimator_mock, keras_model, model_handle_mock, output_batch_generator, monkeypatch ): if estimator_type == "mock": estimator_adapter = EstimatorAdapter(estimator_mock) @@ -481,5 +481,7 @@ def page_width(request): def random_single_color_image_from_metadata(metadata): - image = Image.new('RGB', (metadata[Info.WIDTH], metadata[Info.HEIGHT]), color=tuple(map(int, np.random.uniform(size=3) * 255))) + image = Image.new( + "RGB", (metadata[Info.WIDTH], metadata[Info.HEIGHT]), color=tuple(map(int, np.random.uniform(size=3) * 255)) + ) return image diff --git a/test/unit_tests/coordinate_transformer_test.py b/test/unit_tests/coordinate_transformer_test.py index ec3f0d6..18e69f7 100644 --- a/test/unit_tests/coordinate_transformer_test.py +++ b/test/unit_tests/coordinate_transformer_test.py @@ -51,7 +51,7 @@ def test_pdfnet_coordinate_transformer(position_metadata_in_given_system, positi @pytest.mark.parametrize("coordinate_system", ["fpdf", "fitz", "pdfnet"]) def test_coordinate_transformer_by_metadata( - transformer, position_metadata_in_given_system, position_metadata_in_reference_system + transformer, position_metadata_in_given_system, position_metadata_in_reference_system ): assert transform_equal( transformer.forward(position_metadata_in_reference_system), position_metadata_in_given_system @@ -61,7 +61,7 @@ def test_coordinate_transformer_by_metadata( ) assert transform_equal( compose(transformer.backward, transformer.forward)(position_metadata_in_reference_system), - position_metadata_in_reference_system + position_metadata_in_reference_system, ) @@ -99,7 +99,7 @@ def corner(request): @pytest.fixture def corner2metadata_in_given_system( - coordinate_system, get_fpdf_corner_metadat, get_fitz_corner_metadat, get_pdfnet_corner_metadata + coordinate_system, get_fpdf_corner_metadat, get_fitz_corner_metadat, get_pdfnet_corner_metadata ): if coordinate_system == "fpdf": return get_fpdf_corner_metadat @@ -142,7 +142,7 @@ def get_fpdf_corner_metadat(base_position_metadata, get_metadata_for_coords, get "top_left": get_metadata_for_coords(0, 0, width, height), "bottom_left": get_metadata_for_coords(0, page_height - height, width, page_height), "bottom_right": get_metadata_for_coords(page_width - width, page_height - height, page_width, page_height), - "top_right": get_metadata_for_coords(page_width - width, 0, page_width, height) + "top_right": get_metadata_for_coords(page_width - width, 0, page_width, height), } @@ -202,7 +202,7 @@ def get_metadata_coords(x1, y1, x2, y2): @pytest.mark.parametrize("coordinate_system", ["pdfnet"]) @pytest.mark.parametrize("multiple", [False]) def test_coordinate_transformer_by_image( - transformer, position_metadata_in_given_system, position_metadata_in_reference_system + transformer, position_metadata_in_given_system, position_metadata_in_reference_system ): metadata_transformed = transformer(position_metadata_in_given_system) @@ -213,12 +213,8 @@ def test_coordinate_transformer_by_image( def metadata_to_test_page_image(metadata): - image = get_coordinate_test_image( - *itemgetter(*attrgetter("WIDTH", "HEIGHT")(Info))(metadata) - ) - pdf = get_coordinate_test_fpdf( - *itemgetter(*attrgetter("PAGE_WIDTH", "PAGE_HEIGHT")(Info))(metadata) - ) + image = get_coordinate_test_image(*itemgetter(*attrgetter("WIDTH", "HEIGHT")(Info))(metadata)) + pdf = get_coordinate_test_fpdf(*itemgetter(*attrgetter("PAGE_WIDTH", "PAGE_HEIGHT")(Info))(metadata)) add_image(pdf, ImageMetadataPair(image, metadata)) page_image = fpdf_to_page_tensor(pdf) return page_image diff --git a/test/unit_tests/image_stitcher_test.py b/test/unit_tests/image_stitcher_test.py index 4e310e1..6555e1d 100644 --- a/test/unit_tests/image_stitcher_test.py +++ b/test/unit_tests/image_stitcher_test.py @@ -17,7 +17,6 @@ def test_image_stitcher(partial_image_metadata_pairs): pass - @pytest.mark.parametrize("width", [100]) @pytest.mark.parametrize("height", [300]) @pytest.mark.parametrize("page_width", [500]) @@ -35,7 +34,6 @@ def test_partial_image_metadata_pairs(patches_metadata, page_width, page_height) def split_box(box, max_step=5): def split_recursively(box, step): - def split_horizontal(): return split(Info.WIDTH, Info.X1, Info.X2)