jpeg quality is now 90% by default and can be overridden with IDC_JPEG_QUALITY environment variable; centralized converting image from array back to PILLOW Image and creation of empty image

Author: fracpete

CHANGES.rst

@@ -5,6 +5,7 @@ Changelog
 ------------------
 
 - switched to underscores in project name
+- switched to new methods from idc.api: `empty_image(...)` and `arary_to_image(...)`
 
 
 0.0.4 (2024-07-16)

src/idc/imgaug/filter/_augment_util.py

@@ -1,16 +1,12 @@
-import io
-
 import imageio.v2 as imageio
-import numpy as np
-from PIL import Image
 from imgaug.augmentables.bbs import BoundingBox, BoundingBoxesOnImage
 from imgaug.augmentables.polys import Polygon, PolygonsOnImage
 from imgaug.augmentables.segmaps import SegmentationMapsOnImage
 from wai.common.adams.imaging.locateobjects import LocatedObjects, absolute_to_normalized
 from wai.common.geometry import Point as WaiPoint
 from wai.common.geometry import Polygon as WaiPolygon
 
-from idc.api import ImageData, ObjectDetectionData, ImageSegmentationData, combine_layers, split_layers
+from idc.api import ImageData, ObjectDetectionData, ImageSegmentationData, combine_layers, split_layers, array_to_image
 
 
 def augment_image(item: ImageData, pipeline, image_name: str = None) -> ImageData:
@@ -133,9 +129,7 @@ def augment_image(item: ImageData, pipeline, image_name: str = None) -> ImageDat
     if (objs_aug is not None) and normalized:
         annotation_new = absolute_to_normalized(annotation_new, item.image_width, item.image_height)
 
-    img_new = Image.fromarray(np.uint8(image_aug))
-    img_new_bytes = io.BytesIO()
-    img_new.save(img_new_bytes, format=item.image_format)
+    _, img_new_bytes = array_to_image(image_aug, item.image_format)
 
     result = type(item)(image_name=image_name, data=img_new_bytes.getvalue(),
                         image_format=item.image_format,

src/idc/imgaug/filter/_change_grayscale.py

@@ -7,7 +7,7 @@
 from seppl.io import Filter
 from wai.logging import LOGGING_WARNING
 
-from idc.api import ImageClassificationData, ObjectDetectionData, ImageSegmentationData, flatten_list, make_list
+from idc.api import ImageClassificationData, ObjectDetectionData, ImageSegmentationData, flatten_list, make_list, array_to_image
 
 
 class ChangeGrayscale(Filter):
@@ -117,9 +117,7 @@ def _do_process(self, data):
                 else:
                     img_gray = img_gray + self.increment
                 img_gray = np.clip(img_gray, 0, 255).astype(np.uint8)
-                img_pil = Image.fromarray(np.uint8(img_gray))
-                img_pil_bytes = io.BytesIO()
-                img_pil.save(img_pil_bytes, format=item.image_format)
+                _, img_pil_bytes = array_to_image(img_gray, item.image_format)
                 item_new = type(item)(image_name=item.image_name, data=img_pil_bytes.getvalue(),
                                       metadata=item.get_metadata(), annotation=item.annotation)
                 result.append(item_new)

src/idc/imgaug/filter/_clip_grayscale.py

@@ -1,13 +1,12 @@
 import argparse
-import io
 from typing import List
 
 import numpy as np
-from PIL import Image
 from seppl.io import Filter
 from wai.logging import LOGGING_WARNING
 
-from idc.api import ImageClassificationData, ObjectDetectionData, ImageSegmentationData, flatten_list, make_list
+from idc.api import ImageClassificationData, ObjectDetectionData, ImageSegmentationData, flatten_list, make_list, \
+    array_to_image
 
 
 class ClipGrayscale(Filter):
@@ -142,9 +141,7 @@ def _do_process(self, data):
                 if self.max_value < 255:
                     img_gray = np.where(img_gray > self.max_value, self.max_replacement, img_gray)
                 img_gray = np.clip(img_gray, 0, 255).astype(np.uint8)
-                img_pil = Image.fromarray(np.uint8(img_gray))
-                img_pil_bytes = io.BytesIO()
-                img_pil.save(img_pil_bytes, format=item.image_format)
+                _, img_pil_bytes = array_to_image(img_gray, item.image_format)
                 item_new = type(item)(image_name=item.image_name, data=img_pil_bytes.getvalue(),
                                       metadata=item.get_metadata(), annotation=item.annotation)
                 result.append(item_new)

src/idc/imgaug/filter/_enhance.py

@@ -8,7 +8,7 @@
 from PIL import ImageEnhance
 from ._base_image_augmentation import BaseFilter, IMGAUG_MODE_REPLACE
 from wai.logging import LOGGING_WARNING
-from idc.api import ImageData, ImageClassificationData, ObjectDetectionData, ImageSegmentationData
+from idc.api import ImageData, ImageClassificationData, ObjectDetectionData, ImageSegmentationData, array_to_image
 
 ENHANCEMENT_COLOR = "color"
 ENHANCEMENT_CONTRAST = "contrast"
@@ -184,9 +184,7 @@ def _augment(self, item: ImageData, aug_seed: int, image_name: str) -> ImageData
         img_enhanced = enhancer.enhance(factor)
 
         # convert back to PIL bytes
-        img_pil = Image.fromarray(np.uint8(img_enhanced))
-        img_pil_bytes = io.BytesIO()
-        img_pil.save(img_pil_bytes, format=item.image_format)
+        _, img_pil_bytes = array_to_image(img_enhanced, item.image_format)
         result = type(item)(image_name=image_name, data=img_pil_bytes.getvalue(),
                             image_format=item.image_format,
                             metadata=item.get_metadata(), annotation=item.annotation)

src/idc/imgaug/filter/_hsl_grayscale.py

@@ -1,14 +1,13 @@
 import argparse
-import cv2
-import io
-import numpy as np
 from random import Random
 from typing import List
 
-from PIL import Image
-from ._base_image_augmentation import BaseFilter, IMGAUG_MODE_REPLACE
+import cv2
+import numpy as np
 from wai.logging import LOGGING_WARNING
-from idc.api import ImageData, ImageClassificationData, ObjectDetectionData, ImageSegmentationData
+
+from idc.api import ImageData, ImageClassificationData, ObjectDetectionData, ImageSegmentationData, array_to_image
+from ._base_image_augmentation import BaseFilter, IMGAUG_MODE_REPLACE
 
 
 class HSLGrayScale(BaseFilter):
@@ -159,9 +158,7 @@ def _augment(self, item: ImageData, aug_seed: int, image_name: str) -> ImageData
             img_l = img_l.astype(np.uint8)
 
         # convert back to PIL bytes
-        img_pil = Image.fromarray(np.uint8(img_l))
-        img_pil_bytes = io.BytesIO()
-        img_pil.save(img_pil_bytes, format=item.image_format)
+        _, img_pil_bytes = array_to_image(img_l, item.image_format)
         result = type(item)(image_name=image_name, data=img_pil_bytes.getvalue(),
                             image_format=item.image_format,
                             metadata=item.get_metadata(), annotation=item.annotation)

src/idc/imgaug/filter/_sub_images_utils.py

@@ -1,15 +1,23 @@
-import io
 import logging
 import os
 from typing import List, Tuple, Optional
 
 import numpy as np
-from PIL import Image
 from wai.common.adams.imaging.locateobjects import LocatedObject, LocatedObjects
 from wai.common.geometry import Point as WaiPoint, Polygon as WaiPolygon
 
 from idc.api import ImageSegmentationAnnotations, ImageClassificationData, ImageSegmentationData, ObjectDetectionData, \
-    ImageData, crop_image, pad_image, fit_layers, fit_located_object
+    ImageData, crop_image, pad_image, fit_layers, fit_located_object, array_to_image, empty_image
+import logging
+import os
+from typing import List, Tuple, Optional
+
+import numpy as np
+from wai.common.adams.imaging.locateobjects import LocatedObject, LocatedObjects
+from wai.common.geometry import Point as WaiPoint, Polygon as WaiPolygon
+
+from idc.api import ImageSegmentationAnnotations, ImageClassificationData, ImageSegmentationData, ObjectDetectionData, \
+    ImageData, crop_image, pad_image, fit_layers, fit_located_object, array_to_image, empty_image
 
 REGION_SORTING_NONE = "none"
 REGION_SORTING_XY = "x-then-y"
@@ -162,8 +170,7 @@ def process_image(item: ImageData, regions_lobj: List[LocatedObject], regions_xy
         sub_image = pil.crop((x0, y0, x1+1, y1+1))
         orig_dims = LocatedObject(0, 0, sub_image.size[0], sub_image.size[1])
         sub_image = pad_image(sub_image, pad_width=pad_width, pad_height=pad_height)
-        sub_bytes = io.BytesIO()
-        sub_image.save(sub_bytes, format=item.image_format)
+        _, sub_bytes = array_to_image(sub_image, item.image_format)
         image_name_new = region_filename(item.image_name, regions_lobj, regions_xyxy, region_index, suffix)
 
         # crop annotations and forward
@@ -214,9 +221,7 @@ def new_from_template(item, rebuild_image: bool = False):
     :return: the new container
     """
     if rebuild_image:
-        img = Image.new(item.image.mode, item.image_size)
-        img_bytes = io.BytesIO()
-        img.save(img_bytes, format=item.image_format)
+        _, img_bytes = empty_image(item.image.mode, item.image_width, item.image_height, item.image_format)
         data = img_bytes.getvalue()
     else:
         data = item.image_bytes

src/idc/imgaug/tool/combine_sub_images.py

@@ -1,19 +1,17 @@
 import argparse
-import io
 import logging
 import os.path
 import re
 import sys
 import traceback
 from typing import List, Dict, Tuple
 
-from PIL import Image
 from seppl import Initializable, init_initializable, Session
 from seppl.io import locate_files, StreamWriter, BatchWriter, Writer
 from wai.common.adams.imaging.locateobjects import LocatedObject
 from wai.logging import init_logging, set_logging_level, add_logging_level
 
-from idc.api import ImageData, parse_reader, parse_writer, Reader, ObjectDetectionData, merge_polygons
+from idc.api import ImageData, parse_reader, parse_writer, Reader, ObjectDetectionData, merge_polygons, empty_image
 from idc.core import ENV_IDC_LOGLEVEL
 from idc.imgaug.filter import new_from_template, transfer_region
 
@@ -129,9 +127,7 @@ def merge_images(input_images: List[ImageData], coordinates: [List[Tuple[int, in
     :return: the combined image/annotations
     :rtype: ImageData
     """
-    full_img = Image.new("RGB", (width, height))
-    img_bytes = io.BytesIO()
-    full_img.save(img_bytes, format=input_images[0].image_format)
+    _, img_bytes = empty_image("RGB", width, height, input_images[0].image_format)
     data = img_bytes.getvalue()
 
     cls = type(input_images[0])