sciveo 0.1.83__tar.gz → 0.1.85__tar.gz

{sciveo-0.1.83 → sciveo-0.1.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.83
+Version: 0.1.85
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

{sciveo-0.1.83 → sciveo-0.1.85}/sciveo/cli.py

@@ -61,6 +61,7 @@ def main():
   parser.add_argument('--pid', type=int, default=None, help='Process PID')
   parser.add_argument('--serial', type=str, default=None, help='Serial Name')
   parser.add_argument('--data-json', type=str, default="{}", help='Json Data')
+  parser.add_argument('--display', type=int, default=None, help='Display number')
 
   args = parser.parse_args()
 
@@ -113,7 +114,7 @@ def main():
       player = RTSPVideoPlayer(url)
       player.run()
     else:
-      from sciveo.media.capture.gst_server import CamFactory, ColorBarFactory
+      from sciveo.media.capture.gst_server import CamFactory, ColorBarFactory, CamDisplayDaemon
       data = json.loads(args.data_json)
       if args.src_id is not None:
         server = CamFactory(args.src_id, args.width, args.height, args.fps, configuration=data)
@@ -123,7 +124,12 @@ def main():
         else:
           # warning("RTSP src", args.src, "not recognised")
           server = CamFactory(args.src, args.width, args.height, args.fps, configuration=data)
-      server.serve(host=args.host, port=args.port, stream=args.stream)
+      if args.display is not None:
+        display_daemon = CamDisplayDaemon(server, host=args.host, port=args.port, stream=args.stream, display=args.display)
+        display_daemon.start()
+        display_daemon.display()
+      else:
+        server.serve(host=args.host, port=args.port, stream=args.stream)
   elif args.command == 'media-server':
     from sciveo.media.pipelines.server import __START_SCIVEO_MEDIA_SERVER__
     __START_SCIVEO_MEDIA_SERVER__()

{sciveo-0.1.83 → sciveo-0.1.85}/sciveo/media/capture/gst_server.py

@@ -10,6 +10,8 @@
 #
 
 import numpy as np
+import time
+import cv2
 
 import gi
 gi.require_version('Gst', '1.0')
@@ -18,6 +20,7 @@ from gi.repository import Gst, GObject, GstRtspServer, GLib
 Gst.init(None)
 
 from sciveo.tools.logger import *
+from sciveo.tools.daemon import DaemonBase
 from sciveo.tools.timers import FPSCounter
 from sciveo.media.capture.draw import *
 from sciveo.media.capture.cam import CameraDaemon
@@ -145,19 +148,60 @@ class CamFactory(ColorBarFactory):
     else:
       self.cam = CameraDaemon(cam_id=self.cam_id)
 
+  def read_cam_frame(self):
+    try:
+      frame = self.cam.read()
+    except Exception as e:
+      exception(e, "CAM frame read FAIL")
+      frame = None
+    return frame
+
   def next_frame(self):
-    frame = self.cam.read()
+    frame = self.read_cam_frame()
+
     if frame is None:
       frame = super().next_frame()
 
-    for k, v in self.configuration.get("draw", {}).items():
-      self.list_draw_processors.get(k, DrawNone())(frame, v)
+    try:
+      for k, v in self.configuration.get("draw", {}).items():
+        self.list_draw_processors.get(k, DrawNone())(frame, v)
+    except Exception as e:
+      exception(e, "DRAW FAIL")
 
     self.fps_next_frame.update()
 
     return frame
 
 
+class CamDisplayDaemon(DaemonBase):
+  def __init__(self, cam_factory, host="0.0.0.0", port=8554, stream="test", display=0):
+    super().__init__()
+    self.cam_factory = cam_factory
+    self.host = host
+    self.port = port
+    self.stream = stream
+    self.display = display
+    self.fps_display = FPSCounter(period=10, tag=f"display", round_value=1)
+
+  def loop(self):
+    self.cam_factory.serve(host=self.host, port=self.port, stream=self.stream)
+
+  def display(self):
+    while(True):
+      frame = self.cam_factory.read_cam_frame()
+      if frame is None:
+        time.sleep(0.1)
+        continue
+
+      if self.display == 0:
+        cv2.imshow(f"cam {self.cam_factory.cam_id} {frame.shape}", frame)
+        if cv2.waitKey(1) & 0xFF == ord('q'):
+          break
+
+      self.fps_display.update()
+
+
+
 if __name__ == "__main__":
 
     # server = ColorBarFactory(640, 480, 10)

{sciveo-0.1.83 → sciveo-0.1.85}/sciveo/media/capture/rpi.py

@@ -46,10 +46,13 @@ class RPICamera(CameraDaemon):
     self.picam2.stop()
 
   def read_frame(self):
-    frame = self.picam2.capture_array()
-    cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
-    with self.lock_frame:
-      self.frame = frame
+    try:
+      frame = self.picam2.capture_array()
+      cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
+      with self.lock_frame:
+        self.frame = frame
+    except Exception as e:
+      exception(e, "CAM frame read FAIL")
 
 
 class RPICameraFactory(CamFactory):

{sciveo-0.1.83 → sciveo-0.1.85}/sciveo/ml/evaluation/object_detection.py

@@ -105,7 +105,6 @@ class EvalObjectDetection:
     count_labels = 0
     true_positives = []
     false_positives = []
-    detected = []
 
     for i, prediction in enumerate(self.converted_predictions):
       current_predictions = prediction.get(class_name, [])
@@ -113,6 +112,8 @@ class EvalObjectDetection:
 
       count_labels += len(current_labels)
 
+      detected = set()
+
       for prediction_box in current_predictions:
         if prediction_box[4] < confidence_threshold:
           continue
@@ -126,10 +127,12 @@ class EvalObjectDetection:
             max_iou = iou
             gt_match = label_box
 
-        if gt_match is not None and gt_match not in detected:
+        gt_match_key = tuple([round(x, 6) for x in gt_match]) if gt_match is not None else None
+
+        if gt_match is not None and gt_match_key not in detected:
           true_positives.append(1)
           false_positives.append(0)
-          detected.append(gt_match)
+          detected.add(gt_match_key)
         else:
           true_positives.append(0)
           false_positives.append(1)
@@ -143,7 +146,8 @@ class EvalObjectDetection:
     FP = np.sum(false_positives) / (count_labels + 1e-20)
 
     # Compute AP using the trapezoidal rule (integrating precision over recall)
-    ap = np.trapz(precision, recall)
+    order = np.argsort(recall)
+    ap = np.trapezoid(precision[order], recall[order])
     return ap, FP
 
   # TODO: Use simple gradient-based threshold optimisation instead of current grid search.
@@ -199,13 +203,15 @@ class EvalObjectDetection:
 
   def evaluate(self, confidence_thresholds={"default": 0.0}):
     """
-    Calculate metrics like mAP based on IoU.
+    Non-classical AP-related FP-constrained AP@IoU=0.5 calculation
     """
 
     aps = []
     class_ap = {}
     class_FP = {}
 
+    info("Evaluating non-classical FP-constrained AP@IoU=0.5")
+
     for class_name in self.class_names:
       ap, FP = self.compute_ap(class_name, confidence_thresholds.get(class_name, confidence_thresholds["default"]))
       aps.append(ap)

sciveo-0.1.85/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.1.85'

{sciveo-0.1.83 → sciveo-0.1.85}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.83
+Version: 0.1.85
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

sciveo-0.1.83/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.1.83'