sciveo 0.1.52__tar.gz → 0.1.54__tar.gz

{sciveo-0.1.52 → sciveo-0.1.54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.52
+Version: 0.1.54
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net
@@ -8,7 +8,7 @@ Provides-Extra: server
 Provides-Extra: media
 Provides-Extra: media-ml
 Provides-Extra: all
-Provides-Extra: media-all
+Provides-Extra: ml
 
 # SCIVEO - ML/AI and Scientific tools
 

{sciveo-0.1.52 → sciveo-0.1.54}/sciveo/api/predictors.py

@@ -11,9 +11,12 @@
 
 from sciveo.tools.logger import *
 from sciveo.tools.timers import Timer
+from sciveo.tools.configuration import GlobalConfiguration
 
 
 class Predictors:
+  instance = None
+
   def __init__(self, predictors=None):
     if predictors is not None:
       self.list_predictors = predictors
@@ -27,6 +30,16 @@ class Predictors:
 
     self.stats = {}
 
+  @staticmethod
+  def get():
+    if Predictors.instance is None:
+      Predictors.instance = Predictors(GlobalConfiguration.get().data.get("API_PREDICTORS", None))
+    return Predictors.instance
+
+  @staticmethod
+  def set(predictors):
+    Predictors.instance = predictors
+
   def predict(self, predictor_name, X):
     t = Timer()
     predicted = self.list_predictors[predictor_name].predict(X)
@@ -35,6 +48,14 @@ class Predictors:
     self.stats[predictor_name]["count"] += len(X)
     return predicted
 
+  def train(self, predictor_name, X, Y_true=None):
+    t = Timer()
+    result = self.list_predictors[predictor_name].train(X, Y_true)
+    self.stats.setdefault(predictor_name, {"elapsed": 0.0, "count": 0})
+    self.stats[predictor_name]["elapsed"] += t.stop()
+    self.stats[predictor_name]["count"] += len(X)
+    return result
+
   def describe(self):
     result = []
     for k, v in self.list_predictors.items():

{sciveo-0.1.52 → sciveo-0.1.54}/sciveo/api/server.py

@@ -26,8 +26,6 @@ CONFIG = GlobalConfiguration.get()
 SCI_API_AUTH_TOKEN = CONFIG["api_auth_token"]
 SCI_API_PREFIX = CONFIG["api_prefix"]
 
-API_PREDICTORS = Predictors(CONFIG.data.get("API_PREDICTORS", None))
-API_PREDICTORS.print()
 
 app = Flask(__name__)
 
@@ -49,7 +47,7 @@ def predict_endpoint():
       data = request.json
       if "predictor" in data and "X" in data:
         t = Timer()
-        predicted = API_PREDICTORS.predict(data["predictor"], data["X"])
+        predicted = Predictors.get().predict(data["predictor"], data["X"])
 
         if data.get("compressed", 0) > 0:
           predicted = CompressJsonData().compress(predicted)
@@ -67,11 +65,16 @@ def predict_endpoint():
 
 
 class WebServerDaemon(DaemonBase):
-  def __init__(self, host="0.0.0.0", port=8901):
+  def __init__(self, host="0.0.0.0", port=8901, predictors=None):
     super().__init__()
     self.host = host
     self.port = port
 
+    if predictors is not None:
+      Predictors.set(predictors)
+
   def run(self):
     info("run", [self.host, self.port])
+    Predictors.get().print()
+
     serve(app, host=self.host, port=self.port)

sciveo-0.1.54/sciveo/media/tools/video_interactive.py

@@ -0,0 +1,138 @@
+#
+# Pavlin Georgiev, Softel Labs
+#
+# This is a proprietary file and may not be copied,
+# distributed, or modified without express permission
+# from the owner. For licensing inquiries, please
+# contact pavlin@softel.bg.
+#
+# 2024
+#
+
+import os
+import time
+import cv2
+import threading
+import numpy as np
+
+from sciveo.tools.logger import *
+from sciveo.tools.timers import FPSCounter
+
+
+class BaseInteractiveVideoPlayer:
+  def __init__(self, path_video, tag):
+    self.path_video = path_video
+    self.file_name = os.path.basename(self.path_video)
+    self.file_name_base = filename_without_ext = os.path.splitext(self.file_name)[0]
+    self.path_base = os.path.dirname(self.path_video)
+    self.tag = tag
+    self.frame_tag = f"Video {tag}"
+
+    self.cap = None
+    self.frame = None
+    self.frame_id = 0
+    self.result = None
+    self.progress_lock = threading.Lock()
+    self.frame_lock = threading.Lock()
+    self.ui_video_progress_tag = "video time progress"
+
+    self.fps_ui = FPSCounter(tag="ui", period=1, print_period=600)
+    self.fps_read = FPSCounter(tag="read", period=1, print_period=600)
+
+    self.stop_threads = False
+    self.threads = [
+      threading.Thread(target=self.read, daemon=True)
+    ]
+
+  def callback_video_progress(self, x):
+    # debug("callback_video_progress", x)
+    with self.frame_lock:
+      # self.frame_id = cv2.getTrackbarPos(self.ui_video_progress_tag, self.frame_tag)
+      self.frame_id = x
+
+  def ui_controls(self, min_val, max_val):
+    cv2.createTrackbar(self.ui_video_progress_tag, self.frame_tag, min_val, max_val, self.callback_video_progress)
+
+  def process_frame(self, frame):
+    return {}
+
+  def read(self):
+    while not self.stop_threads:
+      self.fps_read.update()
+      with self.progress_lock:
+        current_frame_id = self.frame_id
+      self.cap.set(cv2.CAP_PROP_POS_FRAMES, int(current_frame_id + 1))
+      ret, current_frame = self.cap.read()
+      if not ret:
+        break
+
+      current_result = self.process_frame(current_frame)
+
+      with self.frame_lock:
+        self.frame = current_frame.copy()
+        self.result = current_result
+
+      with self.progress_lock:
+        self.frame_id += 1
+        if self.frame_id >= self.video_frame_count:
+          self.frame_id = 0
+        cv2.setTrackbarPos(self.ui_video_progress_tag, self.frame_tag, self.frame_id)
+
+  def draw(self, frame, result):
+    cv2.putText(frame, f"R[{result}]", (30, 80), cv2.FONT_HERSHEY_SIMPLEX, 1.3, (0, 255, 255), 2)
+
+  def run(self, max_display_width=1024):
+    cv2.namedWindow(self.frame_tag, cv2.WINDOW_NORMAL)
+
+    self.cap = cv2.VideoCapture(self.path_video)
+
+    self.video_fps = self.cap.get(cv2.CAP_PROP_FPS)
+    self.video_frame_count = int(self.cap.get(cv2.CAP_PROP_FRAME_COUNT))
+    self.video_duration_sec = self.video_frame_count / self.video_fps
+    debug("run", self.path_video, self.tag, "fps", self.video_fps, "count", self.video_frame_count, "duration", self.video_duration_sec)
+
+    self.ui_controls(0, self.video_frame_count)
+
+    for thread in self.threads:
+      thread.start()
+
+    while self.cap.isOpened():
+      self.fps_ui.update()
+      current_frame = None
+      original_current_frame = None
+      current_result = None
+      with self.frame_lock:
+        if self.frame is not None:
+          current_frame = self.frame.copy()
+          original_current_frame = self.frame.copy()
+          current_result = self.result.copy()
+
+      if current_frame is not None:
+        cv2.putText(current_frame, f"FPS read {round(self.fps_read.value, 1)} ui {round(self.fps_ui.value, 1)} T {round(self.frame_id / self.video_fps, 3)}s", (30, 40), cv2.FONT_HERSHEY_SIMPLEX, 1.3, (0, 255, 0), 4)
+        self.draw(current_frame, current_result)
+        height, width = current_frame.shape[:2]
+        if width > max_display_width:
+          display_width = max_display_width
+          display_height = int(height * (max_display_width / width))
+          cv2.resizeWindow(self.frame_tag, display_width, display_height)
+        cv2.imshow(self.frame_tag, current_frame)
+
+      key = cv2.waitKey(1) & 0xFF
+      if key == ord("q"):
+        self.stop_threads = True
+        for thread in self.threads:
+          thread.join()
+        break
+      elif key == ord("p"):
+        if original_current_frame is not None:
+          frame_path = os.path.join(self.path_base, f"{self.file_name_base}-{self.frame_id}.png")
+          cv2.imwrite(frame_path, original_current_frame)
+          debug(f"saved frame {self.frame_id} to {frame_path}")
+
+    self.cap.release()
+    cv2.destroyAllWindows()
+
+
+if __name__ == "__main__":
+  video_player = BaseInteractiveVideoPlayer(os.environ["PATH_VIDEO_FILE"], "base video player")
+  video_player.run()

{sciveo-0.1.52 → sciveo-0.1.54}/sciveo/tools/timers.py

@@ -15,19 +15,30 @@ from sciveo.tools.logger import *
 
 
 class FPSCounter:
-  def __init__(self, period=10, tag=""):
+  def __init__(self, period=1, tag="", print_period=1, printer=debug):
     self.period = period
+    self.print_period = print_period
+    self.printer = printer
+    self.print_n = 0
     self.tag = tag
     self.n = 0
     self.t1 = time.time()
+    self.value = 0
+
+  def print(self):
+    self.print_n += 1
+    if self.print_n > self.print_period:
+      self.printer(self.tag, "FPS", self.value)
+      self.print_n = 0
 
   def update(self):
     self.n += 1
     t2 = time.time()
     if t2 - self.t1 > self.period:
-      debug(self.tag, "FPS", self.n / (t2 - self.t1))
+      self.value = self.n / (t2 - self.t1)
       self.n = 0
       self.t1 = time.time()
+      self.print()
 
 
 class TimerExec:

sciveo-0.1.54/sciveo/version.py

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

{sciveo-0.1.52 → sciveo-0.1.54}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.52
+Version: 0.1.54
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net
@@ -8,7 +8,7 @@ Provides-Extra: server
 Provides-Extra: media
 Provides-Extra: media-ml
 Provides-Extra: all
-Provides-Extra: media-all
+Provides-Extra: ml
 
 # SCIVEO - ML/AI and Scientific tools
 

{sciveo-0.1.52 → sciveo-0.1.54}/sciveo.egg-info/SOURCES.txt

@@ -91,6 +91,7 @@ sciveo/media/pipelines/web/__init__.py
 sciveo/media/pipelines/web/server.py
 sciveo/media/tools/__init__.py
 sciveo/media/tools/nvr.py
+sciveo/media/tools/video_interactive.py
 sciveo/ml/__init__.py
 sciveo/ml/base.py
 sciveo/ml/dataset/__init__.py

{sciveo-0.1.52 → sciveo-0.1.54}/sciveo.egg-info/requires.txt

@@ -5,6 +5,10 @@ requests>=0.0.0
 psutil>=0.0.0
 netifaces>=0.0.0
 scapy>=0.0.0
+fastapi>=0.0.0
+uvicorn[standard]>=0.0.0
+flask>=0.0.0
+waitress>=0.0.0
 
 [media]
 scikit-learn>=0.0.0
@@ -25,10 +29,26 @@ ffmpeg-python>=0.0.0
 opencv-python-headless>=0.0.0
 opencv-contrib-python-headless>=0.0.0
 
-[media-all]
+[media-ml]
+tensorflow>=0.0.0
+keras>=0.0.0
+torch>=0.0.0
+torchvision>=0.0.0
+diffusers>=0.0.0
+transformers>=0.0.0
+sentence_transformers>=0.0.0
+accelerate>=0.0.0
+annoy>=0.0.0
+ultralytics>=0.0.0
+
+[ml]
 psutil>=0.0.0
 netifaces>=0.0.0
 scapy>=0.0.0
+fastapi>=0.0.0
+uvicorn[standard]>=0.0.0
+flask>=0.0.0
+waitress>=0.0.0
 scikit-learn>=0.0.0
 scipy>=0.0.0
 scikit-video>=0.0.0
@@ -46,22 +66,6 @@ tqdm>=0.0.0
 ffmpeg-python>=0.0.0
 opencv-python-headless>=0.0.0
 opencv-contrib-python-headless>=0.0.0
-fastapi>=0.0.0
-uvicorn[standard]>=0.0.0
-flask>=0.0.0
-waitress>=0.0.0
-tensorflow>=0.0.0
-keras>=0.0.0
-torch>=0.0.0
-torchvision>=0.0.0
-diffusers>=0.0.0
-transformers>=0.0.0
-sentence_transformers>=0.0.0
-accelerate>=0.0.0
-annoy>=0.0.0
-ultralytics>=0.0.0
-
-[media-ml]
 tensorflow>=0.0.0
 keras>=0.0.0
 torch>=0.0.0

{sciveo-0.1.52 → sciveo-0.1.54}/setup.py

@@ -39,8 +39,8 @@ extras_require = {
       ]
 }
 
-extras_require['all'] = extras_require['mon'] + extras_require['net']
-extras_require['media-all'] = extras_require['all'] + extras_require['media'] + extras_require['server'] + extras_require['media-ml']
+extras_require['all'] = extras_require['mon'] + extras_require['net'] + extras_require['server']
+extras_require['ml'] = extras_require['all'] + extras_require['media'] + extras_require['media-ml']
 
 setup(
     name='sciveo',

sciveo-0.1.52/sciveo/version.py

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