fix: warnings with aio-pika>=9.5.0

metricq/agent.py

@@ -800,12 +800,14 @@ async def _on_management_message(
                 if r is not None:
                     await r
 
-    def _on_reconnect(self, sender: aio_pika.abc.AbstractRobustConnection) -> None:
+    def _on_reconnect(
+        self, sender: Optional[aio_pika.abc.AbstractRobustConnection]
+    ) -> None:
         logger.info("Reconnected to {}", sender)
 
     def _on_close(
         self,
-        sender: aio_pika.abc.AbstractRobustConnection,
+        sender: Optional[aio_pika.abc.AbstractConnection],
         exception: Optional[BaseException],
     ) -> None:
         if isinstance(exception, asyncio.CancelledError):
@@ -816,13 +818,13 @@ def _on_close(
         )
 
     def _on_management_connection_reconnect(
-        self, sender: aio_pika.abc.AbstractRobustConnection
+        self, sender: Optional[aio_pika.abc.AbstractRobustConnection]
     ) -> None:
         self._management_connection_watchdog.set_established()
 
     def _on_management_connection_close(
         self,
-        sender: aio_pika.abc.AbstractRobustConnection,
+        sender: Optional[aio_pika.abc.AbstractConnection],
         _exception: Optional[BaseException],
     ) -> None:
         self._management_connection_watchdog.set_closed()

metricq/data_client.py

@@ -127,12 +127,12 @@ async def teardown(self) -> None:
 
     def _on_data_connection_close(
         self,
-        sender: aio_pika.abc.AbstractRobustConnection,
+        sender: Optional[aio_pika.abc.AbstractConnection],
         _exception: Optional[BaseException],
     ) -> None:
         self._data_connection_watchdog.set_closed()
 
     def _on_data_connection_reconnect(
-        self, sender: aio_pika.abc.AbstractRobustConnection
+        self, sender: Optional[aio_pika.abc.AbstractConnection]
     ) -> None:
         self._data_connection_watchdog.set_established()

metricq/history_client.py

@@ -748,13 +748,13 @@ async def _on_history_response(
 
     def _on_history_connection_close(
         self,
-        sender: aio_pika.abc.AbstractRobustConnection,
+        sender: Optional[aio_pika.abc.AbstractConnection],
         _exception: Optional[BaseException],
     ) -> None:
         self._history_connection_watchdog.set_closed()
 
     def _on_history_connection_reconnect(
-        self, sender: aio_pika.abc.AbstractRobustConnection
+        self, sender: Optional[aio_pika.abc.AbstractConnection]
     ) -> None:
         logger.info("History connection ({}) reestablished!", sender)
 
@@ -764,6 +764,8 @@ def _on_history_connection_reconnect(
             )
             self._reregister_task.cancel()
 
+        assert sender is not None
+
         self._reregister_task = self._event_loop.create_task(self._reregister(sender))
 
         def reregister_done(task: Task[None]) -> None:

metricq/sink.py

@@ -77,7 +77,7 @@ async def sink_config(self, dataQueue: str, **kwargs: Any) -> None:
         self._data_consumer_tag = await self._data_queue.consume(self._on_data_message)
 
     def _on_data_connection_reconnect(
-        self, sender: aio_pika.abc.AbstractConnection
+        self, sender: Optional[aio_pika.abc.AbstractConnection]
     ) -> None:
         logger.info("Sink data connection ({}) reestablished!", sender)
 
@@ -87,6 +87,8 @@ def _on_data_connection_reconnect(
             )
             self._resubscribe_task.cancel()
 
+        assert sender is not None
+
         self._resubscribe_task = self._event_loop.create_task(self._resubscribe(sender))
 
         def resubscribe_done(task: Task[None]) -> None:

setup.py

@@ -18,7 +18,7 @@
 from bisect import bisect_right
 from datetime import datetime
 from distutils.errors import DistutilsFileError
-from distutils.log import ERROR, INFO
+from distutils.log import ERROR, INFO  # type: ignore
 from distutils.spawn import find_executable
 from operator import itemgetter
 from typing import Any, Iterable, Optional
@@ -134,7 +134,7 @@ def make_protobuf_requirement(major: int, minor: int, patch: int) -> str:
     py_major = protobuf_version_mapping[
         bisect_right(protobuf_version_mapping, minor, key=itemgetter(1)) - 1
     ][0]
-    return f"protobuf>={py_major}.{minor}, <{py_major}.{minor+1}"
+    return f"protobuf>={py_major}.{minor}, <{py_major}.{minor + 1}"
 
 
 def get_protobuf_requirement_from_protoc() -> str: