v1.5.17

Author: actions-user

RELEASE.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## V1.5.17
+
+- Update rest API to include additional attributes
+
 ## V1.5.16
 
 - Update SIO to r250127

VERSION

@@ -1 +1 @@
-v1.5.16
+v1.5.17

deployment-examples/SIOOnDemandAnalytics/restApi.py

@@ -40,24 +40,27 @@ def getLPInfo(lps, lpKey):
     lpString = lp.get("attributes", {}).get("lpString", {}).get("value", None)
     lpStringScore = lp.get("attributes", {}).get("lpString", {}).get("attributeScore", 0)
     lpRegion = lp.get("attributes", {}).get("lpRegion", {}).get("value", None)
+    lpRegionScore = lp.get("attributes", {}).get("lpRegion", {}).get("attributeScore", 0)
 
     # Find the linked vehicle, if any
     vehicleId = getLinkedObjectId(lp, "vehicles")
 
-    return lpString, lpStringScore, lpRegion, vehicleId
+    return lpString, lpStringScore, lpRegion, lpRegionScore, vehicleId
 
 # -------------------------------------------------------------------------------
 def getVehicleInfo(vehicles, vehicleId):
     vehicle = vehicles.get(vehicleId, {})
     makeModel = vehicle.get("attributes", {}).get("vehicleType", {}).get("value", {})
+    makeModelScore = vehicle.get("attributes", {}).get("vehicleType", {}).get("attributeScore", 0)
     if isinstance(makeModel, dict):
         make = makeModel.get("make","unknown")
         model = makeModel.get("model","unknown") + " " + makeModel.get("generation","")
     else:
         make = makeModel
         model = "unknown"
     color = vehicle.get("attributes", {}).get("color", {}).get("value", "unknownColor")
-    return make, model, color
+    colorScore = vehicle.get("attributes", {}).get("color", {}).get("attributeScore", 0)
+    return make, model, makeModelScore, color, colorScore
 
 
 
@@ -72,38 +75,40 @@ def parseSIOMessage(message):
 
     # Process license plates
     for lpKey in lps.keys():
-        lpString, lpStringScore, lpRegion, vehicleId = getLPInfo(lps, lpKey)
+        lpString, lpStringScore, lpRegion, lpRegionScore, vehicleId = getLPInfo(lps, lpKey)
 
         # Process vehicle associated with LP (if found)
         if vehicleId:
-            make, model, color = getVehicleInfo(vehicles, vehicleId)
+            make, model, makeModelScore, color, colorScore = getVehicleInfo(vehicles, vehicleId)
         else:
             make = None
             model = None
+            makeModelScore = 0
             color = None
+            colorScore = 0
 
-        newTuple = [ lpString, lpStringScore, lpRegion, make, model, color ]
+        newTuple = [ lpString, lpStringScore, lpRegion, lpRegionScore, make, model, makeModelScore, color, colorScore ]
         newTupleComplete = all(item is not None for item in newTuple)
 
         if not tuple or (newTupleComplete and not tupleComplete):
             tuple = newTuple
 
     if tuple is None:
         for vehicleId in vehicles.keys():
-            make, model, color = getVehicleInfo(vehicles, vehicleId)
+            make, model, makeModelScore, color, colorScore = getVehicleInfo(vehicles, vehicleId)
             if make and model and color:
-                tuple = [ kInvalidValue, 0, kInvalidValue, make, model, color ]
+                tuple = [ kInvalidValue, 0, kInvalidValue, 0, make, model, makeModelScore, color, colorScore ]
 
     if tuple is None:
-        tuple = [ kInvalidValue, 0, kInvalidValue, kInvalidValue, kInvalidValue, kInvalidValue ]
+        tuple = [ kInvalidValue, 0, kInvalidValue, 0, kInvalidValue, kInvalidValue, 0, kInvalidValue, 0 ]
 
     tuple = [ item if item is not None else kInvalidValue for item in tuple ]
 
     return tuple
 
 ### ======================================================
 def convertJson(data, img):
-    lpString, lpConfidence,  lpState, vehicleMake, vehicleModel, vehicleColor = parseSIOMessage(data)
+    lpString, lpStringScore,  lpRegion, lpRegionScore, make, model, makeModelScore, color, colorScore = parseSIOMessage(data)
 
     res = {
         kLocation : {
@@ -119,13 +124,16 @@ def convertJson(data, img):
                 "imageData" : img,
                 "licensePlate" : {
                     "lpString" : lpString,
-                    "lpnConfidence" : lpConfidence,
-                    "lpRegion" : lpState
+                    "lpStringScore" : lpStringScore,
+                    "lpRegion" : lpRegion,
+                    "lpRegionScore": lpRegionScore
                 },
                 "vehicle" : {
-                    "color": vehicleColor,
-                    "make": vehicleMake,
-                    "model": vehicleModel
+                    "make": make,
+                    "model": model,
+                    "makeModelScore": makeModelScore,
+                    "color": color,
+                    "colorScore": colorScore
                 }
             } ]
         } ],
@@ -308,7 +316,7 @@ def analyzeImage(version):
         time.sleep(0.05)
 
     jsonResult, _ = loadJsonAndBase64(fpResult, False)
-    lpString, lpConfidence,  lpState, vehicleMake, vehicleModel, vehicleColor = parseSIOMessage(jsonResult["0"])
+    lpString, lpStringScore,  lpRegion, lpRegionScore, make, model, makeModelScore, color, colorScore = parseSIOMessage(data)
 
     # Clean up the result
     os.remove(fpResult)
@@ -318,13 +326,16 @@ def analyzeImage(version):
         "imageData" : image,
         "licensePlate" : {
             "lpString" : lpString,
-            "lpConfidence" : lpConfidence,
-            "lpRegion" : lpState
+            "lpStringScore" : lpStringScore,
+            "lpRegion" : lpRegion,
+            "lpRegionScore": lpRegionScore
         },
         "vehicle" : {
-            "color": vehicleColor,
-            "make": vehicleMake,
-            "model": vehicleModel
+            "make": make,
+            "model": model,
+            "makeModelScore": makeModelScore,
+            "color": color,
+            "colorScore": colorScore
         }
     }
 

docs/schemas/anypipe/anypipe.html

@@ -5515,7 +5515,7 @@ <h2 class="mb-0">
     <a href="https://github.com/coveooss/json-schema-for-humans">
      json-schema-for-humans
     </a>
-    on 2025-01-28 at 22:59:31 +0000
+    on 2025-01-29 at 11:21:28 +0000
    </p>
   </footer>
  </body>