sciveo 0.3.2__tar.gz → 0.3.3__tar.gz

{sciveo-0.3.2 → sciveo-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.3.2
+Version: 0.3.3
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: agent
@@ -2396,6 +2396,19 @@ staging, and `BASE/video` for retained recordings. No separate `tmp`, `video`,
 `motion.src`, or `motion.dst` paths are needed. Camera-specific motion settings
 remain under `motion`.
 
+To keep temporary video I/O in RAM while retaining recordings on those HDD roots,
+set `"temp_path": "/mnt/nvr-ram"` to a separately mounted, size-limited tmpfs.
+Capture, motion processing and upload staging then use `TEMP/tmp2`, `TEMP/tmp3`
+and `TEMP/tmp4`; archives still use the ordered `BASE/video` roots and their
+capacity-based cleanup. The same free-space reserve applies to the temporary
+filesystem, so size it above that reserve plus the expected queued video volume.
+When temporary space runs low, capture waits while processing drains the queues;
+it does not switch temporary writes onto an HDD or delete archives to free RAM.
+Make the NVR service require the tmpfs mount at boot. RAM queues are volatile
+across reboot; finalized HDD archives remain persistent. Existing HDD queues are
+not moved or deleted when changing `temp_path`. Point external uploaders at
+`TEMP/tmp4` when this option is enabled.
+
 Optional per-stage transcoding is disabled unless configured. Put `transcode`
 under `cam.CAMERA` to transcode every completed clip before archival and motion
 processing. Put it under `motion.CAMERA` to transcode **only motion-selected**
@@ -2432,7 +2445,7 @@ processing continues without repeatedly encoding the same failed clip. Storage
 write failures retain the source for retry; no incomplete MP4 enters the uploader
 queue. An all-zero motion grid skips video decoding entirely.
 
-All stages use the first available root in list order, skipping absent, unmounted,
+Stages without a separate `temp_path` use the first available root in list order, skipping absent, unmounted,
 or unwritable roots. Low space does not cause fallback. Free space must cover
 both the incoming clip and the larger of `min_free_bytes` and `min_free_ratio`
 (defaults: 1 GiB and 5%). Capture rechecks
@@ -2473,7 +2486,7 @@ With no usable root, capture waits and queued files are retained until storage
 recovers. This provides fallback, not replication: clips already on a disconnected
 disk become available again when that disk returns.
 
-External uploaders must watch `BASE/tmp4` on **every** configured root, including
+Without `temp_path`, external uploaders must watch `BASE/tmp4` on **every** configured root, including
 roots that recover after startup. Existing queued files are not relocated when
 migrating configurations. Legacy single-directory `path.tmp`, `path.video`,
 `motion.src`, and `motion.dst` configurations remain supported when `paths` is

sciveo-0.3.2/sciveo.egg-info/PKG-INFO → sciveo-0.3.3/README.md

@@ -1,28 +1,3 @@
-Metadata-Version: 2.1
-Name: sciveo
-Version: 0.3.2
-Description-Content-Type: text/markdown
-Provides-Extra: mon
-Provides-Extra: agent
-Provides-Extra: agent-local
-Provides-Extra: net
-Provides-Extra: server
-Provides-Extra: storage
-Provides-Extra: storage-postgres
-Provides-Extra: chat
-Provides-Extra: media
-Provides-Extra: media-ml
-Provides-Extra: sciveyolo
-Provides-Extra: sciveyolo-gpu
-Provides-Extra: sciveyolo-trt
-Provides-Extra: web
-Provides-Extra: db
-Provides-Extra: power
-Provides-Extra: industrial
-Provides-Extra: energy
-Provides-Extra: all
-Provides-Extra: ml
-
 # SCIVEO
 
 Sciveo is a Python toolkit and CLI for ML/AI workflows, engineering automation,
@@ -2396,6 +2371,19 @@ staging, and `BASE/video` for retained recordings. No separate `tmp`, `video`,
 `motion.src`, or `motion.dst` paths are needed. Camera-specific motion settings
 remain under `motion`.
 
+To keep temporary video I/O in RAM while retaining recordings on those HDD roots,
+set `"temp_path": "/mnt/nvr-ram"` to a separately mounted, size-limited tmpfs.
+Capture, motion processing and upload staging then use `TEMP/tmp2`, `TEMP/tmp3`
+and `TEMP/tmp4`; archives still use the ordered `BASE/video` roots and their
+capacity-based cleanup. The same free-space reserve applies to the temporary
+filesystem, so size it above that reserve plus the expected queued video volume.
+When temporary space runs low, capture waits while processing drains the queues;
+it does not switch temporary writes onto an HDD or delete archives to free RAM.
+Make the NVR service require the tmpfs mount at boot. RAM queues are volatile
+across reboot; finalized HDD archives remain persistent. Existing HDD queues are
+not moved or deleted when changing `temp_path`. Point external uploaders at
+`TEMP/tmp4` when this option is enabled.
+
 Optional per-stage transcoding is disabled unless configured. Put `transcode`
 under `cam.CAMERA` to transcode every completed clip before archival and motion
 processing. Put it under `motion.CAMERA` to transcode **only motion-selected**
@@ -2432,7 +2420,7 @@ processing continues without repeatedly encoding the same failed clip. Storage
 write failures retain the source for retry; no incomplete MP4 enters the uploader
 queue. An all-zero motion grid skips video decoding entirely.
 
-All stages use the first available root in list order, skipping absent, unmounted,
+Stages without a separate `temp_path` use the first available root in list order, skipping absent, unmounted,
 or unwritable roots. Low space does not cause fallback. Free space must cover
 both the incoming clip and the larger of `min_free_bytes` and `min_free_ratio`
 (defaults: 1 GiB and 5%). Capture rechecks
@@ -2473,7 +2461,7 @@ With no usable root, capture waits and queued files are retained until storage
 recovers. This provides fallback, not replication: clips already on a disconnected
 disk become available again when that disk returns.
 
-External uploaders must watch `BASE/tmp4` on **every** configured root, including
+Without `temp_path`, external uploaders must watch `BASE/tmp4` on **every** configured root, including
 roots that recover after startup. Existing queued files are not relocated when
 migrating configurations. Legacy single-directory `path.tmp`, `path.video`,
 `motion.src`, and `motion.dst` configurations remain supported when `paths` is

{sciveo-0.3.2 → sciveo-0.3.3}/sciveo/media/capture/storage.py

@@ -25,6 +25,11 @@ from sciveo.tools.queue import TouchedFilePathQueue
 class VideoStorage:
   def __init__(self, configuration):
     self.roots = configuration.get("paths")
+    self.temp_root = configuration.get("temp_path")
+    if self.temp_root is not None:
+      if not isinstance(self.temp_root, str) or not self.temp_root.strip():
+        raise ValueError("NVR temp_path must be a nonempty directory path")
+      self.temp_root = os.path.abspath(self.temp_root)
     self.min_free_ratio = float(configuration.get("min_free_ratio", 0.05 if self.roots is not None else 0))
     self.min_free_bytes = int(configuration.get("min_free_bytes", 1073741824 if self.roots is not None else 0))
     self.cleanup_free_bytes = int(configuration.get("cleanup_free_bytes", 1073741824 if self.roots is not None else 0))
@@ -47,6 +52,8 @@ class VideoStorage:
         raise ValueError("Use top-level paths for NVR storage roots")
 
   def locations(self, stage):
+    if self.temp_root is not None and stage in ("tmp2", "tmp3", "tmp4"):
+      return [(self.temp_root, os.path.join(self.temp_root, stage))]
     if self.roots is not None:
       return [(root, os.path.join(root, stage)) for root in self.roots]
     path = self.legacy_paths.get(stage)
@@ -146,6 +153,8 @@ class VideoStorage:
     return None
 
   def start_cleanup(self, root, stage, required_bytes):
+    if root == self.temp_root and stage in ("tmp2", "tmp3", "tmp4"):
+      return
     if not self.cleanup_free_bytes or self.writable(root, required_bytes + self.cleanup_free_bytes // 2):
       return
     if self.cleanup_lock.acquire(blocking=False):
@@ -195,6 +204,8 @@ class VideoStorage:
         warning("NVR empty archive cleanup failed", path, e.errno)
 
   def clean_old_videos(self, root, stage, required_bytes, force=False):
+    if root == self.temp_root and stage in ("tmp2", "tmp3", "tmp4"):
+      return
     selected_path = dict(self.locations(stage))[root]
     if not self.available(root, selected_path):
       return

{sciveo-0.3.2 → sciveo-0.3.3}/sciveo/network/sniff/terminal.py

@@ -280,7 +280,7 @@ class CameraDashboard:
 
   @staticmethod
   def selection_marker(record):
-    return {'rtsp': '▶', 'file': '▣', 'sniff': '◉'}.get(record.get('source_kind'), '>')
+    return {'rtsp': '▶', 'file': '▷', 'sniff': '»'}.get(record.get('source_kind'), '>')
 
   @staticmethod
   def label(record):

{sciveo-0.3.2 → sciveo-0.3.3}/sciveo/tools/defaults.py

@@ -124,6 +124,8 @@ class CLIOptions:
     for word in argv:
       if word.startswith("-"):
         option = self.parser._parse_optional(word)
+        if isinstance(option, list):  # Python 3.12.11+ returns a list of matches.
+          option = option[0] if len(option) == 1 else None
         if option and option[0] is not None:
           explicit.add(option[0].dest)
     command = "sniff" if args.command == "sniffer" else args.command

{sciveo-0.3.2 → sciveo-0.3.3}/sciveo/version.py

@@ -9,4 +9,4 @@
 # 2026
 #
 
-__version__ = '0.3.2'
+__version__ = '0.3.3'

sciveo-0.3.2/README.md → sciveo-0.3.3/sciveo.egg-info/PKG-INFO

@@ -1,3 +1,28 @@
+Metadata-Version: 2.1
+Name: sciveo
+Version: 0.3.3
+Description-Content-Type: text/markdown
+Provides-Extra: mon
+Provides-Extra: agent
+Provides-Extra: agent-local
+Provides-Extra: net
+Provides-Extra: server
+Provides-Extra: storage
+Provides-Extra: storage-postgres
+Provides-Extra: chat
+Provides-Extra: media
+Provides-Extra: media-ml
+Provides-Extra: sciveyolo
+Provides-Extra: sciveyolo-gpu
+Provides-Extra: sciveyolo-trt
+Provides-Extra: web
+Provides-Extra: db
+Provides-Extra: power
+Provides-Extra: industrial
+Provides-Extra: energy
+Provides-Extra: all
+Provides-Extra: ml
+
 # SCIVEO
 
 Sciveo is a Python toolkit and CLI for ML/AI workflows, engineering automation,
@@ -2371,6 +2396,19 @@ staging, and `BASE/video` for retained recordings. No separate `tmp`, `video`,
 `motion.src`, or `motion.dst` paths are needed. Camera-specific motion settings
 remain under `motion`.
 
+To keep temporary video I/O in RAM while retaining recordings on those HDD roots,
+set `"temp_path": "/mnt/nvr-ram"` to a separately mounted, size-limited tmpfs.
+Capture, motion processing and upload staging then use `TEMP/tmp2`, `TEMP/tmp3`
+and `TEMP/tmp4`; archives still use the ordered `BASE/video` roots and their
+capacity-based cleanup. The same free-space reserve applies to the temporary
+filesystem, so size it above that reserve plus the expected queued video volume.
+When temporary space runs low, capture waits while processing drains the queues;
+it does not switch temporary writes onto an HDD or delete archives to free RAM.
+Make the NVR service require the tmpfs mount at boot. RAM queues are volatile
+across reboot; finalized HDD archives remain persistent. Existing HDD queues are
+not moved or deleted when changing `temp_path`. Point external uploaders at
+`TEMP/tmp4` when this option is enabled.
+
 Optional per-stage transcoding is disabled unless configured. Put `transcode`
 under `cam.CAMERA` to transcode every completed clip before archival and motion
 processing. Put it under `motion.CAMERA` to transcode **only motion-selected**
@@ -2407,7 +2445,7 @@ processing continues without repeatedly encoding the same failed clip. Storage
 write failures retain the source for retry; no incomplete MP4 enters the uploader
 queue. An all-zero motion grid skips video decoding entirely.
 
-All stages use the first available root in list order, skipping absent, unmounted,
+Stages without a separate `temp_path` use the first available root in list order, skipping absent, unmounted,
 or unwritable roots. Low space does not cause fallback. Free space must cover
 both the incoming clip and the larger of `min_free_bytes` and `min_free_ratio`
 (defaults: 1 GiB and 5%). Capture rechecks
@@ -2448,7 +2486,7 @@ With no usable root, capture waits and queued files are retained until storage
 recovers. This provides fallback, not replication: clips already on a disconnected
 disk become available again when that disk returns.
 
-External uploaders must watch `BASE/tmp4` on **every** configured root, including
+Without `temp_path`, external uploaders must watch `BASE/tmp4` on **every** configured root, including
 roots that recover after startup. Existing queued files are not relocated when
 migrating configurations. Legacy single-directory `path.tmp`, `path.video`,
 `motion.src`, and `motion.dst` configurations remain supported when `paths` is

{sciveo-0.3.2 → sciveo-0.3.3}/test/test_cli_defaults.py

@@ -54,6 +54,24 @@ class TestCLIOptions(unittest.TestCase):
     args, _ = self.arguments("scan")
     self.assertEqual((args.timeout, args.theme), (2, "light"))
 
+  def test_explicit_options_support_old_and_new_argparse_results(self):
+    self.preferences.update({"scan.port": "22", "timeout": "7", "local-echo": "false", "theme": "amber"})
+    options = self.definitions(self.preferences)
+    argv = ["scan", "--port", "502", "--timeo=-2", "--handle-local-echo"]
+    matches = [(options.actions["port"], "--port", None, None),
+               (options.actions["timeout"], "--timeout", "=", "-2"),
+               (options.actions["local-echo"], "--handle-local-echo", None, None)]
+    for result_type in ("tuple", "list"):
+      with self.subTest(result_type=result_type):
+        args = options.parser.parse_args(argv)
+        results = [(action, name, value) for action, name, _, value in matches]
+        if result_type == "list":
+          results = [[match] for match in matches]
+        with patch.object(options.parser, "_parse_optional", side_effect=results):
+          applied = options.apply(args, argv)
+        self.assertEqual((args.port, args.timeout, args.handle_local_echo, args.theme), (502, -2, True, "amber"))
+        self.assertEqual(applied, {"theme"})
+
   def test_camera_expiry_global_command_and_explicit_precedence(self):
     options = self.definitions()
     for command in ("sniff", "nvr", "rtsp"):

{sciveo-0.3.2 → sciveo-0.3.3}/test/test_nvr.py

@@ -69,6 +69,81 @@ class TestNVRStorage(unittest.TestCase):
       self.assertEqual(storage.select(stage), str(base / stage))
       self.assertTrue((base / stage).is_dir())
 
+  def test_temp_path_separates_queues_from_archive_and_motion_uses_it(self):
+    temporary = self.base / "ram"
+    self.configuration["temp_path"] = str(temporary)
+    recorder = self.recorder()
+    self.assertIs(recorder.daemons[0].storage, recorder.storage)
+    for stage in ("tmp2", "tmp3", "tmp4"):
+      self.assertEqual(recorder.storage.select(stage), str(temporary / stage))
+      self.assertEqual(recorder.storage.locations(stage), [(str(temporary), str(temporary / stage))])
+    self.assertEqual(recorder.storage.select("video"), str(self.first / "video"))
+
+  def test_temp_capture_archives_on_disk_and_motion_stays_in_temp(self):
+    temporary = self.base / "ram"
+    self.configuration["temp_path"] = str(temporary)
+    recorder = self.recorder()
+    source = self.clip(temporary)
+    recorder.process_file(source.name, str(source))
+    archive = self.first / "video/cam/2026-09-28/10.00.00-10.01.00.mp4"
+    motion = temporary / "tmp3/cam___2026-09-28___10.00.00-10.01.00.mp4"
+    self.assertEqual(archive.read_bytes(), motion.read_bytes())
+    self.assertFalse(source.exists())
+    self.assertFalse((self.first / "tmp3").exists())
+
+  def test_full_temp_path_preserves_archives_and_queues_without_hdd_fallback(self):
+    temporary = self.base / "ram"
+    self.configuration.update(temp_path=str(temporary), min_free_bytes=1, cleanup_free_bytes=20)
+    storage = VideoStorage(self.configuration)
+    queued = self.clip(temporary)
+    archive = self.archive(self.first, "2020-01-01")
+    usage = shutil.disk_usage(self.first)
+    with patch("sciveo.media.capture.storage.shutil.disk_usage", return_value=usage._replace(free=0)):
+      self.assertIsNone(storage.select("tmp2"))
+      storage.clean_old_videos(str(temporary), "tmp2", 10, force=True)
+    self.assertTrue(archive.exists())
+    self.assertTrue(queued.exists())
+    self.assertIsNone(storage.cleanup_thread)
+    self.assertEqual(storage.select("tmp2"), str(temporary / "tmp2"))
+
+  def test_missing_temp_mount_cannot_fall_back_to_system_disk(self):
+    temporary = self.base / "unmounted/nvr"
+    self.configuration.update(temp_path=str(temporary), allow_root_disk=False)
+    storage = VideoStorage(self.configuration)
+    with patch.object(storage, "allowed", return_value=False):
+      self.assertIsNone(storage.select("tmp2"))
+    self.assertFalse(temporary.exists())
+
+  def test_temp_path_does_not_change_archive_fallback(self):
+    temporary = self.base / "ram"
+    self.configuration["temp_path"] = str(temporary)
+    storage = VideoStorage(self.configuration)
+    available = storage.available
+    with patch.object(storage, "available", side_effect=lambda root, path: root != str(self.first) and available(root, path)):
+      self.assertEqual(storage.select("video"), str(self.second / "video"))
+      self.assertEqual(storage.select("tmp2"), str(temporary / "tmp2"))
+
+  def test_temp_space_pressure_does_not_start_archive_cleanup(self):
+    temporary = self.base / "ram"
+    self.configuration.update(temp_path=str(temporary), cleanup_free_bytes=10**20)
+    storage = VideoStorage(self.configuration)
+    with patch.object(storage, "run_cleanup") as cleanup:
+      self.assertEqual(storage.select("tmp2"), str(temporary / "tmp2"))
+      cleanup.assert_not_called()
+      self.assertIsNone(storage.cleanup_thread)
+
+  def test_invalid_temp_paths_are_rejected(self):
+    for value in ("", "  ", [], 1, False):
+      with self.subTest(value=value), self.assertRaises(ValueError):
+        VideoStorage(dict(self.configuration, temp_path=value))
+
+  def test_temp_root_matching_archive_root_still_allows_archive_cleanup(self):
+    self.storage.temp_root = str(self.first)
+    old = self.archive(self.first, "2020-01-01")
+    with self.capacity({self.first: 0, self.second: 100}):
+      self.assertEqual(self.storage.select("video"), str(self.first / "video"))
+    self.assertFalse(old.exists())
+
   def test_missing_drive_cannot_create_directories_on_root_disk_by_default(self):
     missing = self.base / "data-10/nvr"
     self.configuration["paths"] = [str(missing)]

{sciveo-0.3.2 → sciveo-0.3.3}/test/test_sniff.py

@@ -555,7 +555,7 @@ class TestSniffTerminal(unittest.TestCase):
 
   def test_selection_marker_identifies_stream_source_in_list_and_grid(self):
     self.assertTrue(all(record['source_kind'] == 'sniff' for record in self.records))
-    for source, marker in (('rtsp', '▶'), ('file', '▣'), ('sniff', '◉')):
+    for source, marker in (('rtsp', '▶'), ('file', '▷'), ('sniff', '»')):
       record = dict(self.records[0], source_kind=source)
       for mode in ('video', 'grid'):
         text = TerminalText.clean(CameraDashboard().render([record], mode=mode, stream=SizedStream(100, 30)))