svc2svc - fix a few typing errors, lint/format

Signed-off-by: Lance Drane <[email protected]>

Author: Lance-Drane

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
         args: [ --fix ]
       - id: ruff-format
   - repo: https://github.com/pdm-project/pdm
-    rev: 2.11.2
+    rev: 2.17.2
     hooks:
       - id: pdm-export
         args: ['--without-hashes']

examples/1_hello_world/hello_service.py

@@ -79,7 +79,7 @@ def say_hello_to_name(self, name: str) -> str:
     @intersect_message and @intersect_status, and that these functions are appropriately type-annotated.
     """
     capability = HelloServiceCapabilityImplementation()
-    capability.capability_name = "HelloExample"
+    capability.capability_name = 'HelloExample'
 
     """
     step three - create service from both the configuration and your own capability

examples/1_hello_world_amqp/hello_service.py

@@ -80,7 +80,7 @@ def say_hello_to_name(self, name: str) -> str:
     @intersect_message and @intersect_status, and that these functions are appropriately type-annotated.
     """
     capability = HelloServiceCapabilityImplementation()
-    capability.capability_name = "HelloExample"
+    capability.capability_name = 'HelloExample'
 
     """
     step three - create service from both the configuration and your own capability

examples/1_hello_world_events/hello_service.py

@@ -83,7 +83,7 @@ def say_hello_to_name(self, name: str) -> str:
     @intersect_message and @intersect_status, and that these functions are appropriately type-annotated.
     """
     capability = HelloServiceCapabilityImplementation()
-    capability.capability_name = "HelloExample"
+    capability.capability_name = 'HelloExample'
 
     """
     step three - create service from both the configuration and your own capability

examples/2_counting/counting_service.py

@@ -191,7 +191,7 @@ def _run_count(self) -> None:
         **from_config_file,
     )
     capability = CountingServiceCapabilityImplementation()
-    capability.capability_name = "CountingExample"
+    capability.capability_name = 'CountingExample'
     service = IntersectService([capability], config)
     logger.info('Starting counting_service, use Ctrl+C to exit.')
     default_intersect_lifecycle_loop(

examples/2_counting_events/counting_service.py

@@ -83,7 +83,7 @@ def increment_counter_function(self) -> None:
         **from_config_file,
     )
     capability = CountingServiceCapabilityImplementation()
-    capability.capability_name = "CountingExample"
+    capability.capability_name = 'CountingExample'
     service = IntersectService([capability], config)
     logger.info('Starting counting_service, use Ctrl+C to exit.')
 

pyproject.toml

@@ -84,7 +84,7 @@ isort = { known-first-party = ['src'] }
 pydocstyle = { convention = 'google'}
 flake8-quotes = {inline-quotes = 'single', multiline-quotes = 'double'}
 mccabe = { max-complexity = 20 }
-pylint = { max-args = 10, max-branches = 20, max-returns = 10 }
+pylint = { max-args = 10, max-branches = 20, max-returns = 10, max-statements = 75 }
 # pyflakes and the relevant pycodestyle rules are already configured
 extend-select = [
     'C90', # mccabe complexity

src/intersect_sdk/_internal/messages/userspace.py

@@ -9,17 +9,22 @@
 from services they explicitly messaged.
 """
 
+from __future__ import annotations
+
 import datetime
 import uuid
 from typing import Any, Union
 
 from pydantic import AwareDatetime, Field, TypeAdapter
 from typing_extensions import Annotated, TypedDict
 
-from ...constants import SYSTEM_OF_SYSTEM_REGEX
-from ...core_definitions import IntersectDataHandler, IntersectMimeType
+from ...constants import SYSTEM_OF_SYSTEM_REGEX  # noqa: TCH001 (this is runtime checked)
+from ...core_definitions import (  # noqa: TCH001 (this is runtime checked)
+    IntersectDataHandler,
+    IntersectMimeType,
+)
 from ...version import version_string
-from ..data_plane.minio_utils import MinioPayload
+from ..data_plane.minio_utils import MinioPayload  # noqa: TCH001 (this is runtime checked)
 
 
 class UserspaceMessageHeader(TypedDict):
@@ -115,7 +120,7 @@ class UserspaceMessage(TypedDict):
     the headers of the message
     """
 
-    payload: Union[bytes, MinioPayload]  # noqa: FA100 (Pydantic uses runtime annotations)
+    payload: Union[bytes, MinioPayload]  # noqa: UP007 (Pydantic uses runtime annotations)
     """
     main payload of the message. Needs to match the schema format, including the content type.
 
@@ -141,7 +146,7 @@ def create_userspace_message(
     content_type: IntersectMimeType,
     data_handler: IntersectDataHandler,
     payload: Any,
-    message_id: uuid.UUID = None,
+    message_id: uuid.UUID | None = None,
     has_error: bool = False,
 ) -> UserspaceMessage:
     """Payloads depend on the data_handler and has_error."""

src/intersect_sdk/_internal/schema.py

@@ -8,7 +8,6 @@
     TYPE_CHECKING,
     Any,
     Callable,
-    List,
     Mapping,
     NamedTuple,
     get_origin,
@@ -339,7 +338,7 @@ def _introspection_baseline(
     # parse functions
     for class_name, name, method, min_params in response_funcs:
         public_name = f'{cap_name}.{name}'
-        
+
         # TODO - I'm placing this here for now because we'll eventually want to capture data plane and broker configs in the schema.
         # (It's possible we may want to separate the backing service schema from the application logic, but it's unlikely.)
         # At the moment, we're just validating that users can support their response_data_handler property.
@@ -495,7 +494,7 @@ def _introspection_baseline(
 
 
 def get_schema_and_functions_from_capability_implementations(
-    capabilities: List[IntersectBaseCapabilityImplementation],
+    capabilities: list[IntersectBaseCapabilityImplementation],
     service_name: HierarchyConfig,
     excluded_data_handlers: set[IntersectDataHandler],
 ) -> tuple[
@@ -510,16 +509,16 @@ def get_schema_and_functions_from_capability_implementations(
 
     In-depth introspection is handled later on.
     """
-    capability_type_docs : str = ""
-    status_function_cap : IntersectBaseCapabilityImplementation = None
-    status_function_name : str = None
-    status_function_schema : dict[str, Any] = None
-    status_function_adapter : TypeAdapter[Any] = None
-    schemas : dict[Any, Any] = dict()
-    channels : dict[str, dict[str, dict[str, Any]]] = dict() # endpoint schemas
-    function_map : dict[str, FunctionMetadata] = dict()      # endpoint functionality
-    events : dict[str, Any] = dict()                         # event schemas
-    event_map : dict[str, EventMetadata] = dict()            # event functionality
+    capability_type_docs: str = ''
+    status_function_cap: IntersectBaseCapabilityImplementation | None = None
+    status_function_name: str | None = None
+    status_function_schema: dict[str, Any] | None = None
+    status_function_adapter: TypeAdapter[Any] | None = None
+    schemas: dict[Any, Any] = {}
+    channels: dict[str, dict[str, dict[str, Any]]] = {}  # endpoint schemas
+    function_map: dict[str, FunctionMetadata] = {}  # endpoint functionality
+    events: dict[str, Any] = {}  # event schemas
+    event_map: dict[str, EventMetadata] = {}  # event functionality
     for capability in capabilities:
         capability_type: type[IntersectBaseCapabilityImplementation] = type(capability)
         if capability_type.__doc__:
@@ -532,7 +531,7 @@ def get_schema_and_functions_from_capability_implementations(
             cap_events,
             cap_event_map,
         ) = _introspection_baseline(capability, excluded_data_handlers)
-        
+
         if cap_status_fn_name and cap_status_schema and cap_status_type_adapter:
             status_function_cap = capability
             status_function_name = cap_status_fn_name
@@ -544,7 +543,6 @@ def get_schema_and_functions_from_capability_implementations(
         function_map.update(cap_function_map)
         events.update(cap_events)
         event_map.update(cap_event_map)
-        
 
     asyncapi_spec = {
         'asyncapi': ASYNCAPI_VERSION,
@@ -576,7 +574,7 @@ def get_schema_and_functions_from_capability_implementations(
         },
     }
 
-    if capability_type_docs != "":
+    if capability_type_docs != '':
         asyncapi_spec['info']['description'] = capability_type_docs  # type: ignore[index]
 
     if status_function_schema:
@@ -591,4 +589,11 @@ def get_schema_and_functions_from_capability_implementations(
     },
     """
 
-    return asyncapi_spec, function_map, event_map, status_function_cap, status_function_name, status_function_adapter
+    return (
+        asyncapi_spec,
+        function_map,
+        event_map,
+        status_function_cap,
+        status_function_name,
+        status_function_adapter,
+    )

src/intersect_sdk/capability/base.py

@@ -26,8 +26,7 @@ def __init__(self) -> None:
 
         NOTE: If you write your own constructor, you MUST call super.__init__() inside of it. The Service will throw an error if you don't.
         """
-        
-        self._capability_name : str = "InvalidCapability"
+        self._capability_name: str = 'InvalidCapability'
         """
         The advertised name for the capability, as opposed to the implementation class name
         """
@@ -49,14 +48,14 @@ def __init_subclass__(cls) -> None:
         ):
             msg = f"{cls.__name__}: Cannot override functions '_intersect_sdk_register_observer' or 'intersect_sdk_emit_event'"
             raise RuntimeError(msg)
-        
+
     @property
     def capability_name(self) -> str:
-        """The advertised name for the capability provided by this implementation"""
+        """The advertised name for the capability provided by this implementation."""
         return self._capability_name
-    
+
     @capability_name.setter
-    def capability_name(self, cname : str) -> str:
+    def capability_name(self, cname: str) -> None:
         self._capability_name = cname
 
     @final