axis 56__tar.gz → 57__tar.gz

{axis-56 → axis-57}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: axis
-Version: 56
+Version: 57
 Summary: A Python library for communicating with devices from Axis Communications
 Home-page: https://github.com/Kane610/axis
-Download-URL: https://github.com/Kane610/axis/archive/v56.tar.gz
+Download-URL: https://github.com/Kane610/axis/archive/v57.tar.gz
 Author: Robert Svensson
 Author-email: Robert Svensson <Kane610@users.noreply.github.com>
 License: MIT
@@ -33,10 +33,10 @@ Provides-Extra: requirements-test
 Requires-Dist: mypy==1.9.0; extra == "requirements-test"
 Requires-Dist: pytest==8.1.1; extra == "requirements-test"
 Requires-Dist: pytest-aiohttp==1.0.5; extra == "requirements-test"
-Requires-Dist: pytest-asyncio==0.23.5.post1; extra == "requirements-test"
+Requires-Dist: pytest-asyncio==0.23.6; extra == "requirements-test"
 Requires-Dist: pytest-cov==4.1.0; extra == "requirements-test"
-Requires-Dist: respx==0.20.2; extra == "requirements-test"
-Requires-Dist: ruff==0.3.2; extra == "requirements-test"
+Requires-Dist: respx==0.21.0; extra == "requirements-test"
+Requires-Dist: ruff==0.3.3; extra == "requirements-test"
 Requires-Dist: types-orjson==3.6.2; extra == "requirements-test"
 Requires-Dist: types-xmltodict==v0.13.0.3; extra == "requirements-test"
 Provides-Extra: requirements-dev

{axis-56 → axis-57}/axis/__init__.py

@@ -1,4 +1,4 @@
 """Library to communicate with a Axis device."""
 
 from .device import AxisDevice  # noqa: F401
-from .errors import *  # noqa: F401, F403
+from .errors import *  # noqa: F403

{axis-56 → axis-57}/axis/__main__.py

@@ -76,7 +76,6 @@ async def main(
 
     except asyncio.CancelledError:
         device.stream.stop()
-        pass
 
     finally:
         await device.config.session.aclose()

{axis-56 → axis-57}/axis/errors.py

@@ -20,6 +20,10 @@ class Unauthorized(AxisException):
     """Username is not authorized."""
 
 
+class Forbidden(AxisException):
+    """Endpoint is not accessible due to low permissions."""
+
+
 class LoginRequired(AxisException):
     """User is logged out."""
 
@@ -32,11 +36,7 @@ class PathNotFound(AxisException):
     """Path not found."""
 
 
-class NoPermission(AxisException):
-    """Users permissions are not high enough."""
-
-
-ERRORS = {401: Unauthorized, 404: PathNotFound, 405: MethodNotAllowed}
+ERRORS = {401: Unauthorized, 403: Forbidden, 404: PathNotFound, 405: MethodNotAllowed}
 
 
 def raise_error(error: int) -> None:

{axis-56 → axis-57}/axis/models/event.py

@@ -100,12 +100,12 @@ EVENT_TYPE = "type"
 EVENT_VALUE = "value"
 
 NOTIFICATION_MESSAGE = ("MetadataStream", "Event", "NotificationMessage")
-MESSAGE = NOTIFICATION_MESSAGE + ("Message", "Message")
-TOPIC = NOTIFICATION_MESSAGE + ("Topic", "#text")
-TIMESTAMP = MESSAGE + ("@UtcTime",)
-OPERATION = MESSAGE + ("@PropertyOperation",)
-SOURCE = MESSAGE + ("Source",)
-DATA = MESSAGE + ("Data",)
+MESSAGE = (*NOTIFICATION_MESSAGE, "Message", "Message")
+TOPIC = (*NOTIFICATION_MESSAGE, "Topic", "#text")
+TIMESTAMP = (*MESSAGE, "@UtcTime")
+OPERATION = (*MESSAGE, "@PropertyOperation")
+SOURCE = (*MESSAGE, "Source")
+DATA = (*MESSAGE, "Data")
 
 XML_NAMESPACES = {
     "http://www.onvif.org/ver10/schema": None,

{axis-56 → axis-57}/axis/vapix/interfaces/api_handler.py

@@ -11,7 +11,7 @@ from collections.abc import (
 )
 from typing import TYPE_CHECKING, Generic, final
 
-from ...errors import PathNotFound, Unauthorized
+from ...errors import Forbidden, PathNotFound, Unauthorized
 
 if TYPE_CHECKING:
     from ..models.api_discovery import ApiId
@@ -126,6 +126,8 @@ class ApiHandler(SubscriptionHandler, Generic[ApiItemT]):
             obj_ids = await self._update()
         except Unauthorized:  # Probably a viewer account
             return False
+        except Forbidden:  # Invalid permissions
+            return False
         except PathNotFound:  # Device doesn't support the endpoint
             return False
         for obj_id in obj_ids:

{axis-56 → axis-57}/axis/vapix/interfaces/applications/__init__.py

@@ -1,3 +1,3 @@
 """Control stand alone applications of an Axis device."""
 
-from .applications import *  # noqa: F401, F403
+from .applications import *  # noqa: F403

{axis-56 → axis-57}/axis/vapix/models/parameters/image.py

@@ -159,7 +159,7 @@ class ImageParam(ParamItem):
         """Create objects from dict."""
         image_data = [  # Rename channels I0-I19 to 0-19
             (str(id), data[0][channel_id])
-            for id in range(0, 20)
+            for id in range(20)
             if (channel_id := f"I{id}") in data[0]
         ]
         return {v.id: v for v in cls.decode_to_list(image_data)}

{axis-56 → axis-57}/axis/vapix/models/parameters/ptz.py

@@ -235,13 +235,13 @@ class PtzSupport:
     auto_ir_cut_filter: bool
     auto_iris: bool
     auxiliary: bool
-    backLight: bool
+    back_light: bool
     continuous_brightness: bool
     continuous_focus: bool
     continuous_iris: bool
     continuous_pan: bool
     continuous_tilt: bool
-    continuousZoom: bool
+    continuous_zoom: bool
     device_preset: bool
     digital_zoom: bool
     generic_http: bool
@@ -275,13 +275,13 @@ class PtzSupport:
             auto_ir_cut_filter=data["AutoIrCutFilter"],
             auto_iris=data["AutoIris"],
             auxiliary=data["Auxiliary"],
-            backLight=data["BackLight"],
+            back_light=data["BackLight"],
             continuous_brightness=data["ContinuousBrightness"],
             continuous_focus=data["ContinuousFocus"],
             continuous_iris=data["ContinuousIris"],
             continuous_pan=data["ContinuousPan"],
             continuous_tilt=data["ContinuousTilt"],
-            continuousZoom=data["ContinuousZoom"],
+            continuous_zoom=data["ContinuousZoom"],
             device_preset=data["DevicePreset"],
             digital_zoom=data["DigitalZoom"],
             generic_http=data["GenericHTTP"],

{axis-56 → axis-57}/axis/vapix/models/pwdgrp_cgi.py

@@ -52,18 +52,12 @@ class User(ApiItem):
     @property
     def privileges(self) -> SecondaryGroup:
         """Return highest privileged role supported."""
-        if self.admin and self.ptz:
-            return SecondaryGroup.ADMIN_PTZ
         if self.admin:
-            return SecondaryGroup.ADMIN
-        if self.operator and self.ptz:
-            return SecondaryGroup.OPERATOR_PTZ
+            return SecondaryGroup.ADMIN_PTZ if self.ptz else SecondaryGroup.ADMIN
         if self.operator:
-            return SecondaryGroup.OPERATOR
-        if self.viewer and self.ptz:
-            return SecondaryGroup.VIEWER_PTZ
+            return SecondaryGroup.OPERATOR_PTZ if self.ptz else SecondaryGroup.OPERATOR
         if self.viewer:
-            return SecondaryGroup.VIEWER
+            return SecondaryGroup.VIEWER_PTZ if self.ptz else SecondaryGroup.VIEWER
         return SecondaryGroup.UNKNOWN
 
     @classmethod

{axis-56 → axis-57}/axis/vapix/vapix.py

@@ -205,9 +205,8 @@ class Vapix:
 
     async def initialize_applications(self) -> None:
         """Load data for applications on device."""
-        if not self.applications.supported:
+        if not self.applications.supported or not await self.applications.update():
             return
-        await self.applications.update()
 
         apps: tuple[ApiHandler[Any], ...] = (
             self.fence_guard,

{axis-56 → axis-57}/axis.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: axis
-Version: 56
+Version: 57
 Summary: A Python library for communicating with devices from Axis Communications
 Home-page: https://github.com/Kane610/axis
-Download-URL: https://github.com/Kane610/axis/archive/v56.tar.gz
+Download-URL: https://github.com/Kane610/axis/archive/v57.tar.gz
 Author: Robert Svensson
 Author-email: Robert Svensson <Kane610@users.noreply.github.com>
 License: MIT
@@ -33,10 +33,10 @@ Provides-Extra: requirements-test
 Requires-Dist: mypy==1.9.0; extra == "requirements-test"
 Requires-Dist: pytest==8.1.1; extra == "requirements-test"
 Requires-Dist: pytest-aiohttp==1.0.5; extra == "requirements-test"
-Requires-Dist: pytest-asyncio==0.23.5.post1; extra == "requirements-test"
+Requires-Dist: pytest-asyncio==0.23.6; extra == "requirements-test"
 Requires-Dist: pytest-cov==4.1.0; extra == "requirements-test"
-Requires-Dist: respx==0.20.2; extra == "requirements-test"
-Requires-Dist: ruff==0.3.2; extra == "requirements-test"
+Requires-Dist: respx==0.21.0; extra == "requirements-test"
+Requires-Dist: ruff==0.3.3; extra == "requirements-test"
 Requires-Dist: types-orjson==3.6.2; extra == "requirements-test"
 Requires-Dist: types-xmltodict==v0.13.0.3; extra == "requirements-test"
 Provides-Extra: requirements-dev

{axis-56 → axis-57}/axis.egg-info/requires.txt

@@ -16,9 +16,9 @@ pre-commit==3.6.2
 mypy==1.9.0
 pytest==8.1.1
 pytest-aiohttp==1.0.5
-pytest-asyncio==0.23.5.post1
+pytest-asyncio==0.23.6
 pytest-cov==4.1.0
-respx==0.20.2
-ruff==0.3.2
+respx==0.21.0
+ruff==0.3.3
 types-orjson==3.6.2
 types-xmltodict==v0.13.0.3

{axis-56 → axis-57}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name        = "axis"
-version     = "56"
+version     = "57"
 license     = {text = "MIT"}
 description = "A Python library for communicating with devices from Axis Communications"
 readme      = "README.md"
@@ -37,10 +37,10 @@ requirements_test = [
     "mypy==1.9.0",
     "pytest==8.1.1",
     "pytest-aiohttp==1.0.5",
-    "pytest-asyncio==0.23.5.post1",
+    "pytest-asyncio==0.23.6",
     "pytest-cov==4.1.0",
-    "respx==0.20.2",
-    "ruff==0.3.2",
+    "respx==0.21.0",
+    "ruff==0.3.3",
     "types-orjson==3.6.2",
     "types-xmltodict==v0.13.0.3",
 ]
@@ -97,54 +97,52 @@ testpaths = ["tests"]
 target-version = "py311"
 lint.select = [
     "B002", # Python does not support the unary prefix increment
+    "B005", # Using .strip() with multi-character strings is misleading
     "B007", # Loop control variable {name} not used within loop body
     "B014", # Exception handler with duplicate exception
+    "B015", # Pointless comparison. Did you mean to assign a value? Otherwise, prepend assert or remove it.
+    "B018", # Found useless attribute access. Either assign it to a variable or remove it.
     "B023", # Function definition does not bind loop variable {name}
     "B026", # Star-arg unpacking after a keyword argument is strongly discouraged
-    "C",      # complexity
+    "B032", # Possible unintentional type annotation (using :). Did you mean to assign (using =)?
+    "C",    # complexity
     "COM818", # Trailing comma on bare tuple prohibited
-    "D",  # docstrings
-    "E",  # pycodestyle
-    "F",  # pyflakes/autoflake
-    "G",  # flake8-logging-format
-    "I",  # isort
+    "D", # docstrings
+    "E", # pycodestyle
+    "F", # pyflakes/autoflake
+    "G", # flake8-logging-format
+    "I", # isort
     "ICN001", # import concentions; {name} should be imported as {asname}
-    # "ISC001", # Implicitly concatenated string literals on one line
-    "N804",   # First argument of a class method should be named cls
-    "N805",   # First argument of a method should be named self
-    # "N815",  # Variable {name} in class scope should not be mixedCase
-    "PERF",    # A Linter for performance anti-patterns
-    "PGH004",  # Use specific rule codes when using noqa
-    "PLC0414", # Useless import alias. Import alias does not rename original package.
-    "PLC", # pylint
-    "PLE", # pylint
-    "PLR", # pylint
-    "PLW", # pylint
+    "ISC", # flake8-implicit-str-concat
+    "LOG", # flake8-logging
+    "N804", # First argument of a class method should be named cls
+    "N805", # First argument of a method should be named self
+    "N815", # Variable {name} in class scope should not be mixedCase
+    "PERF", # A Linter for performance anti-patterns
+    "PGH004", # Use specific rule codes when using noqa
+    "PIE",  # flake8-pie
+    "PL",   # pylint
+    "PERF", # Perflint
+    "RSE",  # flake8-raise
+    "RUF005", # Consider iterable unpacking instead of concatenation
     "RUF006", # Store a reference to the return value of asyncio.create_task
-    "S307",   # No builtin eval() allowed
-    # "SIM105", # Use contextlib.suppress({exception}) instead of try-except-pass
-    "SIM117", # Merge with-statements that use the same scope
-    "SIM118", # Use {key} in {dict} instead of {key} in {dict}.keys()
-    "SIM201", # Use {left} != {right} instead of not {left} == {right}
-    "SIM208", # Use {expr} instead of not (not {expr})
-    "SIM212", # Use {a} if {a} else {b} instead of {b} if not {a} else {a}
-    "SIM300", # Yoda conditions. Use 'age == 42' instead of '42 == age'.
-    "SIM401", # Use get from dict with default instead of an if block
+    "RUF100", # Unused `noqa` directive
+    "S307", # No builtin eval() allowed
+    "SIM",  # flake8-simplify
     "T100", # Trace found: {name} used
     "T20",  # flake8-print
-    "UP",  # pyupgrade
-    "W",   # pycodestyle
+    "UP", # pyupgrade
+    "W",  # pycodestyle
 ]
 
 lint.ignore = [
-    "D203",  # 1 blank line required before class docstring
-    "D213",  # Multi-line docstring summary should start at the second line
-    "E501",  # Checks for lines that exceed the specified maximum character length
-    "PLR0911",  # Too many return statements
-    "PLR0912",  # Maximum number of branches allowed for a function or method body
-    "PLR0913",  # Too many arguments to function call ({c_args} > {max_args})
-    "PLR0915",  # Too many statements ({statements} > {max_statements})
-    "PLR2004",  # Magic value used in comparison, consider replacing {value} with a constant variable
+    "D203", # 1 blank line required before class docstring
+    "D213", # Multi-line docstring summary should start at the second line
+    "E501", # Checks for lines that exceed the specified maximum character length
+    "PLR0912", # Maximum number of branches allowed for a function or method body
+    "PLR0913", # Too many arguments to function call ({c_args} > {max_args})
+    "PLR0915", # Too many statements ({statements} > {max_statements})
+    "PLR2004", # Magic value used in comparison, consider replacing {value} with a constant variable
 ]
 
 [tool.ruff.lint.flake8-pytest-style]

{axis-56 → axis-57}/setup.py

@@ -4,7 +4,7 @@ from setuptools import find_packages, setup
 
 MIN_PY_VERSION = "3.11"
 PACKAGES = find_packages(exclude=["tests", "tests.*"])
-VERSION = "56"
+VERSION = "57"
 
 setup(
     name="axis",

{axis-56 → axis-57}/tests/test_light_control.py

@@ -115,13 +115,13 @@ async def test_get_service_capabilities(respx_mock, light_control: LightHandler)
         "context": "Axis library",
     }
 
-    response.automatic_intensity_support is True
-    response.manual_intensity_support is True
-    response.get_current_intensity_support is True
-    response.individual_intensity_support is False
-    response.automatic_angle_of_illumination_support is False
-    response.manual_angle_of_illumination_support is False
-    response.day_night_synchronize_support is True
+    assert response.automatic_intensity_support is True
+    assert response.manual_intensity_support is True
+    assert response.get_current_intensity_support is True
+    assert response.individual_intensity_support is False
+    assert response.automatic_angle_of_illumination_support is False
+    assert response.manual_angle_of_illumination_support is False
+    assert response.day_night_synchronize_support is True
 
 
 async def test_get_light_information(respx_mock, light_control: LightHandler):

{axis-56 → axis-57}/tests/test_rtsp.py

@@ -31,55 +31,63 @@ async def test_successful_connect(rtsp_server, rtsp_client):
     rtsp_server.register_responses(
         [
             # OPTIONS
-            "RTSP/1.0 200 OK\r\n"
-            + "CSeq: 0\r\n"
-            + "Public: OPTIONS, DESCRIBE, ANNOUNCE, GET_PARAMETER, PAUSE, PLAY, RECORD, SETUP, SET_PARAMETER, TEARDOWN\r\n"
-            + "Server: GStreamer RTSP server\r\n"
-            + "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n",
+            (
+                "RTSP/1.0 200 OK\r\n"
+                "CSeq: 0\r\n"
+                "Public: OPTIONS, DESCRIBE, ANNOUNCE, GET_PARAMETER, PAUSE, PLAY, RECORD, SETUP, SET_PARAMETER, TEARDOWN\r\n"
+                "Server: GStreamer RTSP server\r\n"
+                "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n"
+            ),
             # DESCRIBE is denied since it requires authentication
-            "RTSP/1.0 401 Unauthorized\r\n"
-            + "CSeq: 1\r\n"
-            + 'WWW-Authenticate: Digest realm="AXIS_ACCC8E012345", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", stale=FALSE\r\n'
-            + "Server: GStreamer RTSP server\r\n "
-            + "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n",
+            (
+                "RTSP/1.0 401 Unauthorized\r\n"
+                "CSeq: 1\r\n"
+                'WWW-Authenticate: Digest realm="AXIS_ACCC8E012345", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", stale=FALSE\r\n'
+                "Server: GStreamer RTSP server\r\n "
+                "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n"
+            ),
             # DESCRIBE with digest authentication
-            "RTSP/1.0 200 OK\r\n"
-            + "CSeq: 1\r\n"
-            + "Content-Type: application/sdp\r\n"
-            + "Content-Base: rtsp://127.0.0.1/axis-media/media.amp/\r\n"
-            + "Server: GStreamer RTSP server\r\n"
-            + "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n"
-            + "Content-Length: 440\r\n\r\n"
-            + "v=0\r\n"
-            + "o=- 18302136002250915122 1 IN IP4 host\r\n"
-            + "s=Session streamed with GStreamer\r\n"
-            + "i=rtsp-server\r\n"
-            + "t=0 0\r\n"
-            + "a=tool:GStreamer\r\n"
-            + "a=type:broadcast\r\n"
-            + "a=range:npt=now-\r\n"
-            + "a=control:rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on\r\n"
-            + "m=application 0 RTP/AVP 98\r\n"
-            + "c=IN IP4 0.0.0.0\r\n"
-            + "a=rtpmap:98 vnd.onvif.metadata/90000\r\n"
-            + "a=ts-refclk:local\r\n"
-            + "a=mediaclk:sender\r\n"
-            + "a=control:rtsp://127.0.0.1/axis-media/media.amp/stream=0?video=0&audio=0&event=on\r\n",
+            (
+                "RTSP/1.0 200 OK\r\n"
+                "CSeq: 1\r\n"
+                "Content-Type: application/sdp\r\n"
+                "Content-Base: rtsp://127.0.0.1/axis-media/media.amp/\r\n"
+                "Server: GStreamer RTSP server\r\n"
+                "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n"
+                "Content-Length: 440\r\n\r\n"
+                "v=0\r\n"
+                "o=- 18302136002250915122 1 IN IP4 host\r\n"
+                "s=Session streamed with GStreamer\r\n"
+                "i=rtsp-server\r\n"
+                "t=0 0\r\n"
+                "a=tool:GStreamer\r\n"
+                "a=type:broadcast\r\n"
+                "a=range:npt=now-\r\n"
+                "a=control:rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on\r\n"
+                "m=application 0 RTP/AVP 98\r\n"
+                "c=IN IP4 0.0.0.0\r\n"
+                "a=rtpmap:98 vnd.onvif.metadata/90000\r\n"
+                "a=ts-refclk:local\r\n"
+                "a=mediaclk:sender\r\n"
+                "a=control:rtsp://127.0.0.1/axis-media/media.amp/stream=0?video=0&audio=0&event=on\r\n"
+            ),
             # SETUP requires to know the rtp and rtcp ports which are not yet known
             # "RTSP/1.0 200 OK\r\n"
-            # + "CSeq: 2\r\n"
-            # + 'Transport: RTP/AVP;unicast;client_port=45678-45679;server_port=50000-50001;ssrc=315460DA;mode="PLAY"\r\n'
-            # + "Server: GStreamer RTSP server\r\n"
-            # + "Session: ghLlkf_I9pCBP24t;timeout=60\r\n"
-            # + "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n",
+            # "CSeq: 2\r\n"
+            # 'Transport: RTP/AVP;unicast;client_port=45678-45679;server_port=50000-50001;ssrc=315460DA;mode="PLAY"\r\n'
+            # "Server: GStreamer RTSP server\r\n"
+            # "Session: ghLlkf_I9pCBP24t;timeout=60\r\n"
+            # "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n",
             # PLAY
-            "RTSP/1.0 200 OK\r\n"
-            + "CSeq: 3\r\n"
-            + "RTP-Info: url=rtsp://127.0.0.1/axis-media/media.amp/stream=0?video=0&audio=0&event=on;seq=13114;rtptime=3803548519\r\n"
-            + "Range: npt=now-\r\n"
-            + "Server: GStreamer RTSP server\r\n"
-            + "Session: ghLlkf_I9pCBP24t;timeout=60\r\n"
-            + "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n",
+            (
+                "RTSP/1.0 200 OK\r\n"
+                "CSeq: 3\r\n"
+                "RTP-Info: url=rtsp://127.0.0.1/axis-media/media.amp/stream=0?video=0&audio=0&event=on;seq=13114;rtptime=3803548519\r\n"
+                "Range: npt=now-\r\n"
+                "Server: GStreamer RTSP server\r\n"
+                "Session: ghLlkf_I9pCBP24t;timeout=60\r\n"
+                "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n"
+            ),
         ]
     )
 
@@ -136,9 +144,9 @@ async def test_successful_connect(rtsp_server, rtsp_client):
     # OPTIONS ask server to show what options it supports
     assert rtsp_server.last_request == (
         "OPTIONS "
-        + "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
-        + "CSeq: 0\r\n"
-        + "User-Agent: HASS Axis\r\n\r\n"
+        "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
+        "CSeq: 0\r\n"
+        "User-Agent: HASS Axis\r\n\r\n"
     )
     rtsp_server.step_response()
     await rtsp_server.next_request_received.wait()
@@ -179,10 +187,10 @@ async def test_successful_connect(rtsp_server, rtsp_client):
     # DESCRIBE ask server what it provides
     assert rtsp_server.last_request == (
         "DESCRIBE "
-        + "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
-        + "CSeq: 1\r\n"
-        + "User-Agent: HASS Axis\r\n"
-        + "Accept: application/sdp\r\n\r\n"
+        "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
+        "CSeq: 1\r\n"
+        "User-Agent: HASS Axis\r\n"
+        "Accept: application/sdp\r\n\r\n"
     )
     rtsp_server.step_response()
     await rtsp_server.next_request_received.wait()
@@ -212,11 +220,11 @@ async def test_successful_connect(rtsp_server, rtsp_client):
     # DESCRIBE with digest authentication
     assert rtsp_server.last_request == (
         "DESCRIBE "
-        + "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
-        + "CSeq: 1\r\n"
-        + 'Authorization: Digest username="root", realm="AXIS_ACCC8E012345", algorithm="MD5", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", response="909e6c215f6b0f350147a81ae3980018"\r\n'
-        + "User-Agent: HASS Axis\r\n"
-        + "Accept: application/sdp\r\n\r\n"
+        "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
+        "CSeq: 1\r\n"
+        'Authorization: Digest username="root", realm="AXIS_ACCC8E012345", algorithm="MD5", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", response="909e6c215f6b0f350147a81ae3980018"\r\n'
+        "User-Agent: HASS Axis\r\n"
+        "Accept: application/sdp\r\n\r\n"
     )
     rtsp_server.step_response()
     await rtsp_server.next_request_received.wait()
@@ -266,19 +274,19 @@ async def test_successful_connect(rtsp_server, rtsp_client):
     # SETUP setup rtp connection to server
     assert rtsp_server.last_request == (
         "SETUP "
-        + "rtsp://127.0.0.1/axis-media/media.amp/stream=0?video=0&audio=0&event=on RTSP/1.0\r\n"
-        + "CSeq: 2\r\n"
-        + 'Authorization: Digest username="root", realm="AXIS_ACCC8E012345", algorithm="MD5", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", response="3c4d88afefd4ab931f6db658326d60c2"\r\n'
-        + "User-Agent: HASS Axis\r\n"
-        + f"Transport: RTP/AVP;unicast;client_port={rtp_port}-{rtcp_port}\r\n\r\n"
+        "rtsp://127.0.0.1/axis-media/media.amp/stream=0?video=0&audio=0&event=on RTSP/1.0\r\n"
+        "CSeq: 2\r\n"
+        'Authorization: Digest username="root", realm="AXIS_ACCC8E012345", algorithm="MD5", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", response="3c4d88afefd4ab931f6db658326d60c2"\r\n'
+        "User-Agent: HASS Axis\r\n"
+        f"Transport: RTP/AVP;unicast;client_port={rtp_port}-{rtcp_port}\r\n\r\n"
     )
     rtsp_server.send_response(
         "RTSP/1.0 200 OK\r\n"
-        + "CSeq: 2\r\n"
-        + f'Transport: RTP/AVP;unicast;client_port={rtp_port}-{rtcp_port};server_port=50000-50001;ssrc=315460DA;mode="PLAY"\r\n'
-        + "Server: GStreamer RTSP server\r\n"
-        + "Session: ghLlkf_I9pCBP24t;timeout=60\r\n"
-        + "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n",
+        "CSeq: 2\r\n"
+        f'Transport: RTP/AVP;unicast;client_port={rtp_port}-{rtcp_port};server_port=50000-50001;ssrc=315460DA;mode="PLAY"\r\n'
+        "Server: GStreamer RTSP server\r\n"
+        "Session: ghLlkf_I9pCBP24t;timeout=60\r\n"
+        "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n",
     )
     await rtsp_server.next_request_received.wait()
     assert rtsp_client.session.sequence == 3
@@ -330,11 +338,11 @@ async def test_successful_connect(rtsp_server, rtsp_client):
     # PLAY start stream
     assert rtsp_server.last_request == (
         "PLAY "
-        + "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
-        + "CSeq: 3\r\n"
-        + 'Authorization: Digest username="root", realm="AXIS_ACCC8E012345", algorithm="MD5", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", response="1c882325f7733b0d48d177ee8a0e6b2a"\r\n'
-        + "User-Agent: HASS Axis\r\n"
-        + "Session: ghLlkf_I9pCBP24t\r\n\r\n"
+        "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
+        "CSeq: 3\r\n"
+        'Authorization: Digest username="root", realm="AXIS_ACCC8E012345", algorithm="MD5", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", response="1c882325f7733b0d48d177ee8a0e6b2a"\r\n'
+        "User-Agent: HASS Axis\r\n"
+        "Session: ghLlkf_I9pCBP24t\r\n\r\n"
     )
     with patch.object(rtsp_client, "callback") as mock_callback:
         rtsp_server.step_response()
@@ -425,19 +433,19 @@ async def test_successful_connect(rtsp_server, rtsp_client):
     await rtsp_server.next_request_received.wait()
     assert rtsp_server.last_request == (
         "OPTIONS "
-        + "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
-        + "CSeq: 4\r\n"
-        + "User-Agent: HASS Axis\r\n"
-        + "Session: ghLlkf_I9pCBP24t\r\n\r\n"
+        "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
+        "CSeq: 4\r\n"
+        "User-Agent: HASS Axis\r\n"
+        "Session: ghLlkf_I9pCBP24t\r\n\r\n"
     )
     with patch.object(rtsp_client, "callback") as mock_callback:
         rtsp_server.send_response(
             "RTSP/1.0 200 OK\r\n"
-            + "CSeq: 4\r\n"
-            + "Public: OPTIONS, DESCRIBE, ANNOUNCE, GET_PARAMETER, PAUSE, PLAY, RECORD, SETUP, SET_PARAMETER, TEARDOWN\r\n"
-            + "Server: GStreamer RTSP server\r\n"
-            + "Session: ghLlkf_I9pCBP24t;timeout=30\r\n"
-            + "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n"
+            "CSeq: 4\r\n"
+            "Public: OPTIONS, DESCRIBE, ANNOUNCE, GET_PARAMETER, PAUSE, PLAY, RECORD, SETUP, SET_PARAMETER, TEARDOWN\r\n"
+            "Server: GStreamer RTSP server\r\n"
+            "Session: ghLlkf_I9pCBP24t;timeout=30\r\n"
+            "Date: Sat, 12 Dec 2020 10:44:25 GMT\r\n\r\n"
         )
         # We don't expect additional requests as RTSP handshake is complete
         # but we still need to wait for rtsp client to process response before continuing
@@ -456,11 +464,11 @@ async def test_successful_connect(rtsp_server, rtsp_client):
     await rtsp_server.next_request_received.wait()
     assert rtsp_server.last_request == (
         "TEARDOWN "
-        + "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
-        + "CSeq: 5\r\n"
-        + 'Authorization: Digest username="root", realm="AXIS_ACCC8E012345", algorithm="MD5", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", response="2417a81b93d5ae64926d226e18a5ab99"\r\n'
-        + "User-Agent: HASS Axis\r\n"
-        + "Session: ghLlkf_I9pCBP24t\r\n\r\n"
+        "rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on RTSP/1.0\r\n"
+        "CSeq: 5\r\n"
+        'Authorization: Digest username="root", realm="AXIS_ACCC8E012345", algorithm="MD5", nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", response="2417a81b93d5ae64926d226e18a5ab99"\r\n'
+        "User-Agent: HASS Axis\r\n"
+        "Session: ghLlkf_I9pCBP24t\r\n\r\n"
     )
 
 
@@ -576,8 +584,8 @@ def test_session_state_method(rtsp_client):
         assert session.state == State.STOPPED
 
     with patch.object(session, "sequence", 6), pytest.raises(IndexError):
-        session.method
-        session.state
+        _ = session.method  # B018 lint
+        _ = session.state  # B018 lint
 
 
 def test_session_update_status_codes(rtsp_client):
@@ -630,14 +638,13 @@ def test_session_generate_digest_auth(rtsp_client):
 
     digest_auth = session.generate_digest()
     assert (
-        digest_auth
-        == "Digest "
-        + 'username="root", '
-        + 'realm="AXIS_ACCC8E012345", '
-        + 'algorithm="MD5", '
-        + 'nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", '
-        + 'uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", '
-        + 'response="359495f9e42106627750e3cd65145f6b"'
+        digest_auth == "Digest "
+        'username="root", '
+        'realm="AXIS_ACCC8E012345", '
+        'algorithm="MD5", '
+        'nonce="0000eb57Y1462133062b37999f0cd530f02755fa37b8df1", '
+        'uri="rtsp://127.0.0.1/axis-media/media.amp?video=0&audio=0&event=on", '
+        'response="359495f9e42106627750e3cd65145f6b"'
     )
 
 

{axis-56 → axis-57}/tests/test_vapix.py

@@ -7,7 +7,13 @@ import httpx
 import pytest
 
 from axis.device import AxisDevice
-from axis.errors import MethodNotAllowed, PathNotFound, RequestError, Unauthorized
+from axis.errors import (
+    Forbidden,
+    MethodNotAllowed,
+    PathNotFound,
+    RequestError,
+    Unauthorized,
+)
 from axis.vapix.models.applications.application import ApplicationStatus
 from axis.vapix.models.pwdgrp_cgi import SecondaryGroup
 from axis.vapix.models.stream_profile import StreamProfile
@@ -286,7 +292,8 @@ async def test_initialize_applications(respx_mock, vapix: Vapix):
     assert len(vapix.vmd4.values()) == 1
 
 
-async def test_initialize_applications_unauthorized(respx_mock, vapix: Vapix):
+@pytest.mark.parametrize("code", [401, 403])
+async def test_initialize_applications_unauthorized(respx_mock, vapix: Vapix, code):
     """Verify initialize applications doesnt break on too low credentials."""
     respx_mock.post("/axis-cgi/param.cgi").respond(
         text=PARAM_CGI_RESPONSE,
@@ -295,7 +302,7 @@ async def test_initialize_applications_unauthorized(respx_mock, vapix: Vapix):
     respx_mock.post("/axis-cgi/lightcontrol.cgi").respond(
         json=LIGHT_CONTROL_RESPONSE,
     )
-    respx_mock.post("/axis-cgi/applications/list.cgi").respond(status_code=401)
+    respx_mock.post("/axis-cgi/applications/list.cgi").respond(status_code=code)
 
     await vapix.initialize_param_cgi()
     await vapix.initialize_applications()
@@ -431,7 +438,12 @@ async def test_not_loading_user_groups_makes_access_rights_unknown(vapix: Vapix)
 
 @pytest.mark.parametrize(
     ("code", "error"),
-    ((401, Unauthorized), (404, PathNotFound), (405, MethodNotAllowed)),
+    (
+        (401, Unauthorized),
+        (403, Forbidden),
+        (404, PathNotFound),
+        (405, MethodNotAllowed),
+    ),
 )
 async def test_request_raises(respx_mock, vapix: Vapix, code, error):
     """Verify that a HTTP error raises the appropriate exception."""