Merge pull request #29 from markstur/fix_pillow

Fix object detection bounding box drawing code to allow update of pillow

caikit_huggingface_demo/client/object_detection.py

@@ -66,16 +66,13 @@ def fn(self, model, image_array):
                 label if counter[label] == 1 else f"{label}-{counter[label]}"
             )  # Append counter when repeated
             b = result.box
-            text_size = FONT.getsize(key)
-            label_size = (text_size[0] + 10, text_size[1] + 10)
+            _, _, width, height = FONT.getbbox(key)
+            label_size = (width + 10, height + 10)
             label_rectangle = Image.new(
                 "RGBA", label_size, ImageColor.getrgb(color) + (0,)
             )  # with transparency
             label_draw = ImageDraw.Draw(label_rectangle)
-            # label_draw.rectangle((5, 2)+label_size, fill=ImageColor.getrgb(color)+(127,))  # (255, 255, 0, 100))
-            label_draw.text(
-                (5, 2), key, font=FONT, fill="white"
-            )  #  fill=(255, 255, 0, 255))
+            label_draw.text((5, 2), key, font=FONT, fill="white")
 
             image.paste(label_rectangle, (b.xmin, b.ymin))
             image_draw.rectangle(

requirements.txt

@@ -1,6 +1,6 @@
 caikit[all]==0.10.1
 requests==2.31.0
-Pillow==9.5.0
+Pillow==10.0.1
 click==8.1.3
 timm==0.9.1
 # backend only