python-aidot-cameras 0.11.6__tar.gz → 0.11.8__tar.gz

{python_aidot_cameras-0.11.6/python_aidot_cameras.egg-info → python_aidot_cameras-0.11.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.11.6
+Version: 0.11.8
 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.11.8/aidot/__init__.py

@@ -0,0 +1,46 @@
+"""AiDot camera and device library."""
+
+import logging as _logging
+
+from .client import AidotClient
+from .device_client import DeviceClient
+from .discover import Discover
+from .exceptions import (
+    AidotAuthFailed,
+    AidotAuthTokenExpired,
+    AidotCameraBusy,
+    AidotError,
+    AidotNotLogin,
+    AidotOSError,
+    AidotUserOrPassIncorrect,
+    HTTPError,
+    InvalidHost,
+    InvalidURL,
+)
+
+# The vendored aiortc RTP receiver/sender log EVERY media packet at DEBUG.  When a
+# user enables DEBUG on the parent ``aidot`` logger to diagnose the integration,
+# that becomes thousands of lines per second and floods the logs (in one capture,
+# 99% of all lines).  Cap just those two per-packet loggers at INFO so enabling
+# ``aidot`` DEBUG stays useful - the diagnostically valuable aiortc DEBUG (DTLS,
+# ICE, SCTP/DCEP) still flows.  Respect an explicit level if the user set one.
+for _chatty in ("aidot._vendor.aiortc.rtcrtpreceiver", "aidot._vendor.aiortc.rtcrtpsender"):
+    _lg = _logging.getLogger(_chatty)
+    if _lg.level == _logging.NOTSET:
+        _lg.setLevel(_logging.INFO)
+
+__all__ = [
+    "AidotAuthFailed",
+    "AidotAuthTokenExpired",
+    "AidotCameraBusy",
+    "AidotClient",
+    "AidotError",
+    "AidotNotLogin",
+    "AidotOSError",
+    "AidotUserOrPassIncorrect",
+    "DeviceClient",
+    "Discover",
+    "HTTPError",
+    "InvalidHost",
+    "InvalidURL",
+]

{python_aidot_cameras-0.11.6 → python_aidot_cameras-0.11.8}/aidot/camera/client.py

@@ -668,7 +668,10 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
             # as the octets, e.g. "49.57.50.46" == ASCII of "192.").
             _ip_str = str(_dev_ip_init)
             if _ip_looks_ascii_garbled(_ip_str):
-                _LOGGER.warning(
+                # Benign, handled cloud quirk (not actionable by the user): the
+                # camera's LAN IP comes from WebRTC signaling, not this field.
+                # Debug, not warning, so it does not read as a problem in the log.
+                _LOGGER.debug(
                     "DeviceClient %s: ignoring ASCII-encoded IP %r from device dict "
                     "(cloud stored IP bytes as ASCII chars; real IP unknown)",
                     device.get("id") or device.get("devId"), _ip_str,
@@ -789,6 +792,16 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
             self._cloud_online_explicit = True
         return self.status
 
+    def _open_fail_logger(self):
+        """Pick the log level for a stream-open failure in the serve/keepalive
+        loops: WARNING for a genuine failure, but DEBUG when the cloud has
+        explicitly reported the device offline.  A dead/unpowered camera is
+        already throttled to ~probe cadence by _backoff_or_offline_pause, so its
+        expected open failures should not drip WARNINGs into the log every probe.
+        """
+        _offline = (not self.status.online) and getattr(self, "_cloud_online_explicit", False)
+        return _LOGGER.debug if _offline else _LOGGER.warning
+
     async def _backoff_or_offline_pause(self, delay: float) -> None:
         """Sleep a reconnect backoff, extended while the device is cloud-offline.
 
@@ -2729,7 +2742,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                         "falling back to full relay path", self.device_id,
                         _FAST_OPEN_TIMEOUT)
                 _delay = _pacer.fail_delay()
-                _LOGGER.warning(
+                self._open_fail_logger()(
                     "SDES keepalive: stream open failed for %s (retry in %.0fs): %s",
                     self.device_id, _delay, exc,
                 )
@@ -2905,7 +2918,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 continue
             except Exception as exc:
                 _delay = _pacer.fail_delay()
-                _LOGGER.warning(
+                self._open_fail_logger()(
                     "Stream open failed for %s (retry in %.0fs): %s",
                     self.device_id, _delay, exc,
                 )
@@ -3406,7 +3419,7 @@ class CameraMixin(_CameraControlsMixin, _WebRTCOpenMixin, _SdesOpenMixin):
                 continue
             except Exception as exc:
                 _delay = _pacer.fail_delay()
-                _LOGGER.warning(
+                self._open_fail_logger()(
                     "DTLS serve: open failed for %s (retry %.0fs): %s",
                     self.device_id, _delay, exc,
                 )

{python_aidot_cameras-0.11.6 → python_aidot_cameras-0.11.8}/aidot/camera/sdes_open.py

@@ -790,7 +790,10 @@ class _SdesOpenMixin:
         )
 
         sdp_path = await asyncio.get_running_loop().run_in_executor(
-            None, _make_sdp_tempfile, _inject_sprop(ffmpeg_sdp, self.device_id))
+            # _inject_sprop reads the sprop cache from disk; keep it inside the
+            # executor (not as an eagerly-evaluated arg) so the blocking open()
+            # does not run on the event loop.
+            None, lambda: _make_sdp_tempfile(_inject_sprop(ffmpeg_sdp, self.device_id)))
         _cl(os.unlink, sdp_path)   # released with the sockets on a cancelled open
 
         # --- Send webrtcReq BEFORE releasing reservation sockets ------------- #
@@ -1772,7 +1775,7 @@ class _SdesOpenMixin:
                 )
             try:
                 await asyncio.get_running_loop().run_in_executor(
-                    None, _write_text_file, sdp_path, _inject_sprop(_updated_sdp, self.device_id))
+                    None, lambda: _write_text_file(sdp_path, _inject_sprop(_updated_sdp, self.device_id)))
             except Exception as _sdp_exc:
                 _LOGGER.warning("_open_sdes_stream: could not rewrite SDP: %s", _sdp_exc)
 
@@ -2070,7 +2073,7 @@ class _SdesOpenMixin:
             )
         try:
             await asyncio.get_running_loop().run_in_executor(
-                None, _write_text_file, sdp_path, _inject_sprop(_br_sdp, self.device_id))
+                None, lambda: _write_text_file(sdp_path, _inject_sprop(_br_sdp, self.device_id)))
         except Exception as _br_sdp_exc:
             _LOGGER.warning("bridge: could not rewrite SDP: %s", _br_sdp_exc)
 

{python_aidot_cameras-0.11.6 → python_aidot_cameras-0.11.8}/pyproject.toml

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

{python_aidot_cameras-0.11.6 → python_aidot_cameras-0.11.8/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.11.6
+Version: 0.11.8
 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.11.6 → python_aidot_cameras-0.11.8}/python_aidot_cameras.egg-info/SOURCES.txt

@@ -89,11 +89,13 @@ tests/test_keepalive_renew.py
 tests/test_keyframe_prompter.py
 tests/test_lan_control.py
 tests/test_live_stream_param.py
+tests/test_logging_caps.py
 tests/test_motion_poll.py
 tests/test_mqtt_session_reconnect.py
 tests/test_narrow_pc_ice.py
 tests/test_no_undefined_names.py
 tests/test_offline_keepalive_pause.py
+tests/test_open_fail_logger.py
 tests/test_open_gate_delay.py
 tests/test_persistent_mqtt.py
 tests/test_persistent_mqtt_robustness.py

python_aidot_cameras-0.11.8/tests/test_logging_caps.py

@@ -0,0 +1,22 @@
+"""Importing the library caps the vendored aiortc per-packet loggers.
+
+aiortc's RTP receiver/sender log every media packet at DEBUG. Enabling DEBUG on
+the parent ``aidot`` logger (the normal way to diagnose the integration) would
+otherwise unleash thousands of lines per second. The package init caps just those
+two loggers at INFO so DEBUG on ``aidot`` stays useful without the firehose.
+"""
+import logging
+
+import aidot  # noqa: F401 - import triggers the logger caps
+
+
+def test_vendored_aiortc_packet_loggers_capped_to_info():
+    for name in (
+        "aidot._vendor.aiortc.rtcrtpreceiver",
+        "aidot._vendor.aiortc.rtcrtpsender",
+    ):
+        lg = logging.getLogger(name)
+        assert lg.level == logging.INFO, f"{name} not capped (level={lg.level})"
+        # Even with the parent 'aidot' logger at DEBUG, the per-packet DEBUG is off.
+        logging.getLogger("aidot").setLevel(logging.DEBUG)
+        assert not lg.isEnabledFor(logging.DEBUG), f"{name} still emits DEBUG"

python_aidot_cameras-0.11.8/tests/test_open_fail_logger.py

@@ -0,0 +1,29 @@
+"""Serve/keepalive open-failure logging level.
+
+A stream-open failure logs at WARNING normally, but at DEBUG when the cloud has
+explicitly reported the device offline - a dead/unpowered camera is throttled to
+probe cadence by the offline pause and should not drip WARNINGs every probe.
+"""
+import types
+
+from aidot.camera import client as camclient
+
+
+def _dc(online, explicit):
+    o = types.SimpleNamespace()
+    o.status = types.SimpleNamespace(online=online)
+    o._cloud_online_explicit = explicit
+    return camclient.CameraMixin._open_fail_logger.__get__(o)
+
+
+def test_debug_when_cloud_reports_offline():
+    assert _dc(online=False, explicit=True)() == camclient._LOGGER.debug
+
+
+def test_warning_when_online():
+    assert _dc(online=True, explicit=True)() == camclient._LOGGER.warning
+
+
+def test_warning_when_online_state_unknown():
+    # Never explicitly reported offline -> treat a failure as genuine (WARNING).
+    assert _dc(online=False, explicit=False)() == camclient._LOGGER.warning

python_aidot_cameras-0.11.6/aidot/__init__.py

@@ -1,33 +0,0 @@
-"""AiDot camera and device library."""
-
-from .client import AidotClient
-from .device_client import DeviceClient
-from .discover import Discover
-from .exceptions import (
-    AidotAuthFailed,
-    AidotAuthTokenExpired,
-    AidotCameraBusy,
-    AidotError,
-    AidotNotLogin,
-    AidotOSError,
-    AidotUserOrPassIncorrect,
-    HTTPError,
-    InvalidHost,
-    InvalidURL,
-)
-
-__all__ = [
-    "AidotAuthFailed",
-    "AidotAuthTokenExpired",
-    "AidotCameraBusy",
-    "AidotClient",
-    "AidotError",
-    "AidotNotLogin",
-    "AidotOSError",
-    "AidotUserOrPassIncorrect",
-    "DeviceClient",
-    "Discover",
-    "HTTPError",
-    "InvalidHost",
-    "InvalidURL",
-]