python-aidot-cameras 0.11.14__tar.gz → 0.12.0__tar.gz

{python_aidot_cameras-0.11.14/python_aidot_cameras.egg-info → python_aidot_cameras-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.11.14
+Version: 0.12.0
 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
@@ -11,6 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: python-aidot==0.3.55
 Requires-Dist: aiohttp>=3.9
 Requires-Dist: paho-mqtt>=1.6.1
 Requires-Dist: cryptography>=42.0
@@ -36,10 +37,16 @@ Dynamic: license-file
 
 Control AIDOT WiFi lights **and cameras** from Python.
 
-This is a camera-capable fork of the upstream lights-only
-[`python-aidot`](https://github.com/AiDot-Development-Team/python-AiDot). It adds
-live WebRTC video streaming (DTLS and SDES-SRTP paths), snapshots, PTZ, camera
-controls, cloud recordings/thumbnails, and two-way (push-to-talk) audio.
+This **extends** the upstream lights-only
+[`python-aidot`](https://github.com/AiDot-Development-Team/python-AiDot), which it
+installs as a dependency rather than forking. It adds live WebRTC video streaming
+(DTLS and SDES-SRTP paths), snapshots, PTZ, camera controls, cloud
+recordings/thumbnails, and two-way (push-to-talk) audio.
+
+Upstream owns the `aidot` import name and handles non-camera devices (lights,
+plugs, switches) with none of this package's code in the path; everything here
+lives under `aidot_cameras`. Taking a new upstream release is a dependency bump
+plus a test run - see [`docs/UPSTREAM.md`](docs/UPSTREAM.md).
 
 This repository is the **library** (distribution name `python-aidot-cameras`).
 The Home Assistant custom component (`custom_components/aidot/`) lives in the
@@ -142,7 +149,7 @@ The library reads the following environment variables.
 ### Credentials
 
 Used by the credential helper (`aidot.credentials`); they take priority over any
-stored credentials file. See [`aidot/credentials.py`](aidot/credentials.py).
+stored credentials file. See [`aidot_cameras/credentials.py`](aidot_cameras/credentials.py).
 
 | Variable | Purpose | Default |
 | --- | --- | --- |
@@ -152,7 +159,7 @@ stored credentials file. See [`aidot/credentials.py`](aidot/credentials.py).
 
 ### Camera streaming / tuning
 
-The most useful knobs read by the camera client (`aidot.camera.client`). Defaults
+The most useful knobs read by the camera client (`aidot_cameras.camera.client`). Defaults
 are chosen to work out of the box; override only when tuning. Finer-grained
 internal knobs (audio normalization, keyframe/PLI cadence, retry timing, SDES
 audio, idle release, the sprop cache path) are documented in

{python_aidot_cameras-0.11.14 → python_aidot_cameras-0.12.0}/README.md

@@ -6,10 +6,16 @@
 
 Control AIDOT WiFi lights **and cameras** from Python.
 
-This is a camera-capable fork of the upstream lights-only
-[`python-aidot`](https://github.com/AiDot-Development-Team/python-AiDot). It adds
-live WebRTC video streaming (DTLS and SDES-SRTP paths), snapshots, PTZ, camera
-controls, cloud recordings/thumbnails, and two-way (push-to-talk) audio.
+This **extends** the upstream lights-only
+[`python-aidot`](https://github.com/AiDot-Development-Team/python-AiDot), which it
+installs as a dependency rather than forking. It adds live WebRTC video streaming
+(DTLS and SDES-SRTP paths), snapshots, PTZ, camera controls, cloud
+recordings/thumbnails, and two-way (push-to-talk) audio.
+
+Upstream owns the `aidot` import name and handles non-camera devices (lights,
+plugs, switches) with none of this package's code in the path; everything here
+lives under `aidot_cameras`. Taking a new upstream release is a dependency bump
+plus a test run - see [`docs/UPSTREAM.md`](docs/UPSTREAM.md).
 
 This repository is the **library** (distribution name `python-aidot-cameras`).
 The Home Assistant custom component (`custom_components/aidot/`) lives in the
@@ -112,7 +118,7 @@ The library reads the following environment variables.
 ### Credentials
 
 Used by the credential helper (`aidot.credentials`); they take priority over any
-stored credentials file. See [`aidot/credentials.py`](aidot/credentials.py).
+stored credentials file. See [`aidot_cameras/credentials.py`](aidot_cameras/credentials.py).
 
 | Variable | Purpose | Default |
 | --- | --- | --- |
@@ -122,7 +128,7 @@ stored credentials file. See [`aidot/credentials.py`](aidot/credentials.py).
 
 ### Camera streaming / tuning
 
-The most useful knobs read by the camera client (`aidot.camera.client`). Defaults
+The most useful knobs read by the camera client (`aidot_cameras.camera.client`). Defaults
 are chosen to work out of the box; override only when tuning. Finer-grained
 internal knobs (audio normalization, keyframe/PLI cadence, retry timing, SDES
 audio, idle release, the sprop cache path) are documented in

{python_aidot_cameras-0.11.14/aidot → python_aidot_cameras-0.12.0/aidot_cameras}/__init__.py

@@ -1,15 +1,23 @@
-"""AiDot camera and device library."""
+"""AiDot camera library.
+
+This package extends the upstream ``python-aidot`` library rather than forking
+it: upstream owns the ``aidot`` import name and handles non-camera devices by
+itself, while everything here adds the camera surface (streaming, snapshots,
+recordings, motion) on top of it.  See docs/UPSTREAM.md for how to take a new
+upstream release.
+"""
 
 import logging as _logging
 import time as _time
 
-from .client import AidotClient
-from .device_client import DeviceClient
-from .discover import Discover
+from .client import AidotClient, CameraClient
+from .device_client import CameraDeviceClient, DeviceInformation, DeviceStatusData
+from .discover import CameraDiscover, Discover
 from .exceptions import (
     AidotAuthFailed,
     AidotAuthTokenExpired,
     AidotCameraBusy,
+    AidotCameraNotReady,
     AidotError,
     AidotNotLogin,
     AidotOSError,
@@ -20,8 +28,8 @@ from .exceptions import (
 )
 
 # Cap the noisy external/vendored loggers so enabling DEBUG on the parent
-# ``aidot`` logger to diagnose the integration does not unleash a flood that,
-# on a microSD Home Assistant host, can starve the recorder with log I/O.
+# ``aidot_cameras`` logger to diagnose the integration does not unleash a flood
+# that, on a microSD Home Assistant host, can starve the recorder with log I/O.
 #
 # The vendored aiortc RTP receiver/sender log every media packet at DEBUG, so
 # capping them at INFO removes that flood while leaving the diagnostically
@@ -29,15 +37,15 @@ from .exceptions import (
 #
 # The external ``aioice`` package's flood is different: it logs ICE
 # connectivity-check state transitions at INFO, not DEBUG (aioice is a real
-# dependency, not vendored, so it is not under ``aidot._vendor``). An INFO cap
-# cannot suppress an INFO-level flood, so ``aioice.ice`` and ``aioice.turn``
-# are capped at WARNING instead; aioice emits nothing at WARNING or above, so
-# no real warning is lost. A user who wants the aioice ICE INFO logging back
-# (e.g. to debug connectivity issues) can set that logger's level explicitly -
-# the NOTSET guard below respects it.
+# dependency, not vendored, so it is not under ``aidot_cameras._vendor``). An
+# INFO cap cannot suppress an INFO-level flood, so ``aioice.ice`` and
+# ``aioice.turn`` are capped at WARNING instead; aioice emits nothing at
+# WARNING or above, so no real warning is lost. A user who wants the aioice ICE
+# INFO logging back (e.g. to debug connectivity issues) can set that logger's
+# level explicitly - the NOTSET guard below respects it.
 _EXTERNAL_LOGGER_CAPS = {
-    "aidot._vendor.aiortc.rtcrtpreceiver": _logging.INFO,
-    "aidot._vendor.aiortc.rtcrtpsender": _logging.INFO,
+    "aidot_cameras._vendor.aiortc.rtcrtpreceiver": _logging.INFO,
+    "aidot_cameras._vendor.aiortc.rtcrtpsender": _logging.INFO,
     "aioice.ice": _logging.WARNING,
     "aioice.turn": _logging.WARNING,
 }
@@ -58,7 +66,7 @@ def _cap_external_loggers() -> None:
 _cap_external_loggers()
 
 # The vendored H.264 decoder logs a WARNING per corrupt/undecodable frame
-# (aidot/_vendor/aiortc/codecs/h264.py:118). A degrading link can therefore
+# (aidot_cameras/_vendor/aiortc/codecs/h264.py). A degrading link can therefore
 # log hundreds of identical lines in a few minutes; a live evaluation saw 172
 # in 11 minutes. A level cap cannot help here since the message is already at
 # WARNING, and the message is a corruption canary for a degrading link, so it
@@ -67,7 +75,7 @@ _cap_external_loggers()
 # WARNINGs within a window, and lets the first WARNING after the window
 # elapses through carrying the suppressed count, so the canary stays visible
 # at a low rate instead of flooding.
-_H264_DECODE_LOGGER_NAME = "aidot._vendor.aiortc.codecs.h264"
+_H264_DECODE_LOGGER_NAME = "aidot_cameras._vendor.aiortc.codecs.h264"
 _H264_DECODE_RATE_LIMIT_WINDOW_SECONDS = 30.0
 
 
@@ -124,12 +132,17 @@ __all__ = [
     "AidotAuthFailed",
     "AidotAuthTokenExpired",
     "AidotCameraBusy",
+    "AidotCameraNotReady",
     "AidotClient",
     "AidotError",
     "AidotNotLogin",
     "AidotOSError",
     "AidotUserOrPassIncorrect",
-    "DeviceClient",
+    "CameraClient",
+    "CameraDeviceClient",
+    "CameraDiscover",
+    "DeviceInformation",
+    "DeviceStatusData",
     "Discover",
     "HTTPError",
     "InvalidHost",

{python_aidot_cameras-0.11.14/aidot → python_aidot_cameras-0.12.0/aidot_cameras}/camera/client.py

@@ -9,7 +9,7 @@ import asyncio
 from typing import Any, Callable, List, Optional
 
 from ..exceptions import AidotCameraBusy, AidotCameraNotReady
-from ..login_const import APP_ID as _AIDOT_APP_ID
+from ..const import APP_ID as _AIDOT_APP_ID
 from ..const import (
     LOGIN_INFO_PERSISTENT_MQTT_KEY,
     LOGIN_INFO_PERSISTENT_MQTT_LOCK_KEY,

{python_aidot_cameras-0.11.14/aidot → python_aidot_cameras-0.12.0/aidot_cameras}/camera/lan_control.py

@@ -32,7 +32,7 @@ import time
 from datetime import datetime
 from typing import Any, Optional
 
-from ..aes_utils import aes_encrypt, aes_decrypt
+from ..crypto import aes_encrypt, aes_decrypt
 
 _LOGGER = logging.getLogger(__name__)
 

{python_aidot_cameras-0.11.14/aidot → python_aidot_cameras-0.12.0/aidot_cameras}/camera/playback.py

@@ -16,7 +16,7 @@ import struct
 import time
 from typing import Callable, List, Optional
 
-from ..aes_utils import aes_ecb_decrypt_str_key, aes_ecb_encrypt_str_key
+from ..crypto import aes_ecb_decrypt_str_key, aes_ecb_encrypt_str_key
 from .constants import (
     _CMD_HB_REQ, _CMD_HB_RES, _CMD_LOGIN_REQ, _CMD_LOGIN_RES,
     _CMD_PARAM, _CMD_STREAM_REQ, _CMD_STREAM_RES, _CMD_SUBCMD,

{python_aidot_cameras-0.11.14/aidot → python_aidot_cameras-0.12.0/aidot_cameras}/camera/protocol.py

@@ -352,7 +352,7 @@ def _make_talk_audio_track(pcm_provider: Callable[[], "Optional[bytes]"]):
     try:
         import fractions
         import av
-        from aidot._vendor.aiortc.mediastreams import MediaStreamTrack
+        from aidot_cameras._vendor.aiortc.mediastreams import MediaStreamTrack
     except ImportError:
         return None
 

{python_aidot_cameras-0.11.14/aidot → python_aidot_cameras-0.12.0/aidot_cameras}/camera/webrtc_open.py

@@ -301,8 +301,8 @@ class _WebRTCOpenMixin:
 
         if not use_sdes:
             try:
-                from aidot._vendor.aiortc import RTCPeerConnection, RTCSessionDescription
-                from aidot._vendor.aiortc.sdp import candidate_from_sdp
+                from aidot_cameras._vendor.aiortc import RTCPeerConnection, RTCSessionDescription
+                from aidot_cameras._vendor.aiortc.sdp import candidate_from_sdp
             except ImportError:
                 raise ImportError(
                     "aiortc is required for WebRTC streaming. "
@@ -327,7 +327,7 @@ class _WebRTCOpenMixin:
             # that negotiate DTLS 1.2 still get DTLS 1.2; this only widens
             # the floor.
             try:
-                from aidot._vendor.aiortc.rtcdtlstransport import RTCCertificate as _AidotRTCCert
+                from aidot_cameras._vendor.aiortc.rtcdtlstransport import RTCCertificate as _AidotRTCCert
                 if not getattr(_AidotRTCCert, "_aidot_dtls10_patched", False):
                     _orig_create_ctx = _AidotRTCCert._create_ssl_context
                     _DTLS1_VERSION = 0xFEFF  # not exposed in pyOpenSSL; raw OpenSSL constant
@@ -1289,7 +1289,7 @@ class _WebRTCOpenMixin:
         # aioice.turn at INFO anyway, so forcing DEBUG was both self-defeating and
         # noisy.  To debug ICE, set the aioice logger level explicitly (that
         # overrides the NOTSET-guarded cap).
-        from aidot._vendor.aiortc import RTCConfiguration, RTCIceServer
+        from aidot_cameras._vendor.aiortc import RTCConfiguration, RTCIceServer
 
         def _sanitize_ice_uris(uris):
             """Remove ?transport= from stun: URIs - invalid per RFC 7064."""
@@ -1888,7 +1888,7 @@ class _WebRTCOpenMixin:
         recorder = None
         if output_path:
             try:
-                from aidot._vendor.aiortc.contrib.media import MediaRecorder
+                from aidot_cameras._vendor.aiortc.contrib.media import MediaRecorder
                 recorder = MediaRecorder(output_path)
 
                 _video_recorded = [False]
@@ -2392,7 +2392,7 @@ class _WebRTCOpenMixin:
             # ICE connects), but does NOT require setRemoteDescription first.
             import types as _types
             try:
-                from aidot._vendor.aiortc.rtcdtlstransport import (
+                from aidot_cameras._vendor.aiortc.rtcdtlstransport import (
                     RTCDtlsFingerprint as _RRFp,
                     certificate_digest as _rr_cert_fp,
                 )
@@ -2918,7 +2918,7 @@ class _WebRTCOpenMixin:
             if _fp_subs or _np_pinned_fp:
                 import types as _np_types
                 try:
-                    from aidot._vendor.aiortc.rtcdtlstransport import (
+                    from aidot_cameras._vendor.aiortc.rtcdtlstransport import (
                         RTCDtlsFingerprint as _NPFp,
                         certificate_digest as _np_cert_fp,
                     )