New Visualisation of Bounding Boxes of 1st passtrough; upgraded gradio.

.gitignore

@@ -160,4 +160,5 @@ cython_debug/
 #.idea/
 
 # Custom
-flagged/
+flagged/
+anon.jpg

README.md

@@ -4,7 +4,7 @@ emoji: 🕶
 colorFrom: gray
 colorTo: yellow
 sdk: gradio
-sdk_version: 4.4.1
+sdk_version: 4.31.5
 app_file: app.py
 pinned: false
 license: agpl-3.0

app.py

@@ -46,23 +46,27 @@ def detect(image):
     vehicle_mask = Image.new(mode="L", size=image.size, color=255)
     vehicle_draw = ImageDraw.Draw(vehicle_mask)
     for vehicle_box in vehicle_boxes:
-        vehicle_draw.rectangle(vehicle_box.tolist(), outline = 0, width=5)
-
+        vehicle_draw.rectangle(vehicle_box.tolist(), fill=0)
 
+    person_box_mask = Image.new(mode="L", size=image.size, color=255)
+    person_box_draw = ImageDraw.Draw(person_box_mask)
+    for person_box in seg_boxes[person_indices][:, :4]:
+        person_box_draw.rectangle(person_box.tolist(), fill=0)
 
     #TODO: move combination to caller function
     combined_mask = Image.fromarray(np.minimum.reduce([np.array(m) for m in [people_mask, lp_mask]]))
-    return combined_mask, people_mask, lp_mask, vehicle_mask
+    return combined_mask, people_mask, lp_mask, vehicle_mask, person_box_mask
 
 
 def test_comb(image):
-    mask, people_mask, lp_mask, vm = detect(image)
+    mask, people_mask, lp_mask, vm, pbm = detect(image)
     blurred = image.filter(ImageFilter.GaussianBlur(30))
     anonymized = Image.composite(image, blurred, mask)
     ## TODO: Tempfile statt einem generischen File
     anonymized.save("anon.JPG")
-    annotation_list = [(1 - np.asarray(people_mask) / 255, "Person"), (1 - np.asarray(vm) / 255, "Fahrzeug"), (1 - np.asarray(lp_mask) / 255, "Kennzeichen")]
-    return "anon.JPG", (image, annotation_list)
+    box_list = [(1 - np.asarray(pbm) / 255, "Person (Rahmen)"), (1 - np.asarray(vm) / 255, "Fahrzeug")]
+    anon_list = [(1 - np.asarray(people_mask) / 255, "Person (Umriss)"), (1 - np.asarray(lp_mask) / 255, "Kennzeichen")]
+    return "anon.JPG", (image, box_list), (image, anon_list)
 
 
 css = """
@@ -87,7 +91,7 @@ Ein Prototyp des it@M InnovationLab ([email protected])
 demo = gr.Interface(
     fn=test_comb, 
     inputs=gr.Image(type="pil", label="Zu anonymisierendes Bild"), 
-    outputs=[gr.Image(label="Anonymisiertes Bild"), gr.AnnotatedImage(label="Erkannte Regionen")],
+    outputs=[gr.Image(label="Anonymisiertes Bild"), gr.AnnotatedImage(label="Detektierte Umrisse"), gr.AnnotatedImage(label="Erkannte Objekte")],
     title="Bild auswählen / hochladen",
     allow_flagging="never",
     examples="examples",

requirements.txt

@@ -3,4 +3,5 @@ ultralytics
 Pillow
 numpy
 torch
-torchvision
+torchvision
+dill