From 97ef2264ba5061b450e32ad26576855d25ae472c Mon Sep 17 00:00:00 2001 From: Shahd Yousef Date: Tue, 3 Jun 2025 13:33:05 -0400 Subject: [PATCH 1/5] deprecated dir + build.yml --- build.yml | 11 ----------- .../svg-action-recognition/Dockerfile | 0 .../{ => deprecated}/svg-action-recognition/README.md | 0 .../{ => deprecated}/svg-action-recognition/ar_svg.py | 0 .../svg-action-recognition/requirements.txt | 0 .../{ => deprecated}/action-recognition/Dockerfile | 0 .../{ => deprecated}/action-recognition/README.md | 0 .../action-recognition/action-recognition.py | 0 .../action-recognition/requirements.txt | 0 .../{ => deprecated}/action-recognition/utils.py | 0 10 files changed, 11 deletions(-) rename handlers/{ => deprecated}/svg-action-recognition/Dockerfile (100%) rename handlers/{ => deprecated}/svg-action-recognition/README.md (100%) rename handlers/{ => deprecated}/svg-action-recognition/ar_svg.py (100%) rename handlers/{ => deprecated}/svg-action-recognition/requirements.txt (100%) rename preprocessors/{ => deprecated}/action-recognition/Dockerfile (100%) rename preprocessors/{ => deprecated}/action-recognition/README.md (100%) rename preprocessors/{ => deprecated}/action-recognition/action-recognition.py (100%) rename preprocessors/{ => deprecated}/action-recognition/requirements.txt (100%) rename preprocessors/{ => deprecated}/action-recognition/utils.py (100%) diff --git a/build.yml b/build.yml index 9f6a359f1..20ed805f2 100644 --- a/build.yml +++ b/build.yml @@ -227,12 +227,6 @@ services: context: . dockerfile: ./handlers/svg-semantic-seg/Dockerfile image: "semseg-svg:latest" - action-recognition: - build: - context: . - dockerfile: ./preprocessors/action-recognition/Dockerfile - image: "action-recognition:latest" - high-charts-handler: build: context: . @@ -273,11 +267,6 @@ services: context: . dockerfile: ./preprocessors/nominatim/Dockerfile image: "nominatim-preprocessor:latest" - svg-action-recognition: - build: - context: . - dockerfile: ./handlers/svg-action-recognition/Dockerfile - image: "svg-action-recognition:latest" text-followup-handler: build: context: . diff --git a/handlers/svg-action-recognition/Dockerfile b/handlers/deprecated/svg-action-recognition/Dockerfile similarity index 100% rename from handlers/svg-action-recognition/Dockerfile rename to handlers/deprecated/svg-action-recognition/Dockerfile diff --git a/handlers/svg-action-recognition/README.md b/handlers/deprecated/svg-action-recognition/README.md similarity index 100% rename from handlers/svg-action-recognition/README.md rename to handlers/deprecated/svg-action-recognition/README.md diff --git a/handlers/svg-action-recognition/ar_svg.py b/handlers/deprecated/svg-action-recognition/ar_svg.py similarity index 100% rename from handlers/svg-action-recognition/ar_svg.py rename to handlers/deprecated/svg-action-recognition/ar_svg.py diff --git a/handlers/svg-action-recognition/requirements.txt b/handlers/deprecated/svg-action-recognition/requirements.txt similarity index 100% rename from handlers/svg-action-recognition/requirements.txt rename to handlers/deprecated/svg-action-recognition/requirements.txt diff --git a/preprocessors/action-recognition/Dockerfile b/preprocessors/deprecated/action-recognition/Dockerfile similarity index 100% rename from preprocessors/action-recognition/Dockerfile rename to preprocessors/deprecated/action-recognition/Dockerfile diff --git a/preprocessors/action-recognition/README.md b/preprocessors/deprecated/action-recognition/README.md similarity index 100% rename from preprocessors/action-recognition/README.md rename to preprocessors/deprecated/action-recognition/README.md diff --git a/preprocessors/action-recognition/action-recognition.py b/preprocessors/deprecated/action-recognition/action-recognition.py similarity index 100% rename from preprocessors/action-recognition/action-recognition.py rename to preprocessors/deprecated/action-recognition/action-recognition.py diff --git a/preprocessors/action-recognition/requirements.txt b/preprocessors/deprecated/action-recognition/requirements.txt similarity index 100% rename from preprocessors/action-recognition/requirements.txt rename to preprocessors/deprecated/action-recognition/requirements.txt diff --git a/preprocessors/action-recognition/utils.py b/preprocessors/deprecated/action-recognition/utils.py similarity index 100% rename from preprocessors/action-recognition/utils.py rename to preprocessors/deprecated/action-recognition/utils.py From d9232b6c9e3b15bc21a9b1af02226f20ec0083dd Mon Sep 17 00:00:00 2001 From: Shahd Yousef Date: Tue, 3 Jun 2025 13:42:37 -0400 Subject: [PATCH 2/5] removing action recognition pp & handler from docker composes --- docker-compose.yml | 31 +------------------------------ test-docker-compose.yml | 9 --------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7ddb13d41..ee36bbec2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -273,7 +273,7 @@ services: 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.optional_dependencies: "action-recognition,collage-detector-preprocessor,graphic-tagger" + ca.mcgill.a11y.image.optional_dependencies: "collage-detector-preprocessor,graphic-tagger" volumes: - sc-store:/tmp/sc-store environment: @@ -508,25 +508,6 @@ services: environment: - PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED} - action-recognition: - profiles: [test, default] - image: ghcr.io/shared-reality-lab/image-preprocessor-action-recognition:${REGISTRY_TAG} - restart: "no" - labels: - ca.mcgill.a11y.image.preprocessor: 4 - 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" - deploy: - resources: - reservations: - devices: - - driver: nvidia - capabilities: ["gpu", "utility", "compute"] - environment: - - PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED} - ocr-handler: profiles: [test, default] image: ghcr.io/shared-reality-lab/image-handler-ocr:${REGISTRY_TAG} @@ -580,16 +561,6 @@ services: ca.mcgill.a11y.image.optional_dependencies: "" environment: - PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED} - - svg-action-recognition-handler: - profiles: [test, default] - image: ghcr.io/shared-reality-lab/image-handler-svg-action-recognition:${REGISTRY_TAG} - labels: - ca.mcgill.a11y.image.handler: enable - ca.mcgill.a11y.image.required_dependencies: "object-detection,action-recognition" - ca.mcgill.a11y.image.optional_dependencies: "" - environment: - - PII_LOGGING_ENABLED=${PII_LOGGING_ENABLED} monarch-link-app: profiles: [production, test, default] diff --git a/test-docker-compose.yml b/test-docker-compose.yml index ce4ffb13c..b28a16a7c 100644 --- a/test-docker-compose.yml +++ b/test-docker-compose.yml @@ -62,15 +62,6 @@ services: device_ids: ['0'] capabilities: ["gpu", "utility", "compute"] - action-recognition: - deploy: - resources: - reservations: - devices: - - driver: nvidia - device_ids: ['0'] - capabilities: ["gpu", "utility", "compute"] - object-detection: deploy: resources: From e2a4abba27e0176e595048d618d66e0409338dbf Mon Sep 17 00:00:00 2001 From: Shahd Yousef Date: Tue, 3 Jun 2025 14:41:07 -0400 Subject: [PATCH 3/5] disabling respective workflows --- .github/workflows/action-recognition.yml | 25 +++++++++++++----------- .github/workflows/svg-action-handler.yml | 24 ++++++++++++----------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.github/workflows/action-recognition.yml b/.github/workflows/action-recognition.yml index fe1c9672d..ae825e626 100644 --- a/.github/workflows/action-recognition.yml +++ b/.github/workflows/action-recognition.yml @@ -1,17 +1,20 @@ name: Action Recognition +# Disabled workflow — kept for archival purposes + on: - push: - branches: [ main ] - tags: [ "preprocessor-action-recognition-[0-9]+.[0-9]+.[0-9]+" ] - paths: [ "preprocessors/action-recognition/**" ] - pull_request: - branches: [ main ] - paths: [ "preprocessors/action-recognition/**" ] - workflow_run: - workflows: [ "Schemas (Trigger)" ] - types: - - completed workflow_dispatch: + + # push: + # branches: [ main ] + # tags: [ "preprocessor-action-recognition-[0-9]+.[0-9]+.[0-9]+" ] + # paths: [ "preprocessors/action-recognition/**" ] + # pull_request: + # branches: [ main ] + # paths: [ "preprocessors/action-recognition/**" ] + # workflow_run: + # workflows: [ "Schemas (Trigger)" ] + # types: + # - completed env: REGISTRY: ghcr.io IMAGE_NAME: shared-reality-lab/image-preprocessor-action-recognition diff --git a/.github/workflows/svg-action-handler.yml b/.github/workflows/svg-action-handler.yml index ae2050b5b..b6d84bea6 100644 --- a/.github/workflows/svg-action-handler.yml +++ b/.github/workflows/svg-action-handler.yml @@ -1,17 +1,19 @@ name: Action Recognition Handler +# Disabled workflow — kept for archival purposes on: - push: - branches: [ main ] - tags: [ "handler-svg-action-recognition-[0-9]+.[0-9]+.[0-9]+" ] - paths: [ "handlers/svg-action-recognition/**" ] - pull_request: - branches: [ main ] - paths: [ "handlers/svg-action-recognition/**" ] - workflow_run: - workflows: [ "Schemas (Trigger)" ] - types: - - completed workflow_dispatch: + + # push: + # branches: [ main ] + # tags: [ "handler-svg-action-recognition-[0-9]+.[0-9]+.[0-9]+" ] + # paths: [ "handlers/svg-action-recognition/**" ] + # pull_request: + # branches: [ main ] + # paths: [ "handlers/svg-action-recognition/**" ] + # workflow_run: + # workflows: [ "Schemas (Trigger)" ] + # types: + # - completed env: REGISTRY: ghcr.io IMAGE_NAME: shared-reality-lab/image-handler-svg-action-recognition From 9b8109aa4db84404707e8ff3dbb4b47d2752087e Mon Sep 17 00:00:00 2001 From: Shahd Yousef Date: Fri, 6 Jun 2025 14:19:46 -0400 Subject: [PATCH 4/5] removing commenr --- .github/workflows/action-recognition.yml | 2 -- .github/workflows/svg-action-handler.yml | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/action-recognition.yml b/.github/workflows/action-recognition.yml index ae825e626..24ab0d9e3 100644 --- a/.github/workflows/action-recognition.yml +++ b/.github/workflows/action-recognition.yml @@ -1,6 +1,4 @@ name: Action Recognition -# Disabled workflow — kept for archival purposes - on: workflow_dispatch: diff --git a/.github/workflows/svg-action-handler.yml b/.github/workflows/svg-action-handler.yml index b6d84bea6..d1b1298da 100644 --- a/.github/workflows/svg-action-handler.yml +++ b/.github/workflows/svg-action-handler.yml @@ -1,6 +1,5 @@ name: Action Recognition Handler -# Disabled workflow — kept for archival purposes -on: +gon: workflow_dispatch: # push: From 7e04c71bd115b8370aea35078510d9f376a9bf21 Mon Sep 17 00:00:00 2001 From: Shahd Yousef Date: Fri, 6 Jun 2025 14:20:52 -0400 Subject: [PATCH 5/5] typo --- .github/workflows/svg-action-handler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/svg-action-handler.yml b/.github/workflows/svg-action-handler.yml index d1b1298da..df8496c97 100644 --- a/.github/workflows/svg-action-handler.yml +++ b/.github/workflows/svg-action-handler.yml @@ -1,5 +1,5 @@ name: Action Recognition Handler -gon: +on: workflow_dispatch: # push: