From 9763d2ca657bb7ebd83b20397f10b6cf7606751f Mon Sep 17 00:00:00 2001 From: Julius Unverfehrt Date: Mon, 12 Sep 2022 15:29:47 +0200 Subject: [PATCH] Pull request #32: RED-5202 port hotfixes Merge in RR/image-prediction from RED-5202-port-hotfixes to master Squashed commit of the following: commit aaa02ea35e9c1b3b307116d7e3e32c93fd79ef5d Merge: 5d87066 521222e Author: Julius Unverfehrt Date: Mon Sep 12 15:28:39 2022 +0200 Merge branch 'master' of ssh://git.iqser.com:2222/rr/image-prediction into RED-5202-port-hotfixes commit 5d87066b40b28f919b1346f5e5396b46445b4e00 Author: Julius Unverfehrt Date: Mon Sep 12 15:25:01 2022 +0200 remove warning log for non existent non default env var commit 23c61ef49ef918b29952150d4a6e61b99d60ac64 Author: Julius Unverfehrt Date: Mon Sep 12 15:14:19 2022 +0200 make env var parser discrete commit c1b92270354c764861da0f7782348e9cd0725d76 Author: Matthias Bisping Date: Mon Sep 12 13:28:44 2022 +0200 fixed statefulness issue with os.environ in tests commit ad9c5657fe93079d5646ba2b70fa091e8d2daf76 Author: Matthias Bisping Date: Mon Sep 12 13:04:55 2022 +0200 - Adapted response formatting logic for threshold maps passed via env vars. - Added test for reading threshold maps and values from env vars. commit c60e8cd6781b8e0c3ec69ccd0a25375803de26f0 Author: Julius Unverfehrt Date: Mon Sep 12 11:38:01 2022 +0200 add parser for environment variables WIP commit 101b71726c697f30ec9298ba62d2203bd7da2efb Author: Julius Unverfehrt Date: Mon Sep 12 09:52:33 2022 +0200 Add typehints, make custom page quotient breach function private since the intention of outsourcing it from build_image_info is to make it testable seperately commit 04aee4e62781e78cd54c6d20e961dcd7bf1fc081 Author: Julius Unverfehrt Date: Mon Sep 12 09:25:59 2022 +0200 DotIndexable default get method exception made more specific commit 4584e7ba66400033dc5f1a38473b644eeb11e67c Author: Julius Unverfehrt Date: Mon Sep 12 08:55:05 2022 +0200 RED-5202 port temporary broken image handling so the hotfix won't be lost by upgrading the service. A proper solution is still desirable (see RED-5148) commit 5f99622646b3f6d3a842aebef91ff8e082072cd6 Author: Julius Unverfehrt Date: Mon Sep 12 08:47:02 2022 +0200 RED-5202 add per class customizable max image to page quotient setting for signatures, default is 0.4. Can be overwritten by , set to null to use default value or set to value that should be used. --- .../transformer/transformers/response.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/image_prediction/transformer/transformers/response.py b/image_prediction/transformer/transformers/response.py index 91244c9..7c2b326 100644 --- a/image_prediction/transformer/transformers/response.py +++ b/image_prediction/transformer/transformers/response.py @@ -4,7 +4,7 @@ import os from functools import lru_cache from operator import itemgetter -from funcy import filter, juxt, first, rest, compose +from funcy import first from image_prediction.config import CONFIG from image_prediction.exceptions import ParsingError @@ -131,16 +131,14 @@ def build_image_info(data: dict) -> dict: @lru_cache(maxsize=None) def parse_env_var(prefix, table=None): table = table or os.environ - head, tail = juxt(first, compose(list, rest))(filter(prefix, table)) - if not head: - logger.warning(f"Found no environment variable with prefix '{prefix}'.") - elif tail: - logger.warning(f"Found multiple candidates for environment variable with prefix '{prefix}'.") - else: + head = first(filter(lambda s: s == prefix, table)) + if head: try: return parse_env_var_value(table[head]) except ParsingError as err: logger.warning(err) + else: + return None def parse_env_var_value(env_var_value):