digitalkin 0.3.2.dev29__tar.gz → 0.3.2.dev31__tar.gz

{digitalkin-0.3.2.dev29 → digitalkin-0.3.2.dev31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.2.dev29
+Version: 0.3.2.dev31
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International

{digitalkin-0.3.2.dev29 → digitalkin-0.3.2.dev31}/pyproject.toml

@@ -25,7 +25,7 @@
         "Programming Language :: Python",
         "Topic :: Software Development :: Libraries",
     ]
-    version = "0.3.2.dev29"
+    version = "0.3.2.dev31"
 
     dependencies = [
         "agentic-mesh-protocol==0.2.1.dev0",
@@ -61,7 +61,7 @@
         "mypy>=1.19.1",
         "pre-commit>=4.5.1",
         "pyright>=1.1.407",
-        "ruff>=0.14.9",
+        "ruff>=0.14.14",
         "twine>=6.2.0",
         "typos>=1.40.0",
     ]

{digitalkin-0.3.2.dev29 → digitalkin-0.3.2.dev31}/src/digitalkin/__version__.py

@@ -5,4 +5,4 @@ from importlib.metadata import PackageNotFoundError, version
 try:
     __version__ = version("digitalkin")
 except PackageNotFoundError:
-    __version__ = "0.3.2.dev29"
+    __version__ = "0.3.2.dev31"

{digitalkin-0.3.2.dev29 → digitalkin-0.3.2.dev31}/src/digitalkin/grpc_servers/module_server.py

@@ -13,7 +13,6 @@ from digitalkin.logger import logger
 from digitalkin.models.grpc_servers.models import (
     ClientConfig,
     ModuleServerConfig,
-    SecurityMode,
 )
 from digitalkin.modules._base_module import BaseModule
 from digitalkin.services.registry import GrpcRegistry
@@ -45,8 +44,8 @@ class ModuleServer(BaseServer):
 
         Args:
             module_class: The module instance to be served.
-            server_config: Server configuration including registry address if auto-registration is desired.
-            client_config: Client configuration used by services.
+            server_config: Server configuration.
+            client_config: Client configuration used by services and registry connection.
         """
         super().__init__(server_config)
         self.module_class = module_class
@@ -55,9 +54,6 @@ class ModuleServer(BaseServer):
         self.module_servicer: ModuleServicer | None = None
         self.registry: RegistryStrategy | None = None
 
-        self._registry_client_config: ClientConfig | None = None
-        if self.server_config.registry_address:
-            self._registry_client_config = self._build_registry_client_config()
         self._prepare_registry_config()
 
     def _register_servicers(self) -> None:
@@ -85,36 +81,17 @@ class ModuleServer(BaseServer):
         This ensures ServicesConfig created by JobManager will have registry config,
         allowing spawned module instances to inherit the registry configuration.
         """
-        if not self._registry_client_config:
+        if not self.client_config:
             return
 
-        self.module_class.services_config_params["registry"] = {"client_config": self._registry_client_config}
-
-    def _build_registry_client_config(self) -> ClientConfig:
-        """Build ClientConfig for registry from server_config.registry_address.
-
-        Returns:
-            ClientConfig configured for registry connection.
-        """
-        host, port = self.server_config.registry_address.rsplit(":", 1)
-        return ClientConfig(
-            host=host,
-            port=int(port),
-            mode=self.server_config.mode,
-            security=self.client_config.security if self.client_config else SecurityMode.INSECURE,
-            credentials=self.client_config.credentials if self.client_config else None,
-        )
+        self.module_class.services_config_params["registry"] = {"client_config": self.client_config}
 
     def _init_registry(self) -> None:
-        """Initialize server-level registry client for registration.
-
-        Note: services_config_params["registry"] is already set in _prepare_registry_config()
-        which runs in __init__(). This method only creates the server-level client instance.
-        """
-        if not self._registry_client_config:
+        """Initialize server-level registry client for registration."""
+        if not self.client_config:
             return
 
-        self.registry = GrpcRegistry("", "", "", self._registry_client_config)
+        self.registry = GrpcRegistry("", "", "", self.client_config)
 
     def start(self) -> None:
         """Start the module server and register with the registry if configured."""
@@ -170,20 +147,21 @@ class ModuleServer(BaseServer):
             )
             return
 
+        advertise_address = self.server_config.advertise_host or self.server_config.host
+
         logger.info(
             "Attempting to register module with registry",
             extra={
                 "module_id": module_id,
-                "address": self.server_config.host,
+                "address": advertise_address,
                 "port": self.server_config.port,
                 "version": version,
-                "registry_address": self.server_config.registry_address,
             },
         )
 
         result = self.registry.register(
             module_id=module_id,
-            address=self.server_config.host,
+            address=advertise_address,
             port=self.server_config.port,
             version=version,
         )
@@ -193,16 +171,12 @@ class ModuleServer(BaseServer):
                 "Module registered successfully",
                 extra={
                     "module_id": result.module_id,
-                    "address": self.server_config.host,
+                    "address": advertise_address,
                     "port": self.server_config.port,
-                    "registry_address": self.server_config.registry_address,
                 },
             )
         else:
             logger.warning(
                 "Module registration returned None (module may not exist in registry)",
-                extra={
-                    "module_id": module_id,
-                    "registry_address": self.server_config.registry_address,
-                },
+                extra={"module_id": module_id, "address": advertise_address},
             )

{digitalkin-0.3.2.dev29 → digitalkin-0.3.2.dev31}/src/digitalkin/models/grpc_servers/models.py

@@ -344,10 +344,12 @@ class ModuleServerConfig(ServerConfig):
     """Configuration for Module gRPC server.
 
     Attributes:
-        registry_address: Address of the registry server
+        advertise_host: Public hostname/IP sent to registry for discovery. Falls back to host if not set.
     """
 
-    registry_address: str = Field(..., description="Address of the registry server")
+    advertise_host: str | None = Field(
+        None, description="Public hostname/IP sent to registry for discovery. Falls back to host if not set."
+    )
 
 
 class RegistryServerConfig(ServerConfig):

{digitalkin-0.3.2.dev29 → digitalkin-0.3.2.dev31}/src/digitalkin/models/module/tool_reference.py

@@ -43,7 +43,7 @@ class _ToolReferenceInputSchema:
     def __init__(
         self,
         setup_ids: list[str],
-        module_ids: list[str],
+        module_ids: list[str] | None,
         tag_ids: list[str],
         categories: list[str],
         max_tools: int = 0,
@@ -77,16 +77,17 @@ class _ToolReferenceInputSchema:
         json_schema["ui:widget"] = "toolSelect"
         json_schema["ui:options"] = {
             "setupIds": self.setup_ids,
-            "moduleIds": self.module_ids,
             "tagIds": self.tag_ids,
             "categories": self.categories,
+            "moduleIds": self.module_ids or [],
+            "showModules": self.module_ids is not None,
         }
         return json_schema
 
 
 def tool_reference_input(
     setup_ids: list[str] = [],
-    module_ids: list[str] = [],
+    module_ids: list[str] | None = [],
     tag_ids: list[str] = [],
     categories: list[str] = [],
     max_tools: int = 0,

{digitalkin-0.3.2.dev29 → digitalkin-0.3.2.dev31}/src/digitalkin/utils/schema_splitter.py

@@ -59,9 +59,18 @@ class SchemaSplitter:
                 if items_ui:
                     ui_target["items"] = items_ui
             elif key in {"allOf", "oneOf", "anyOf"} and isinstance(value, list):
-                for item in value:
-                    if isinstance(item, dict):
-                        cls._extract_ui_properties(item, ui_target, defs)
+                # For oneOf/anyOf, create a mirrored structure in ui_target
+                if key in {"oneOf", "anyOf"}:
+                    ui_target[key] = []
+                    for item in value:
+                        if isinstance(item, dict):
+                            item_ui: dict[str, Any] = {}
+                            cls._extract_ui_properties(item, item_ui, defs)
+                            ui_target[key].append(item_ui)
+                else:  # allOf - merge into parent
+                    for item in value:
+                        if isinstance(item, dict):
+                            cls._extract_ui_properties(item, ui_target, defs)
             elif key in {"if", "then", "else"} and isinstance(value, dict):
                 cls._extract_ui_properties(value, ui_target, defs)
             elif key == "$ref" and isinstance(value, str) and defs is not None and value.startswith("#/$defs/"):
@@ -132,13 +141,16 @@ class SchemaSplitter:
                         json_target["allOf"].append(item)
             elif key in {"oneOf", "anyOf"} and isinstance(value, list):
                 json_target[key] = []
+                ui_target[key] = []  # Mirror structure in ui_schema
                 for item in value:
                     if isinstance(item, dict):
                         item_json_oneof_anyof: dict[str, Any] = {}
                         cls._strip_ui_properties(item, item_json_oneof_anyof)
                         json_target[key].append(item_json_oneof_anyof)
-                        # Extract UI properties from oneOf/anyOf item (resolves $ref)
-                        cls._extract_ui_properties(item, ui_target, schema_defs)
+                        # Extract UI properties into a separate dict for this variant
+                        item_ui_oneof_anyof: dict[str, Any] = {}
+                        cls._extract_ui_properties(item, item_ui_oneof_anyof, schema_defs)
+                        ui_target[key].append(item_ui_oneof_anyof)
                     else:
                         json_target[key].append(item)
             elif key in {"if", "then", "else"} and isinstance(value, dict):
@@ -200,15 +212,18 @@ class SchemaSplitter:
                     ui_target["items"] = items_ui
             elif key in {"oneOf", "anyOf"} and isinstance(value, list):
                 json_target[key] = []
+                ui_target[key] = []  # Mirror structure in ui_schema
                 for item in value:
                     if isinstance(item, dict):
                         item_json_oneof_anyof: dict[str, Any] = {}
                         cls._strip_ui_properties(item, item_json_oneof_anyof)
                         json_target[key].append(item_json_oneof_anyof)
-                        # Extract UI properties from $ref in oneOf/anyOf items
+                        # Extract UI properties for this variant
+                        item_ui_oneof_anyof: dict[str, Any] = {}
                         ref_path = item.get("$ref", "")
                         if ref_path.startswith("#/$defs/") and ref_path[8:] in defs_ui:
-                            ui_target.update(defs_ui[ref_path[8:]])
+                            item_ui_oneof_anyof.update(defs_ui[ref_path[8:]])
+                        ui_target[key].append(item_ui_oneof_anyof)
                     else:
                         json_target[key].append(item)
             elif key == "hidden":

{digitalkin-0.3.2.dev29 → digitalkin-0.3.2.dev31}/src/digitalkin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.2.dev29
+Version: 0.3.2.dev31
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International