From f9cc7df4d8c492c01d549c7aed443c701d9f3487 Mon Sep 17 00:00:00 2001
From: Mike Gvozdev <mv.gvozdev@gmail.com>
Date: Mon, 27 Oct 2025 14:59:21 -0400
Subject: [PATCH] fix dependencies and object IDs

---
 docker-compose.yml                                 | 14 +++++++-------
 .../object-detection-llm/object-detection-llm.py   |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c0256228..1e6fc6d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -253,7 +253,7 @@ services:
       ca.mcgill.a11y.image.preprocessor: 5
       ca.mcgill.a11y.image.port: 5000
       ca.mcgill.a11y.image.cacheTimeout: 3600
-      ca.mcgill.a11y.image.required_dependencies: "object-detection"
+      ca.mcgill.a11y.image.required_dependencies: "object-detection-llm"
       ca.mcgill.a11y.image.optional_dependencies: ""
     environment:
       - PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED}
@@ -298,7 +298,7 @@ services:
       - ./config/express-common.env
     labels:
       ca.mcgill.a11y.image.handler: enable
-      ca.mcgill.a11y.image.required_dependencies: "semantic-segmentation,object-grouping,object-detection,graphic-caption"
+      ca.mcgill.a11y.image.required_dependencies: "semantic-segmentation,object-grouping,object-detection-llm,graphic-caption"
       ca.mcgill.a11y.image.optional_dependencies: "content-categoriser"
     volumes:
       - sc-store:/tmp/sc-store
@@ -328,7 +328,7 @@ services:
       - ./config/express-common.env
     labels:
       ca.mcgill.a11y.image.handler: enable
-      ca.mcgill.a11y.image.required_dependencies: "semantic-segmentation,object-grouping,object-detection"
+      ca.mcgill.a11y.image.required_dependencies: "semantic-segmentation,object-grouping,object-detection-llm"
       ca.mcgill.a11y.image.optional_dependencies: ""
     volumes:
       - sc-store:/tmp/sc-store
@@ -491,7 +491,7 @@ services:
       - ./config/express-common.env
     labels:
       ca.mcgill.a11y.image.handler: enable
-      ca.mcgill.a11y.image.required_dependencies: "object-detection"
+      ca.mcgill.a11y.image.required_dependencies: "object-detection-llm"
       ca.mcgill.a11y.image.optional_dependencies: ""
     environment:
       - PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED}
@@ -508,7 +508,7 @@ services:
       ca.mcgill.a11y.image.port: 5000
       ca.mcgill.a11y.image.cacheTimeout: 3600
       ca.mcgill.a11y.image.required_dependencies: ""
-      ca.mcgill.a11y.image.optional_dependencies: "object-detection"
+      ca.mcgill.a11y.image.optional_dependencies: "object-detection-llm"
     environment:
       - PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED}
 
@@ -521,7 +521,7 @@ services:
       ca.mcgill.a11y.image.port: 5000
       ca.mcgill.a11y.image.cacheTimeout: 3600
       ca.mcgill.a11y.image.required_dependencies: ""
-      ca.mcgill.a11y.image.optional_dependencies: "object-detection"
+      ca.mcgill.a11y.image.optional_dependencies: "object-detection-llm"
     environment:
       - PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED}
 
@@ -544,7 +544,7 @@ services:
     restart: "no"
     labels:
       ca.mcgill.a11y.image.handler: enable
-      ca.mcgill.a11y.image.required_dependencies: "ocr-clouds-preprocessor,object-detection"
+      ca.mcgill.a11y.image.required_dependencies: "ocr-clouds-preprocessor,object-detection-llm"
       ca.mcgill.a11y.image.optional_dependencies: ""
     environment:
       - PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED}
diff --git a/preprocessors/object-detection-llm/object-detection-llm.py b/preprocessors/object-detection-llm/object-detection-llm.py
index 39e9b486..5cbc83e2 100644
--- a/preprocessors/object-detection-llm/object-detection-llm.py
+++ b/preprocessors/object-detection-llm/object-detection-llm.py
@@ -85,6 +85,11 @@ def filter_objects_by_confidence(objects, threshold):
         if obj.get("confidence", 0) >= threshold:
             obj['type'] = obj['type'].replace('_', ' ')
             filtered.append(obj)
+
+    # Renumber IDs sequentially after filtering
+    for idx, obj in enumerate(filtered):
+        obj['ID'] = idx
+
     logging.debug(
         f"Filtered {len(objects)} objects to {len(filtered)} "
         f"objects with confidence >= {threshold}"