Migrate to using aiohttp

Author: bdraco

onvif/managers.py

@@ -2,19 +2,18 @@
 
 from __future__ import annotations
 
-from abc import abstractmethod
 import asyncio
 import datetime as dt
 import logging
-from typing import TYPE_CHECKING, Any
+from abc import abstractmethod
 from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
-import httpx
-from httpx import TransportError
 from zeep.exceptions import Fault, XMLParseError, XMLSyntaxError
 from zeep.loader import parse_xml
 from zeep.wsdl.bindings.soap import SoapOperation
 
+import aiohttp
 from onvif.exceptions import ONVIFError
 
 from .settings import DEFAULT_SETTINGS
@@ -27,8 +26,8 @@
 
 _RENEWAL_PERCENTAGE = 0.8
 
-SUBSCRIPTION_ERRORS = (Fault, asyncio.TimeoutError, TransportError)
-RENEW_ERRORS = (ONVIFError, httpx.RequestError, XMLParseError, *SUBSCRIPTION_ERRORS)
+SUBSCRIPTION_ERRORS = (Fault, asyncio.TimeoutError, aiohttp.ClientError)
+RENEW_ERRORS = (ONVIFError, aiohttp.ClientError, XMLParseError, *SUBSCRIPTION_ERRORS)
 SUBSCRIPTION_RESTART_INTERVAL_ON_ERROR = dt.timedelta(seconds=40)
 
 # If the camera returns a subscription with a termination time that is less than
@@ -87,7 +86,8 @@ async def stop(self) -> None:
         await self._subscription.Unsubscribe()
 
     async def shutdown(self) -> None:
-        """Shutdown the manager.
+        """
+        Shutdown the manager.
 
         This method is irreversible.
         """
@@ -105,7 +105,7 @@ async def set_synchronization_point(self) -> float:
         """Set the synchronization point."""
         try:
             await self._service.SetSynchronizationPoint()
-        except (Fault, asyncio.TimeoutError, TransportError, TypeError):
+        except (TimeoutError, Fault, aiohttp.ClientError, TypeError):
             logger.debug("%s: SetSynchronizationPoint failed", self._service.url)
 
     def _cancel_renewals(self) -> None:
@@ -214,7 +214,8 @@ def __init__(
         super().__init__(device, interval, subscription_lost_callback)
 
     async def _start(self) -> float:
-        """Start the notification processor.
+        """
+        Start the notification processor.
 
         Returns the next renewal call at time.
         """
@@ -290,7 +291,8 @@ class PullPointManager(BaseManager):
     """Manager for PullPoint."""
 
     async def _start(self) -> float:
-        """Start the PullPoint manager.
+        """
+        Start the PullPoint manager.
 
         Returns the next renewal call at time.
         """

onvif/wrappers.py

@@ -3,12 +3,11 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Awaitable
 import logging
+from collections.abc import Awaitable, Callable
 from typing import ParamSpec, TypeVar
-from collections.abc import Callable
 
-import httpx
+import aiohttp
 
 from .const import BACKOFF_TIME, DEFAULT_ATTEMPTS
 
@@ -19,14 +18,15 @@
 
 def retry_connection_error(
     attempts: int = DEFAULT_ATTEMPTS,
-    exception: httpx.HTTPError = httpx.RequestError,
+    exception: type[Exception] = aiohttp.ClientError,
 ) -> Callable[[Callable[P, Awaitable[T]]], Callable[P, Awaitable[T]]]:
     """Define a wrapper to retry on connection error."""
 
     def _decorator_retry_connection_error(
         func: Callable[P, Awaitable[T]],
     ) -> Callable[P, Awaitable[T]]:
-        """Define a wrapper to retry on connection error.
+        """
+        Define a wrapper to retry on connection error.
 
         The remote server is allowed to disconnect us any time so
         we need to retry the operation.
@@ -40,11 +40,11 @@ async def _async_wrap_connection_error_retry(  # type: ignore[return]
                     return await func(*args, **kwargs)
                 except exception as ex:
                     #
-                    # We should only need to retry on RemoteProtocolError but some cameras
+                    # We should only need to retry on ServerDisconnectedError but some cameras
                     # are flakey and sometimes do not respond to the Renew request so we
-                    # retry on RequestError as well.
+                    # retry on ClientError as well.
                     #
-                    # For RemoteProtocolError:
+                    # For ServerDisconnectedError:
                     # http://datatracker.ietf.org/doc/html/rfc2616#section-8.1.4 allows the server
                     # to close the connection at any time, we treat this as a normal and try again
                     # once since we do not want to declare the camera as not supporting PullPoint

requirements.txt

@@ -1,4 +1,5 @@
 # Package
+aiohttp==3.12.9
 ciso8601==2.3.2
 httpx==0.28.1
 zeep[async]==4.3.1

setup.py

@@ -9,6 +9,7 @@
 version = open(version_path).read().strip()
 
 requires = [
+    "aiohttp>=3.12.9",
     "httpx>=0.19.0,<1.0.0",
     "zeep[async]>=4.2.1,<5.0.0",
     "ciso8601>=2.1.3",