Skip to content

Commit 4b07822

Browse files
Merge branch 'main' into main
2 parents 94aefbe + 26bd6b3 commit 4b07822

File tree

128 files changed

+5040
-2814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+5040
-2814
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,12 @@ README.md @xwu2intel
5353

5454
# documentation content - metro-ai
5555
/metro-ai-suite/README.md @rrajore @vagheshp @ArokiEdgard @xwu2intel @ajagadi1 @open-edge-platform/open-edge-platform-docs-write
56+
/metro-ai-suite/metro-vision-ai-app-recipe/docs/ @rrajore @vagheshp @ArokiEdgard @xwu2intel @ajagadi1 @open-edge-platform/open-edge-platform-docs-write
57+
/metro-ai-suite/metro-vision-ai-app-recipe/README.md @rrajore @vagheshp @ArokiEdgard @xwu2intel @ajagadi1 @open-edge-platform/open-edge-platform-docs-write
58+
5659
/metro-ai-suite/image-based-video-search/docs/ @rrajore @vagheshp @ArokiEdgard @rohitkatakol @xwu2intel @ajagadi1 @open-edge-platform/open-edge-platform-docs-write
5760
/metro-ai-suite/image-based-video-search/README.md @rrajore @vagheshp @ArokiEdgard @rohitkatakol @xwu2intel @ajagadi1 @open-edge-platform/open-edge-platform-docs-write
61+
5862
/metro-ai-suite/interactive-digital-avatar/docs/ @senhui2intel @Junyu-B @wzq112358 @myqi @xwu2intel @open-edge-platform/open-edge-platform-docs-write
5963
/metro-ai-suite/interactive-digital-avatar/README.md @senhui2intel @Junyu-B @wzq112358 @myqi @xwu2intel @open-edge-platform/open-edge-platform-docs-write
6064

.github/workflows/sensor-fusion-for-traffic-management-scan.yaml

Lines changed: 53 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,72 +39,89 @@ jobs:
3939
with:
4040
name: bandit-report
4141
path: security-results/bandit*
42-
42+
4343
trivy-scan:
44-
runs-on: ubuntu-22.04-64core-256GB
44+
runs-on: ubuntu-24.04-16core-64GB
4545
permissions:
4646
contents: read
4747
steps:
4848
- uses: actions/checkout@8edcb1bdb4e267140fa742c62e395cd74f332709
4949
with:
50-
path: edge-ai-suites-repo
5150
persist-credentials: false
52-
53-
- name: Run Trivy Filesystem Scan
54-
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
55-
id: trivy-fs
56-
with:
57-
scan_type: "fs"
58-
scan-scope: "all"
59-
scan-target: "edge-ai-suites-repo/metro-ai-suite/sensor-fusion-for-traffic-management"
60-
severity: "HIGH,CRITICAL"
61-
format: "json"
6251

6352
- name: Build Docker images
6453
run: |
6554
ls
66-
cd edge-ai-suites-repo/metro-ai-suite/sensor-fusion-for-traffic-management/docker
55+
cd metro-ai-suite/sensor-fusion-for-traffic-management/docker
6756
bash build_docker.sh
6857
TFCC_IMAGE_ID=$(docker images -q tfcc)
6958
docker images --format '{{.ID}} {{.Repository}}' | \
7059
awk -v keep="$TFCC_IMAGE_ID" '$1 != keep {print $1}' | \
7160
xargs --no-run-if-empty docker rmi -f
7261
docker system prune -f
73-
curl -fsSL https://raw.githubusercontent.com/kou/arrow/e49d8ae15583ceff03237571569099a6ad62be32/ci/scripts/util_free_space.sh | bash
74-
75-
- name: Free disk space
76-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
77-
with:
78-
tool-cache: true
79-
android: true
80-
dotnet: true
81-
haskell: true
82-
large-packages: true
83-
docker-images: false
84-
swap-storage: true
8562
86-
- name: Check resources
63+
- name: Verify Docker image
8764
run: |
88-
df -h
65+
echo "=== Built Docker Image ==="
8966
docker images
90-
- name: Run trivy Scan - tfcc
67+
ls
68+
echo "=== Image Build Verification Complete ==="
69+
70+
- name: Run Trivy Filesystem Scan
71+
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
72+
id: trivy-fs
73+
with:
74+
scan_type: "fs"
75+
scan-scope: "all"
76+
severity: "HIGH,CRITICAL"
77+
format: "json"
78+
scan_target: "metro-ai-suite/sensor-fusion-for-traffic-management/"
79+
report_suffix: "-fs-tfcc-CT7"
80+
81+
82+
- name: Run trivy Scan - tfcc (HTML Report)
9183
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
92-
id: tfccsample
84+
id: tfcc-html
9385
with:
9486
scan_type: "image"
95-
scan-scope: all
87+
scan-scope: "all"
9688
scan_target: "tfcc:latest"
9789
severity: "HIGH,CRITICAL"
98-
format: "json"
99-
90+
format: "table"
91+
report_suffix: "-image-tfcc-html-CT248"
92+
generate_sbom: "false"
93+
94+
- name: Run trivy Scan - tfcc (SPDX SBOM)
95+
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
96+
id: tfcc-spdx
97+
with:
98+
scan_type: "image"
99+
scan-scope: "all"
100+
scan_target: "tfcc:latest"
101+
severity: "HIGH,CRITICAL"
102+
format: "spdx-json"
103+
scanners: "vuln"
104+
report_suffix: "-image-tfcc-spdx-CT248"
105+
generate_sbom: "false"
106+
107+
- name: Scan Dockerfile with Trivy
108+
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
109+
with:
110+
scan_type: "config"
111+
scan_target: "metro-ai-suite/sensor-fusion-for-traffic-management/docker/"
112+
severity: "HIGH,CRITICAL"
113+
format: "json"
114+
misconfig_scanners: "dockerfile"
115+
report_suffix: "-config-tfcc-CT222"
116+
100117
- name: Upload Report
101118
uses: actions/upload-artifact@de65e23aa2b7e23d713bb51fbfcb6d502f8667d8
102119
with:
103-
name: trivy-report
104-
path: security-results/trivy
120+
name: trivy-report-tfcc
121+
path: security-results/trivy*
105122

106123
coverity-scan:
107-
runs-on: ubuntu-22.04
124+
runs-on: ubuntu-latest
108125
permissions:
109126
contents: read
110127
steps:

.github/workflows/video-processing-for-nvr-scan.yaml

Lines changed: 53 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@8edcb1bdb4e267140fa742c62e395cd74f332709
2727
with:
28-
path: edge-ai-suites-repo
2928
persist-credentials: false
30-
- name: Run Trivy Filesystem Scan
31-
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
32-
id: trivy-fs
33-
with:
34-
scan_type: "fs"
35-
scan-scope: "all"
36-
scan_target: "edge-ai-suites-repo/metro-ai-suite/video-processing-for-nvr"
37-
severity: "HIGH,CRITICAL"
38-
format: "json"
3929

4030
- name: Build Docker images
4131
run: |
@@ -47,25 +37,70 @@ jobs:
4737
sudo apt install intel-vppsdk
4838
sudo bash /opt/intel/vppsdk/install_vppsdk_dependencies.sh
4939
source /opt/intel/vppsdk/env.sh
50-
cd edge-ai-suites-repo/metro-ai-suite
40+
cd metro-ai-suite
5141
cd video-processing-for-nvr/docker
5242
bash build_sample.sh
5343
54-
- name: Run trivy Scan - vppsample
44+
- name: Verify Docker image
45+
run: |
46+
echo "=== Built Docker Image ==="
47+
docker images
48+
ls
49+
echo "=== Image Build Verification Complete ==="
50+
- name: Run Trivy Filesystem Scan
51+
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
52+
id: trivy-fs
53+
with:
54+
scan_type: "fs"
55+
scan-scope: "all"
56+
severity: "HIGH,CRITICAL"
57+
format: "json"
58+
scan_target: "metro-ai-suite/video-processing-for-nvr/"
59+
report_suffix: "-fs-vpp-CT7"
60+
61+
62+
- name: Run trivy Scan - vpp (HTML Report)
5563
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
56-
id: vppsample
64+
id: vpp-html
5765
with:
5866
scan_type: "image"
59-
scan-scope: all
67+
scan-scope: "all"
6068
scan_target: "vppsample:latest"
6169
severity: "HIGH,CRITICAL"
62-
format: "json"
63-
70+
format: "table"
71+
report_suffix: "-image-vpp-html-CT248"
72+
generate_sbom: "false"
73+
74+
- name: Run trivy Scan - vpp (SPDX SBOM)
75+
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
76+
id: vpp-spdx
77+
with:
78+
scan_type: "image"
79+
scan-scope: "all"
80+
scan_target: "vppsample:latest"
81+
severity: "HIGH,CRITICAL"
82+
format: "spdx-json"
83+
scanners: "vuln"
84+
report_suffix: "-image-vpp-spdx-CT248"
85+
generate_sbom: "false"
86+
87+
- name: Scan Dockerfile with Trivy
88+
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
89+
with:
90+
scan_type: "config"
91+
scan_target: "metro-ai-suite/video-processing-for-nvr/docker/"
92+
severity: "HIGH,CRITICAL"
93+
format: "json"
94+
misconfig_scanners: "dockerfile"
95+
report_suffix: "-config-vpp-CT222"
96+
6497
- name: Upload Report
6598
uses: actions/upload-artifact@de65e23aa2b7e23d713bb51fbfcb6d502f8667d8
6699
with:
67-
name: trivy-report
68-
path: security-results/trivy
100+
name: trivy-report-vpp
101+
path: security-results/trivy*
102+
103+
69104

70105
coverity-scan:
71106
runs-on: ubuntu-latest

.github/workflows/visual-search-qa-scans.yml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,83 +18,84 @@ on:
1818
- cron: "0 2 * * 0" # 2 a.m. on Sunday
1919

2020
jobs:
21-
2221
trivy-scan:
2322
runs-on: ubuntu-latest
2423
permissions:
2524
contents: read
2625
steps:
2726
- uses: actions/checkout@8edcb1bdb4e267140fa742c62e395cd74f332709
2827
with:
29-
path: edge-ai-suites-repo
3028
persist-credentials: false
31-
- name: Run Trivy Filesystem Scan
32-
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
33-
id: trivy-fs
34-
with:
35-
scan_type: "fs"
36-
scan-scope: "all"
37-
severity: "HIGH,CRITICAL"
38-
format: "json"
39-
29+
4030
- name: Build Docker images
4131
run: |
42-
git clone https://github.com/open-edge-platform/edge-ai-libraries.git
43-
cd edge-ai-libraries/microservices
44-
docker build -t dataprep-visualdata-milvus:latest -f visual-data-preparation-for-retrieval/milvus/src/Dockerfile .
45-
docker build -t retriever-milvus:latest -f vector-retriever/milvus/src/Dockerfile .
46-
cd vlm-openvino-serving
47-
docker build -t vlm-openvino-serving:latest -f docker/Dockerfile .
48-
cd ../../..
49-
cd edge-ai-suites-repo
32+
# git clone https://github.com/open-edge-platform/edge-ai-libraries.git
33+
# cd edge-ai-libraries/microservices
34+
# docker build -t dataprep-visualdata-milvus:latest -f visual-data-preparation-for-retrieval/milvus/src/Dockerfile .
35+
# docker build -t retriever-milvus:latest -f vector-retriever/milvus/src/Dockerfile .
36+
# cd vlm-openvino-serving
37+
# docker build -t vlm-openvino-serving:latest -f docker/Dockerfile .
38+
# cd ../../..
39+
ls
5040
cd metro-ai-suite
51-
ls -R
5241
docker build -t visual-search-qa-app:latest -f visual-search-question-and-answering/src/Dockerfile .
5342
54-
- name: Run trivy Scan - dataprep-visualdata-milvus
43+
- name: Verify Docker image
44+
run: |
45+
echo "=== Built Docker Image ==="
46+
docker images
47+
ls
48+
echo "=== Image Build Verification Complete ==="
49+
- name: Run Trivy Filesystem Scan
5550
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
56-
id: dataprep-visualdata-milvus
51+
id: trivy-fs
5752
with:
58-
scan_type: "image"
59-
scan-scope: all
60-
scan_target: "dataprep-visualdata-milvus:latest"
61-
severity: "HIGH,CRITICAL"
62-
format: "json"
53+
scan_type: "fs"
54+
scan-scope: "all"
55+
severity: "HIGH,CRITICAL"
56+
format: "json"
57+
scan_target: "metro-ai-suite/visual-search-question-and-answering/"
58+
report_suffix: "-fs-vqa-CT7"
6359

64-
- name: Run trivy Scan - retriever-milvus
60+
- name: Run trivy Scan -vqa (HTML Report)
6561
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
66-
id: retriever-milvus
62+
id: vqa-visual-html
6763
with:
6864
scan_type: "image"
69-
scan-scope: all
70-
scan_target: "retriever-milvus:latest"
71-
severity: "HIGH,CRITICAL"
72-
format: "json"
73-
74-
- name: Run trivy Scan - vlm-openvino-serving
65+
scan-scope: "all"
66+
scan_target: "visual-search-qa-app:latest"
67+
severity: "HIGH,CRITICAL"
68+
format: "table"
69+
report_suffix: "-image-vqa-visual-html-CT248"
70+
generate_sbom: "false"
71+
72+
- name: Run trivy Scan - vqa (SPDX SBOM)
7573
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
76-
id: vlm-openvino-serving
74+
id: vqa-visual-spdx
7775
with:
7876
scan_type: "image"
79-
scan-scope: all
80-
scan_target: "vlm-openvino-serving:latest"
77+
scan-scope: "all"
78+
scan_target: "visual-search-qa-app:latest"
8179
severity: "HIGH,CRITICAL"
82-
format: "json"
80+
format: "spdx-json"
81+
scanners: "vuln"
82+
report_suffix: "-image-vqa-visual-spdx-CT248"
83+
generate_sbom: "false"
8384

84-
- name: Run trivy Scan - visual-search-qa-app
85+
- name: Scan Dockerfile with Trivy
8586
uses: open-edge-platform/orch-ci/.github/actions/security/trivy@27276444a9bcf247a27369406686b689933bd1ff
86-
id: visual-search-qa-app
8787
with:
88-
scan_type: "image"
89-
scan-scope: all
90-
scan_target: "visual-search-qa-app:latest"
91-
severity: "HIGH,CRITICAL"
92-
format: "json"
93-
88+
scan_type: "config"
89+
scan_target: "metro-ai-suite/visual-search-question-and-answering/docker/"
90+
severity: "HIGH,CRITICAL"
91+
format: "json"
92+
misconfig_scanners: "dockerfile"
93+
report_suffix: "-config-vqa-CT222"
94+
9495
- name: Upload Report
9596
uses: actions/upload-artifact@de65e23aa2b7e23d713bb51fbfcb6d502f8667d8
9697
with:
97-
name: trivy-report
98+
name: trivy-report-vqa
9899
path: security-results/trivy*
99100

100101
bandit-scan:
@@ -136,4 +137,3 @@ jobs:
136137
name: clamav-report
137138
path: security-results/clamav*
138139

139-

education-ai-suite/smart-classroom/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ The basic architecture follows a modular pipeline designed for efficient audio s
2828
![High-Level System Diagram](./docs/user-guide/images/architecture.svg)
2929

3030

31+
For more information see [How it works](./docs/user-guide/how-it-works.md)
32+
3133
## Learn More
3234

3335
[Release Notes](./docs/user-guide/release-notes.md)

education-ai-suite/smart-classroom/docs/user-guide/get-started.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,3 +173,13 @@ If you changed the port, adjust the URL accordingly.
173173
```
174174

175175
Delete the models folder from `edge-ai-suites/education-ai-suite/smart-classroom/models` and try again.
176+
177+
## Uninstall the Application
178+
179+
To uninstall the application, follow these steps:
180+
181+
1. **Delete the Python virtual environment folder:**
182+
Navigate to the directory and remove *education-ai-suite/smartclassroom*
183+
2. **Remove the models directory:**
184+
Remove the models folder located under *education-ai-suite/smart-classroom*.
185+

0 commit comments

Comments
 (0)