sciveo 0.1.62__tar.gz → 0.1.64__tar.gz

{sciveo-0.1.62 → sciveo-0.1.64}/PKG-INFO

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

{sciveo-0.1.62 → sciveo-0.1.64}/sciveo/media/tools/video_interactive.py

@@ -35,6 +35,7 @@ class BaseInteractiveVideoPlayer:
     self.progress_lock = threading.Lock()
     self.frame_lock = threading.Lock()
     self.ui_video_progress_tag = "video time progress"
+    self.current_mouse_pos = (0,0)
 
     self.fps_ui = FPSCounter(tag="ui", period=1, print_period=600)
     self.fps_read = FPSCounter(tag="read", period=1, print_period=600)
@@ -44,6 +45,10 @@ class BaseInteractiveVideoPlayer:
       threading.Thread(target=self.read, daemon=True)
     ]
 
+  def _mouse_callback(self, event, x, y, flags, param):
+    if event == cv2.EVENT_MOUSEMOVE:
+      self.current_mouse_pos = (x, y)
+
   def callback_video_progress(self, x):
     # debug("callback_video_progress", x)
     with self.frame_lock:
@@ -79,10 +84,14 @@ class BaseInteractiveVideoPlayer:
         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)
+    cv2.putText(frame, f"R[{result}]", (30, 80), cv2.FONT_HERSHEY_SIMPLEX, 1.3, (0, 0, 255), 2)
+
+  def on_key(self, key):
+    pass
 
   def run(self, max_display_width=1024):
     cv2.namedWindow(self.frame_tag, cv2.WINDOW_NORMAL)
+    cv2.setMouseCallback(self.frame_tag, self._mouse_callback)
 
     self.cap = cv2.VideoCapture(self.path_video)
 
@@ -108,7 +117,7 @@ class BaseInteractiveVideoPlayer:
           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)
+        cv2.putText(current_frame, f"FPS read {round(self.fps_read.value, 1)} ui {round(self.fps_ui.value, 1)} T[{self.frame_id}] {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:
@@ -128,6 +137,8 @@ class BaseInteractiveVideoPlayer:
           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}")
+      else:
+        self.on_key(key)
 
     self.cap.release()
     cv2.destroyAllWindows()

{sciveo-0.1.62 → sciveo-0.1.64}/sciveo/ml/base.py

@@ -31,16 +31,16 @@ class BaseML:
     self.init_models()
 
   def init_models(self):
-    warning("init_models not implemented")
+    debug("init_models not implemented")
 
   def init(self):
-    warning("init not implemented")
+    debug("init not implemented")
 
   def post_init(self):
-    warning("post_init not implemented")
+    debug("post_init not implemented")
 
   def predict_one(self, x):
-    warning("predict_one not implemented")
+    debug("predict_one not implemented")
 
   def predict(self, X):
     predictions = []
@@ -49,7 +49,7 @@ class BaseML:
     return predictions
 
   def train(self, X, Y_true=None):
-    warning("train not implemented")
+    debug("train not implemented")
 
   def describe(self):
     return f"{type(self).__name__}: {self.model_name}"

{sciveo-0.1.62 → sciveo-0.1.64}/sciveo/monitoring/watchdog/process.py

@@ -43,28 +43,38 @@ class ProcessWatchDogDaemon(BaseWatchDogDaemon):
       info(f"processes matching [{self.process_cmd}]", matched_pids)
     return matched_pids
 
-  def get_threads(self, process):
+  def get_threads(self, process, pid):
     current_time = time.time()
     for t in process.threads():
       cpu_time = t.user_time + t.system_time
-      if t.id not in self.info_threads:
-        self.info_threads[t.id] = {
-          "id": t.id,
-          "start_at": current_time,
-          "last_active": current_time,
-          "last_cpu": cpu_time
-        }
-      else:
-        if cpu_time != self.info_threads[t.id]["last_cpu"]:
-          self.info_threads[t.id]["last_active"] = current_time
-        self.info_threads[t.id]["last_cpu"] = cpu_time
-
-  def check_threads(self, pid):
+
+      self.info_threads.setdefault(pid, {})
+      self.info_threads[pid].setdefault(t.id, {
+        "id": t.id,
+        "start_at": current_time,
+        "last_active": current_time,
+        "last_cpu": cpu_time,
+        "last_check": current_time
+      })
+
+      if cpu_time != self.info_threads[pid][t.id]["last_cpu"]:
+        self.info_threads[pid][t.id]["last_active"] = current_time
+      self.info_threads[pid][t.id]["last_cpu"] = cpu_time
+      self.info_threads[pid][t.id]["last_check"] = current_time
+
+  def check_threads(self, process, pid):
     current_time = time.time()
-    for tid, thr in self.info_threads.items():
+    delete_thread_info = []
+    for tid, thr in self.info_threads[pid].items():
+      check_time = int(current_time - thr["last_check"])
+      if check_time > 1.5 * self.period:
+        delete_thread_info.append(tid)
+        continue
       elapsed_time = int(current_time - thr["last_active"])
       if elapsed_time > self.thread_inactive_threshold:
         warning(f"⚠️ process[{pid}] thread[{tid}] inactive for {elapsed_time}s.")
+    for tid in delete_thread_info:
+      self.info_threads[pid].pop(tid, None)
 
   def process_value(self, pid):
     try:
@@ -74,8 +84,8 @@ class ProcessWatchDogDaemon(BaseWatchDogDaemon):
 
           if self.thread_inactive_threshold is not None:
             try:
-              self.get_threads(p)
-              self.check_threads(pid)
+              self.get_threads(p, pid)
+              self.check_threads(p, pid)
             except psutil.NoSuchProcess as e:
               exception(e, pid)
 

sciveo-0.1.64/sciveo/version.py

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

{sciveo-0.1.62 → sciveo-0.1.64}/sciveo.egg-info/PKG-INFO

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

sciveo-0.1.62/sciveo/version.py

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