python-aidot-cameras 1.0.0rc14__tar.gz → 1.0.0rc15__tar.gz

{python_aidot_cameras-1.0.0rc14/python_aidot_cameras.egg-info → python_aidot_cameras-1.0.0rc15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 1.0.0rc14
+Version: 1.0.0rc15
 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-1.0.0rc14 → python_aidot_cameras-1.0.0rc15}/aidot_cameras/camera/client.py

@@ -6561,11 +6561,20 @@ class CameraMixin(_CameraControlsMixin, _CameraSdMixin, _WebRTCOpenMixin, _SdesO
         # A001064 on the first attempt. Reverting THIS LINE ALONE, with every
         # other change of that release left in place, restored 3 of 3.
         #
-        # The A000088 is a different SoC (Realtek Ameba, FreeRTOS/KM4) whose
-        # image has never been disassembled. A finding from the A001064's
-        # firmware does not transfer to it, and this camera does not merely
-        # ignore the byte - announcing APP_ANDROID makes it accept the session
-        # and send nothing, which is worse than the random value it replaced.
+        # The A000088 is a different SoC (Realtek RTL8735B / AmebaPro2). Its
+        # image WAS disassembled on 2026-09-07, and it has **no client class at
+        # all**: `lds_process_peerid` in rtc_mqtt.c parses
+        # `%[^_]_%[^_]_%02hhd_%02hhd_%02hhd`, keeps field 2 as an opaque string
+        # at buf+0x32, and never derives a class from its first character. It
+        # also treats a parse failure as NON-fatal - it substitutes the literal
+        # "userid" for field 2 and continues. Only field 1 is compared, against
+        # "google". So `client_type = field2[0]-'0'` and "a malformed peer id is
+        # rejected outright" are BOTH A001064-only; do not generalise either.
+        #
+        # Which leaves the class-0 result real but unexplained: 0 of 9 is not
+        # luck against a 29-of-30 baseline, yet the firmware has nothing there
+        # to read. Do not repeat "class 0 breaks it because it announces
+        # APP_ANDROID" - that story is not supported by the image.
         #
         # Class '2' (WEB) - what the vendor web app sends - was screened on
         # 2026-09-07 and does NOT break it: 6 of 6 A000088 cameras PASS across

{python_aidot_cameras-1.0.0rc14 → python_aidot_cameras-1.0.0rc15}/aidot_cameras/camera/controls.py

@@ -190,6 +190,49 @@ class _CameraControlsMixin:
         return await self.async_trigger_device_action(
             "setRoiHuman", {"roi": [payload]})
 
+    #: The siren's automatic trigger.  ``autoAlarm`` is the master; the other
+    #: two say what sets it off.  Probed 2026-09-07: NOT a mirror of anything
+    #: else we expose -- on an A000088 ``motionDetection`` read 0 while the
+    #: camera's own motion-detection setting read True, and on an A001064
+    #: ``humanDetect`` read 0 while ``getRoiHuman``'s read 1.
+    AUTO_ALARM_KEYS = ("autoAlarm", "motionDetection", "humanDetect")
+
+    async def async_get_auto_alarm(self) -> "Optional[dict]":
+        """Siren auto-trigger settings as ``{key: bool}``.
+
+        ``None`` means the camera did not answer -- unknown, NOT all-off.
+        Reporting an unanswered camera as three disarmed switches would claim a
+        state it never gave, and this is the setting that decides whether a
+        siren goes off in someone's house.
+        """
+        out = await self.async_query_device_action("getAutoAlarm")
+        if not isinstance(out, list) or not out or not isinstance(out[0], dict):
+            return None
+        return {k: bool(v) for k, v in out[0].items()}
+
+    async def async_set_auto_alarm(self, key: str, enabled: bool) -> bool:
+        """Arm or disarm the siren's automatic trigger, or one of its causes.
+
+        Read-modify-write against the camera's own object.  That matters more
+        here than anywhere else: rebuilding the payload from our own key list
+        could arm ``autoAlarm`` as a side effect of changing a trigger, which
+        would make a camera start sounding a siren nobody asked it to.
+        """
+        out = await self.async_query_device_action("getAutoAlarm")
+        if not isinstance(out, list) or not out or not isinstance(out[0], dict):
+            _LOGGER.warning(
+                "auto alarm: %s did not report its settings; not writing",
+                self.device_id)
+            return False
+        current = out[0]
+        if key not in current:
+            _LOGGER.warning("auto alarm: %s does not report %r",
+                            self.device_id, key)
+            return False
+        payload = dict(current)
+        payload[key] = 1 if enabled else 0
+        return await self.async_trigger_device_action("setAutoAlarm", [payload])
+
     async def async_get_wifi_info(self) -> "Optional[dict]":
         """``{"ssid": str, "rssi": int}`` for the camera's own WiFi link.
 

{python_aidot_cameras-1.0.0rc14 → python_aidot_cameras-1.0.0rc15}/pyproject.toml

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

{python_aidot_cameras-1.0.0rc14 → python_aidot_cameras-1.0.0rc15/python_aidot_cameras.egg-info}/PKG-INFO

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

@@ -83,6 +83,7 @@ tests/test_answer_pt_kinds.py
 tests/test_answer_sdp_video_pt.py
 tests/test_answer_section_selection.py
 tests/test_audio_mux_offline.py
+tests/test_auto_alarm.py
 tests/test_avio_ctrl_uses_the_session_dseq.py
 tests/test_avio_request.py
 tests/test_avio_response_parse.py

python_aidot_cameras-1.0.0rc15/tests/test_auto_alarm.py

@@ -0,0 +1,70 @@
+"""The siren's automatic trigger: on/off, and what sets it off.
+
+`getAutoAlarm` returns `[{autoAlarm, motionDetection, humanDetect}]` -- a master
+switch plus which events fire it. Probed on real hardware 2026-09-07, and it is
+NOT a mirror of anything already exposed: on an A000088 its `motionDetection`
+read 0 while the camera's own motion-detection setting read True, and on an
+A001064 its `humanDetect` read 0 while `getRoiHuman`'s read 1. Two independent
+settings that happen to share field names.
+
+Same discipline as the detection types: read-modify-write against the camera's
+own object so a flag we do not model cannot be reset, and a camera that does not
+answer is unknown rather than all-off.
+"""
+
+import asyncio
+
+from aidot_cameras.camera.controls import _CameraControlsMixin
+
+
+class _Cam(_CameraControlsMixin):
+    device_id = "cam1"
+
+    def __init__(self, out):
+        self._out = out
+        self.triggered: list = []
+
+    async def async_query_device_action(self, action, params=None, **kw):
+        return self._out
+
+    async def async_trigger_device_action(self, action, params=None, **kw):
+        self.triggered.append((action, params))
+        return True
+
+
+_LIVE = [{"autoAlarm": 0, "motionDetection": 0, "humanDetect": 1}]
+
+
+def test_reads_the_master_and_both_triggers():
+    got = asyncio.run(_Cam(_LIVE).async_get_auto_alarm())
+    assert got == {"autoAlarm": False, "motionDetection": False,
+                   "humanDetect": True}
+
+
+def test_a_camera_that_does_not_answer_is_unknown_not_all_off():
+    assert asyncio.run(_Cam(None).async_get_auto_alarm()) is None
+
+
+def test_setting_one_flag_preserves_the_others():
+    """Turning a trigger on must not silently disarm the master, or arm it."""
+    cam = _Cam(_LIVE)
+    assert asyncio.run(cam.async_set_auto_alarm("motionDetection", True)) is True
+    action, payload = cam.triggered[0]
+    assert action == "setAutoAlarm"
+    row = payload[0]
+    assert row["motionDetection"] == 1     # the one we changed
+    assert row["autoAlarm"] == 0           # master untouched - still disarmed
+    assert row["humanDetect"] == 1         # other trigger untouched
+    assert set(row) == set(_LIVE[0])
+
+
+def test_a_key_the_camera_does_not_report_is_refused():
+    cam = _Cam(_LIVE)
+    assert asyncio.run(cam.async_set_auto_alarm("sirenDetect", True)) is False
+    assert cam.triggered == []
+
+
+def test_no_write_when_the_camera_will_not_say_what_it_has():
+    cam = _Cam(None)
+    assert asyncio.run(cam.async_set_auto_alarm("autoAlarm", True)) is False
+    assert cam.triggered == []