fix: fix typechecking errors (still warnings)

Author: snus-kin

src/resolver_athena_client/client/deployment_selector.py

@@ -26,7 +26,7 @@ class DeploymentSelector:
 
     """
 
-    channel: grpc.aio.Channel
+    channel: grpc.aio.Channel | None = None
     classifier: ClassifierServiceClient
 
     def __init__(self, channel: grpc.aio.Channel) -> None:
@@ -37,7 +37,7 @@ def __init__(self, channel: grpc.aio.Channel) -> None:
                 the Athena service.
 
         """
-        self.logger = logging.getLogger(__name__)
+        self.logger: logging.Logger = logging.getLogger(__name__)
         self.classifier = ClassifierServiceClient(channel)
 
     async def list_deployments(self) -> ListDeploymentsResponse:
@@ -90,5 +90,5 @@ async def __aexit__(
             exc_tb: The traceback of the exception that was raised
 
         """
-        if hasattr(self, "channel"):
+        if hasattr(self, "channel") and self.channel is not None:
             await self.channel.close()

src/resolver_athena_client/grpc_wrappers/classifier_service.py

@@ -1,7 +1,7 @@
 """Low-level GRPC client for the ClassifierService."""
 
 from collections.abc import AsyncIterable
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, final
 
 from google.protobuf.empty_pb2 import Empty
 from grpc import aio
@@ -21,6 +21,7 @@
     from grpc.aio import StreamStreamCall
 
 
+@final
 class ClassifierServiceClient:
     """Low-level gRPC wrapper for the ClassifierService."""
 

tests/client/test_timeout_behavior.py

@@ -22,7 +22,7 @@
 class MockGrpcError(AioRpcError):
     """Mock gRPC error for testing."""
 
-    def __init__(self, code: StatusCode, details: str | None = None) -> None:
+    def __init__(self, code: StatusCode, details: str | None = None) -> None:  # pyright: ignore[reportMissingSuperCall] - Mock
         self._code = code
         self._details: str | None = details
         self._debug_error_string: str | None = f"MockGrpcError: {code.name}"

tests/test_classify_single.py

@@ -123,7 +123,7 @@ async def test_classify_single_with_correlation_id(
     )
 
     # Call classify_single with custom correlation ID
-    await athena_client.classify_single(
+    _ = await athena_client.classify_single(
         sample_image_data, correlation_id=custom_correlation_id
     )
 
@@ -147,14 +147,16 @@ async def test_classify_single_auto_correlation_id(
     )
 
     # Call classify_single without correlation ID
-    await athena_client.classify_single(sample_image_data)
+    _ = await athena_client.classify_single(sample_image_data)
 
     # Verify a correlation ID was generated
     call_args = athena_client.classifier.classify_single.call_args[0][0]
     assert call_args.correlation_id is not None
     assert len(call_args.correlation_id) > 0
     # Should be a valid UUID format
-    uuid.UUID(call_args.correlation_id)  # This will raise if not a valid UUID
+    _ = uuid.UUID(
+        call_args.correlation_id
+    )  # This will raise if not a valid UUID
 
 
 @pytest.mark.asyncio
@@ -175,7 +177,7 @@ async def test_classify_single_with_compression(
     )
 
     # Call classify_single
-    await athena_client.classify_single(sample_image_data)
+    _ = await athena_client.classify_single(sample_image_data)
 
     # Verify compression settings were applied
     call_args = athena_client.classifier.classify_single.call_args[0][0]
@@ -210,7 +212,7 @@ async def test_classify_single_error_handling(
     )
 
     # Call classify_single with valid image
-    await athena_client.classify_single(valid_image_data)
+    _ = await athena_client.classify_single(valid_image_data)
 
     # Verify resizing was processed (encoding should be uncompressed)
     call_args = athena_client.classifier.classify_single.call_args[0][0]
@@ -239,7 +241,7 @@ async def test_classify_single_with_error_response(
 
     # Call classify_single and expect AthenaError
     with pytest.raises(AthenaError, match="Image is too large"):
-        await athena_client.classify_single(sample_image_data)
+        _ = await athena_client.classify_single(sample_image_data)
 
 
 @pytest.mark.asyncio
@@ -276,7 +278,7 @@ async def test_classify_single_timeout_parameter(
     )
 
     # Call classify_single
-    await athena_client.classify_single(sample_image_data)
+    _ = await athena_client.classify_single(sample_image_data)
 
     # Verify timeout was passed
     call_kwargs = athena_client.classifier.classify_single.call_args[1]
@@ -306,7 +308,7 @@ async def test_classify_single_multiple_hashes(
     )
 
     # Call classify_single
-    await athena_client.classify_single(image_data)
+    _ = await athena_client.classify_single(image_data)
 
     # Verify all hashes were included
     call_args = athena_client.classifier.classify_single.call_args[0][0]

tests/test_correlation.py

@@ -1,5 +1,7 @@
 """Tests for correlation ID generation."""
 
+from typing import final, override
+
 import pytest
 
 from resolver_athena_client.client.correlation import HashCorrelationProvider
@@ -47,15 +49,19 @@ def test_hash_correlation_provider_with_invalid_input() -> None:
     provider = HashCorrelationProvider()
 
     # Create an object that raises an exception when converted to string
-    class BadStr:
+    @final
+    class BadStr(str):
+        __slots__ = ()
+
+        @override
         def __str__(self) -> str:
             error_msg = "Cannot convert to string"
             raise ValueError(error_msg)
 
     with pytest.raises(
         ValueError, match="Failed to generate correlation ID from input"
     ):
-        provider.get_correlation_id(BadStr())  # type: ignore[arg-type]
+        _ = provider.get_correlation_id(BadStr())
 
 
 def test_hash_correlation_provider_consistency() -> None:

tests/test_version.py

@@ -13,7 +13,7 @@ def test_version_from_metadata() -> None:
         mock_version.return_value = "1.2.3"
         # Force reload of version module to get mocked value
 
-        importlib.reload(resolver_athena_client.version)
+        _ = importlib.reload(resolver_athena_client.version)
         assert resolver_athena_client.version.__version__ == "1.2.3"
 
 

tests/utils/mock_async_iterator.py

@@ -6,15 +6,16 @@
 
 class MockAsyncIterator(Generic[T]):
     def __init__(self, items: list[T]) -> None:
-        self._items = items.copy()
-        self.call_count = 0
+        self._items: list[T] = items.copy()
+        self.call_count: int = 0
+        self._timeout: float | None = None
 
     async def __call__(
         self,
         _: AsyncIterable[bytes],
         *,
         timeout: float | None = None,
-    ) -> "MockAsyncIterator":
+    ) -> "MockAsyncIterator[T]":
         self.call_count += 1
         # Store timeout for potential use in testing
         self._timeout = timeout

tests/utils/mock_stream_call.py

@@ -1,7 +1,7 @@
 """Mock gRPC stream call for testing."""
 
 from collections.abc import AsyncIterator, Callable
-from typing import Generic, TypeVar
+from typing import Generic, TypeVar, override
 
 import grpc
 from grpc.aio import Call, Metadata, StreamStreamCall
@@ -24,8 +24,10 @@ class MockStreamCall(Generic[RequestT, ResponseT]):
 
     def __init__(self, responses: list[ResponseT]) -> None:
         """Initialize with response list."""
-        self.responses = responses.copy()
-        self.call_count = 0
+        self.responses: list[ResponseT] = responses.copy()
+        self.call_count: int = 0
+        self._last_timeout: float | None = None
+        self._last_wait_for_ready: bool = True
 
     def __call__(
         self,
@@ -57,12 +59,13 @@ def __init__(
     ) -> None:
         """Initialize with request iterator and responses."""
         super().__init__()
-        self._request_iter = request_iter
-        self._responses = responses.copy()
-        self._done = False
-        self._cancelled = False
+        self._request_iter: AsyncIterator[RequestT] = request_iter
+        self._responses: list[ResponseT] = responses.copy()
+        self._done: bool = False
+        self._cancelled: bool = False
         self._done_callbacks: list[Callable[[Call], None]] = []
 
+    @override
     def __aiter__(self) -> AsyncIterator[ResponseT]:
         """Get async iterator over responses."""
         return self
@@ -80,6 +83,7 @@ async def __anext__(self) -> ResponseT:
             raise StopAsyncIteration
         return self._responses.pop(0)
 
+    @override
     async def read(self) -> ResponseT:
         """Read next response message.
 
@@ -88,17 +92,20 @@ async def read(self) -> ResponseT:
         """
         return await self.__anext__()
 
+    @override
     async def write(self, request: RequestT) -> None:
         """Write a request message (no-op).
 
         Args:
             request: Request message to write.
         """
 
+    @override
     async def done_writing(self) -> None:
         """Signal end of request stream."""
         self._done = True
 
+    @override
     def add_done_callback(self, callback: Callable[[Call], None]) -> None:
         """Register completion callback.
 
@@ -109,6 +116,7 @@ def add_done_callback(self, callback: Callable[[Call], None]) -> None:
         if self._done:
             callback(self)
 
+    @override
     def time_remaining(self) -> float | None:
         """Get remaining timeout time.
 
@@ -117,6 +125,7 @@ def time_remaining(self) -> float | None:
         """
         return None
 
+    @override
     def cancel(self) -> bool:
         """Cancel the call.
 
@@ -131,6 +140,7 @@ def cancel(self) -> bool:
             return True
         return False
 
+    @override
     def cancelled(self) -> bool:
         """Check if call was cancelled.
 
@@ -139,6 +149,7 @@ def cancelled(self) -> bool:
         """
         return self._cancelled
 
+    @override
     async def code(self) -> grpc.StatusCode:
         """Get status code.
 
@@ -147,6 +158,7 @@ async def code(self) -> grpc.StatusCode:
         """
         return grpc.StatusCode.OK
 
+    @override
     async def details(self) -> str:
         """Get error details.
 
@@ -155,6 +167,7 @@ async def details(self) -> str:
         """
         return ""
 
+    @override
     async def initial_metadata(self) -> Metadata:
         """Get initial metadata.
 
@@ -163,6 +176,7 @@ async def initial_metadata(self) -> Metadata:
         """
         return Metadata()
 
+    @override
     async def trailing_metadata(self) -> Metadata:
         """Get trailing metadata.
 
@@ -171,6 +185,7 @@ async def trailing_metadata(self) -> Metadata:
         """
         return Metadata()
 
+    @override
     def done(self) -> bool:
         """Check if call is complete.
 
@@ -179,5 +194,6 @@ def done(self) -> bool:
         """
         return self._done
 
+    @override
     async def wait_for_connection(self) -> None:
         """Wait for connection (no-op)."""