Marmelator/image-classification-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 29 Wiki Activity

adjust log messages, readabiltiy improvements

Browse Source
This commit is contained in:
Julius Unverfehrt 2022-08-30 14:29:45 +02:00
parent 8245faecff
commit afaa0aefee
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
image_prediction/redai_adapter/model_wrapper.py
View File

@ -35,9 +35,7 @@ class ModelWrapper(abc.ABC):
# RED-5170: fails if image is 'broken' # RED-5170: fails if image is 'broken'
try: try:
image, valid = self.__resize_and_convert(image), True image, valid = self.__resize_and_convert(image), True
except OSError as err: except (OSError, Exception) as err:
image, valid = self.__handle_resize_exception(err)
except Exception as err:
image, valid = self.__handle_resize_exception(err) image, valid = self.__handle_resize_exception(err)
return image, valid return image, valid
@ -46,7 +44,7 @@ class ModelWrapper(abc.ABC):
return image.resize(self.input_shape[:-1]).convert("RGB") return image.resize(self.input_shape[:-1]).convert("RGB")
def __handle_resize_exception(self, err): def __handle_resize_exception(self, err):
logger.warn(f"{err}: couldn't resize image, replace and passthrough.") logger.warn(f"{err}: Couldn't resize image, replace with blank image and passthrough.")
image = Image.new("RGB", self.input_shape[:-1]) image = Image.new("RGB", self.input_shape[:-1])
valid = False valid = False
return image, valid return image, valid

4
image_prediction/stitching/merging.py
View File

@ -191,6 +191,8 @@ def concat_images(im1: Image, im2: Image, metadata: dict, axis):
try: # RED-5170: fails if image is 'broken' try: # RED-5170: fails if image is 'broken'
im_aggr.paste(im, box=box) im_aggr.paste(im, box=box)
except Exception as err: except Exception as err:
logger.warn(f"{err}: couldn't merge image, replace and passthrough. (page: {metadata[Info.PAGE_IDX]})") logger.warn(
f"{err}: Couldn't merge image, replace broken part by blank image and passthrough. (page: {metadata[Info.PAGE_IDX]})"
)
return im_aggr return im_aggr

2
test/fixtures/model.py vendored
View File

@ -102,7 +102,7 @@ def model_handle_mock(estimator_mock):
self.model = estimator_mock self.model = estimator_mock
def prep_images(self, batch): def prep_images(self, batch):
return [True for _ in batch], [None for _ in batch] return [None for _ in batch], [True for _ in batch]
def predict(self, batch): def predict(self, batch):
return [None for _ in batch] return [None for _ in batch]