python-aidot-cameras 0.7.23__tar.gz → 0.7.25__tar.gz

{python_aidot_cameras-0.7.23/src/python_aidot_cameras.egg-info → python_aidot_cameras-0.7.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.7.23
+Version: 0.7.25
 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.7.23 → python_aidot_cameras-0.7.25}/pyproject.toml

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

{python_aidot_cameras-0.7.23 → python_aidot_cameras-0.7.25}/src/aidot/camera/client.py

@@ -543,6 +543,14 @@ class CameraMixin(_CameraControlsMixin):
     # data-channel-less; it's parked on the SDES/TUTK side anyway.
     _NO_DATACHANNEL_MODELS: frozenset = frozenset({"LK.IPC.A001064"})
 
+    # A001064's role-reversal handshake (the camera echoes our offer back as its
+    # own webrtcReq before doing ICE, and won't stream until it gets our
+    # webrtcResp) needs the camera armed BEFORE our webrtcReq.  sdes_fast_liveplay
+    # sends webrtcReq ~4.5 s earlier, which degrades A001064 media reliability
+    # (2/2 -> 1/2 media in a live A/B; the flag was soak-validated only on the
+    # A001513 battery cameras).  Exclude role-reversal models from the flag.
+    _NO_FAST_LIVEPLAY_MODELS: frozenset = frozenset({"LK.IPC.A001064"})
+
     @property
     def _offer_should_include_datachannel(self) -> bool:
         model = getattr(getattr(self, "info", None), "model_id", None)
@@ -2537,7 +2545,14 @@ class CameraMixin(_CameraControlsMixin):
 
         Per-camera ``sdes_fast_liveplay`` (set via start_keepalive) wins; else the
         ``AIDOT_SDES_FAST_LIVEPLAY`` env (truthy = 1/true/yes/on), default off.
-        Only consulted for SDES cameras (the caller gates on is_sdes_camera)."""
+        Only consulted for SDES cameras (the caller gates on is_sdes_camera).
+
+        Role-reversal models (``_NO_FAST_LIVEPLAY_MODELS``, e.g. A001064) are always
+        excluded - their handshake needs the camera armed before our webrtcReq, so
+        the flag's early webrtcReq degrades their media reliability."""
+        model = getattr(getattr(self, "info", None), "model_id", None)
+        if model in self._NO_FAST_LIVEPLAY_MODELS:
+            return False
         opt = getattr(self, "_sdes_fast_liveplay_opt", None)
         if opt is not None:
             return bool(opt)
@@ -3705,7 +3720,14 @@ class CameraMixin(_CameraControlsMixin):
                     or msg.get("devId") == device_id):
                 loop.call_soon_threadsafe(camera_ready_ev.set)
             # livePlayResp: explicit camera ack/nack for start-play command.
-            if method == "livePlayResp" and inner.get("devId") == device_id:
+            # The camera echoes our peer_id (verified live); its payload has NO
+            # devId, so the old devId-only match never fired and this future never
+            # resolved (the wait always timed out).  Match on the echoed peer_id
+            # (per-open, precise); keep devId as a fallback for any camera that
+            # does send it.  dstAddr is the account-wide userId - too loose to use.
+            if method == "livePlayResp" and (
+                    inner.get("peerid") == peer_id
+                    or inner.get("devId") == device_id):
                 if not liveplay_resp_fut.done():
                     loop.call_soon_threadsafe(liveplay_resp_fut.set_result, inner)
             # livePlayReq echo: broker/camera confirmed delivery of our livePlayReq.
@@ -4171,9 +4193,19 @@ class CameraMixin(_CameraControlsMixin):
                     _lp_arrived = True
                     _lp_code = int(_lp_resp.get("code", 200))
                     _lp_on = int(_lp_resp.get("livePlay", 1))
-                    if _lp_code not in (0, 200) or _lp_on == 0:
+                    # Fast-fail only on an unambiguous refusal (livePlay=0).
+                    # Other non-OK codes (incl. -50019 "not ready") are
+                    # transient on battery cameras and recover via ICE; abort
+                    # there would spuriously kill otherwise-good streams.
+                    if _lp_on == 0:
                         raise RuntimeError(
-                            f"livePlay rejected by camera (code={_lp_code}, livePlay={_lp_on})"
+                            f"livePlay refused by camera (livePlay=0, code={_lp_code})"
+                        )
+                    elif _lp_code not in (0, 200):
+                        _status(
+                            f"livePlayResp: non-OK code {_lp_code}"
+                            f"{' (not ready, transient)' if _lp_code == -50019 else ''}"
+                            " - proceeding"
                         )
                 except TimeoutError:
                     pass
@@ -4216,9 +4248,15 @@ class CameraMixin(_CameraControlsMixin):
                     _lp_resp2 = liveplay_resp_fut.result()
                     _lp_code2 = int(_lp_resp2.get("code", 200))
                     _lp_on2   = int(_lp_resp2.get("livePlay", 1))
-                    if _lp_code2 not in (0, 200) or _lp_on2 == 0:
+                    if _lp_on2 == 0:
                         raise RuntimeError(
-                            f"livePlay rejected by camera (code={_lp_code2}, livePlay={_lp_on2})"
+                            f"livePlay refused by camera (livePlay=0, code={_lp_code2})"
+                        )
+                    elif _lp_code2 not in (0, 200):
+                        _status(
+                            f"livePlayResp: non-OK code {_lp_code2}"
+                            f"{' (not ready, transient)' if _lp_code2 == -50019 else ''}"
+                            " - proceeding"
                         )
                 except RuntimeError:
                     raise
@@ -7085,10 +7123,18 @@ class CameraMixin(_CameraControlsMixin):
                 _lp_arrived = True
                 _lp_code_sdes = int(_lp_resp_sdes.get("code", 200))
                 _lp_on_sdes = int(_lp_resp_sdes.get("livePlay", 1))
-                if _lp_code_sdes not in (0, 200) or _lp_on_sdes == 0:
+                # Only an explicit livePlay=0 is an unambiguous refusal (fast-fail).
+                # Numeric codes (e.g. -50019 "not ready" on a waking battery cam)
+                # are transient - the camera recovers and streams - so log and
+                # proceed rather than abort on a code we can't classify as terminal
+                # (genuine terminal rejects are still caught on the webrtcResp ack).
+                if _lp_on_sdes == 0:
                     raise RuntimeError(
-                        f"livePlay rejected by camera (code={_lp_code_sdes}, livePlay={_lp_on_sdes})"
-                    )
+                        f"livePlay refused by camera (livePlay=0, code={_lp_code_sdes})")
+                elif _lp_code_sdes not in (0, 200):
+                    _status(f"livePlayResp: non-OK code {_lp_code_sdes}"
+                            f"{' (not ready, transient)' if _lp_code_sdes == -50019 else ''}"
+                            " - proceeding")
             except TimeoutError:
                 pass
             _LOGGER.info(

{python_aidot_cameras-0.7.23 → python_aidot_cameras-0.7.25/src/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.7.23
+Version: 0.7.25
 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.7.23 → python_aidot_cameras-0.7.25}/tests/test_sdes_fast_liveplay.py

@@ -38,6 +38,22 @@ def test_env_falsey_values(monkeypatch):
         assert _cam()._resolve_sdes_fast_liveplay() is False, val
 
 
+def test_role_reversal_model_always_excluded(monkeypatch):
+    # A001064 (role-reversal) must NOT use the flag even when opt/env force it on -
+    # the early webrtcReq degrades its media reliability.
+    from types import SimpleNamespace
+    monkeypatch.setenv("AIDOT_SDES_FAST_LIVEPLAY", "1")
+    cam = _cam()
+    cam.info = SimpleNamespace(model_id="LK.IPC.A001064")
+    cam._sdes_fast_liveplay_opt = True
+    assert cam._resolve_sdes_fast_liveplay() is False
+    # a non-excluded SDES model still honours the flag
+    cam2 = _cam()
+    cam2.info = SimpleNamespace(model_id="LK.IPC.A001513")
+    cam2._sdes_fast_liveplay_opt = True
+    assert cam2._resolve_sdes_fast_liveplay() is True
+
+
 def test_kwarg_option_wins_over_env(monkeypatch):
     monkeypatch.setenv("AIDOT_SDES_FAST_LIVEPLAY", "1")
     cam = _cam()