Merge in RR/image-prediction from RED-6084-adhoc-scanned-pages-filtering-refactoring to master
Squashed commit of the following:
commit bd6d83e7363b1c1993babcceb434110a6312c645
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Thu Feb 9 16:08:25 2023 +0100
Tweak logging
commit 55bdd48d2a3462a8b4a6b7194c4a46b21d74c455
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Thu Feb 9 15:47:31 2023 +0100
Update dependencies
commit 970275b25708c05e4fbe78b52aa70d791d5ff17a
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Thu Feb 9 15:35:37 2023 +0100
Refactoring
Make alpha channel check monadic to streamline error handling
commit e99e97e23fd8ce16f9a421d3e5442fccacf71ead
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Tue Feb 7 14:32:29 2023 +0100
Refactoring
- Rename
- Refactor image extraction functions
commit 76b1b0ca2401495ec03ba2b6483091b52732eb81
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Tue Feb 7 11:55:30 2023 +0100
Refactoring
commit cb1c461049d7c43ec340302f466447da9f95a499
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Tue Feb 7 11:44:01 2023 +0100
Refactoring
commit 092069221a85ac7ac19bf838dcbc7ab1fde1e12b
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Tue Feb 7 10:18:53 2023 +0100
Add to-do
commit 3cea4dad2d9703b8c79ddeb740b66a3b8255bb2a
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Tue Feb 7 10:11:35 2023 +0100
Refactoring
- Rename
- Add typehints everywhere
commit 865e0819a14c420bc2edff454d41092c11c019a4
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 19:38:57 2023 +0100
Add type explanation
commit 01d3d5d33f1ccb05aea1cec1d1577572b1a4deaa
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 19:37:49 2023 +0100
Formatting
commit dffe1c18fc3a322a6b08890d4438844e8122faaf
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 19:34:13 2023 +0100
[WIP] Either refactoring
Add alternative formulation for monadic chain
commit 066cf17add404a313520cd794c06e3264cf971c9
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 18:40:30 2023 +0100
[WIP] Either refactoring
commit f53f0fea298cdab88deb090af328b34d37e0198e
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 18:18:34 2023 +0100
[WIP] Either refactoring
Propagate error and metadata
commit 274a5f56d4fcb9c67fac5cf43e9412ec1ab5179e
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 17:51:35 2023 +0100
[WIP] Either refactoring
Fix test assertion
commit 3235a857f6e418e50484cbfff152b0f63efb2f53
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 16:57:31 2023 +0100
[WIP] Either-refactoring
Replace Maybe with Either to allow passing on error information or
metadata which otherwise get sucked up by Nothing.
commit 89989543d87490f8b20a0a76055605d34345e8f4
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 16:12:40 2023 +0100
[WIP] Monadic refactoring
Integrate image validation step into monadic chain.
At the moment we lost the error information through this. Refactoring to
Either monad can bring it back.
commit 022bd4856a51aa085df5fe983fd77b99b53d594c
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 15:16:41 2023 +0100
[WIP] Monadic refactoring
commit ca3898cb539607c8c3dd01c57e60211a5fea8a7d
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 15:10:34 2023 +0100
[WIP] Monadic refactoring
commit d8f37bed5cbd6bdd2a0b52bae46fcdbb50f9dff2
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 15:09:51 2023 +0100
[WIP] Monadic refactoring
commit 906fee0e5df051f38076aa1d2725e52a182ade13
Author: Matthias Bisping <matthias.bisping@axbit.com>
Date: Mon Feb 6 15:03:35 2023 +0100
[WIP] Monadic refactoring
... and 35 more commits
98 lines
3.3 KiB
Python
98 lines
3.3 KiB
Python
import json
|
|
import os
|
|
import random
|
|
from functools import partial
|
|
from operator import itemgetter
|
|
|
|
import numpy as np
|
|
import pytest
|
|
from funcy import rcompose, lmap
|
|
|
|
from image_prediction.encoder.encoders.hash_encoder import hash_image
|
|
from image_prediction.exceptions import UnknownLabelFormat
|
|
from image_prediction.label_mapper.mappers.probability import ProbabilityMapperKeys
|
|
from image_prediction.locations import TEST_DATA_DIR
|
|
from test.utils.label import map_labels
|
|
|
|
|
|
@pytest.fixture
|
|
def expected_predictions_mapped(
|
|
label_format, batch_of_expected_string_labels, batch_of_expected_label_to_probability_mappings
|
|
):
|
|
if label_format == "index":
|
|
return batch_of_expected_string_labels
|
|
elif label_format == "probability":
|
|
return batch_of_expected_label_to_probability_mappings
|
|
else:
|
|
raise UnknownLabelFormat(f"No label mapper for label format {label_format} was specified.")
|
|
|
|
|
|
@pytest.fixture
|
|
def expected_predictions(label_format, batch_of_expected_numeric_labels, batch_of_expected_probability_arrays):
|
|
if label_format == "index":
|
|
return batch_of_expected_numeric_labels
|
|
elif label_format == "probability":
|
|
return batch_of_expected_probability_arrays
|
|
else:
|
|
raise UnknownLabelFormat(f"No label mapper for label format {label_format} was specified.")
|
|
|
|
|
|
@pytest.fixture
|
|
def batch_of_expected_string_labels(batch_of_expected_numeric_labels, classes):
|
|
return map_labels(batch_of_expected_numeric_labels, classes)
|
|
|
|
|
|
@pytest.fixture
|
|
def batch_of_expected_numeric_labels(batch_size, classes):
|
|
return random.choices(range(len(classes)), k=batch_size)
|
|
|
|
|
|
@pytest.fixture
|
|
def batch_of_expected_label_to_probability_mappings(batch_of_expected_probability_arrays, classes):
|
|
def map_probabilities(probabilities):
|
|
lbl2prob = dict(sorted(zip(classes, map(rounder, probabilities)), key=itemgetter(1), reverse=True))
|
|
most_likely = [*lbl2prob][0]
|
|
return {ProbabilityMapperKeys.LABEL: most_likely, ProbabilityMapperKeys.PROBABILITIES: lbl2prob}
|
|
|
|
rounder = rcompose(partial(np.round, decimals=4), float)
|
|
return lmap(map_probabilities, batch_of_expected_probability_arrays)
|
|
|
|
|
|
@pytest.fixture
|
|
def batch_of_expected_probability_arrays(batch_size, classes):
|
|
return [np.random.uniform(size=len(classes)) for _ in range(batch_size)]
|
|
|
|
|
|
@pytest.fixture
|
|
def output_batch_generator(expected_predictions):
|
|
return iter(expected_predictions)
|
|
|
|
|
|
@pytest.fixture
|
|
def metadata_plus_mapped_prediction(expected_predictions_mapped, metadata):
|
|
return [{"classification": epm, **mdt} for epm, mdt in zip(expected_predictions_mapped, metadata)]
|
|
|
|
|
|
@pytest.fixture
|
|
def metadata_formatted_plus_mapped_prediction_formatted(expected_predictions_mapped_and_formatted, metadata_formatted):
|
|
return [
|
|
{"classification": epm, **mdt}
|
|
for epm, mdt in zip(expected_predictions_mapped_and_formatted, metadata_formatted)
|
|
]
|
|
|
|
|
|
@pytest.fixture
|
|
def expected_predictions_mapped_and_formatted(expected_predictions_mapped):
|
|
return [{k.value: v for k, v in epm.items()} for epm in expected_predictions_mapped]
|
|
|
|
|
|
@pytest.fixture
|
|
def real_expected_service_response(dvc_test_data):
|
|
with open(os.path.join(TEST_DATA_DIR, "f2dc689ca794fccb8cd38b95f2bf6ba9_predictions.json"), "r") as f:
|
|
yield json.load(f)
|
|
|
|
|
|
@pytest.fixture
|
|
def hashed_images(images):
|
|
return lmap(hash_image, images)
|