sciveo 0.1.56__tar.gz → 0.1.58__tar.gz

{sciveo-0.1.56 → sciveo-0.1.58}/PKG-INFO

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

{sciveo-0.1.56 → sciveo-0.1.58}/sciveo/cli.py

@@ -41,7 +41,7 @@ def main():
   parser.add_argument('--port', type=int, default=22, help='Host port number, used for network ops')
   parser.add_argument('--ports', type=str, default="[]", help='Host ports list')
   parser.add_argument('--localhost', type=bool, default=False, help='Add localhost to list of hosts')
-  parser.add_argument('--input-path', type=str, help='Input Path')
+  parser.add_argument('--input-path', type=str, default=None, help='Input Path')
   parser.add_argument('--output-path', type=str, default=None, help='Output Path')
   parser.add_argument('--width', type=str, default=None, help='width')
   parser.add_argument('--height', type=str, default=None, help='height')
@@ -91,10 +91,13 @@ def main():
       from sciveo.media.pipelines.processors.audio.audio_extractor_process import plot_audio
       plot_audio(args.width, args.height, args.rate, args.input_path, args.output_path)
   elif args.command == 'watchdog':
-    from sciveo.monitoring.watchdog.memory import MemoryWatchDogDaemon
+    from sciveo.monitoring.watchdog.base import MemoryWatchDogDaemon, DiskWatchDogDaemon
     daemons = []
     if args.execute is not None:
-      daemons.append(MemoryWatchDogDaemon(threshold_percent=args.threshold, period=args.period, command=args.execute))
+      if args.src is None or args.src.startswith("mem"):
+        daemons.append(MemoryWatchDogDaemon(threshold_percent=args.threshold, period=args.period, command=args.execute))
+      elif args.src.startswith("disk") and args.input_path is not None:
+        daemons.append(DiskWatchDogDaemon(path=args.input_path, threshold_percent=args.threshold, period=args.period, command=args.execute))
     for daemon in daemons:
       daemon.start()
     while(True):

{sciveo-0.1.56 → sciveo-0.1.58}/sciveo/media/tools/nvr.py

@@ -56,6 +56,11 @@ class VideoCameraCaptureDaemon(DaemonBase):
         info("RM", file_path)
         os.remove(file_path)
 
+  def get_current_files(self):
+    current_files = [f for f in os.listdir(self.dst_path) if f.startswith(f"{self.cam_id}___") and f.endswith(".mp4")]
+    current_files.sort(key=lambda x: os.path.getmtime(os.path.join(self.dst_path, x)), reverse=True)
+    return current_files
+
   def loop(self):
     info("start", self.cam_id)
 
@@ -75,12 +80,9 @@ class VideoCameraCaptureDaemon(DaemonBase):
           if p.poll() is not None:
             break
 
-          current_files = [
-            f for f in os.listdir(self.dst_path)
-            if f.startswith(f"{self.cam_id}___") and f.endswith(".mp4")
-          ]
-          if current_files:
-            current_files.sort(key=lambda x: os.path.getmtime(os.path.join(self.dst_path, x)), reverse=True)
+          current_files = self.get_current_files()
+
+          if len(current_files) > 0:
             newest_file = os.path.join(self.dst_path, current_files[0])
 
             mod_time = os.path.getmtime(newest_file)
@@ -96,6 +98,13 @@ class VideoCameraCaptureDaemon(DaemonBase):
               last_mod_time = mod_time
               last_progress_time = time.time()
 
+          else:
+            time.sleep(1)
+            current_files = self.get_current_files()
+            if len(current_files) == 0:
+              p.kill()
+              break
+
       except Exception as e:
         exception(e)
 
@@ -104,7 +113,6 @@ class VideoCameraCaptureDaemon(DaemonBase):
       time.sleep(5)
 
 
-
 class VideoRecorder:
   def __init__(self, path_configuration):
     with open(path_configuration, 'r') as fp:

sciveo-0.1.58/sciveo/monitoring/watchdog/base.py

@@ -0,0 +1,55 @@
+#
+# 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.
+#
+# 2025
+#
+
+
+import psutil
+import subprocess
+
+from sciveo.tools.daemon import *
+from sciveo.tools.logger import *
+from sciveo.tools.simple_counter import RunCounter
+
+
+class BaseWatchDogDaemon(DaemonBase):
+  def __init__(self, threshold_percent=90, period=5, command="echo '⚠️'", monitored="none"):
+    super().__init__(period=period)
+    self.threshold_percent = threshold_percent
+    self.command = command
+    self.used_percent = 0
+    self.monitored = monitored
+    self.printer = RunCounter(60, lambda: debug(f"{self.monitored} usage: {self.used_percent}%", f"threshold: {self.threshold_percent}%"))
+
+  def get_used_percent(self):
+    return 0.0
+
+  def loop(self):
+    current_value = self.value()
+    self.used_percent = current_value["percent"]
+    self.printer.run()
+    if self.used_percent > self.threshold_percent:
+      warning(f"⚠️ {self.monitored} usage {self.used_percent}% exceeded {self.threshold_percent}%, executing command: {self.command}")
+      subprocess.run(self.command, shell=True)
+
+
+class MemoryWatchDogDaemon(BaseWatchDogDaemon):
+  def __init__(self, threshold_percent=90, period=5, command="echo '⚠️ Low Memory!'"):
+    super().__init__(threshold_percent=threshold_percent, period=period, command=command, monitored="Memory")
+
+  def value(self):
+    return psutil.virtual_memory()._asdict()
+
+class DiskWatchDogDaemon(BaseWatchDogDaemon):
+  def __init__(self, path, threshold_percent=90, period=5, command="echo '⚠️ Low Disk space!'"):
+    self.path = path
+    super().__init__(threshold_percent=threshold_percent, period=period, command=command, monitored=f"Disk [{self.path}] space")
+
+  def value(self):
+    return psutil.disk_usage(self.path)._asdict()

{sciveo-0.1.56 → sciveo-0.1.58}/sciveo/tools/remote.py

@@ -9,9 +9,6 @@
 # 2024
 #
 
-import os
-import time
-import cv2
 import base64
 import requests
 
@@ -56,6 +53,7 @@ class PredictorRemoteClient:
     return data
 
   def image_encoded(self, image=None, resize_to=(256, 256), local_path=None):
+    import cv2
     if local_path is not None:
       image = cv2.imread(local_path)
     if resize_to is not None:

sciveo-0.1.58/sciveo/version.py

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

{sciveo-0.1.56 → sciveo-0.1.58}/sciveo.egg-info/PKG-INFO

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

{sciveo-0.1.56 → sciveo-0.1.58}/sciveo.egg-info/SOURCES.txt

@@ -116,7 +116,7 @@ sciveo/monitoring/__init__.py
 sciveo/monitoring/monitor.py
 sciveo/monitoring/start.py
 sciveo/monitoring/watchdog/__init__.py
-sciveo/monitoring/watchdog/memory.py
+sciveo/monitoring/watchdog/base.py
 sciveo/network/__init__.py
 sciveo/network/camera.py
 sciveo/network/sniffer.py

sciveo-0.1.56/sciveo/monitoring/watchdog/memory.py

@@ -1,37 +0,0 @@
-#
-# 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.
-#
-# 2025
-#
-
-
-import psutil
-import subprocess
-import time
-import threading
-
-from sciveo.tools.daemon import *
-from sciveo.tools.logger import *
-from sciveo.tools.simple_counter import RunCounter
-
-
-class MemoryWatchDogDaemon(DaemonBase):
-  def __init__(self, threshold_percent=90, period=5, command="echo '⚠️ Low Memory!'"):
-    super().__init__(period=period)
-    self.threshold_percent = threshold_percent
-    self.command = command
-    self.used_percent = 0
-    self.printer = RunCounter(60, lambda: debug(f"Memory usage: {self.used_percent}%", f"threshold: {self.threshold_percent}%"))
-
-  def loop(self):
-    mem = psutil.virtual_memory()
-    self.used_percent = mem.percent
-    self.printer.run()
-    if self.used_percent > self.threshold_percent:
-      warning(f"⚠️ Memory usage {self.used_percent}% exceeded {self.threshold_percent}%, executing command: {self.command}")
-      subprocess.run(self.command, shell=True)

sciveo-0.1.56/sciveo/version.py

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