v1.5.19

Author: actions-user

README.md

@@ -295,11 +295,10 @@ The `.env` [file](https://docs.docker.com/compose/environment-variables/set-envi
    ./scripts/sh-services edit <service>
    ```
    and follow the prompts to edit `.env` variables interactively.
-
 2. Add a user-specific file with an `.env` extension to the `conf/` folder, e.g. `sio/conf/0009-debug.env`:
    ```bash
    echo "MY_VARIABLE=24" > sio/conf/0009-debug.env
-   echo "SIO_DOCKER_TAG=r250127" >> sio/conf/0009-debug.env
+   echo "SIO_DOCKER_TAG=r250201" >> sio/conf/0009-debug.env
 
    ./scripts/sh-services merge sio
    ```

RELEASE.md

@@ -1,5 +1,11 @@
 # Release Notes
 
+## V1.5.19
+
+- Update SIO to r250201
+- Add vehicle MMCG to the UI
+- Add webhook output via POST
+
 ## V1.5.18
 
 - Add important MCP information

VERSION

@@ -1 +1 @@
-v1.5.18
+v1.5.19

deployment-examples/ALPRDemo/common/Database.py

@@ -3,12 +3,15 @@
 from datetime import datetime, timedelta
 
 class LicensePlate:
-    def __init__(self, object_id, region, plate_string, detection_time, source_id, x, y, w, h, imageId):
+    def __init__(self, object_id, make, model, color, region, plate_string, detection_time, source_id, x, y, w, h, imageId):
         self.object_id = object_id
         self.region = region
         self.plate_string = plate_string
         self.detection_time = detection_time
         self.source_id = source_id
+        self.make = make
+        self.model = model
+        self.color = color
         self.x = x
         self.y = y
         self.w = w
@@ -18,6 +21,9 @@ def __init__(self, object_id, region, plate_string, detection_time, source_id, x
     def to_dict(self):
         return {
             "oid" : self.object_id,
+            "make" : self.make,
+            "model" : self.model,
+            "color" : self.color,
             "string" : self.plate_string,
             "region" : self.region,
             "time" : self.detection_time,
@@ -38,6 +44,9 @@ def create_table(self):
                 CREATE TABLE IF NOT EXISTS plates (
                     id INTEGER PRIMARY KEY AUTOINCREMENT,
                     object_id TEXT UNIQUE,
+                    make TEXT,
+                    model TEXT,
+                    color TEXT,
                     region TEXT,
                     plate_string TEXT,
                     detection_time INTEGER,  -- Epoch time
@@ -53,10 +62,13 @@ def create_table(self):
     def add_detection(self, license_plate):
         with self.conn:
             self.conn.execute('''
-                INSERT OR IGNORE INTO plates (object_id, region, plate_string, detection_time, source_id, x, y, w, h, imageId)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                INSERT OR IGNORE INTO plates (object_id, make, model, color, region, plate_string, detection_time, source_id, x, y, w, h, imageId)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                 ON CONFLICT(id)
                 DO UPDATE SET
+                make = excluded.make,
+                model = excluded.model,
+                color = excluded.color,
                 region = excluded.region,
                 plate_string = excluded.plate_string,
                 detection_time = excluded.detection_time,
@@ -66,7 +78,8 @@ def add_detection(self, license_plate):
                 h = excluded.h,
                 imageId = excluded.imageId;
                 ''', (
-                license_plate.object_id, license_plate.region, license_plate.plate_string,
+                license_plate.object_id, license_plate.make, license_plate.model,
+                license_plate.color, license_plate.region, license_plate.plate_string,
                 int(license_plate.detection_time), license_plate.source_id,
                 license_plate.x, license_plate.y, license_plate.w, license_plate.h,
                 license_plate.imageId
@@ -123,6 +136,9 @@ def close(self):
     current_time = int(datetime.now().timestamp())
     license_plate = LicensePlate(
         object_id='123ABC',
+        make = 'toyota',
+        model = 'corolla',
+        color = 'white',
         region='FL',
         plate_string='ABC1234',
         detection_time=current_time,

deployment-examples/ALPRDemo/config/sio-pipelines.json

@@ -3,7 +3,7 @@
         "pipeline"      : "./share/pipelines/VehicleAnalytics/VehicleAnalyticsRTSP.yaml",
         "restartPolicy" : "restart",
         "parameters" : {
-            "VIDEO_IN"  : "rtsp://live555_svc:554/StreetVideo1.mkv",
+            "VIDEO_IN"  : "rtsp://live555_svc:554/Turn-01.mkv",
             "boxFilterConfig" : "/config/sio-box-filter.json",
             "detectionModel" : "gen7es",
             "lptModel" : "gen7es",
@@ -30,7 +30,7 @@
         "pipeline"      : "./share/pipelines/VehicleAnalytics/VehicleAnalyticsRTSP.yaml",
         "restartPolicy" : "restart",
         "parameters" : {
-            "VIDEO_IN"  : "rtsp://live555_svc:554/StreetVideo2.mkv",
+            "VIDEO_IN"  : "rtsp://live555_svc:554/Turn-02.mkv",
             "boxFilterConfig" : "/config/sio-box-filter.json",
             "detectionModel" : "gen7es",
             "lptModel" : "gen7es",

deployment-examples/ALPRDemo/consumer/SIO.py

@@ -37,6 +37,24 @@ def getLPInfo(self, lps, lpKey):
 
         return lpString, lpRegion, lpBox
 
+    # -------------------------------------------------------------------------------
+    # Get Vehicle attributes
+    # -------------------------------------------------------------------------------
+    def getVehicleInfo(self, vehicles, vehicleKey):
+        vehicle = vehicles[vehicleKey]
+        makeModel = vehicle.get("attributes", {}).get("vehicleType", {}).get("value", {})
+        makeModelScore = vehicle.get("attributes", {}).get("vehicleType", {}).get("value", {})
+        if isinstance(makeModel, dict):
+            make = makeModel.get("make",{})
+            model = makeModel.get("model",{}) + " " + makeModel.get("generation",{})
+        else:
+            make = makeModel
+            model = ""
+        color = vehicle.get("attributes", {}).get("color", {}).get("value", {})
+        vehicleBox = self.getBox(vehicle)
+
+        return make, model, color, vehicleBox, makeModelScore
+
     # -------------------------------------------------------------------------------
     # Get image ID associated with current message or None
     # -------------------------------------------------------------------------------
@@ -54,25 +72,34 @@ def parseSIOMessage(self, message):
 
         mc = message.get("metaClasses", {})
         lps = mc.get("licensePlates", {})
+        vehicles = mc.get("vehicles", {})
 
         # Get image associated with the frame (this isn't guaranteed)
         imageId = self.getFrameImageID(message)
 
         # Process license plates
         for lpKey in lps.keys():
             lpString, lpRegion, lpBox = self.getLPInfo(lps, lpKey)
-            self.onLicensePlate(sourceId, lpKey, frameTimestamp, lpString, lpRegion, lpBox, imageId)
+            links = lps[lpKey].get("links",{})[0]
+            make = ""; model = ""; color = ""; vehicleBox = ""
+            if "vehicles" == links.get("metaClass",{}):
+                vehicleId = links.get("id",{})
+                make, model, color, vehicleBox, makeModelScore = self.getVehicleInfo(vehicles, vehicleId)
+
+            self.onLicensePlate(sourceId, lpKey, frameTimestamp, lpString, lpRegion, lpBox,
+                                make, model, color, makeModelScore, vehicleBox, imageId)
 
 
     # -------------------------------------------------------------------------------
-    def onLicensePlate(self, sourceId, uid, frameTimestamp, lpString, lpRegion, lpBox, imageId):
+    def onLicensePlate(self, sourceId, uid, frameTimestamp, lpString, lpRegion, lpBox, make, model, color, makeModelScore, vBox, imageId):
         frameTimestampValue = int(frameTimestamp)
         timestamp_str = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(frameTimestampValue/1000))
 
-        lp = LicensePlate(uid, lpRegion, lpString, frameTimestamp, sourceId, lpBox[0], lpBox[1], lpBox[2], lpBox[3], imageId)
+        lp = LicensePlate(uid, make, model, color, lpRegion, lpString, frameTimestamp, sourceId,
+                          lpBox[0], lpBox[1], lpBox[2], lpBox[3], imageId)
         try:
             self.db.add_detection(lp)
-            print(f"{timestamp_str} Got LP source={sourceId}, uid={uid} time={frameTimestamp} string={lpString} region={lpRegion} box={lpBox} imageId={imageId}")
+            print(f"{timestamp_str} Got LP source={sourceId}, uid={uid} time={frameTimestamp} make={make} model={model} color={color} string={lpString} region={lpRegion} box={lpBox} imageId={imageId}")
         except:
             print(f"{timestamp_str} Failed to add to DB: source={sourceId}, uid={uid} time={frameTimestamp} string={lpString} region={lpRegion} box={lpBox}")
             print(f"Failed to insert/update LP: {traceback.format_exc()}")

deployment-examples/ALPRDemo/docker-compose.yml

@@ -23,7 +23,7 @@ services:
 
   # ========================= SIO ALPR Analytics =========================
   analytics_svc:
-    image: us-central1-docker.pkg.dev/ext-edge-analytics/docker/sio:${SIO_RELEASE-r250127}${SIO_DOCKER_TAG_VARIANT}
+    image: us-central1-docker.pkg.dev/ext-edge-analytics/docker/sio:${SIO_RELEASE-r250201}${SIO_DOCKER_TAG_VARIANT}
     restart: unless-stopped
     environment:
       # Location where SIO will place generated model engine files

deployment-examples/ALPRDemo/ui/python/ALPRUI.py

@@ -13,8 +13,10 @@
 import cv2
 from datetime import datetime
 from SIOParser import SIOParser
+import argparse
 
 kDefaultTimeout = 5
+kDefaultIpAddress = "127.0.0.1"
 
 def epoch_to_offset(epoch_timestamp):
     return datetime.utcfromtimestamp(epoch_timestamp/1000).strftime('%H:%M:%S')
@@ -86,11 +88,11 @@ def onCancel(self, event):
 
 class MainFrame(wx.Frame):
     # =========================================================================
-    def __init__(self, *args, **kw):
+    def __init__(self, ipAddress, *args, **kw):
         super(MainFrame, self).__init__(*args, **kw)
 
         self.settings = {
-            "api_ip": "10.10.10.20",
+            "api_ip": ipAddress,
             "api_port": "8888",
             "refresh_rate": 10,
             "max_entries": 50,
@@ -154,7 +156,6 @@ def initUI(self):
         search_sizer.Add(self.search_button, 0, wx.ALIGN_CENTER | wx.ALL, 5)
         self.search_tab.SetSizer(search_sizer)
 
-
         # Layout for the File tab
         file_sizer = wx.BoxSizer(wx.VERTICAL)
         self.uploaded_files_list = wx.ListCtrl(self.file_tab, style=wx.LC_REPORT)
@@ -172,17 +173,22 @@ def initUI(self):
         self.file_tab.SetSizer(file_sizer)
         self.uploaded_files_results = {}
 
-
         self.list_box = self.initListCtrl(self.panel)
         self.image_ctrl = wx.StaticBitmap(self.panel)
-        self.lp_ctrl = wx.StaticBitmap(self.panel, size=(100,60))
+        self.lp_ctrl = wx.StaticBitmap(self.panel, size=(200,100))
+
+        # Create a horizontal sizer for image_ctrl and lp_ctrl
+        self.image_lp_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.image_lp_sizer.Add(self.image_ctrl, 1, wx.EXPAND | wx.ALL, 5)  # image_ctrl takes more space
+        self.image_lp_sizer.Add(self.lp_ctrl, 1, wx.ALIGN_CENTER | wx.ALL, 5)  # lp_ctrl stays small
 
         # Layout for the main panel
         main_sizer = wx.BoxSizer(wx.VERTICAL)
         main_sizer.Add(self.notebook, 1, wx.EXPAND)
         main_sizer.Add(self.list_box, 1, wx.EXPAND | wx.ALL, 5)
-        main_sizer.Add(self.image_ctrl, 1, wx.EXPAND | wx.ALL, 5)
-        main_sizer.Add(self.lp_ctrl, 1, wx.ALIGN_CENTER | wx.ALL, 5)
+        main_sizer.Add(self.image_lp_sizer, 1, wx.EXPAND | wx.ALL, 5)
+        # main_sizer.Add(self.image_ctrl, 1, wx.EXPAND | wx.ALL, 5)
+        # main_sizer.Add(self.lp_ctrl, 1, wx.ALIGN_CENTER | wx.ALL, 5)
         self.panel.SetSizer(main_sizer)
 
         # Bind events
@@ -267,9 +273,10 @@ def clearSharedUIState(self):
     def initListCtrl(self,parent):
         ctrl = wx.ListCtrl(parent, style=wx.LC_REPORT)
         ctrl.InsertColumn(0, 'Time')
-        ctrl.InsertColumn(1, 'Plate/State')
-        ctrl.InsertColumn(2, 'Source')
-        ctrl.InsertColumn(3, 'UID')
+        ctrl.InsertColumn(1, 'Make/Model/Color')
+        ctrl.InsertColumn(2, 'Plate/State')
+        ctrl.InsertColumn(3, 'Source')
+        ctrl.InsertColumn(4, 'UID')
         # Bind the single-click event
         ctrl.Bind(wx.EVT_LIST_ITEM_SELECTED, self.onListItemSelected)
         return ctrl
@@ -481,11 +488,15 @@ def populateListWithData(self,data,ctrl,isoffset):
             else:
                 dt = epoch_to_string(int(entry['time']))
             ctrl.InsertItem(index, f"{dt}")
-            ctrl.SetItem(index, 1, f"{entry['string']}/{entry['region']}")
-            ctrl.SetItem(index, 2, f"{entry['sourceId']}")
-            ctrl.SetItem(index, 3, f"{entry['oid']}")
+            ctrl.SetItem(index, 1, f"{entry['make']}/{entry['model']}/{entry['color']}")
+            ctrl.SetItem(index, 2, f"{entry['string']}/{entry['region']}")
+            ctrl.SetItem(index, 3, f"{entry['sourceId']}")
+            ctrl.SetItem(index, 4, f"{entry['oid']}")
             index = index + 1
 
+            for i in range(4):  # Adjust all columns
+                ctrl.SetColumnWidth(i, wx.LIST_AUTOSIZE)
+
     # =========================================================================
     def apiRoot(self):
         return f"http://{self.settings['api_ip']}:{self.settings['api_port']}"
@@ -628,8 +639,20 @@ def BringToFront(self):
                 print("Error bringing window to front:", e)
 
 
-app = wx.App(False)
-frame = MainFrame(None, title="ALPR Demo", size=(800, 600))
-frame.Bind(wx.EVT_CLOSE, frame.onClose)
-frame.Show()
-app.MainLoop()
+def main():
+
+    # Load args
+    parser = argparse.ArgumentParser(description='Run ALPR Demo Client UI')
+    parser.add_argument('-i', '--ipAddress', type=str, help='The Server IP Address', default=kDefaultIpAddress)
+
+    args = parser.parse_args()
+    ipAddress = args.ipAddress
+
+    app = wx.App(False)
+    frame = MainFrame(ipAddress, None, title="ALPR Demo", size=(800, 600))
+    frame.Bind(wx.EVT_CLOSE, frame.onClose)
+    frame.Show()
+    app.MainLoop()
+
+if __name__ == "__main__":
+    main()

deployment-examples/ALPRDemo/ui/python/SIOParser.py

@@ -28,6 +28,24 @@ def getLPInfo(self, lps, lpKey):
 
         return lpString, lpRegion, lpBox
 
+    # -------------------------------------------------------------------------------
+    # Get Vehicle attributes
+    # -------------------------------------------------------------------------------
+    def getVehicleInfo(self, vehicles, vehicleKey):
+        vehicle = vehicles[vehicleKey]
+        makeModel = vehicle.get("attributes", {}).get("vehicleType", {}).get("value", {})
+        makeModelScore = vehicle.get("attributes", {}).get("vehicleType", {}).get("attributeScore", {})
+        if isinstance(makeModel, dict):
+            make = makeModel.get("make",{})
+            model = makeModel.get("model",{}) + " " + makeModel.get("generation",{})
+        else:
+            make = makeModel
+            model = ""
+        color = vehicle.get("attributes", {}).get("color", {}).get("value", {})
+        vehicleBox = self.getBox(vehicle)
+
+        return make, model, color, vehicleBox, makeModelScore
+
     # -------------------------------------------------------------------------------
     def parseSIOResult(self, result):
         frames = sorted([int(key) for key in result])
@@ -38,27 +56,38 @@ def parseSIOResult(self, result):
 
             mc = message.get("metaClasses", {})
             lps = mc.get("licensePlates", {})
-
+            vehicles = mc.get("vehicles", {})
 
             # Process license plates
             for lpKey in lps.keys():
+                links = lps[lpKey].get("links",{})[0]
+                make = ""; model = ""; color = ""; vehicleBox = ""
+                if "vehicles" == links.get("metaClass",{}):
+                    vehicleId = links.get("id",{})
+                    make, model, color, vehicleBox, makeModelScore = self.getVehicleInfo(vehicles, vehicleId)
+
                 lpString, lpRegion, lpBox = self.getLPInfo(lps, lpKey)
                 if lpKey in self.lps:
                     if self.lps[lpKey][3] == lpString and self.lps[lpKey][2] == lpRegion:
                         # Nothing changed about the plate (but the box may have gotten worse, so keep an earlier one)
                         continue
-                self.onLicensePlate(sourceId, frame, lpKey, frameTimestamp, lpString, lpRegion, lpBox)
+
+                self.onLicensePlate(sourceId, frame, lpKey, frameTimestamp, lpString,
+                                    lpRegion, lpBox, make, model, color, makeModelScore, vehicleBox)
 
 
     # -------------------------------------------------------------------------------
-    def onLicensePlate(self, sourceid, frameid, uid, frameTimestamp, lpString, lpRegion, lpBox):
+    def onLicensePlate(self, sourceid, frameid, uid, frameTimestamp,
+                       lpString, lpRegion, lpBox, make, model, color, makeModelScore, vehicleBox):
         frameTimestampValue = int(frameTimestamp)
-        self.lps[uid] = ( sourceid, frameid, lpRegion, lpString, frameTimestamp, lpBox )
+        self.lps[uid] = ( sourceid, frameid, lpRegion, lpString, frameTimestamp, lpBox,
+                         make, model, color, makeModelScore, vehicleBox )
 
     # -------------------------------------------------------------------------------
     def getLPs(self):
         res = []
         for k in self.lps:
             lp = self.lps[k]
-            res.append( { 'time': lp[4], 'string' : lp[3], 'region' : lp[2], 'sourceId' : lp[0], 'box' : lp[5], 'oid' : k, 'frameid' : lp[1] } )
+            res.append( { 'time': lp[4], 'string' : lp[3], 'region' : lp[2], 'sourceId' : lp[0], 'box' : lp[5],
+                          'oid' : k, 'frameid' : lp[1], 'make' : lp[6], 'model' : lp[7],  'color' : lp[8], 'vBox' : lp[9] } )
         return res

deployment-examples/SIOOnDemandAnalytics/README.md

@@ -47,6 +47,10 @@ When deploying on Jetson devices, additional configuration is required:
    ```bash
    sed -i 's|"VIDEO_IN".*:.*"rtsp://.*"|"VIDEO_IN": "rtsp://sh-ui-backend:8555/live"|' config/analytics/pipelines.json
    ```
+6. Execute the following command to get it up and running:
+   ```bash
+   docker compose up
+   ```
 
 ## Testing the API