axis 70__tar.gz → 71__tar.gz

{axis-70 → axis-71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axis
-Version: 70
+Version: 71
 Summary: A Python library for communicating with devices from Axis Communications
 Author-email: Robert Svensson <Kane610@users.noreply.github.com>
 License: MIT
@@ -34,7 +34,7 @@ Requires-Dist: pytest-aiohttp==1.1.0; extra == "requirements-test"
 Requires-Dist: pytest-asyncio==1.3.0; extra == "requirements-test"
 Requires-Dist: pytest-cov==7.1.0; extra == "requirements-test"
 Requires-Dist: ruff==0.15.12; extra == "requirements-test"
-Requires-Dist: types-xmltodict==v1.0.1.20260408; extra == "requirements-test"
+Requires-Dist: types-xmltodict==v1.0.1.20260508; extra == "requirements-test"
 Provides-Extra: requirements-dev
 Requires-Dist: pre-commit==4.6.0; extra == "requirements-dev"
 Dynamic: license-file

{axis-70 → axis-71}/axis/interfaces/mqtt.py

@@ -42,6 +42,8 @@ def mqtt_json_to_event(msg: bytes | bytearray | memoryview | str) -> dict[str, A
             source, source_idx = next(iter(source_dict.items()))
         if data_dict := msg_message.get("data"):
             data_type, data_value = next(iter(data_dict.items()))
+            if "active" in data_dict:
+                data_type, data_value = "active", data_dict["active"]
 
     return {
         "topic": topic,

{axis-70 → axis-71}/axis/models/event.py

@@ -91,6 +91,9 @@ TOPIC_TO_STATE = {
     EventTopic.RELAY: "active",
 }
 
+KNOWN_FALSE_STATES = {"", "0", "false", "inactive", "low", "off"}
+KNOWN_TRUE_STATES = {"1", "active", "high", "on", "true"}
+
 EVENT_OPERATION = "operation"
 EVENT_SOURCE = "source"
 EVENT_SOURCE_IDX = "source_idx"
@@ -138,6 +141,28 @@ def extract_name_value(
     return item.get("Name", ""), item.get("Value", "")
 
 
+def is_tripped(value: object, topic_base: EventTopic, event_type: object) -> bool:
+    """Return whether an event value should be considered active/tripped."""
+    if (expected_state := TOPIC_TO_STATE.get(topic_base)) is not None:
+        return str(value) == expected_state
+
+    value_text = str(value).strip()
+    state = value_text.casefold()
+
+    if state in KNOWN_FALSE_STATES:
+        return False
+
+    if state in KNOWN_TRUE_STATES:
+        return True
+
+    if str(event_type).casefold() == "active":
+        return False
+
+    # Non-empty semantic values (for example classification values like "human")
+    # are treated as stateless event triggers.
+    return bool(value_text)
+
+
 @dataclass
 class Event:
     """Event data from Axis device."""
@@ -166,6 +191,7 @@ class Event:
         topic = data.get(EVENT_TOPIC, "")
         source = data.get(EVENT_SOURCE, "")
         source_idx = data.get(EVENT_SOURCE_IDX, "")
+        event_type = data.get(EVENT_TYPE, "")
         value = data.get(EVENT_VALUE, "")
 
         if (topic_base := EventTopic(topic)) is EventTopic.UNKNOWN:
@@ -181,7 +207,7 @@ class Event:
             data=data,
             group=TOPIC_TO_GROUP.get(topic_base, EventGroup.NONE),
             id=source_idx,
-            is_tripped=value == TOPIC_TO_STATE.get(topic_base, "1"),
+            is_tripped=is_tripped(value, topic_base, event_type),
             operation=operation,
             source=source,
             state=value,

{axis-70 → axis-71}/axis/websocket.py

@@ -113,6 +113,8 @@ def _parse_ws_notification(notification: dict[str, Any]) -> dict[str, Any]:
 
     source, source_idx = next(iter(source_dict.items()), ("", ""))
     data_type, data_value = next(iter(data_dict.items()), ("", ""))
+    if "active" in data_dict:
+        data_type, data_value = "active", data_dict["active"]
 
     return {
         EVENT_TOPIC: topic,

{axis-70 → axis-71}/axis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axis
-Version: 70
+Version: 71
 Summary: A Python library for communicating with devices from Axis Communications
 Author-email: Robert Svensson <Kane610@users.noreply.github.com>
 License: MIT
@@ -34,7 +34,7 @@ Requires-Dist: pytest-aiohttp==1.1.0; extra == "requirements-test"
 Requires-Dist: pytest-asyncio==1.3.0; extra == "requirements-test"
 Requires-Dist: pytest-cov==7.1.0; extra == "requirements-test"
 Requires-Dist: ruff==0.15.12; extra == "requirements-test"
-Requires-Dist: types-xmltodict==v1.0.1.20260408; extra == "requirements-test"
+Requires-Dist: types-xmltodict==v1.0.1.20260508; extra == "requirements-test"
 Provides-Extra: requirements-dev
 Requires-Dist: pre-commit==4.6.0; extra == "requirements-dev"
 Dynamic: license-file

{axis-70 → axis-71}/axis.egg-info/requires.txt

@@ -20,4 +20,4 @@ pytest-aiohttp==1.1.0
 pytest-asyncio==1.3.0
 pytest-cov==7.1.0
 ruff==0.15.12
-types-xmltodict==v1.0.1.20260408
+types-xmltodict==v1.0.1.20260508

{axis-70 → axis-71}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name        = "axis"
-version     = "70"
+version     = "71"
 license     = {text = "MIT"}
 description = "A Python library for communicating with devices from Axis Communications"
 readme      = "README.md"
@@ -41,7 +41,7 @@ requirements-test = [
     "pytest-asyncio==1.3.0",
     "pytest-cov==7.1.0",
     "ruff==0.15.12",
-    "types-xmltodict==v1.0.1.20260408",
+    "types-xmltodict==v1.0.1.20260508",
 ]
 requirements-dev = [
     "pre-commit==4.6.0"

{axis-70 → axis-71}/tests/test_event.py

@@ -365,3 +365,77 @@ def test_parse_event_xml(input: bytes, expected: dict):
 def test_unknown_event_operation():
     """Verify unknown event operation is caught."""
     assert EventOperation("") == EventOperation.UNKNOWN
+
+
+@pytest.mark.parametrize(
+    ("event_data", "expected"),
+    [
+        (
+            {
+                "topic": "tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1",
+                "source": "",
+                "source_idx": "Device1Scenario1",
+                "type": "active",
+                "value": "0",
+            },
+            False,
+        ),
+        (
+            {
+                "topic": "tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1",
+                "source": "",
+                "source_idx": "Device1Scenario1",
+                "type": "classType",
+                "value": "human",
+            },
+            True,
+        ),
+        (
+            {
+                "topic": "tns1:Device/tnsaxis:Sensor/PIR",
+                "source": "sensor",
+                "source_idx": "0",
+                "type": "state",
+                "value": "0",
+            },
+            False,
+        ),
+        (
+            {
+                "topic": "tns1:AudioSource/tnsaxis:TriggerLevel",
+                "source": "channel",
+                "source_idx": "1",
+                "type": "active",
+                "value": "high",
+            },
+            True,
+        ),
+        (
+            {
+                "topic": "tns1:AudioSource/tnsaxis:TriggerLevel",
+                "source": "channel",
+                "source_idx": "1",
+                "type": "active",
+                "value": "unknown",
+            },
+            False,
+        ),
+        (
+            {
+                "topic": "tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1",
+                "source": "",
+                "source_idx": "Device1Scenario1",
+                "type": "classType",
+                "value": "   ",
+            },
+            False,
+        ),
+    ],
+)
+def test_decode_from_dict_type_aware_is_tripped(
+    event_data: dict[str, str], expected: bool
+) -> None:
+    """Verify state handling for binary and semantic event payloads."""
+    event = Event.decode(event_data)
+
+    assert event.is_tripped is expected

{axis-70 → axis-71}/tests/test_event_stream.py

@@ -377,6 +377,32 @@ def test_mqtt_event(event_manager: EventManager, subscriber: Mock) -> None:
     assert event.is_tripped
 
 
+def test_mqtt_object_analytics_mixed_data_prefers_active(
+    event_manager: EventManager, subscriber: Mock
+) -> None:
+    """Verify object analytics event with semantic and active data uses active state."""
+    mqtt_event = {
+        "topic": "tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1",
+        "source": "device",
+        "source_idx": "1",
+        "type": "active",
+        "value": "0",
+    }
+
+    event_manager.handler(mqtt_event)
+    assert subscriber.call_count == 1
+
+    event: Event = subscriber.call_args[0][0]
+    assert (
+        event.topic
+        == "tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1"
+    )
+    assert event.source == "device"
+    assert event.id == "1"
+    assert event.state == "0"
+    assert event.is_tripped is False
+
+
 def test_unsupported_event(event_manager: EventManager, subscriber: Mock) -> None:
     """Verify that unsupported events aren't signalled to subscribers."""
     event_manager.handler(GLOBAL_SCENE_CHANGE)

{axis-70 → axis-71}/tests/test_mqtt.py

@@ -320,6 +320,21 @@ async def test_convert_json_to_event():
     }
 
 
+async def test_convert_json_to_event_prefers_active_value() -> None:
+    """Verify conversion prefers binary active state when available."""
+    event = mqtt_json_to_event(
+        b'{"topic": "onvif:CameraApplicationPlatform/axis:ObjectAnalytics/Device1Scenario1", "message": {"source": {"device": "1"}, "data": {"classTypes": "human", "active": "0"}}}'
+    )
+
+    assert event == {
+        "topic": "tns1:CameraApplicationPlatform/tnsaxis:ObjectAnalytics/Device1Scenario1",
+        "source": "device",
+        "source_idx": "1",
+        "type": "active",
+        "value": "0",
+    }
+
+
 def test_mqtt_json_to_event_missing_keys(caplog):
     """Test mqtt_json_to_event returns None and logs warning if keys are missing."""
     # Missing 'topic'

{axis-70 → axis-71}/tests/test_websocket.py

@@ -185,6 +185,55 @@ async def test_websocket_stream_receives_data(axis_device):
     )
 
 
+async def test_websocket_stream_prefers_active_value(axis_device):
+    """Verify websocket parsing prefers active when multiple data keys are present."""
+    callback = MagicMock()
+    notify_payload = orjson.dumps(
+        {
+            "apiVersion": "1.0",
+            "method": "events:notify",
+            "params": {
+                "notification": {
+                    "timestamp": "2024-01-01T00:00:00Z",
+                    "topic": "tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1",
+                    "message": {
+                        "source": {"device": "1"},
+                        "key": {},
+                        "data": {"classTypes": "human", "active": "0"},
+                    },
+                }
+            },
+        }
+    )
+    ws = MockWebSocket(
+        _configure_ok_msg(),
+        [
+            SimpleNamespace(type=aiohttp.WSMsgType.TEXT, data=notify_payload.decode()),
+            SimpleNamespace(type=aiohttp.WSMsgType.CLOSED, data=None),
+        ],
+    )
+
+    axis_device.vapix.request = AsyncMock(return_value=b"token123")
+    ws_connect = AsyncMock(return_value=ws)
+
+    with patch.object(axis_device.config.session, "ws_connect", ws_connect):
+        client = WebSocketClient(
+            axis_device,
+            "ws://127.0.0.1:80/vapix/ws-data-stream?sources=events",
+            callback,
+        )
+        await client.start()
+        await client._receiver_task
+
+    assert client.data == {
+        "topic": "tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1",
+        "source": "device",
+        "source_idx": "1",
+        "type": "active",
+        "value": "0",
+    }
+
+
 async def test_websocket_configure_failure(axis_device):
     """Verify websocket client reports failed configure."""
     callback = MagicMock()