Merge in RR/image-prediction from tdd_refactoring to master
Squashed commit of the following:
commit f6c64430007590f5d2b234a7f784e26025d06484
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 12:18:47 2022 +0200
renaming
commit 8f40b51282191edf3e2a5edcd6d6acb388ada453
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 12:07:18 2022 +0200
adjusted expetced output for alpha channel in response
commit 7e666302d5eadb1e84b70cae27e8ec6108d7a135
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 11:52:51 2022 +0200
added alpha channel check result to response
commit a6b9f64b51cd888fc0c427a38bd43ae2ae2cb051
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 11:27:57 2022 +0200
readme updated
commit 0d06ad657e3c21dcef361c53df37b05aba64528b
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 11:19:35 2022 +0200
readme updated and config
commit 75748a1d82f0ebdf3ad7d348c6d820c8858aa3cb
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 11:19:26 2022 +0200
refactoring
commit 60101337828d11f5ee5fed0d8c4ec80cde536d8a
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 11:18:23 2022 +0200
multiple reoutes for prediction
commit c8476cb5f55e470b831ae4557a031a2c1294eb86
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 11:17:49 2022 +0200
add banner.txt to container
commit 26ef5fce8a9bc015f1c35f32d40e8bea50a96454
Author: Matthias Bisping <Matthias.Bisping@iqser.com>
Date: Mon Apr 25 10:08:49 2022 +0200
Pull request #8: Pipeline refactoring
Merge in RR/image-prediction from pipeline_refactoring to tdd_refactoring
Squashed commit of the following:
commit 6989fcb3313007b7eecf4bba39077fcde6924a9a
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 09:49:49 2022 +0200
removed obsolete module
commit 7428aeee37b11c31cffa597c85b018ba71e79a1d
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 09:45:45 2022 +0200
refactoring
commit 0dcd3894154fdf34bd3ba4ef816362434474f472
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Mon Apr 25 08:57:21 2022 +0200
refactoring; removed obsolete extractor-classifier
commit 1078aa81144f4219149b3fcacdae8b09c4b905c0
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Fri Apr 22 17:18:10 2022 +0200
removed obsolete imports
commit 71f61fc5fc915da3941cf5ed5d9cc90fccc49031
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Fri Apr 22 17:16:25 2022 +0200
comment changed
commit b582726cd1de233edb55c5a76c91e99f9dd3bd13
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Fri Apr 22 17:12:11 2022 +0200
refactoring
commit 8abc9010048078868b235d6793ac6c8b20abb985
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Thu Apr 21 21:25:47 2022 +0200
formatting
commit 2c87c419fe3185a25c27139e7fcf79f60971ad24
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Thu Apr 21 21:24:05 2022 +0200
formatting
commit 50b161192db43a84464125c6d79650225e1010d6
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Thu Apr 21 21:20:18 2022 +0200
refactoring
commit 9a1446cccfa070852a5d9c0bdbc36037b82541fc
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Thu Apr 21 21:04:57 2022 +0200
refactoring
commit 6c10b55ff8e61412cb2fe5a5625e660ecaf1d7d1
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Thu Apr 21 19:48:05 2022 +0200
refactoring
commit 72e785e3e31c132ab352119e9921725f91fac9e2
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Thu Apr 21 19:43:39 2022 +0200
refactoring
commit f036ee55e6747daf31e3929bdc2d93dc5f2a56ca
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Wed Apr 20 18:30:41 2022 +0200
refactoring pipeline WIP
commit 120721f5f1a7e910c0c2ebc79dc87c2908794c80
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Wed Apr 20 15:39:58 2022 +0200
rm debug ls
commit 81226d4f8599af0db0e9718fbb1789cfad91a855
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Wed Apr 20 15:28:27 2022 +0200
no compose down
commit 943f7799d49b6a6b0fed985a76ed4fe725dfaeef
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Wed Apr 20 15:22:17 2022 +0200
coverage combine
commit d4cd96607157ea414db417cfd7133f56cb56afe1
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Wed Apr 20 14:43:09 2022 +0200
model builder path in mlruns adjusted
commit 5b90bb47c3421feb6123c179eb68d1125d58ff1e
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Wed Apr 20 10:56:58 2022 +0200
dvc pull in test running script
commit a935cacf2305a4a78a15ff571f368962f4538369
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Wed Apr 20 10:50:36 2022 +0200
no clean working dir
commit ba09df7884485b8ab8efbf42a8058de9af60c75c
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Wed Apr 20 10:43:22 2022 +0200
debug ls
commit 71263a9983dbfe2060ef5b74de7cc2cbbad43416
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Wed Apr 20 09:11:03 2022 +0200
debug ls
commit 41fbadc331e65e4ffe6d053e2d925e5e0543d8b7
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Tue Apr 19 20:08:08 2022 +0200
debug echo
commit bb19698d640b3a99ea404e5b4b06d719a9bfe9e9
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Tue Apr 19 20:01:59 2022 +0200
skip server predict test
commit 5094015a87fc0976c9d3ff5d1f4c6fdbd96b7eae
Author: Matthias Bisping <matthias.bisping@iqser.com>
Date: Tue Apr 19 19:05:50 2022 +0200
sonar stage after build stage
... and 253 more commits
247 lines
8.7 KiB
Python
247 lines
8.7 KiB
Python
import json
|
|
import os
|
|
from copy import deepcopy
|
|
from functools import partial
|
|
from itertools import starmap, repeat
|
|
from operator import itemgetter
|
|
from typing import List
|
|
|
|
import fpdf
|
|
import pdf2image
|
|
import pytest
|
|
from funcy import juxt, one, first
|
|
|
|
from image_prediction.formatter.formatters.enum import ReverseEnumFormatter
|
|
from image_prediction.image_extractor.extractor import ImageMetadataPair
|
|
from image_prediction.info import Info
|
|
from image_prediction.stitching.grouping import group_by_coordinate
|
|
from image_prediction.stitching.merging import (
|
|
merge_metadata_horizontally,
|
|
merge_metadata_vertically,
|
|
merge_pair_horizontally,
|
|
merge_pair_vertically,
|
|
concat_images_horizontally,
|
|
concat_images_vertically,
|
|
merge_group_horizontally,
|
|
merge_group_vertically,
|
|
)
|
|
from image_prediction.stitching.stitching import stitch_pairs
|
|
from image_prediction.stitching.utils import (
|
|
make_coord_getter,
|
|
make_length_getter,
|
|
)
|
|
from test.utils.comparison import images_equal
|
|
from test.utils.generation.image import random_single_color_image_from_metadata, gray_image_from_metadata
|
|
from test.utils.generation.pdf import add_image
|
|
from test.utils.stitching import BoxSplitter
|
|
|
|
x1_getter, y1_getter, x2_getter, y2_getter = map(make_coord_getter, ("x1", "y1", "x2", "y2"))
|
|
width_getter, height_getter = map(make_length_getter, ("width", "height"))
|
|
|
|
|
|
def test_group_by_coordinate_exact():
|
|
pairs = [(0, 1), (0, 3), (1, 4), (1, 4), (1, 2), (3, 3)]
|
|
pairs_grouped = list(group_by_coordinate(pairs, itemgetter(0), tolerance=0))
|
|
assert pairs_grouped == [[(0, 1), (0, 3)], [(1, 4), (1, 4), (1, 2)], [(3, 3)]]
|
|
|
|
|
|
def test_group_by_coordinate_fuzzy():
|
|
pairs = [(0, 1), (1, 3), (1, 4), (2, 4), (2, 2), (3, 3)]
|
|
pairs_grouped = list(group_by_coordinate(pairs, itemgetter(0), tolerance=1))
|
|
assert pairs_grouped == [[(0, 1), (1, 3), (1, 4)], [(2, 4), (2, 2), (3, 3)]]
|
|
|
|
|
|
def test_image_stitcher(patch_image_metadata_pairs, base_patch_metadata, base_patch_image):
|
|
pairs_stitched = stitch_pairs(patch_image_metadata_pairs)
|
|
pair_stitched = first(pairs_stitched)
|
|
|
|
assert len(pairs_stitched) == 1
|
|
assert pair_stitched.metadata == base_patch_metadata
|
|
assert images_equal(pair_stitched.image.resize((10, 10)), base_patch_image.resize((10, 10)), atol=0.4)
|
|
|
|
|
|
def test_image_stitcher_with_gaps_must_succeed():
|
|
from image_prediction.locations import TEST_DATA_DIR
|
|
|
|
with open(os.path.join(TEST_DATA_DIR, "stitching_with_tolerance.json")) as f:
|
|
patches_metadata, base_patch_metadata = itemgetter("input", "target")(ReverseEnumFormatter(Info)(json.load(f)))
|
|
|
|
images = map(gray_image_from_metadata, patches_metadata)
|
|
patch_image_metadata_pairs = list(starmap(ImageMetadataPair, zip(images, patches_metadata)))
|
|
|
|
pairs_stitched = stitch_pairs(patch_image_metadata_pairs, tolerance=7)
|
|
|
|
assert len(pairs_stitched) == 1
|
|
pair_stitched = first(pairs_stitched)
|
|
assert pair_stitched.metadata == base_patch_metadata
|
|
|
|
|
|
@pytest.mark.parametrize("noise", [(0, 2)])
|
|
@pytest.mark.parametrize("split_count", [5])
|
|
@pytest.mark.parametrize("width", [100])
|
|
@pytest.mark.parametrize("height", [100])
|
|
@pytest.mark.parametrize("page_width", [100])
|
|
@pytest.mark.parametrize("page_height", [100])
|
|
@pytest.mark.parametrize("execution_number", range(100))
|
|
@pytest.mark.xfail(reason="Does not always succeed due to locally maximizing merging logic.")
|
|
def test_image_stitcher_with_gaps_can_fail(patch_image_metadata_pairs, base_patch_metadata, execution_number):
|
|
pairs_stitched = stitch_pairs(patch_image_metadata_pairs, tolerance=4)
|
|
assert len(pairs_stitched) == 1 and first(pairs_stitched).metadata == base_patch_metadata
|
|
|
|
|
|
def test_merge_group_horizontally(horizontal_merge_test_pairs):
|
|
pr1, pr2, pr_merged_expected = horizontal_merge_test_pairs
|
|
|
|
prs_merged = merge_group_horizontally([pr1, pr2])
|
|
assert len(prs_merged) == 1
|
|
assert pair_equal(prs_merged[0], pr_merged_expected)
|
|
|
|
mdat3 = deepcopy(pr2.metadata)
|
|
mdat3[Info.HEIGHT] += 30
|
|
mdat3[Info.Y2] += 30
|
|
im3 = gray_image_from_metadata(mdat3)
|
|
pr3 = ImageMetadataPair(im3, mdat3)
|
|
|
|
prs_merged = merge_group_horizontally([pr1, pr2, pr3])
|
|
assert len(prs_merged) == 2
|
|
assert one(partial(pair_equal, pr_merged_expected), prs_merged)
|
|
|
|
|
|
def test_merge_group_vertically(vertical_merge_test_pairs):
|
|
pr1, pr2, pr_merged_expected = vertical_merge_test_pairs
|
|
|
|
prs_merged = merge_group_vertically([pr1, pr2])
|
|
assert len(prs_merged) == 1
|
|
assert pair_equal(prs_merged[0], pr_merged_expected)
|
|
|
|
mdat3 = deepcopy(pr2.metadata)
|
|
mdat3[Info.WIDTH] += 30
|
|
mdat3[Info.X2] += 30
|
|
im3 = gray_image_from_metadata(mdat3)
|
|
pr3 = ImageMetadataPair(im3, mdat3)
|
|
|
|
prs_merged = merge_group_vertically([pr1, pr2, pr3])
|
|
assert len(prs_merged) == 2
|
|
assert one(partial(pair_equal, pr_merged_expected), prs_merged)
|
|
|
|
|
|
def pair_equal(pr1, pr2):
|
|
return pr1.metadata == pr2.metadata and images_equal(pr1.image, pr2.image)
|
|
|
|
|
|
def test_merge_pairs_horizontally(horizontal_merge_test_pairs):
|
|
pr1, pr2, pr_merged_expected = horizontal_merge_test_pairs
|
|
pr_merged = merge_pair_horizontally(pr1, pr2)
|
|
assert pair_equal(pr_merged, pr_merged_expected)
|
|
|
|
|
|
def test_merge_pairs_vertically(vertical_merge_test_pairs):
|
|
pr1, pr2, pr_merged_expected = vertical_merge_test_pairs
|
|
pr_merged = merge_pair_vertically(pr1, pr2)
|
|
assert pair_equal(pr_merged, pr_merged_expected)
|
|
|
|
|
|
@pytest.fixture
|
|
def horizontal_merge_test_pairs(horizontal_merge_test_metadata):
|
|
images = map(gray_image_from_metadata, horizontal_merge_test_metadata)
|
|
return list(starmap(ImageMetadataPair, zip(images, horizontal_merge_test_metadata)))
|
|
|
|
|
|
@pytest.fixture
|
|
def vertical_merge_test_pairs(vertical_merge_test_metadata):
|
|
images = map(gray_image_from_metadata, vertical_merge_test_metadata)
|
|
return list(starmap(ImageMetadataPair, zip(images, vertical_merge_test_metadata)))
|
|
|
|
|
|
def test_merge_metadata_horizontally(horizontal_merge_test_metadata):
|
|
mdat1, mdat2, mdat_merged = horizontal_merge_test_metadata
|
|
assert merge_metadata_horizontally(mdat1, mdat2) == mdat_merged
|
|
|
|
|
|
def test_merge_metadata_vertically(vertical_merge_test_metadata):
|
|
mdat1, mdat2, mdat_merged = vertical_merge_test_metadata
|
|
assert merge_metadata_vertically(mdat1, mdat2) == mdat_merged
|
|
|
|
|
|
@pytest.fixture
|
|
def horizontal_merge_test_metadata(merge_test_metadata):
|
|
mdat1, mdat2, mdat_merged = merge_test_metadata
|
|
|
|
mdat2[Info.X1] = mdat1[Info.X2]
|
|
mdat2[Info.X2] = mdat2[Info.X1] + mdat2[Info.WIDTH]
|
|
|
|
mdat_merged.update({Info.WIDTH: mdat1[Info.WIDTH] + mdat2[Info.WIDTH], Info.X2: mdat2[Info.X2]})
|
|
|
|
return mdat1, mdat2, mdat_merged
|
|
|
|
|
|
@pytest.fixture
|
|
def vertical_merge_test_metadata(merge_test_metadata):
|
|
mdat1, mdat2, mdat_merged = merge_test_metadata
|
|
|
|
mdat2[Info.Y1] = mdat1[Info.Y2]
|
|
mdat2[Info.Y2] = mdat2[Info.Y1] + mdat2[Info.HEIGHT]
|
|
|
|
mdat_merged.update({Info.HEIGHT: mdat1[Info.HEIGHT] + mdat2[Info.HEIGHT], Info.Y2: mdat2[Info.Y2]})
|
|
|
|
return mdat1, mdat2, mdat_merged
|
|
|
|
|
|
@pytest.fixture
|
|
def merge_test_metadata(base_patch_metadata):
|
|
return juxt(*repeat(deepcopy, 3))(base_patch_metadata)
|
|
|
|
|
|
@pytest.fixture
|
|
def base_patch_image(stitch_test_pdf):
|
|
return pdf2image.convert_from_bytes(stitch_test_pdf)[0]
|
|
|
|
|
|
def test_concat_images_horizontally(horizontal_merge_test_metadata):
|
|
mdat1, mdat2, mdat_merged = horizontal_merge_test_metadata
|
|
im1, im2, im_merged_expected = map(gray_image_from_metadata, [mdat1, mdat2, mdat_merged])
|
|
im_merged = concat_images_horizontally(im1, im2, mdat_merged)
|
|
assert im_merged.size == im_merged_expected.size
|
|
assert images_equal(im_merged, im_merged_expected)
|
|
|
|
|
|
def test_concat_images_vertically(vertical_merge_test_metadata):
|
|
mdat1, mdat2, mdat_merged = vertical_merge_test_metadata
|
|
im1, im2, im_merged_expected = map(gray_image_from_metadata, [mdat1, mdat2, mdat_merged])
|
|
im_merged = concat_images_vertically(im1, im2, mdat_merged)
|
|
assert im_merged.size == im_merged_expected.size
|
|
assert images_equal(im_merged, im_merged_expected)
|
|
|
|
|
|
@pytest.fixture
|
|
def stitch_test_pdf(patch_image_metadata_pairs, width, height):
|
|
|
|
pdf = fpdf.FPDF(unit="pt", format=(width, height))
|
|
|
|
for pair in patch_image_metadata_pairs:
|
|
add_image(pdf, pair)
|
|
|
|
return pdf.output(dest="S").encode("latin1")
|
|
|
|
|
|
@pytest.fixture
|
|
def patch_image_metadata_pairs(patches_metadata) -> List[ImageMetadataPair]:
|
|
images = map(random_single_color_image_from_metadata, patches_metadata)
|
|
return list(starmap(ImageMetadataPair, zip(images, patches_metadata)))
|
|
|
|
|
|
@pytest.fixture
|
|
def patches_metadata(base_patch_metadata, noise, split_count):
|
|
patches_metadata = list(BoxSplitter(noise).split_box(base_patch_metadata, split_count))
|
|
return patches_metadata
|
|
|
|
|
|
@pytest.fixture(params=[(0, 0)])
|
|
def noise(request):
|
|
return request.param
|
|
|
|
|
|
@pytest.fixture(params=[5])
|
|
def split_count(request):
|
|
return request.param
|