intersect-sdk 0.9.0__tar.gz → 0.9.1__tar.gz

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/PKG-INFO

@@ -1,30 +1,28 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: intersect-sdk
-Version: 0.9.0
+Version: 0.9.1
 Summary: Python SDK to interact with INTERSECT
 Keywords: intersect
-Author-Email: Lance Drane <dranelt@ornl.gov>, Marshall McDonnell <mcdonnellmt@ornl.gov>, Seth Hitefield <hitefieldsd@ornl.gov>, Andrew Ayres <ayresaf@ornl.gov>, Gregory Cage <cagege@ornl.gov>, Jesse McGaha <mcgahajr@ornl.gov>, Robert Smith <smithrw@ornl.gov>, Gavin Wiggins <wigginsg@ornl.gov>, Michael Brim <brimmj@ornl.gov>, Rick Archibald <archibaldrk@ornl.gov>, Addi Malviya Thakur <malviyaa@ornl.gov>
+Author: Lance Drane, Marshall McDonnell, Seth Hitefield, Andrew Ayres, Gregory Cage, Jesse McGaha, Robert Smith, Gavin Wiggins, Michael Brim, Rick Archibald, Addi Malviya Thakur
+Author-email: Lance Drane <dranelt@ornl.gov>, Marshall McDonnell <mcdonnellmt@ornl.gov>, Seth Hitefield <hitefieldsd@ornl.gov>, Andrew Ayres <ayresaf@ornl.gov>, Gregory Cage <cagege@ornl.gov>, Jesse McGaha <mcgahajr@ornl.gov>, Robert Smith <smithrw@ornl.gov>, Gavin Wiggins <wigginsg@ornl.gov>, Michael Brim <brimmj@ornl.gov>, Rick Archibald <archibaldrk@ornl.gov>, Addi Malviya Thakur <malviyaa@ornl.gov>
 License: BSD-3-Clause
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: pydantic>=2.7.0
+Requires-Dist: intersect-sdk-common>=0.9.6,<0.10.0
+Requires-Dist: jsonschema[format-nongpl]>=4.21.1
+Requires-Dist: psutil>=7.0.0
+Requires-Dist: sphinx>=5.3.0 ; extra == 'docs'
+Requires-Dist: furo>=2023.3.27 ; extra == 'docs'
+Requires-Python: >=3.10, <4.0
 Project-URL: Homepage, https://github.com/INTERSECT-SDK/python-sdk/
 Project-URL: Changelog, https://github.com/INTERSECT-SDK/python-sdk/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://intersect-python-sdk.readthedocs.io/en/latest/
 Project-URL: Issues, https://github.com/INTERSECT-SDK/python-sdk/issues
-Requires-Python: <4.0,>=3.10
-Requires-Dist: pydantic>=2.7.0
-Requires-Dist: retrying<2.0.0,>=1.3.4
-Requires-Dist: paho-mqtt<3.0.0,>=2.1.0
-Requires-Dist: pika<2.0.0,>=1.3.2
-Requires-Dist: minio>=7.2.3
-Requires-Dist: jsonschema[format-nongpl]>=4.21.1
-Requires-Dist: psutil>=7.0.0
 Provides-Extra: docs
-Requires-Dist: sphinx>=5.3.0; extra == "docs"
-Requires-Dist: furo>=2023.3.27; extra == "docs"
 Description-Content-Type: text/markdown
 
 [![Static Badge](https://img.shields.io/badge/DOI-10.11578%2Fdc.20240927.1-blue)](https://doi.org/10.11578/dc.20240927.1)

intersect_sdk-0.9.1/pyproject.toml

@@ -0,0 +1,198 @@
+[project]
+name = "intersect-sdk"
+description = "Python SDK to interact with INTERSECT"
+authors = [
+  { name = "Lance Drane", email = "dranelt@ornl.gov" },
+  { name = "Marshall McDonnell", email = "mcdonnellmt@ornl.gov" },
+  { name = "Seth Hitefield", email = "hitefieldsd@ornl.gov" },
+  { name = "Andrew Ayres", email = "ayresaf@ornl.gov" },
+  { name = "Gregory Cage", email = "cagege@ornl.gov" },
+  { name = "Jesse McGaha", email = "mcgahajr@ornl.gov" },
+  { name = "Robert Smith", email = "smithrw@ornl.gov" },
+  { name = "Gavin Wiggins", email = "wigginsg@ornl.gov" },
+  { name = "Michael Brim", email = "brimmj@ornl.gov" },
+  { name = "Rick Archibald", email = "archibaldrk@ornl.gov" },
+  { name = "Addi Malviya Thakur", email = "malviyaa@ornl.gov" },
+]
+version = "0.9.1"
+readme = "README.md"
+license = { text = "BSD-3-Clause" }
+requires-python = ">=3.10,<4.0"
+keywords = ["intersect"]
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+]
+dependencies = [
+  "pydantic>=2.7.0",
+  "intersect-sdk-common>=0.9.6,<0.10.0",
+  "jsonschema[format-nongpl]>=4.21.1",   # extras necessary for enforcing formats
+  #"brotli>=1.1.0", # TODO - add this dependency when we add compression
+  "psutil>=7.0.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/INTERSECT-SDK/python-sdk/"
+Changelog = "https://github.com/INTERSECT-SDK/python-sdk/blob/main/CHANGELOG.md"
+Documentation = "https://intersect-python-sdk.readthedocs.io/en/latest/"
+Issues = "https://github.com/INTERSECT-SDK/python-sdk/issues"
+
+[project.optional-dependencies]
+docs = ["sphinx>=5.3.0", "furo>=2023.3.27"]
+
+[dependency-groups]
+dev = [
+  "pre-commit>=3.3.1",
+  "ruff==0.12.7",
+  "mypy>=1.10.0",
+  "codespell>=2.3.0",
+  "pytest>=7.3.2",
+  "pytest-cov>=4.1.0",
+  "httpretty>=1.1.4",
+]
+
+[build-system]
+requires = ["uv_build>=0.10.2,<0.11.0"]
+build-backend = "uv_build"
+
+[tool.ruff]
+line-length = 100
+format = { quote-style = 'single' }
+
+[tool.ruff.lint]
+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 = 15, max-statements = 75 }
+# pyflakes and the relevant pycodestyle rules are already configured
+extend-select = [
+  'C90',   # mccabe complexity
+  'I',     # isort
+  'N',     # pep8-naming
+  'D',     # pydocstyle
+  'UP',    # pyupgrade
+  'YTT',   # flake8-2020
+  'ANN',   # flake8-annotations
+  'ASYNC', # flake8-async
+  'S',     # flake8-bandit
+  'BLE',   # flake8-blind-except
+  'B',     # flake8-bugbear
+  'A',     # flake8-builtins
+  'COM',   # flake8-commas
+  'C4',    # flake8-comprehensions
+  'DTZ',   # flake8-datetimez
+  'T10',   # flake8-debugger
+  'EM',    # flake8-error-message
+  'FA',    # flake8-future-annotations
+  'ISC',   # flake8-implicit-string-concat
+  'ICN',   # flake8-import-conventions
+  'G',     # flake8-logging-format
+  'INP',   # flake8-no-pep420
+  'PIE',   # flake8-PIE
+  'T20',   # flake8-T20
+  'PYI',   # flake8-pyi
+  'PT',    # flake8-pytest-style
+  'Q',     # flake8-quotes
+  'RSE',   # flake8-raise
+  'RET',   # flake8-return
+  'SLF',   # flake8-self
+  'SLOT',  # flake8-slots
+  'SIM',   # flake8-simplify
+  'TC',    # flake8-type-checking
+  'ARG',   # flake8-unused-arguments
+  'PTH',   # flake8-use-pathlib
+  'PGH',   # pygrep-hooks
+  'PL',    # pylint
+  'TRY',   # tryceratops
+  'FLY',   # flynt
+  'RUF',   # RUFF additional rules
+  'INT',   # flake8-gettext
+]
+# If you're seeking to disable a rule, first consider whether the rule is overbearing, or if it should only be turned off for your usecase.
+ignore = [
+  'COM812',  # formatter, handled by Ruff format
+  'ISC001',  # formatter, handled by Ruff format
+  'SIM105',  # "with contextlib.suppress():" is slower than try-except-pass
+  'ANN401',  # allow explicit "Any" typing, use with care
+  'PLR2004', # allow "magic numbers"
+]
+
+[tool.ruff.lint.flake8-type-checking]
+runtime-evaluated-base-classes = [
+  "pydantic.BaseModel",
+  "intersect_sdk.IntersectBaseCapabilityImplementation",
+]
+runtime-evaluated-decorators = [
+  "pydantic.dataclasses.dataclass",
+  "pydantic.validate_call",
+]
+
+[tool.ruff.lint.extend-per-file-ignores]
+'__init__.py' = [
+  'F401',  # __init__.py commonly has unused imports
+  'TC004', # do lazy imports when importing from the base module
+]
+'docs/*' = [
+  'D',      # the documentation folder does not need documentation
+  'INP001', # docs are not a namespace package
+]
+'examples/*' = [
+  'N999',   # module names for examples are not standard
+  'T20',    # allow print/pprint statements in examples
+  'S106',   # don't care about credentials in examples
+  'D100',   # documenting modules in examples is unhelpful
+  'D104',   # documenting packages in examples is unhelpful
+  'TRY002', # examples can raise their own exception
+]
+'tests/*' = [
+  'S101',   # allow assert statements in tests
+  'S106',   # don't care about credentials in tests
+  'S311',   # don't care about cryptographic security in tests
+  'SLF001', # allow private member access in tests
+  'ANN',    # tests in general don't need types, unless they are runtime types.
+  'ARG',    # allow unused parameters in tests
+  'D',      # ignore documentation in tests
+  'RUF012', # permit "mutable" class attributes to not be annotated with typing.ClassVar (these shouldn't be mutated anyways...)
+]
+
+# see https://mypy.readthedocs.io/en/stable/config_file.html for a complete reference
+[tool.mypy]
+strict = true
+ignore_missing_imports = true       # don't require typing for library stubs if they don't exist
+disallow_untyped_decorators = false # this is needed for library decorator compatibility, i.e. "retrying"
+plugins = ["pydantic.mypy"]
+
+[tool.pydantic-mypy]
+init_forbid_extra = true
+init_typed = true
+warn_required_dynamic_aliases = true
+warn_untyped_fields = true
+
+[tool.pytest.ini_options]
+log_cli = true
+addopts = "-ra"
+
+[tool.coverage.report]
+omit = [
+  '*__init__*',             # __init__ files should just re-export other classes and functions
+  '*/discovery_service.py', # currently unused
+]
+exclude_also = [
+  'pragma: no-cover',              # standard
+  'if (typing\\.)?TYPE_CHECKING:', # type checking blocks are not executed in coverage, but we don't care
+  '@(abc\\.)?abstractmethod',      # don't try to cover abstract methods
+  "class .*\\bProtocol\\):",       # don't cover protocol classes (similar to abstract classes)
+  'raise NotImplementedError',     # it's not implemented so shouldn't be covered
+  'except.* ImportError',          # these are usually used to throw a "friendlier" error and are not really worth testing
+]
+
+[tool.codespell]
+# Ref: https://github.com/codespell-project/codespell#using-a-config-file
+skip = '.git*,*.lock,.venv,.*cache/*,./docs/_build/*'
+check-hidden = true
+# ignore-regex = ''
+# ignore-words-list = ''

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/src/intersect_sdk/__init__.py

@@ -12,6 +12,18 @@ from typing import TYPE_CHECKING
 
 # import everything eagerly for IDEs/LSPs
 if TYPE_CHECKING:
+    from intersect_sdk_common import (
+        ControlPlaneConfig,
+        ControlProvider,
+        DataStoreConfig,
+        DataStoreConfigMap,
+        HierarchyConfig,
+        IntersectDataHandler,
+        IntersectMimeType,
+        intersect_sdk_version_info,
+        intersect_sdk_version_string,
+    )
+
     from .app_lifecycle import default_intersect_lifecycle_loop
     from .capability.base import IntersectBaseCapabilityImplementation
     from .client import IntersectClient
@@ -22,14 +34,6 @@ if TYPE_CHECKING:
     )
     from .config.client import IntersectClientConfig
     from .config.service import IntersectServiceConfig
-    from .config.shared import (
-        ControlPlaneConfig,
-        ControlProvider,
-        DataStoreConfig,
-        DataStoreConfigMap,
-        HierarchyConfig,
-    )
-    from .core_definitions import IntersectDataHandler, IntersectMimeType
     from .exceptions import IntersectCapabilityError
     from .schema import get_schema_from_capability_implementations
     from .service import IntersectService
@@ -47,7 +51,7 @@ if TYPE_CHECKING:
         IntersectDirectMessageParams,
         IntersectEventMessageParams,
     )
-    from .version import __version__, version_info, version_string
+    from .version import __version__
 
 __all__ = (
     'INTERSECT_CLIENT_EVENT_CALLBACK_TYPE',
@@ -76,50 +80,78 @@ __all__ = (
     'default_intersect_lifecycle_loop',
     'get_schema_from_capability_implementations',
     'intersect_message',
+    'intersect_sdk_version_info',
+    'intersect_sdk_version_string',
     'intersect_status',
-    'version_info',
-    'version_string',
 )
 
 # PEP 562 stuff: do lazy imports for people who just want to import from the top-level module
-
+# [0] = package, [1] = path to module within package
 __lazy_imports = {
-    'INTERSECT_CLIENT_EVENT_CALLBACK_TYPE': '.client_callback_definitions',
-    'INTERSECT_CLIENT_RESPONSE_CALLBACK_TYPE': '.client_callback_definitions',
-    'INTERSECT_JSON_VALUE': '.shared_callback_definitions',
-    'INTERSECT_RESPONSE_VALUE': '.shared_callback_definitions',
-    'INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE': '.service_callback_definitions',
-    'ControlPlaneConfig': '.config.shared',
-    'ControlProvider': '.config.shared',
-    'DataStoreConfig': '.config.shared',
-    'DataStoreConfigMap': '.config.shared',
-    'HierarchyConfig': '.config.shared',
-    'IntersectBaseCapabilityImplementation': '.capability.base',
-    'IntersectCapabilityError': '.exceptions',
-    'IntersectClient': '.client',
-    'IntersectClientCallback': '.client_callback_definitions',
-    'IntersectClientConfig': '.config.client',
-    'IntersectDataHandler': '.core_definitions',
-    'IntersectDirectMessageParams': '.shared_callback_definitions',
-    'IntersectEventDefinition': '.service_definitions',
-    'IntersectEventMessageParams': '.shared_callback_definitions',
-    'IntersectMimeType': '.core_definitions',
-    'IntersectService': '.service',
-    'IntersectServiceConfig': '.config.service',
-    '__version__': '.version',
-    'default_intersect_lifecycle_loop': '.app_lifecycle',
-    'get_schema_from_capability_implementations': '.schema',
-    'intersect_message': '.service_definitions',
-    'intersect_status': '.service_definitions',
-    'version_info': '.version',
-    'version_string': '.version',
+    # COMMON: core types
+    'IntersectDataHandler': ('intersect_sdk_common', '.'),
+    'IntersectMimeType': ('intersect_sdk_common', '.'),
+    # COMMON: config types
+    'ControlPlaneConfig': ('intersect_sdk_common', '.'),
+    'ControlProvider': ('intersect_sdk_common', '.'),
+    'DataStoreConfig': ('intersect_sdk_common', '.'),
+    'DataStoreConfigMap': ('intersect_sdk_common', '.'),
+    'HierarchyConfig': ('intersect_sdk_common', '.'),
+    # COMMON: version
+    'intersect_sdk_version_info': ('intersect_sdk_common', '.'),
+    'intersect_sdk_version_string': ('intersect_sdk_common', '.'),
+    # imports not in common
+    'INTERSECT_CLIENT_EVENT_CALLBACK_TYPE': (
+        __spec__.parent,
+        '.client_callback_definitions',
+    ),
+    'INTERSECT_CLIENT_RESPONSE_CALLBACK_TYPE': (
+        __spec__.parent,
+        '.client_callback_definitions',
+    ),
+    'INTERSECT_JSON_VALUE': (__spec__.parent, '.shared_callback_definitions'),
+    'INTERSECT_RESPONSE_VALUE': (
+        __spec__.parent,
+        '.shared_callback_definitions',
+    ),
+    'INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE': (
+        __spec__.parent,
+        '.service_callback_definitions',
+    ),
+    'IntersectBaseCapabilityImplementation': (
+        __spec__.parent,
+        '.capability.base',
+    ),
+    'IntersectCapabilityError': (__spec__.parent, '.exceptions'),
+    'IntersectClient': (__spec__.parent, '.client'),
+    'IntersectClientCallback': (
+        __spec__.parent,
+        '.client_callback_definitions',
+    ),
+    'IntersectClientConfig': (__spec__.parent, '.config.client'),
+    'IntersectDirectMessageParams': (
+        __spec__.parent,
+        '.shared_callback_definitions',
+    ),
+    'IntersectEventDefinition': (__spec__.parent, '.service_definitions'),
+    'IntersectEventMessageParams': (
+        __spec__.parent,
+        '.shared_callback_definitions',
+    ),
+    'IntersectService': (__spec__.parent, '.service'),
+    'IntersectServiceConfig': (__spec__.parent, '.config.service'),
+    '__version__': (__spec__.parent, '.version'),
+    'default_intersect_lifecycle_loop': (__spec__.parent, '.app_lifecycle'),
+    'get_schema_from_capability_implementations': (__spec__.parent, '.schema'),
+    'intersect_message': (__spec__.parent, '.service_definitions'),
+    'intersect_status': (__spec__.parent, '.service_definitions'),
 }
 
 
 def __getattr__(attr_name: str) -> object:
     attr_module = __lazy_imports.get(attr_name)
     if attr_module:
-        module = import_module(attr_module, package=__spec__.parent)
+        module = import_module(attr_module[1], package=attr_module[0])
         return getattr(module, attr_name)
 
     msg = f'module {__name__!r} has no attribute {attr_name!r}'

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/src/intersect_sdk/_internal/interfaces.py

@@ -5,8 +5,9 @@ from typing import TYPE_CHECKING, Any, Protocol
 if TYPE_CHECKING:
     from uuid import UUID
 
+    from intersect_sdk_common import HierarchyConfig
+
     from ..client_callback_definitions import INTERSECT_CLIENT_EVENT_CALLBACK_TYPE
-    from ..config.shared import HierarchyConfig
     from ..service_callback_definitions import (
         INTERSECT_SERVICE_RESPONSE_CALLBACK_TYPE,
     )

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/src/intersect_sdk/_internal/schema.py

@@ -14,12 +14,18 @@ from typing import (
     get_origin,
 )
 
+from intersect_sdk_common import intersect_sdk_version_string
+from intersect_sdk_common.constants import CAPABILITY_REGEX
+from intersect_sdk_common.control_plane.messages.event import (
+    EventMessageHeaders,
+)
+from intersect_sdk_common.control_plane.messages.userspace import (
+    UserspaceMessageHeaders,
+)
 from pydantic import Field, PydanticUserError, TypeAdapter
 from typing_extensions import TypeAliasType
 
-from ..constants import CAPABILITY_REGEX
 from ..service_definitions import IntersectEventDefinition
-from ..version import version_string
 from .constants import (
     BASE_RESPONSE_ATTR,
     BASE_STATUS_ATTR,
@@ -32,18 +38,15 @@ from .constants import (
 from .event_metadata import EventMetadata, definition_metadata_differences
 from .function_metadata import FunctionMetadata
 from .logger import logger
-from .messages.event import EventMessageHeaders
-from .messages.userspace import UserspaceMessageHeaders
 from .pydantic_schema_generator import GenerateTypedJsonSchema
 from .status_metadata import StatusMetadata
 from .utils import die
 
 if TYPE_CHECKING:
+    from intersect_sdk_common import HierarchyConfig, IntersectDataHandler
     from pydantic.json_schema import JsonSchemaMode
 
     from ..capability.base import IntersectBaseCapabilityImplementation
-    from ..config.shared import HierarchyConfig
-    from ..core_definitions import IntersectDataHandler
 
 ASYNCAPI_VERSION = '2.6.0'
 
@@ -619,7 +622,7 @@ def get_schema_and_functions_from_capability_implementations(
             or not re.fullmatch(CAPABILITY_REGEX, cap_name)
         ):
             die(
-                f'Invalid intersect_sdk_capability_name on capability {capability_type.__name__} - must be a non-empty string with only alphanumeric characters and hyphens (you must explicitly set this, and do so on the class and not an instance).'
+                f'Invalid intersect_sdk_capability_name on capability {capability_type.__name__} - must be a non-empty string with only alphanumeric characters and underscores (you must explicitly set this, and do so on the class and not an instance).'
             )
         if cap_name in capability_schemas:
             die(
@@ -659,7 +662,7 @@ def get_schema_and_functions_from_capability_implementations(
 
     asyncapi_spec = {
         'asyncapi': ASYNCAPI_VERSION,
-        'x-intersect-version': version_string,
+        'x-intersect-version': intersect_sdk_version_string,
         'info': {
             'title': service_name.hierarchy_string('.'),
             'description': 'INTERSECT schema',

intersect_sdk-0.9.1/src/intersect_sdk/_internal/service_queue_name.py

@@ -0,0 +1,14 @@
+from hashlib import sha384
+
+
+def get_service_queue_name(routing_key: str) -> str:
+    """Generate a valid queue name from the routing key.
+
+    We want to always be able to generate the same queue name from the routing key every time,
+    so we don't use UUIDs or want the broker to generate a key name.
+
+    We must also keep the length under 128 characters.
+
+    See https://www.rabbitmq.com/docs/queues#names for a complete reference.
+    """
+    return sha384(routing_key.encode()).hexdigest()

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/src/intersect_sdk/capability/universal_capability/status.py

@@ -1,7 +1,5 @@
 """Definitions supporting the 'core status' functionality of the core capability."""
 
-from __future__ import annotations
-
 import datetime
 from typing import Annotated
 

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/src/intersect_sdk/client.py

@@ -10,44 +10,39 @@ Users do not need to interact with the client other than through its constructor
 Most useful definitions and typings will be found in the client_callback_definitions module.
 """
 
-from __future__ import annotations
-
 import time
-from typing import TYPE_CHECKING
 from uuid import uuid4
 
-from pydantic import ValidationError
-from typing_extensions import Self, final
-
-from intersect_sdk._internal.generic_serializer import GENERIC_MESSAGE_SERIALIZER
-
-from ._internal.control_plane.control_plane_manager import (
+from intersect_sdk_common import (
     ControlPlaneManager,
+    DataPlaneManager,
+    HierarchyConfig,
+    IntersectError,
+    resolve_user_version,
 )
-from ._internal.data_plane.data_plane_manager import DataPlaneManager
-from ._internal.exceptions import IntersectError
-from ._internal.logger import logger
-from ._internal.messages.event import (
+from intersect_sdk_common.control_plane.messages.event import (
     validate_event_message_headers,
 )
-from ._internal.messages.userspace import (
+from intersect_sdk_common.control_plane.messages.userspace import (
     create_userspace_message_headers,
     validate_userspace_message_headers,
 )
+from pydantic import ValidationError
+from typing_extensions import Self, final
+
+from intersect_sdk._internal.generic_serializer import (
+    GENERIC_MESSAGE_SERIALIZER,
+)
+
+from ._internal.logger import logger
 from ._internal.utils import die, send_os_signal
-from ._internal.version_resolver import resolve_user_version
 from .client_callback_definitions import (
+    INTERSECT_CLIENT_EVENT_CALLBACK_TYPE,
+    INTERSECT_CLIENT_RESPONSE_CALLBACK_TYPE,
     IntersectClientCallback,
 )
 from .config.client import IntersectClientConfig
-from .config.shared import HierarchyConfig
-
-if TYPE_CHECKING:
-    from .client_callback_definitions import (
-        INTERSECT_CLIENT_EVENT_CALLBACK_TYPE,
-        INTERSECT_CLIENT_RESPONSE_CALLBACK_TYPE,
-    )
-    from .shared_callback_definitions import IntersectDirectMessageParams
+from .shared_callback_definitions import IntersectDirectMessageParams
 
 
 @final
@@ -131,6 +126,7 @@ class IntersectClient:
                     f'{self._hierarchy.hierarchy_string("/")}/response',
                     {self._handle_userspace_message},
                     persist=False,
+                    queue_name=self._hierarchy.service,
                 )
             if event_callback:
                 # Do not persist, as event messages are meant to be short-lived.
@@ -142,6 +138,7 @@ class IntersectClient:
                         f'{service.hierarchy.replace(".", "/")}/events/{service.capability_name}/{service.event_name}',
                         {self._handle_event_message},
                         persist=False,
+                        queue_name=self._hierarchy.service,
                     )
         self._user_callback = user_callback
         self._event_callback = event_callback
@@ -393,6 +390,7 @@ class IntersectClient:
                 self._control_plane_manager.add_subscription_channel(
                     f'{add_event.hierarchy.replace(".", "/")}/events/{add_event.capability_name}/{add_event.event_name}',
                     {self._handle_event_message},
+                    queue_name=self._hierarchy.service,
                     persist=False,
                 )
             for remove_event in validated_result.services_to_stop_listening_for_events:

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/src/intersect_sdk/config/client.py

@@ -1,19 +1,19 @@
 """Client specific configuration types."""
 
-from typing import Annotated, Literal
+from typing import Annotated
 
+from intersect_sdk_common import ControlPlaneConfig, DataStoreConfigMap
 from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import final
 
 from ..client_callback_definitions import IntersectClientCallback
-from .shared import ControlPlaneConfig, DataStoreConfigMap
 
 
 @final
 class IntersectClientConfig(BaseModel):
     """The user-provided configuration needed to integrate with INTERSECT as a client."""
 
-    brokers: Annotated[list[ControlPlaneConfig], Field(min_length=1)] | Literal['discovery']
+    brokers: Annotated[list[ControlPlaneConfig], Field(min_length=1)]
     """
     Configurations for any message brokers the application should attach to
 

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/src/intersect_sdk/config/service.py

@@ -1,11 +1,14 @@
 """Service specific configuration types."""
 
-from typing import Annotated, Literal
+from typing import Annotated
 
+from intersect_sdk_common import (
+    ControlPlaneConfig,
+    DataStoreConfigMap,
+    HierarchyConfig,
+)
 from pydantic import BaseModel, ConfigDict, Field, PositiveFloat
 
-from .shared import ControlPlaneConfig, DataStoreConfigMap, HierarchyConfig
-
 
 class IntersectServiceConfig(BaseModel):
     """The user-provided configuration needed to integrate with INTERSECT."""
@@ -15,7 +18,7 @@ class IntersectServiceConfig(BaseModel):
     Configuration of the System-of-System representation
     """
 
-    brokers: Annotated[list[ControlPlaneConfig], Field(min_length=1)] | Literal['discovery']
+    brokers: Annotated[list[ControlPlaneConfig], Field(min_length=1)]
     """
     Configurations for any message brokers the application should attach to
 

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/src/intersect_sdk/exceptions.py

@@ -1,9 +1,9 @@
 """Public exceptions API."""
 
-from ._internal.exceptions import IntersectError
+from intersect_sdk_common import IntersectApplicationError
 
 
-class IntersectCapabilityError(IntersectError):
+class IntersectCapabilityError(IntersectApplicationError):
     """This is a marker for a special kind of Capability Exception. WARNING: USE THIS WITH CARE.
 
     When the SDK catches an Exception from Capability code, it has to decide whether to send information about the Exception in the message, or a generic "Application raised Exception" message.

{intersect_sdk-0.9.0 → intersect_sdk-0.9.1}/src/intersect_sdk/schema.py

@@ -38,7 +38,7 @@ from .capability.base import IntersectBaseCapabilityImplementation
 from .capability.universal_capability.universal_capability import IntersectSdkCoreCapability
 
 if TYPE_CHECKING:
-    from .config.shared import HierarchyConfig
+    from intersect_sdk_common import HierarchyConfig
 
 
 def get_schema_from_capability_implementations(