python-aidot-cameras 0.15.3__tar.gz → 0.15.4__tar.gz

{python_aidot_cameras-0.15.3/python_aidot_cameras.egg-info → python_aidot_cameras-0.15.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.15.3
+Version: 0.15.4
 Summary: Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)
 Author-email: cbrightly <chris.brightly@gmail.com>
 License-Expression: MIT

{python_aidot_cameras-0.15.3 → python_aidot_cameras-0.15.4}/aidot_cameras/camera/sdes.py

@@ -38,7 +38,12 @@ class SdesSession:
         teardown_requested=None,
         first_video_pt=None,
         first_audio_pt=None,
+        device_id=None,
     ) -> None:
+        # Which camera this session belongs to, for logging only.  Optional so
+        # an existing caller that does not pass it still works; the logs then
+        # read "?" exactly as they did before.
+        self._device_id  = device_id or "?"
         self._proc       = proc
         self._sdp_path   = sdp_path
         self._outgoing_q = outgoing_q
@@ -215,7 +220,8 @@ class SdesSession:
             or "Could not find codec parameters" in text
         )
         (_LOGGER.debug if expected_no_media else _LOGGER.warning)(
-            "ffmpeg SDES stderr:\n%s", text
+            "camera %s: ffmpeg SDES stderr:\n%s",
+            getattr(self, "_device_id", "?"), text
         )
 
     @staticmethod

{python_aidot_cameras-0.15.3 → python_aidot_cameras-0.15.4}/aidot_cameras/camera/sdes_open.py

@@ -2825,23 +2825,31 @@ class _SdesOpenMixin:
                                 _br_level = _classify_ffmpeg_exit(
                                     _br_rc, _br_teardown_requested
                                 )
+                                # Name the camera.  These lines used to carry no
+                                # device id at all, and this account runs several
+                                # SDES cameras at once, so a burst of exits could
+                                # not be attributed to one of them without extra
+                                # tooling - which sent a live investigation down
+                                # the wrong path once already.
+                                _br_dev = getattr(self, "device_id", "?")
                                 _br_msg = (
-                                    "SDES bridge: ffmpeg exited with code %d"
-                                    " - stopped by teardown"
+                                    "camera %s: SDES bridge: ffmpeg exited with"
+                                    " code %d - stopped by teardown"
                                     if _br_level < _log_br.WARNING else
-                                    "SDES bridge: ffmpeg exited with code %d"
-                                    " - stream ended"
+                                    "camera %s: SDES bridge: ffmpeg exited with"
+                                    " code %d - stream ended"
                                 )
                                 _log_br.getLogger(__name__).log(
-                                    _br_level, _br_msg, _br_rc
+                                    _br_level, _br_msg, _br_dev, _br_rc
                                 )
                                 if _br_level >= _log_br.WARNING:
                                     _serr_tail = getattr(
                                         _br_proc, "_aidot_stderr_tail", None)
                                     if _serr_tail:
                                         _log_br.getLogger(__name__).warning(
-                                            "SDES serve ffmpeg stderr (last %d"
-                                            " lines):\n%s", len(_serr_tail),
+                                            "camera %s: SDES serve ffmpeg stderr"
+                                            " (last %d lines):\n%s", _br_dev,
+                                            len(_serr_tail),
                                             "\n".join(_serr_tail),
                                         )
                             if _bridge_should_break(
@@ -4909,4 +4917,5 @@ class _SdesOpenMixin:
             teardown_requested=_teardown_holder,
             first_video_pt=_first_video_pt,
             first_audio_pt=_first_audio_pt,
+            device_id=getattr(self, "device_id", None),
         )

{python_aidot_cameras-0.15.3 → python_aidot_cameras-0.15.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.15.3"
+version = "0.15.4"
 description = "Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)"
 readme = "README.md"
 license = "MIT"

{python_aidot_cameras-0.15.3 → python_aidot_cameras-0.15.4/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.15.3
+Version: 0.15.4
 Summary: Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)
 Author-email: cbrightly <chris.brightly@gmail.com>
 License-Expression: MIT

{python_aidot_cameras-0.15.3 → python_aidot_cameras-0.15.4}/tests/test_sdes_ffmpeg_stderr_log.py

@@ -12,8 +12,10 @@ import types
 from aidot_cameras.camera.sdes import SdesSession
 
 
-def _log_fn(last_media):
-    obj = types.SimpleNamespace(last_media_monotonic=last_media)
+def _log_fn(last_media, device_id="dev-abc"):
+    obj = types.SimpleNamespace(
+        last_media_monotonic=last_media, _device_id=device_id
+    )
     return SdesSession._log_ffmpeg_stderr.__get__(obj)
 
 
@@ -31,6 +33,18 @@ def test_no_media_expected_shape_logs_debug(caplog):
         assert recs and recs[0].levelno == logging.DEBUG, msg
 
 
+def test_the_log_names_the_camera(caplog):
+    """Several SDES cameras stream at once; an unattributed line is near-useless.
+
+    A burst of these lines with no device id could not be pinned to a camera
+    during a live investigation, which cost real time and one wrong conclusion.
+    """
+    with caplog.at_level(logging.DEBUG, logger="aidot_cameras.camera.sdes"):
+        _log_fn(1.0, device_id="12b144cb12da")(b"Error writing trailer")
+    recs = _stderr_records(caplog)
+    assert recs and "12b144cb12da" in recs[0].getMessage()
+
+
 def test_no_media_unexpected_error_still_warns(caplog):
     # No media, but NOT the expected empty-output shape -> a real ffmpeg failure.
     with caplog.at_level(logging.DEBUG, logger="aidot_cameras.camera.sdes"):

{python_aidot_cameras-0.15.3 → python_aidot_cameras-0.15.4}/tests/test_sdes_serve_stderr_drain.py

@@ -59,6 +59,35 @@ def test_stderr_none_is_safe() -> None:
     assert _tail(proc) == []
 
 
+def test_every_piped_spawn_installs_the_drain() -> None:
+    """A serve spawned with an un-drained ``stderr=PIPE`` is the outage itself.
+
+    There are two serve-spawn sites (cold open and key-restart), and the bug
+    shipped because a pipe was opened at one of them with nothing reading it.
+    A third site, or a drain call deleted from an existing one, reintroduces it
+    exactly - and no behavioural test can see the difference until ffmpeg has
+    written ~64KB, which is far past where a unit test looks. Pin the source.
+    """
+    import inspect
+
+    from aidot_cameras.camera import sdes_open
+
+    src = inspect.getsource(sdes_open).splitlines()
+    spawns = [i for i, line in enumerate(src) if "stderr=subprocess.PIPE" in line]
+    assert spawns, (
+        "no piped spawn found in sdes_open - if the serve stopped using a pipe "
+        "this guard is obsolete, but do not delete it without checking why"
+    )
+    for line_no in spawns:
+        window = "\n".join(src[line_no:line_no + 12])
+        assert "_start_serve_stderr_drain(" in window, (
+            f"{sdes_open.__name__}:{line_no + 1} spawns with stderr=PIPE and "
+            "nothing drains it within the next few lines. An un-drained pipe "
+            "fills at ~64KB and blocks ffmpeg on its next write, which kills "
+            "the RTSP publisher and 404s every viewer"
+        )
+
+
 class _TornDownProc:
     """A serve proc whose stderr pipe the drainer already emptied.
 

{python_aidot_cameras-0.15.3 → python_aidot_cameras-0.15.4}/tests/test_sdes_teardown_exit_log.py

@@ -61,6 +61,27 @@ def test_reap_sets_teardown_flag_before_kill():
     )
 
 
+def test_the_bridge_exit_log_names_the_camera():
+    """The exit line is emitted from a closure the tests cannot call directly.
+
+    It is still worth pinning: this account streams several SDES cameras at
+    once, and while these lines carried no device id a burst of exits could not
+    be attributed to a camera at all. Assert the format string takes one, and
+    that the session is handed the id it needs for its own stderr log.
+    """
+    src = inspect.getsource(sdes_open)
+    assert "camera %s: SDES bridge: ffmpeg exited" in src, (
+        "the bridge exit log lost its device id - a burst of these is "
+        "unattributable without it"
+    )
+    assert "camera %s: SDES serve ffmpeg stderr" in src
+    start = src.index("return SdesSession(")
+    assert "device_id=" in src[start:start + 800], (
+        "SdesSession is constructed without a device_id, so its own stderr "
+        "log cannot name the camera"
+    )
+
+
 class _FakeProc:
     def __init__(self):
         self._alive = True