Skip to content

Fix dependencies and object IDs #1169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffbl merged 1 commit into from
Oct 27, 2025
Merged

Fix dependencies and object IDs #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -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}

Expand All @@ -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}

Expand All @@ -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}
Expand Down
5 changes: 5 additions & 0 deletions preprocessors/object-detection-llm/object-detection-llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down