Lint fixes

Author: andrewfayres

src/intersect_sdk/client.py

@@ -15,7 +15,7 @@
 import time
 from collections import defaultdict
 from threading import Event, Thread
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 from uuid import uuid4
 
 from pydantic import ValidationError
@@ -154,7 +154,7 @@ def __init__(
         self._user_callback = user_callback
         self._event_callback = event_callback
         self._timeout_callback = timeout_callback
-        self._pending_requests: defaultdict[str, list] = defaultdict(list)
+        self._pending_requests: defaultdict[str, list[dict[str, Any]]] = defaultdict(list)
         self._stop_timeout_thread = Event()
         self._timeout_thread = Thread(target=self._check_timeouts, daemon=True)
 
@@ -229,8 +229,10 @@ def _check_timeouts(self) -> None:
                     if now > request['timeout']:
                         try:
                             request['on_timeout'](operation_id)
-                        except Exception as e:
-                            logger.warning(f'Exception from timeout callback for operation {operation_id}:\n{e}')
+                        except Exception as e:  # noqa: BLE001
+                            logger.warning(
+                                f'Exception from timeout callback for operation {operation_id}:\n{e}'
+                            )
                         requests.remove(request)
                 if not requests:
                     del self._pending_requests[operation_id]
@@ -293,7 +295,9 @@ def _handle_userspace_message(self, message: UserspaceMessage) -> None:
         if message['operationId'] in self._pending_requests:
             del self._pending_requests[message['operationId']]
         else:
-            logger.debug(f'Received response for operation {message["operationId"]} that already timed out, ignoring')
+            logger.debug(
+                f'Received response for operation {message["operationId"]} that already timed out, ignoring'
+            )
             return
 
         # TWO: GET DATA FROM APPROPRIATE DATA STORE AND DESERIALIZE IT

src/intersect_sdk/client_callback_definitions.py

@@ -11,7 +11,6 @@
 from .constants import SYSTEM_OF_SYSTEM_REGEX
 from .shared_callback_definitions import INTERSECT_JSON_VALUE, IntersectDirectMessageParams
 
-
 INTERSECT_CLIENT_TIMEOUT_CALLBACK_TYPE = Callable[[str], None]
 """
 This is a callable function type which should be defined by the user.

src/intersect_sdk/shared_callback_definitions.py

@@ -1,6 +1,8 @@
 """Callback definitions shared between Services, Capabilities, and Clients."""
 
-from typing import Any, Callable, Dict, List, Optional, Union
+from __future__ import annotations
+
+from typing import Any, Callable, Dict, List, Union
 
 from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import Annotated, TypeAlias
@@ -66,12 +68,12 @@ class IntersectDirectMessageParams(BaseModel):
     # pydantic config
     model_config = ConfigDict(revalidate_instances='always')
 
-    timeout: Optional[float] = None
+    timeout: float | None = None
     """
     The timeout in seconds for the request. If the request is not fulfilled within this time, the on_timeout callback will be called.
     """
 
-    on_timeout: Optional[Callable[[], None]] = None
+    on_timeout: Callable[[], None] | None = None
     """
     The callback to call if the request times out.
     """

tests/unit/test_client.py

@@ -2,9 +2,7 @@
 
 import time
 from threading import Event, Thread
-from unittest.mock import MagicMock, patch
-
-import pytest
+from unittest.mock import MagicMock
 
 from intersect_sdk.client import IntersectClient
 from intersect_sdk.client_callback_definitions import IntersectClientCallback
@@ -18,7 +16,15 @@ def test_timeout_callback_is_called():
         system='test',
         facility='test',
         organization='test',
-        brokers=[{'host': 'localhost', 'port': 1883, 'protocol': 'mqtt3.1.1', 'username': 'test', 'password': 'test'}],
+        brokers=[
+            {
+                'host': 'localhost',
+                'port': 1883,
+                'protocol': 'mqtt3.1.1',
+                'username': 'test',
+                'password': 'test',
+            }
+        ],
         initial_message_event_config=IntersectClientCallback(),
         terminate_after_initial_messages=True,
     )
@@ -72,7 +78,15 @@ def test_timeout_callback_is_not_called():
         system='test',
         facility='test',
         organization='test',
-        brokers=[{'host': 'localhost', 'port': 1883, 'protocol': 'mqtt3.1.1', 'username': 'test', 'password': 'test'}],
+        brokers=[
+            {
+                'host': 'localhost',
+                'port': 1883,
+                'protocol': 'mqtt3.1.1',
+                'username': 'test',
+                'password': 'test',
+            }
+        ],
         initial_message_event_config=IntersectClientCallback(),
         terminate_after_initial_messages=True,
     )
@@ -86,7 +100,6 @@ def on_timeout(operation_id):
 
     def user_callback(source, operation_id, has_error, payload):
         user_callback_called.append(True)
-        return None
 
     client = IntersectClient(config, user_callback=user_callback)
 
@@ -151,7 +164,15 @@ def test_response_after_timeout_is_ignored():
         system='test',
         facility='test',
         organization='test',
-        brokers=[{'host': 'localhost', 'port': 1883, 'protocol': 'mqtt3.1.1', 'username': 'test', 'password': 'test'}],
+        brokers=[
+            {
+                'host': 'localhost',
+                'port': 1883,
+                'protocol': 'mqtt3.1.1',
+                'username': 'test',
+                'password': 'test',
+            }
+        ],
         initial_message_event_config=IntersectClientCallback(),
         terminate_after_initial_messages=True,
     )
@@ -165,7 +186,6 @@ def on_timeout(operation_id):
 
     def user_callback(source, operation_id, has_error, payload):
         user_callback_called.append(True)
-        return None
 
     client = IntersectClient(config, user_callback=user_callback)