axis 61__tar.gz → 63__tar.gz

{axis-61 → axis-63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: axis
-Version: 61
+Version: 63
 Summary: A Python library for communicating with devices from Axis Communications
 Author-email: Robert Svensson <Kane610@users.noreply.github.com>
 License: MIT

{axis-61 → axis-63}/axis/__main__.py

@@ -71,8 +71,8 @@ async def main(
 
     try:
         if events:
-            while True:
-                await asyncio.sleep(1)
+            done = asyncio.Event()
+            await done.wait()
 
     except asyncio.CancelledError:
         device.stream.stop()

{axis-61 → axis-63}/axis/interfaces/pwdgrp_cgi.py

@@ -34,11 +34,9 @@ class Users(ApiHandler[User]):
     @property
     def listed_in_parameters(self) -> bool:
         """Is pwdgrp.cgi supported."""
-        if self.vapix.params.property_handler.supported and (
+        return self.vapix.params.property_handler.supported and (
             self.vapix.params.property_handler["0"].api_http_version >= 3
-        ):
-            return True
-        return False
+        )
 
     async def _api_request(self) -> dict[str, User]:
         """Get default data of basic device information."""

{axis-61 → axis-63}/axis/models/api.py

@@ -58,7 +58,7 @@ ApiResponseT = TypeVar("ApiResponseT", bound=ApiResponseSupportDecode)
 
 
 @dataclass
-class ApiRequest(ABC):
+class ApiRequest:
     """Create API request body."""
 
     method: str = field(init=False)

{axis-61 → axis-63}/axis/models/event.py

@@ -122,12 +122,17 @@ def traverse(
 
 
 def extract_name_value(
-    data: dict[str, list[dict[str, str]] | dict[str, str]],
+    data: dict[str, list[dict[str, str]] | dict[str, str]], prefer: str | None = None
 ) -> tuple[str, str]:
     """Extract name and value from a simple item, take first dictionary if it is a list."""
     item = data.get("SimpleItem", {})
     if isinstance(item, list):
-        item = item[0]
+        if prefer is None:
+            item = item[0]
+        else:
+            item = next(
+                (item for item in item if item.get("@Name", "") == prefer), item[0]
+            )
     return item.get("@Name", ""), item.get("@Value", "")
     # return item.get("Name", ""), item.get("Value", "")
 
@@ -206,7 +211,7 @@ class Event:
 
         data_type = data_value = ""
         if match := traverse(raw, DATA):
-            data_type, data_value = extract_name_value(match)
+            data_type, data_value = extract_name_value(match, "active")
 
         return cls._decode_from_dict(
             {

{axis-61 → axis-63}/axis/models/port_management.py

@@ -247,7 +247,7 @@ class SetPortsRequest(ApiRequest):
                 "apiVersion": self.api_version,
                 "context": self.context,
                 "method": "setPorts",
-                "params": ports,
+                "params": {"ports": ports},
             }
         )
 

{axis-61 → axis-63}/axis/models/ptz_cgi.py

@@ -269,8 +269,7 @@ class PtzControlRequest(ApiRequest):
             data["center"] = f"{x},{y}"
         if self.area_zoom:
             x, y, z = self.area_zoom
-            if z < 1:
-                z = 1
+            z = max(z, 1)
             data["areazoom"] = f"{x},{y},{z}"
         if self.center or self.area_zoom:
             if self.image_width:
@@ -308,13 +307,15 @@ class PtzControlRequest(ApiRequest):
             if command_bool is not None:
                 data[key] = "on" if command_bool else "off"
 
-        for key, command_enum in (
-            ("imagerotation", self.image_rotation),
-            ("ircutfilter", self.ir_cut_filter),
-            ("move", self.move),
-        ):
-            if command_enum is not None:
-                data[key] = command_enum
+        data |= {
+            key: command_enum
+            for key, command_enum in (
+                ("imagerotation", self.image_rotation),
+                ("ircutfilter", self.ir_cut_filter),
+                ("move", self.move),
+            )
+            if command_enum is not None
+        }
 
         if self.continuous_pantilt_move:
             pan_speed, tilt_speed = self.continuous_pantilt_move

{axis-61 → axis-63}/axis/rtsp.py

@@ -35,6 +35,7 @@ class State(enum.StrEnum):
 
 
 TIME_OUT_LIMIT = 5
+RTP_HEADER_SIZE = 12
 
 
 class RTSPClient(asyncio.Protocol):
@@ -191,6 +192,7 @@ class RTPClient:
             self.callback = callback
             self.data: deque[bytes] = deque()
             self.transport: asyncio.BaseTransport | None = None
+            self.fragment: bool = False
 
         def connection_made(self, transport: asyncio.BaseTransport) -> None:
             """Execute when port is up and listening.
@@ -207,8 +209,19 @@ class RTPClient:
         def datagram_received(self, data: bytes, addr: Any) -> None:
             """Signals when new data is available."""
             if self.callback:
-                self.data.append(data[12:])
-                self.callback(Signal.DATA)
+                payload = data[RTP_HEADER_SIZE:]
+
+                # if the previous packet was a fragment, then merge it
+                if self.fragment:
+                    previous = self.data.pop()
+                    self.data.append(previous + payload)
+                else:
+                    self.data.append(payload)
+
+                # check whether the RTP marker bit is set, if not it is a fragment
+                self.fragment = (data[1] & 0b1 << 7) == 0
+                if not self.fragment:
+                    self.callback(Signal.DATA)
 
 
 class RTSPSession:

{axis-61 → axis-63}/axis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: axis
-Version: 61
+Version: 63
 Summary: A Python library for communicating with devices from Axis Communications
 Author-email: Robert Svensson <Kane610@users.noreply.github.com>
 License: MIT

{axis-61 → axis-63}/axis.egg-info/requires.txt

@@ -4,21 +4,21 @@ packaging>23
 xmltodict>=0.13.0
 
 [requirements]
-httpx==0.27.0
-orjson==3.10.0
-packaging==24.0
-xmltodict==0.13.0
+httpx==0.27.2
+orjson==3.10.9
+packaging==24.1
+xmltodict==0.14.2
 
 [requirements_dev]
-pre-commit==3.7.0
+pre-commit==4.0.1
 
 [requirements_test]
-mypy==1.9.0
-pytest==8.1.1
+mypy==1.12.1
+pytest==8.3.3
 pytest-aiohttp==1.0.5
-pytest-asyncio==0.23.6
+pytest-asyncio==0.24.0
 pytest-cov==5.0.0
 respx==0.21.1
-ruff==0.3.5
+ruff==0.7.0
 types-orjson==3.6.2
-types-xmltodict==v0.13.0.3
+types-xmltodict==v0.14.0.20241009

{axis-61 → axis-63}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name        = "axis"
-version     = "61"
+version     = "63"
 license     = {text = "MIT"}
 description = "A Python library for communicating with devices from Axis Communications"
 readme      = "README.md"
@@ -28,24 +28,24 @@ dependencies    = [
 
 [project.optional-dependencies]
 requirements = [
-    "httpx==0.27.0",
-    "orjson==3.10.0",
-    "packaging==24.0",
-    "xmltodict==0.13.0",
+    "httpx==0.27.2",
+    "orjson==3.10.9",
+    "packaging==24.1",
+    "xmltodict==0.14.2",
 ]
 requirements_test = [
-    "mypy==1.9.0",
-    "pytest==8.1.1",
+    "mypy==1.12.1",
+    "pytest==8.3.3",
     "pytest-aiohttp==1.0.5",
-    "pytest-asyncio==0.23.6",
+    "pytest-asyncio==0.24.0",
     "pytest-cov==5.0.0",
     "respx==0.21.1",
-    "ruff==0.3.5",
+    "ruff==0.7.0",
     "types-orjson==3.6.2",
-    "types-xmltodict==v0.13.0.3",
+    "types-xmltodict==v0.14.0.20241009",
 ]
 requirements_dev = [
-    "pre-commit==3.7.0"
+    "pre-commit==4.0.1"
 ]
 
 [project.urls]

{axis-61 → axis-63}/tests/test_event.py

@@ -18,6 +18,7 @@ from .event_fixtures import (
     LIGHT_STATUS_INIT,
     LOITERING_GUARD_INIT,
     MOTION_GUARD_INIT,
+    OBJECT_ANALYTICS_ANY_CHANGE,
     OBJECT_ANALYTICS_INIT,
     PIR_CHANGE,
     PIR_INIT,
@@ -133,6 +134,18 @@ from .event_fixtures import (
                 "tripped": False,
             },
         ),
+        (
+            OBJECT_ANALYTICS_ANY_CHANGE,
+            {
+                "topic": "tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1",
+                "source": "",
+                "source_idx": "Device1Scenario1",
+                "group": EventGroup.MOTION,
+                "type": "Object Analytics",
+                "state": "1",
+                "tripped": True,
+            },
+        ),
         (
             PIR_INIT,
             {
@@ -329,6 +342,17 @@ def test_create_event(input: bytes, expected: tuple) -> None:
                 "value": "1",
             },
         ),
+        (
+            OBJECT_ANALYTICS_ANY_CHANGE,
+            {
+                "operation": "Changed",
+                "topic": "tnsaxis:CameraApplicationPlatform/ObjectAnalytics/Device1Scenario1",
+                "source": "",
+                "source_idx": "",
+                "type": "active",
+                "value": "1",
+            },
+        ),
     ],
 )
 def test_parse_event_xml(input: bytes, expected: dict):

{axis-61 → axis-63}/tests/test_port_management.py

@@ -55,7 +55,7 @@ async def test_get_ports(respx_mock, io_port_management):
         "method": "setPorts",
         "apiVersion": "1.0",
         "context": "Axis library",
-        "params": [{"port": "0", "state": "open"}],
+        "params": {"ports": [{"port": "0", "state": "open"}]},
     }
 
     await io_port_management.close("0")
@@ -67,7 +67,7 @@ async def test_get_ports(respx_mock, io_port_management):
         "method": "setPorts",
         "apiVersion": "1.0",
         "context": "Axis library",
-        "params": [{"port": "0", "state": "closed"}],
+        "params": {"ports": [{"port": "0", "state": "closed"}]},
     }
 
 
@@ -105,16 +105,18 @@ async def test_set_ports(respx_mock, io_port_management):
         "method": "setPorts",
         "apiVersion": "1.0",
         "context": "Axis library",
-        "params": [
-            {
-                "port": "0",
-                "usage": "",
-                "direction": "",
-                "name": "",
-                "normalState": "",
-                "state": "closed",
-            }
-        ],
+        "params": {
+            "ports": [
+                {
+                    "port": "0",
+                    "usage": "",
+                    "direction": "",
+                    "name": "",
+                    "normalState": "",
+                    "state": "closed",
+                }
+            ]
+        },
     }
 
 

{axis-61 → axis-63}/tests/test_rtsp.py

@@ -9,9 +9,14 @@ from unittest.mock import Mock, patch
 
 import pytest
 
-from axis.rtsp import RTSPClient, Signal, State
+from axis.rtsp import RTP_HEADER_SIZE, RTSPClient, Signal, State
 
 from .conftest import HOST, RTSP_PORT
+from .packet_fixtures import (
+    RTP_PACKET1_FULL,
+    RTP_PACKET2_FRAGMENT1,
+    RTP_PACKET2_FRAGMENT2,
+)
 
 LOGGER = logging.getLogger(__name__)
 
@@ -514,14 +519,33 @@ def test_rtp_client(rtsp_client, caplog):
     assert "Stream recepient offline" in caplog.text
 
     with patch.object(rtp_client.client, "callback") as mock_callback:
-        rtp_client.client.datagram_received("0123456789ABCDEF", "addr")
+        rtp_client.client.datagram_received(
+            bytes.fromhex("008000000000000000000000AABBCCDD"), "addr"
+        )
         mock_callback.assert_called_with(Signal.DATA)
-        assert rtp_client.data == "CDEF"
+        assert rtp_client.data == bytes.fromhex("AABBCCDD")
 
     rtsp_client.stop()
     mock_transport.close.assert_called()
 
 
+@pytest.mark.parametrize(
+    ("packets"),
+    [([RTP_PACKET1_FULL]), ([RTP_PACKET2_FRAGMENT1, RTP_PACKET2_FRAGMENT2])],
+)
+def test_rtp_fragment(rtsp_client, packets: list[bytes]):
+    """Verify RTP fragment handling."""
+    rtp_client = rtsp_client.rtp
+
+    with patch.object(rtp_client.client, "callback") as mock_callback:
+        payload = b""
+        for packet in packets:
+            rtp_client.client.datagram_received(packet, "addr")
+            payload += packet[RTP_HEADER_SIZE:]
+        mock_callback.assert_called_with(Signal.DATA)
+        assert rtp_client.data == payload
+
+
 def test_methods(rtsp_client):
     """Verify method attributes."""
     method = rtsp_client.method