Merge branch 'main' into sairam/metro-smart-intersection-gpu

Author: sairampillai

.github/workflows/industrial-edge-insights-time-series-pull-request.yml

@@ -3,12 +3,13 @@
 # Copyright (C) 2025 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 #
-name: "[Industrial Edge Insights Time Series] PR workflow"
-run-name: "[Industrial Edge Insights Time Series] PR  workflow (by @${{ github.actor }} via ${{ github.event_name }})"
+name: "[Industrial Edge Insights Time Series and Multimodal] PR workflow"
+run-name: "[Industrial Edge Insights Time Series and Multimodal] PR workflow (by @${{ github.actor }} via ${{ github.event_name }})"
 on:
   pull_request:
     paths:
       - 'manufacturing-ai-suite/industrial-edge-insights-time-series/*'
+      - 'manufacturing-ai-suite/industrial-edge-insights-multimodal/*'
   workflow_call:
   workflow_dispatch:
 
@@ -52,7 +53,7 @@ jobs:
       with:
           path: timeseries
           persist-credentials: false
-    - name: Building Wind Turbine Anomaly Detection Sample App
+    - name: Building Time Series Sample App
       run: |
         cd ./timeseries/manufacturing-ai-suite/industrial-edge-insights-time-series
         make down 
@@ -87,6 +88,50 @@ jobs:
         cd "${{ github.workspace }}"
         cd ./timeseries/manufacturing-ai-suite/industrial-edge-insights-time-series
         make down
+    - name: Deploying Weld Anomaly Detection Sample App
+      run: |
+        cd "${{ github.workspace }}"
+        cd ./timeseries/manufacturing-ai-suite/industrial-edge-insights-time-series
+        echo "Deploying Weld Anomaly Detection Sample App"
+        make up_mqtt_ingestion app=weld-anomaly-detection
+    - name: Undeploying Weld Anomaly Detection Sample App
+      run: |
+        cd "${{ github.workspace }}"
+        cd ./timeseries/manufacturing-ai-suite/industrial-edge-insights-time-series
+        make down
+
+    - name: Building Multimodal Sample App
+      run: |
+        cd ./timeseries/manufacturing-ai-suite/industrial-edge-insights-multimodal
+        make down 
+        # Generate random values for sensitive environment variables
+        INFLUXDB_USERNAME=$(cat /dev/urandom | tr -dc 'a-zA-Z' | head -c 8)
+        INFLUXDB_PASSWORD=$(openssl rand -hex 6)
+        VISUALIZER_GRAFANA_USER=$(cat /dev/urandom | tr -dc 'a-zA-Z' | head -c 8)
+        VISUALIZER_GRAFANA_PASSWORD=$(openssl rand -hex 6)
+        MTX_WEBRTCICESERVERS2_0_USERNAME=$(cat /dev/urandom | tr -dc 'a-zA-Z' | head -c 8)
+        MTX_WEBRTCICESERVERS2_0_PASSWORD=$(openssl rand -hex 10)
+        HOST_IP=$(hostname -I | awk '{print $1}')
+
+        sed -i "s/INFLUXDB_USERNAME=.*/INFLUXDB_USERNAME=${INFLUXDB_USERNAME}/g" .env
+        sed -i "s/INFLUXDB_PASSWORD=.*/INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD}/g" .env
+        sed -i "s/VISUALIZER_GRAFANA_USER=.*/VISUALIZER_GRAFANA_USER=${VISUALIZER_GRAFANA_USER}/g" .env
+        sed -i "s/VISUALIZER_GRAFANA_PASSWORD=.*/VISUALIZER_GRAFANA_PASSWORD=${VISUALIZER_GRAFANA_PASSWORD}/g" .env
+        sed -i "s/MTX_WEBRTCICESERVERS2_0_USERNAME=.*/MTX_WEBRTCICESERVERS2_0_USERNAME=${MTX_WEBRTCICESERVERS2_0_USERNAME}/g" .env
+        sed -i "s/MTX_WEBRTCICESERVERS2_0_PASSWORD=.*/MTX_WEBRTCICESERVERS2_0_PASSWORD=${MTX_WEBRTCICESERVERS2_0_PASSWORD}/g" .env
+        sed -i "s/HOST_IP=.*/HOST_IP=${HOST_IP}/g" .env
+        make build
+    - name: Deploying Multimodal Weld Defect Detection Sample App
+      run: |
+        cd "${{ github.workspace }}"
+        cd ./timeseries/manufacturing-ai-suite/industrial-edge-insights-multimodal
+        echo "Deploying Multimodal Weld Defect Detection Sample App"
+        make up
+    - name: Undeploying Multimodal Weld Defect Detection Sample App
+      run: |
+        cd "${{ github.workspace }}"
+        cd ./timeseries/manufacturing-ai-suite/industrial-edge-insights-multimodal
+        make down
 
   industrial-edge-insights-time-series-scans:
     uses: ./.github/workflows/industrial-edge-insights-time-series-scans.yml

.github/workflows/industrial-edge-insights-time-series-scans.yml

@@ -2,8 +2,8 @@
 # SPDX-FileCopyrightText: (C) 2025 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-name: "[Industrial Edge Insights Time Series] SDLe Scans"
-run-name: "[Industrial Edge Insights Time Series] SDLe Scans workflow (by @${{ github.actor }} via ${{ github.event_name }})"
+name: "[Industrial Edge Insights Multimodal and Time Series] SDLe Scans"
+run-name: "[Industrial Edge Insights Multimodal and Time Series] SDLe Scans workflow (by @${{ github.actor }} via ${{ github.event_name }})"
 
 
 # Only run at most 1 workflow concurrently per PR, unlimited for branches
@@ -77,7 +77,6 @@ jobs:
         run: |
           pwd
           CWD=$(pwd)
-          cd manufacturing-ai-suite/industrial-edge-insights-time-series/
           trivy --version
           which trivy
           trivy image --download-db-only
@@ -164,7 +163,7 @@ jobs:
         shell: bash
         run: |
           pwd
-          cd manufacturing-ai-suite/industrial-edge-insights-time-series/
+          CWD=$(pwd)
           trivy --version
           which trivy
           trivy image --download-db-only
@@ -209,7 +208,7 @@ jobs:
               CWD=$(pwd)
               if [[ "${{ inputs.application }}" == "time-series" || "${{ inputs.application }}" == "both" ]]; then
                 echo "Building Time Series Sample app and scanning docker images"
-                cd manufacturing-ai-suite/industrial-edge-insights-time-series/
+                cd $CWD/manufacturing-ai-suite/industrial-edge-insights-time-series/
                 make down
 
                 OPC_UA_SERVER_IMAGE=$(grep '^OPC_UA_SERVER_IMAGE=' .env | cut -d'=' -f2)
@@ -246,7 +245,7 @@ jobs:
 
               if [[ "${{ inputs.application }}" == "multimodal" || "${{ inputs.application }}" == "both" ]]; then
                 echo "Building Multimodal Weld Defect Detection Sample app and scanning docker images"
-                cd manufacturing-ai-suite/industrial-edge-insights-multimodal/
+                cd $CWD/manufacturing-ai-suite/industrial-edge-insights-multimodal/
                 make down
 
                 WELD_SIMULATOR_IMAGE=$(grep '^WELD_SIMULATOR_IMAGE=' .env | cut -d'=' -f2)
@@ -316,7 +315,6 @@ jobs:
         shell: bash
         run: |
           pwd
-          cd manufacturing-ai-suite/industrial-edge-insights-time-series/
           trivy --version
           which trivy
           trivy image --download-db-only
@@ -359,15 +357,29 @@ jobs:
             cd manufacturing-ai-suite/industrial-edge-insights-time-series/
             make gen_helm_charts
             cd helm
-            trivy config . >> trivy-timeseries-helm.txt
+            INFLUXDB_USERNAME=$(cat /dev/urandom | tr -dc 'a-zA-Z' | head -c 8)
+            INFLUXDB_PASSWORD=$(openssl rand -hex 10)
+            VISUALIZER_GRAFANA_USER=$(cat /dev/urandom | tr -dc 'a-zA-Z' | head -c 8)
+            VISUALIZER_GRAFANA_PASSWORD=$(openssl rand -hex 10)
+
+            sed -i "s/INFLUXDB_USERNAME:.*/INFLUXDB_USERNAME: ${INFLUXDB_USERNAME}/g" values.yaml
+            sed -i "s/INFLUXDB_PASSWORD:.*/INFLUXDB_PASSWORD: ${INFLUXDB_PASSWORD}/g" values.yaml
+            sed -i "s/VISUALIZER_GRAFANA_USER:.*/VISUALIZER_GRAFANA_USER: ${VISUALIZER_GRAFANA_USER}/g" values.yaml
+            sed -i "s/VISUALIZER_GRAFANA_PASSWORD:.*/VISUALIZER_GRAFANA_PASSWORD: ${VISUALIZER_GRAFANA_PASSWORD}/g" values.yaml
+
+            trivy config . >> trivy-timeseries-mqtt-helm.txt
+
+            sed -i "s/TELEGRAF_INPUT_PLUGIN:.*/TELEGRAF_INPUT_PLUGIN: opcua/g" values.yaml
+            trivy config . >> trivy-timeseries-opcua-helm.txt
+
           fi
           
       - name: Upload Scan artifact to Github
         uses: actions/upload-artifact@v4
         with:
           name: Trivy Report - Config scan for Helm
           path: |
-            manufacturing-ai-suite/industrial-edge-insights-time-series/helm/trivy-timeseries-helm.txt
+            manufacturing-ai-suite/industrial-edge-insights-time-series/helm/trivy-timeseries-*.txt
       
   trivy-config-time-series-dockerfile-scan:
     if: ${{ ((inputs.target == 'trivy-config-scan') || (inputs.target == 'trivy-dockerfile-scan') || (inputs.target == 'all-scans')) && ((inputs.application == 'time-series') || (inputs.application == 'both')) }}
@@ -405,10 +417,10 @@ jobs:
         include:
           - dockerfile-path: manufacturing-ai-suite/industrial-edge-insights-multimodal/weld-data-simulator/Dockerfile
             output-report-path: trivy-weld-simulator-dockerfile.json
-            scan-name: Time Series Weld Data Simulator Dockerfile
+            scan-name: Multimodal Weld Data Simulator Dockerfile
           - dockerfile-path: manufacturing-ai-suite/industrial-edge-insights-multimodal/fusion-analytics/Dockerfile
             output-report-path: trivy-fusion-analytics-dockerfile.json
-            scan-name: Time Series Fusion Analytics Dockerfile
+            scan-name: Multimodal Fusion Analytics Dockerfile
     uses: open-edge-platform/edge-ai-libraries/.github/workflows/trivy-config-mode.yaml@e6e04af3dbca805db9118b85a22ad2998f7eec39
     with:
       dockerfile-path: ${{ matrix.dockerfile-path }}
@@ -452,7 +464,7 @@ jobs:
         pwd
     - name: Convert JSON to CSV
       run: |
-        python3 <<EOF
+        cat > convert_json_to_csv.py << 'EOF'
         import json
         import csv
         import glob
@@ -481,6 +493,7 @@ jobs:
                         "test_name": issue["test_name"]
                     })
         EOF
+        python3 convert_json_to_csv.py
     - name: Upload Scan Reports
       uses: actions/upload-artifact@v4
       with:
@@ -673,14 +686,16 @@ jobs:
           VISUALIZER_GRAFANA_PASSWORD=$(openssl rand -hex 10)
           MTX_WEBRTCICESERVERS2_0_USERNAME=$(cat /dev/urandom | tr -dc 'a-zA-Z' | head -c 8)
           MTX_WEBRTCICESERVERS2_0_PASSWORD=$(openssl rand -hex 10)
+          HOST_IP=$(hostname -I | awk '{print $1}')
 
           sed -i "s/INFLUXDB_USERNAME=.*/INFLUXDB_USERNAME=${INFLUXDB_USERNAME}/g" .env
           sed -i "s/INFLUXDB_PASSWORD=.*/INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD}/g" .env
           sed -i "s/VISUALIZER_GRAFANA_USER=.*/VISUALIZER_GRAFANA_USER=${VISUALIZER_GRAFANA_USER}/g" .env
           sed -i "s/VISUALIZER_GRAFANA_PASSWORD=.*/VISUALIZER_GRAFANA_PASSWORD=${VISUALIZER_GRAFANA_PASSWORD}/g" .env
           sed -i "s/MTX_WEBRTCICESERVERS2_0_USERNAME=.*/MTX_WEBRTCICESERVERS2_0_USERNAME=${MTX_WEBRTCICESERVERS2_0_USERNAME}/g" .env
           sed -i "s/MTX_WEBRTCICESERVERS2_0_PASSWORD=.*/MTX_WEBRTCICESERVERS2_0_PASSWORD=${MTX_WEBRTCICESERVERS2_0_PASSWORD}/g" .env
- 
+          sed -i "s/HOST_IP=.*/HOST_IP=${HOST_IP}/g" .env
+
           make build
           echo "Deploying using mqtt ingestion"
           make up

.github/workflows/pre-merge.yml

@@ -22,6 +22,7 @@ jobs:
       hmi-augmented-worker_changed: ${{ steps.filter.outputs.hmi-augmented-worker }}
       image-based-video-search_changed: ${{ steps.filter.outputs.image-based-video-search }}
       industrial-edge-insights-time-series_changed: ${{ steps.filter.outputs.industrial-edge-insights-time-series }}
+      industrial-edge-insights-multimodal_changed: ${{ steps.filter.outputs.industrial-edge-insights-multimodal }}
       loitering-detection_changed: ${{ steps.filter.outputs.loitering-detection }}
       metro-sdk-manager_changed: ${{ steps.filter.outputs.metro-sdk-manager }}
       pallet-defect-detection_changed: ${{ steps.filter.outputs.pallet-defect-detection }}
@@ -47,6 +48,8 @@ jobs:
               - 'metro-ai-suite/image-based-video-search/docs/**'
             industrial-edge-insights-time-series:
               - 'manufacturing-ai-suite/industrial-edge-insights-time-series/docs/**'
+            industrial-edge-insights-multimodal:
+              - 'manufacturing-ai-suite/industrial-edge-insights-multimodal/docs/**'
             loitering-detection:
               - 'metro-ai-suite/metro-vision-ai-app-recipe/loitering-detection/docs/**'
             metro-sdk-manager:
@@ -108,6 +111,20 @@ jobs:
     with:
       docs_directory: manufacturing-ai-suite/industrial-edge-insights-time-series
       exclude_patterns: "**/Overview.md"
+  
+  build_industrial-edge-insights-multimodal:
+    permissions:
+      contents: read          # needed for actions/checkout
+    needs: filter
+    if: ${{ needs.filter.outputs.industrial-edge-insights-multimodal_changed == 'true' }}
+    uses: open-edge-platform/orch-ci/.github/workflows/build-documentation.yml@b14b0105bf312a2c98457dd021622de4c14f6bff
+    secrets:
+      SYS_ORCH_GITHUB: ${{ secrets.SYS_ORCH_GITHUB }}
+      DOC_AWS_ACCESS_KEY_ID: ${{ secrets.DOC_AWS_ACCESS_KEY_ID }}
+      DOC_AWS_SECRET_ACCESS_KEY: ${{ secrets.DOC_AWS_SECRET_ACCESS_KEY }}
+    with:
+      docs_directory: manufacturing-ai-suite/industrial-edge-insights-multimodal
+      exclude_patterns: "**/Overview.md"
 
   build_loitering-detection:
     permissions:

README.md

@@ -45,7 +45,6 @@ The **Edge AI Suites** project is licensed under the [APACHE 2.0](LICENSE), exce
 | Sample Application | License |
 |:-------------------|:--------|
 |[Smart Intersection](metro-ai-suite/metro-vision-ai-app-recipe/smart-intersection) | [LIMITED EDGE SOFTWARE DISTRIBUTION LICENSE AGREEMENT](metro-ai-suite/metro-vision-ai-app-recipe/smart-intersection/LICENSE.txt) |
-|[Video Processing for NVR](metro-ai-suite/video-processing-for-nvr) | [LIMITED EDGE SOFTWARE DISTRIBUTION LICENSE AGREEMENT](metro-ai-suite/video-processing-for-nvr/LICENSE.txt) |
 
 ## Third-Party
 

manufacturing-ai-suite/industrial-edge-insights-multimodal/README.md

@@ -6,8 +6,8 @@ The Weld Defect Detection sample application demonstrates a powerful fusion of v
 
 To see the system requirements and other installation, see the following guides:
 
-  - [System Requirements](docs/user-guide/system-requirements.md): Hardware and software requirements for running the sample application.
-  - [Get Started](docs/user-guide/get-started.md): Step-by-step guide to getting started with the docker compose deployment of the sample application.
+  - [System Requirements](docs/user-guide/weld-defect-detection/system-requirements.md): Hardware and software requirements for running the sample application.
+  - [Get Started](docs/user-guide/weld-defect-detection/get-started.md): Step-by-step guide to getting started with the docker compose deployment of the sample application.
 
 ## Architecture and Functionality Overview
 

manufacturing-ai-suite/industrial-edge-insights-multimodal/docs/toc.rst

@@ -0,0 +1,40 @@
+# Industrial Edge Insights - Multimodal
+
+MultiModal sample apps demonstrate how to use AI at the edge to identify defects in manufacturing environments by analyzing both image and time series sensor data.
+
+In industrial quality is critical for safety and reliability. Manual inspections are time-consuming and prone to human error. Our solutions leverage deep learning models to automate defect detection, improving accuracy and efficiency.
+
+Key features include:
+
+- Multi-modal data fusion: Combines visual inspection (images) and sensor data (such as current, voltage, and temperature)
+  for comprehensive defect detection.
+- Real-time inference: Processes data at the edge for immediate feedback and reduced latency.
+- Configurable alerts: Notifies operators of detected defects to enable timely intervention.
+- Extensible pipeline: Supports integration with additional data sources and models.
+
+Applications such as [Weld Defect Detection](./weld-defect-detection/Overview.md) help manufacturers enhance product quality, reduce inspection time, and minimize costly rework by enabling proactive defect detection on the factory floor.
+
+<!--hide_directive
+::::{grid} 1 2 3 4
+:::{grid-item-card} Weld Defect Detection
+:class-card: homepage-card-container-big
+:link: ./weld-defect-detection/Overview.html
+
+Multimodal, real-time monitoring of weld defects.
+:::
+::::
+hide_directive-->
+
+<!--hide_directive
+:::{toctree}
+:hidden:
+
+weld-defect-detection/how-it-works.md
+weld-defect-detection/system-requirements.md
+weld-defect-detection/get-started.md
+weld-defect-detection/how-to-build-from-source.md
+weld-defect-detection/how-to-configure-alerts.md
+weld-defect-detection/how-to-update-config.md
+weld-defect-detection/release_notes/Overview.md
+:::
+hide_directive-->