Update scenescape to 2025.2 rc2

metro-ai-suite/metro-vision-ai-app-recipe/compose-scenescape.yml

@@ -167,9 +167,9 @@ services:
     devices:
       - "/dev/dri:/dev/dri"
     device_cgroup_rules:
-      - 'c 189:* rmw'
-      - 'c 209:* rmw'
-      - 'a 189:* rwm'
+      - "c 189:* rmw"
+      - "c 209:* rmw"
+      - "a 189:* rwm"
     group_add:
       - "109"
       - "110"
@@ -208,67 +208,46 @@ services:
     restart: on-failure:5
 
   pgserver:
-    image: docker.io/intel/scenescape-manager:v1.4.0
-    init: true
+    image: postgres:17.6
+    env_file:
+      - ./${SAMPLE_APP}/src/secrets/pgserver/pgserver.env
     networks:
       - scenescape
     environment:
-      - "DBROOT=/workspace"
-      - "EXAMPLEDB=smart-intersection-ri.tar.bz2"
-      - http_proxy=${http_proxy}
-      - https_proxy=${https_proxy}
-      - no_proxy=${no_proxy},.scenescape.intel.com,influxdb2
-      - NO_PROXY=${no_proxy},.scenescape.intel.com,influxdb2
-      - HTTP_PROXY=${http_proxy}
-      - HTTPS_PROXY=${https_proxy}
-    entrypoint: [
-        "/bin/bash",
-        "-e",
-        "-c",
-        "cp /tmp/user_access_config.json /home/scenescape/SceneScape/user_access_config.json && \
-        cp /tmp/smart-intersection-ri.tar.bz2 /home/scenescape/SceneScape/smart-intersection-ri.tar.bz2 && \
-        chown -R scenescape:scenescape /workspace && \
-        SUPASS=$(cat /run/secrets/supass) /usr/local/bin/scenescape-init database --preloadexample",
-      ]
-    cap_add:
-      - SYS_ADMIN
-    devices:
-      - /dev/fuse
-    security_opt:
-      - apparmor:unconfined
+      POSTGRES_USER: scenescape
+      POSTGRES_DB: scenescape
     volumes:
-      - pgserver-db:/workspace/db
-      - pgserver-migrations:/workspace/migrations
-      - pgserver-media:/workspace/media
-      - ./${SAMPLE_APP}/src/webserver/user_access_config.json:/tmp/user_access_config.json
-      - ./${SAMPLE_APP}/src/webserver/smart-intersection-ri.tar.bz2:/tmp/smart-intersection-ri.tar.bz2
-    secrets:
-      - django
-      - browser.auth
-      - controller.auth
-      - supass
-    restart: on-failure:5
+      - pgserver-db:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
 
   web:
-    image: docker.io/intel/scenescape-manager:v1.4.0
+    image: ghcr.io/open-edge-platform/edge-ai-libraries/intel/scenescape-manager:2025.2-rc2
     init: true
     networks:
       scenescape:
         aliases:
           - web.scenescape.intel.com
     depends_on:
-      - pgserver
+      pgserver:
+        condition: service_started
+      broker:
+        condition: service_started
     environment:
-      - "DBROOT=/workspace"
       - http_proxy=${http_proxy}
       - https_proxy=${https_proxy}
       - no_proxy=${no_proxy},.scenescape.intel.com,influxdb2
       - NO_PROXY=${no_proxy},.scenescape.intel.com,influxdb2
       - HTTP_PROXY=${http_proxy}
       - HTTPS_PROXY=${https_proxy}
+      - SUPASS
+      - EXAMPLEDB=/home/scenescape/SceneScape/smart-intersection-ri.tar.bz2
+      - DJANGO_DEBUG=True
     command: >
       webserver
       --dbhost pgserver
+      --dbtype postgres
+      --dbport 5432
       --broker broker.scenescape.intel.com
       --brokerauth /run/secrets/browser.auth
       --brokerrootcert /run/secrets/certs/scenescape-ca.pem
@@ -286,6 +265,10 @@ services:
       - apparmor:unconfined
     volumes:
       - pgserver-media:/workspace/media
+      - pgserver-migrations:/workspace/migrations
+      - sample-data:/home/scenescape/SceneScape/sample_data
+      - ./${SAMPLE_APP}/src/webserver/user_access_config.json:/home/scenescape/SceneScape/user_access_config.json
+      - ./${SAMPLE_APP}/src/webserver/smart-intersection-ri.tar.bz2:/home/scenescape/SceneScape/smart-intersection-ri.tar.bz2
     secrets:
       - source: root-cert
         target: certs/scenescape-ca.pem
@@ -299,7 +282,7 @@ services:
     restart: on-failure:5
 
   scene:
-    image: docker.io/intel/scenescape-controller:v1.4.0
+    image: ghcr.io/open-edge-platform/edge-ai-libraries/intel/scenescape-controller:2025.2-rc2
     init: true
     environment:
       - http_proxy=${http_proxy}
@@ -308,19 +291,31 @@ services:
       - NO_PROXY=${no_proxy},.scenescape.intel.com,influxdb2
       - HTTP_PROXY=${http_proxy}
       - HTTPS_PROXY=${https_proxy}
+      - CONTROLLER_ENABLE_METRICS
+      - CONTROLLER_METRICS_ENDPOINT
+      - CONTROLLER_METRICS_EXPORT_INTERVAL_S
+      - CONTROLLER_ENABLE_TRACING
+      - CONTROLLER_TRACING_ENDPOINT
+      - CONTROLLER_TRACING_SAMPLE_RATIO
     networks:
       scenescape:
+    configs:
+      - source: tracker-config
+        target: /home/scenescape/SceneScape/tracker-config.json
     depends_on:
       web:
         condition: service_healthy
       broker:
         condition: service_started
       ntpserver:
         condition: service_started
-    command: controller --broker broker.scenescape.intel.com --ntp ntpserv
+    command: >
+      --restauth /run/secrets/controller.auth
+      --brokerauth /run/secrets/controller.auth
+      --broker broker.scenescape.intel.com
+      --ntp ntpserv
     volumes:
       - pgserver-media:/home/scenescape/SceneScape/media
-      - ./${SAMPLE_APP}/src/controller/tracker-config.json:/home/scenescape/SceneScape/tracker-config.json
     secrets:
       - source: root-cert
         target: certs/scenescape-ca.pem
@@ -381,6 +376,14 @@ secrets:
   supass:
     file: ./${SAMPLE_APP}/src/secrets/supass
 
+configs:
+  mosquitto-secure:
+    file: ./${SAMPLE_APP}/src/mosquitto/mosquitto-secure.conf
+  tracker-config:
+    # Use this configuration file to run tracking with time-chunking enabled
+    # file: ./controller/config/tracker-config-time-chunking.json
+    file: ./${SAMPLE_APP}/src/controller/tracker-config.json
+
 volumes:
   dlstreamer-pipeline-server-pipeline-root:
     driver: local
@@ -398,3 +401,4 @@ volumes:
   pgserver-db:
   pgserver-migrations:
   pgserver-media:
+  sample-data:

metro-ai-suite/metro-vision-ai-app-recipe/smart-intersection/.gitignore

@@ -1,6 +1,7 @@
 src/secrets/ca
 src/secrets/certs
 src/secrets/django
+src/secrets/pgserver
 src/secrets/influxdb2
 src/secrets/*.auth
 src/secrets/*.token

metro-ai-suite/metro-vision-ai-app-recipe/smart-intersection/chart/files/controller/tracker-config.json

@@ -2,5 +2,7 @@
     "max_unreliable_frames": 10,
     "non_measurement_frames_dynamic": 8,
     "non_measurement_frames_static": 16,
-    "baseline_frame_rate": 30
-}
+    "baseline_frame_rate": 30,
+    "time_chunking_enabled": false,
+    "time_chunking_interval_milliseconds": 50
+}