Merge branch 'main' into removeheadings_robotics

Author: achamuah

health-and-life-sciences-ai-suite/multi_modal_patient_monitoring/docker-compose.yaml

@@ -38,7 +38,7 @@ services:
     environment:
       - WORKLOAD_TYPE=mdpnp
       - GRPC_PORT=50051
-      - HTTP_PORT=8000    
+      - HTTP_PORT=8001
     network_mode: "host"
 
   metrics-collector:
@@ -99,7 +99,7 @@ services:
     environment:
       - GRPC_HOST=localhost
       - GRPC_PORT=50051
-      - MDPNP_DEVICE=${MDPNP_DEVICE}
+      - MDPNP_DEVICE=${MDPNP_DEVICE:-}
     env_file:
         - ./configs/device.env   
     depends_on:
@@ -127,7 +127,7 @@ services:
       patient-monitoring-aggregator:
         condition: service_started
     environment:
-      - ECG_DEVICE=${ECG_DEVICE}  
+      - ECG_DEVICE=${ECG_DEVICE:-}  
     env_file:
       - ./configs/device.env  
     volumes:
@@ -191,7 +191,7 @@ services:
       patient-monitoring-aggregator:
           condition: service_started  
     environment:
-      - RPPG_DEVICE=${RPPG_DEVICE}  
+      - RPPG_DEVICE=${RPPG_DEVICE:-}  
     env_file:
       - ./configs/device.env  
     volumes:
@@ -207,6 +207,8 @@ services:
       context: ./services/ui
       dockerfile: Dockerfile
       args:
+        VITE_API_BASE_URL: http://${HOST_IP:-localhost}:8001
+        VITE_POSE_STREAM_URL: http://${HOST_IP:-localhost}:8085/video_feed
         HTTP_PROXY: ${HTTP_PROXY}
         HTTPS_PROXY: ${HTTPS_PROXY}
         NO_PROXY: ${NO_PROXY}

health-and-life-sciences-ai-suite/multi_modal_patient_monitoring/helm/README.md

@@ -8,22 +8,12 @@ This Helm chart deploys the **Health & Life Sciences AI Suite** on Kubernetes.
 - Kubernetes cluster (Minikube / Kind / Bare-metal)
 - `kubectl`
 - `helm` (v3+)
-- Docker images built locally
-
-## Required Docker Images
-
-The following images **must exist locally** before deploying the Helm chart.
-
-Check available images:
-```bash
-docker images | grep intel/hl-ai
-```
 
 
 ## Install
 
 ```bash
-cd health-and-life-sciences-ai-suite/helm/multi_modal_patient_monitoring
+cd /health-and-life-sciences-ai-suite/multi_modal_patient_monitoring/helm/multi_modal_patient_monitoring
 
 helm install multi-modal-patient-monitoring . \
   --namespace multi-modal-patient-monitoring \
@@ -53,7 +43,7 @@ kubectl get svc -n multi-modal-patient-monitoring
 
 ## Check Logs (recommended)
 ```bash
-kubectl logs -n multi-modal-patient-monitoringi deploy/mdpnp
+kubectl logs -n multi-modal-patient-monitoring deploy/mdpnp
 kubectl logs -n multi-modal-patient-monitoring deploy/dds-bridge
 kubectl logs -n multi-modal-patient-monitoring deploy/aggregator
 kubectl logs -n multi-modal-patient-monitoring deploy/ai-ecg
@@ -70,7 +60,9 @@ Healthy services will show:
 
 
 ## Access the Frontend UI
-Check Ingress resource:
+### 1. Check the Ingress Resource
+
+Run the following command to view the ingress configuration:
 
 ```bash
 kubectl get ingress -n multi-modal-patient-monitoring
@@ -82,24 +74,42 @@ Example output:
 NAME       HOSTS               PATHS   ADDRESS         PORTS
 multi-modal-patient-monitoring  multi-modal-patient-monitoring.local       /       xx.xx.xx.xx   80
 ```
+### 2. If an IP Address Appears in ADDRESS
 
-Add an entry on your Linux host (replace <IP> with the one you found):
+Add the hostname mapping to your local machine:
 ```bash
 echo "<IP> multi-modal-patient-monitoring.local" | sudo tee -a /etc/hosts
 ```
+Replace <IP> with the value shown in the ADDRESS column.
+
+### 3. If the ADDRESS Field is Empty (Common in Minikube)
+Some local Kubernetes environments (such as Minikube) do not automatically populate the ingress IP.
+
+Retrieve the Minikube cluster IP:
+```bash
+minikube ip
+```
+Then map the hostname to the IP:
+```bash
+echo "$(minikube ip) multi-modal-patient-monitoring.local" | sudo tee -a /etc/hosts
+```
+
+### 4. Enable Ingress in Minikube (if not already enabled)
+```bash
+minikube addons enable ingress
+```
+Wait a few moments for the ingress controller to start.
 
-Open your browser and go to:
+### 5.Open the Application
+Open your browser and navigate to:
 ```bash
 http://<host-or-ip>/
 ``` 
 Example:
 ```bash
 http://multi-modal-patient-monitoring.local/
 ``` 
-If using Minikube, you may need to enable the ingress addon:
-```bash
-minikube addons enable ingress
-``` 
+
 This will open the Health AI Suite frontend dashboard.
 
 From here you can access:

health-and-life-sciences-ai-suite/multi_modal_patient_monitoring/helm/multi_modal_patient_monitoring/templates/aggregator-deployment.yaml

@@ -18,6 +18,8 @@ spec:
           imagePullPolicy: {{ .Values.aggregator.image.pullPolicy }}
           ports:
             - containerPort: 8001
+              hostPort: 8001
+              protocol: TCP
             - containerPort: 50051
           env:
             - name: METRICS_SERVICE_URL

health-and-life-sciences-ai-suite/multi_modal_patient_monitoring/helm/multi_modal_patient_monitoring/templates/ai-ecg-deployment.yaml

@@ -13,16 +13,19 @@ spec:
         app: ai-ecg
     spec:
       initContainers:
-        - name: copy-models
-          image: "{{ .Values.assets.image.repository }}/{{ .Values.assets.image.name }}:{{ .Values.assets.image.tag }}"
-          imagePullPolicy: {{ .Values.assets.image.pullPolicy }}
-          command: ["/bin/sh", "-c"]
-          args:
-            - cp -r /opt/assets/models/* /models/
+        - name: wait-for-ecg-model
+          image: busybox:1.36
+          command:
+            - sh
+            - -c
+            - >-
+              until [ -f /models/ai-ecg/hubert_ecg_small_fp16.xml ]; do
+                echo "Waiting for HuBERT-ECG model asset...";
+                sleep 5;
+              done
           volumeMounts:
             - name: models
               mountPath: /models
-
       containers:
         - name: ai-ecg
           image: "{{ .Values.aiEcg.image.repository }}/{{ .Values.aiEcg.image.name }}:{{ .Values.aiEcg.image.tag }}"
@@ -32,22 +35,46 @@ spec:
           envFrom:
             - configMapRef:
                 name: device-config
+          startupProbe:
+            tcpSocket:
+              port: 8000
+            periodSeconds: 5
+            failureThreshold: 24
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: 8000
+            initialDelaySeconds: 5
+            periodSeconds: 5
+            failureThreshold: 6
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: 8000
+            initialDelaySeconds: 15
+            periodSeconds: 15
+            failureThreshold: 3
           ports:
             - containerPort: 8000
           volumeMounts:
             - name: models
               mountPath: /models
+            - name: videos
+              mountPath: /videos
             - name: dri
               mountPath: /dev/dri
             - name: dev
               mountPath: /dev
-
       volumes:
         - name: models
-          emptyDir: {}
+          persistentVolumeClaim:
+            claimName: models-pvc
+        - name: videos
+          persistentVolumeClaim:
+            claimName: videos-pvc
         - name: dri
           hostPath:
             path: /dev/dri
         - name: dev
           hostPath:
-            path: /dev
+            path: /dev

health-and-life-sciences-ai-suite/multi_modal_patient_monitoring/helm/multi_modal_patient_monitoring/templates/assets-job.yaml

@@ -0,0 +1,45 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: assets-prep
+spec:
+  template:
+    spec:
+      restartPolicy: OnFailure
+      containers:
+        - name: assets
+          image: "{{ .Values.assets.image.repository }}/{{ .Values.assets.image.name }}:{{ .Values.assets.image.tag }}"
+          imagePullPolicy: {{ .Values.assets.image.pullPolicy }}
+          envFrom:
+            - configMapRef:
+                name: device-config
+          env:
+            - name: HTTP_PROXY
+              value: "http://proxy-pilot.intel.com:912"
+            - name: HTTPS_PROXY
+              value: "http://proxy-pilot.intel.com:912"
+            - name: http_proxy
+              value: "http://proxy-pilot.intel.com:912"
+            - name: https_proxy
+              value: "http://proxy-pilot.intel.com:912"
+            - name: NO_PROXY
+              value: "intel.com,.intel.com,10.0.0.0/8,192.168.0.0/16,localhost,.local,127.0.0.0/8,134.134.0.0/16"
+            - name: no_proxy
+              value: "intel.com,.intel.com,10.0.0.0/8,192.168.0.0/16,localhost,.local,127.0.0.0/8,134.134.0.0/16"
+          volumeMounts:
+            - name: models
+              mountPath: /models
+            - name: videos
+              mountPath: /videos
+            - name: model-config
+              mountPath: /app/configs
+      volumes:
+        - name: models
+          persistentVolumeClaim:
+            claimName: models-pvc
+        - name: videos
+          persistentVolumeClaim:
+            claimName: videos-pvc
+        - name: model-config
+          configMap:
+            name: rppg-model-config

health-and-life-sciences-ai-suite/multi_modal_patient_monitoring/helm/multi_modal_patient_monitoring/templates/model-config-configmap.yaml

@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: rppg-model-config
+data:
+  model-config.yaml: |-
+    ai-ecg:
+      models:
+        - name: hubert_ecg_small_fp16
+          type: ai-ecg
+          hub: hf
+          source: hubert-ecg
+          model_id: Edoardo-BS/hubert-ecg-small
+          target_dir: /models/ai-ecg
+          ir_file: hubert_ecg_small_fp16.xml
+          video_dir: /videos/ai-ecg
+
+    rppg:
+      models:
+        - name: mtts_can.hdf5
+          type: rppg
+          hub: hls
+          target_dir: /models/rppg
+          model_file: mtts_can.hdf5
+          model_url: https://github.com/xliucs/MTTS-CAN/raw/main/mtts_can.hdf5
+          video_dir: /videos/rppg
+          video_url: https://github.com/opencv/opencv/raw/master/samples/data/vtest.avi
+
+    pose-3d:
+      models:
+        - name: human-pose-estimation-3d-0001
+          type: 3d-pose
+          hub: hls
+          target_dir: /models/3d-pose
+          model_url: https://storage.openvinotoolkit.org/repositories/open_model_zoo/public/2022.1/human-pose-estimation-3d-0001/human-pose-estimation-3d.tar.gz
+          ir_file: human-pose-estimation-3d-0001.xml
+          video_dir: /videos/3d-pose
+          video_url: https://www.pexels.com/download/video/6130537

health-and-life-sciences-ai-suite/multi_modal_patient_monitoring/helm/multi_modal_patient_monitoring/templates/pose-deployment.yaml

@@ -13,22 +13,30 @@ spec:
         app: pose
     spec:
       initContainers:
-        - name: copy-assets
-          image: "{{ .Values.assets.image.repository }}/{{ .Values.assets.image.name }}:{{ .Values.assets.image.tag }}"
-          imagePullPolicy: {{ .Values.assets.image.pullPolicy }}
+        - name: wait-for-pose-assets
+          image: "{{ .Values.pose.image.repository }}/{{ .Values.pose.image.name }}:{{ .Values.pose.image.tag }}"
+          imagePullPolicy: {{ .Values.pose.image.pullPolicy }}
           command: ["/bin/sh", "-c"]
           args:
-            - >
-              mkdir -p /models/3d-pose;
-              cp -r /opt/assets/models/3d-pose/* /models/3d-pose/;
-              mkdir -p /videos/3d-pose;
-              cp -r /opt/assets/videos/3d-pose/* /videos/3d-pose/
+            - |
+              set -e
+              MODEL="/models/3d-pose/human-pose-estimation-3d-0001.xml"
+              VIDEO="/videos/3d-pose/face-demographics-walking.mp4"
+              for i in $(seq 1 120); do
+                if [ -f "$MODEL" ] && [ -f "$VIDEO" ]; then
+                  echo "Pose assets found"
+                  exit 0
+                fi
+                echo "Waiting for pose assets..."
+                sleep 5
+              done
+              echo "Timed out waiting for pose assets"
+              exit 1
           volumeMounts:
             - name: models
               mountPath: /models
             - name: videos
               mountPath: /videos
-
       containers:
         - name: pose
           image: "{{ .Values.pose.image.repository }}/{{ .Values.pose.image.name }}:{{ .Values.pose.image.tag }}"
@@ -41,7 +49,9 @@ spec:
             - "--video"
             - "/videos/3d-pose/face-demographics-walking.mp4"
             - "--aggregator"
-            - "aggregator:50051" 
+            - "aggregator:50051"
+            - "--source-id"
+            - "3d-pose-camera-1"
           securityContext:
             privileged: true
           envFrom:
@@ -51,7 +61,8 @@ spec:
             - containerPort: 8083
             - name: video-feed
               containerPort: 8085
-
+              hostPort: 8085
+              protocol: TCP
           env:
             - name: AGGREGATOR_ADDRESS
               value: "aggregator:50051"
@@ -63,7 +74,6 @@ spec:
               value: "aggregator,localhost,127.0.0.1"
             - name: no_proxy
               value: "aggregator,localhost,127.0.0.1"
-
           volumeMounts:
             - name: models
               mountPath: /models
@@ -73,12 +83,13 @@ spec:
               mountPath: /dev/dri
             - name: dev
               mountPath: /dev
-
       volumes:
         - name: models
-          emptyDir: {}
+          persistentVolumeClaim:
+            claimName: models-pvc
         - name: videos
-          emptyDir: {}
+          persistentVolumeClaim:
+            claimName: videos-pvc
         - name: dri
           hostPath:
             path: /dev/dri