rename 'DirectMessageParams' to 'IntersectDirectMessageParams'

Signed-off-by: Lance Drane <dranelt@ornl.gov>

Author: Lance-Drane

examples/1_hello_world/hello_client.py

@@ -2,10 +2,10 @@
 
 from intersect_sdk import (
     INTERSECT_JSON_VALUE,
-    DirectMessageParams,
     IntersectClient,
     IntersectClientCallback,
     IntersectClientConfig,
+    IntersectDirectMessageParams,
     default_intersect_lifecycle_loop,
 )
 
@@ -74,7 +74,7 @@ def simple_client_callback(
       you'll get a message back.
     """
     initial_messages = [
-        DirectMessageParams(
+        IntersectDirectMessageParams(
             destination='hello-organization.hello-facility.hello-system.hello-subsystem.hello-service',
             operation='HelloExample.say_hello_to_name',
             payload='hello_client',

examples/1_hello_world_amqp/hello_client.py

@@ -2,10 +2,10 @@
 
 from intersect_sdk import (
     INTERSECT_JSON_VALUE,
-    DirectMessageParams,
     IntersectClient,
     IntersectClientCallback,
     IntersectClientConfig,
+    IntersectDirectMessageParams,
     default_intersect_lifecycle_loop,
 )
 
@@ -76,7 +76,7 @@ def simple_client_callback(
       you'll get a message back.
     """
     initial_messages = [
-        DirectMessageParams(
+        IntersectDirectMessageParams(
             destination='hello-organization.hello-facility.hello-system.hello-subsystem.hello-service',
             operation='HelloExample.say_hello_to_name',
             payload='hello_client',

examples/1_hello_world_events/hello_client.py

@@ -2,10 +2,10 @@
 
 from intersect_sdk import (
     INTERSECT_JSON_VALUE,
-    DirectMessageParams,
     IntersectClient,
     IntersectClientCallback,
     IntersectClientConfig,
+    IntersectDirectMessageParams,
     default_intersect_lifecycle_loop,
 )
 
@@ -95,7 +95,7 @@ def simple_event_callback(
       you'll get a message back.
     """
     initial_messages = [
-        DirectMessageParams(
+        IntersectDirectMessageParams(
             destination='hello-organization.hello-facility.hello-system.hello-subsystem.hello-service',
             operation='HelloExample.say_hello_to_name',
             payload='hello_client',

examples/2_counting/counting_client.py

@@ -4,10 +4,10 @@
 
 from intersect_sdk import (
     INTERSECT_JSON_VALUE,
-    DirectMessageParams,
     IntersectClient,
     IntersectClientCallback,
     IntersectClientConfig,
+    IntersectDirectMessageParams,
     default_intersect_lifecycle_loop,
 )
 
@@ -38,7 +38,7 @@ def __init__(self) -> None:
         self.message_stack = [
             # wait 5 seconds before stopping the counter. "Count" in response will be approx. 6
             (
-                DirectMessageParams(
+                IntersectDirectMessageParams(
                     destination='counting-organization.counting-facility.counting-system.counting-subsystem.counting-service',
                     operation='CountingExample.stop_count',
                     payload=None,
@@ -47,7 +47,7 @@ def __init__(self) -> None:
             ),
             # start the counter up again - it will not be 0 at this point! "Count" in response will be approx. 7
             (
-                DirectMessageParams(
+                IntersectDirectMessageParams(
                     destination='counting-organization.counting-facility.counting-system.counting-subsystem.counting-service',
                     operation='CountingExample.start_count',
                     payload=None,
@@ -56,7 +56,7 @@ def __init__(self) -> None:
             ),
             # reset the counter, but have it immediately start running again. "Count" in response will be approx. 10
             (
-                DirectMessageParams(
+                IntersectDirectMessageParams(
                     destination='counting-organization.counting-facility.counting-system.counting-subsystem.counting-service',
                     operation='CountingExample.reset_count',
                     payload=True,
@@ -65,7 +65,7 @@ def __init__(self) -> None:
             ),
             # reset the counter, but don't have it run again. "Count" in response will be approx. 6
             (
-                DirectMessageParams(
+                IntersectDirectMessageParams(
                     destination='counting-organization.counting-facility.counting-system.counting-subsystem.counting-service',
                     operation='CountingExample.reset_count',
                     payload=False,
@@ -74,7 +74,7 @@ def __init__(self) -> None:
             ),
             # start the counter back up. "Count" in response will be approx. 1
             (
-                DirectMessageParams(
+                IntersectDirectMessageParams(
                     destination='counting-organization.counting-facility.counting-system.counting-subsystem.counting-service',
                     operation='CountingExample.start_count',
                     payload=None,
@@ -83,7 +83,7 @@ def __init__(self) -> None:
             ),
             # finally, stop the counter one last time. "Count" in response will be approx. 4
             (
-                DirectMessageParams(
+                IntersectDirectMessageParams(
                     destination='counting-organization.counting-facility.counting-system.counting-subsystem.counting-service',
                     operation='CountingExample.stop_count',
                     payload=None,
@@ -158,7 +158,7 @@ def client_callback(
     # The counter will start after the initial message.
     # If the service is already active and counting, this may do nothing.
     initial_messages = [
-        DirectMessageParams(
+        IntersectDirectMessageParams(
             destination='counting-organization.counting-facility.counting-system.counting-subsystem.counting-service',
             operation='CountingExample.start_count',
             payload=None,

src/intersect_sdk/__init__.py

@@ -37,7 +37,7 @@
 )
 from .shared_callback_definitions import (
     INTERSECT_JSON_VALUE,
-    DirectMessageParams,
+    IntersectDirectMessageParams,
 )
 from .version import __version__, version_info, version_string
 
@@ -52,7 +52,7 @@
     'IntersectService',
     'IntersectClient',
     'IntersectClientCallback',
-    'DirectMessageParams',
+    'IntersectDirectMessageParams',
     'INTERSECT_CLIENT_RESPONSE_CALLBACK_TYPE',
     'INTERSECT_CLIENT_EVENT_CALLBACK_TYPE',
     'INTERSECT_JSON_VALUE',

src/intersect_sdk/_internal/interfaces.py

@@ -10,7 +10,7 @@
         INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE,
     )
     from ..shared_callback_definitions import (
-        DirectMessageParams,
+        IntersectDirectMessageParams,
     )
 
 
@@ -34,7 +34,7 @@ def _on_observe_event(self, event_name: str, event_value: Any, operation: str) -
     @abstractmethod
     def create_external_request(
         self,
-        request: DirectMessageParams,
+        request: IntersectDirectMessageParams,
         response_handler: INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None = None,
     ) -> UUID:
         """Observed entity (capabilitiy) tells observer (i.e. service) to send an external request.

src/intersect_sdk/capability/base.py

@@ -18,7 +18,7 @@
         INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE,
     )
     from ..shared_callback_definitions import (
-        DirectMessageParams,
+        IntersectDirectMessageParams,
     )
 
 
@@ -131,7 +131,7 @@ def intersect_sdk_emit_event(self, event_name: str, event_value: Any) -> None:
     @final
     def intersect_sdk_call_service(
         self,
-        request: DirectMessageParams,
+        request: IntersectDirectMessageParams,
         response_handler: INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None = None,
     ) -> list[UUID]:
         """Create an external request that we'll send to a different Service.

src/intersect_sdk/client.py

@@ -49,7 +49,7 @@
         INTERSECT_CLIENT_EVENT_CALLBACK_TYPE,
         INTERSECT_CLIENT_RESPONSE_CALLBACK_TYPE,
     )
-    from .shared_callback_definitions import DirectMessageParams
+    from .shared_callback_definitions import IntersectDirectMessageParams
 
 
 @final
@@ -425,7 +425,7 @@ def _handle_client_callback(self, user_value: IntersectClientCallback | None) ->
         for message in validated_result.messages_to_send:
             self._send_userspace_message(message)
 
-    def _send_userspace_message(self, params: DirectMessageParams) -> None:
+    def _send_userspace_message(self, params: IntersectDirectMessageParams) -> None:
         """Send a userspace message, be it an initial message from the user or from the user's callback function."""
         # ONE: SERIALIZE FUNCTION RESULTS
         # (function input should already be validated at this point)

src/intersect_sdk/client_callback_definitions.py

@@ -9,7 +9,7 @@
 from typing_extensions import Annotated, TypeAlias, final
 
 from .constants import SYSTEM_OF_SYSTEM_REGEX
-from .shared_callback_definitions import DirectMessageParams
+from .shared_callback_definitions import IntersectDirectMessageParams
 
 
 @final
@@ -19,7 +19,7 @@ class IntersectClientCallback(BaseModel):
     If you do not return a value of this type (or None), this will be treated as an Exception and will break the pub-sub loop.
     """
 
-    messages_to_send: List[DirectMessageParams] = []  # noqa: FA100 (runtime annotation)
+    messages_to_send: List[IntersectDirectMessageParams] = []  # noqa: FA100 (runtime annotation)
     """
     Messages to send as a result of an event or a response from a Service.
     """

src/intersect_sdk/service.py

@@ -59,7 +59,7 @@
 )
 from .shared_callback_definitions import (
     INTERSECT_JSON_VALUE,  # noqa: TCH001 (runtime-checked annotation)
-    DirectMessageParams,  # noqa: TCH001 (runtime-checked annotation)
+    IntersectDirectMessageParams,  # noqa: TCH001 (runtime-checked annotation)
 )
 from .version import version_string
 
@@ -111,7 +111,7 @@ def __init__(
             self,
             req_id: UUID,
             req_name: str,
-            request: DirectMessageParams,
+            request: IntersectDirectMessageParams,
             response_handler: INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None = None,
         ) -> None:
             """Create an external request."""
@@ -223,13 +223,13 @@ def __init__(
         self._external_request_ctr = 0
 
         self._startup_messages: list[
-            tuple[DirectMessageParams, INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None]
+            tuple[IntersectDirectMessageParams, INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None]
         ] = []
         self._resend_startup_messages = True
         self._sent_startup_messages = False
 
         self._shutdown_messages: list[
-            tuple[DirectMessageParams, INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None]
+            tuple[IntersectDirectMessageParams, INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None]
         ] = []
 
         self._data_plane_manager = DataPlaneManager(self._hierarchy, config.data_stores)
@@ -449,7 +449,9 @@ def get_blocked_keys(self) -> set[str]:
 
     def add_startup_messages(
         self,
-        messages: list[tuple[DirectMessageParams, INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None]],
+        messages: list[
+            tuple[IntersectDirectMessageParams, INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None]
+        ],
     ) -> None:
         """Add request messages to send out to various microservices when this service starts.
 
@@ -461,7 +463,9 @@ def add_startup_messages(
 
     def add_shutdown_messages(
         self,
-        messages: list[tuple[DirectMessageParams, INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None]],
+        messages: list[
+            tuple[IntersectDirectMessageParams, INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE | None]
+        ],
     ) -> None:
         """Add request messages to send out to various microservices on shutdown.
 
@@ -474,7 +478,7 @@ def add_shutdown_messages(
     @validate_call(config=ConfigDict(revalidate_instances='always'))
     def create_external_request(
         self,
-        request: DirectMessageParams,
+        request: IntersectDirectMessageParams,
         response_handler: Union[INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE, None] = None,  # noqa: UP007 (runtime checked annotation)
     ) -> UUID:
         """Create an external request that we'll send to a different Service.
@@ -715,7 +719,7 @@ def _handle_client_message(self, message: UserspaceMessage) -> None:
             error_msg = f'No external request found for message:\n{message}'
             logger.warning(error_msg)
 
-    def _send_client_message(self, request_id: UUID, params: DirectMessageParams) -> bool:
+    def _send_client_message(self, request_id: UUID, params: IntersectDirectMessageParams) -> bool:
         """Send a userspace message."""
         # "params" should already be validated at this stage.
         request = GENERIC_MESSAGE_SERIALIZER.dump_json(params.payload, warnings=False)