digitalkin 0.3.2.dev17__tar.gz → 0.3.2.dev18__tar.gz

{digitalkin-0.3.2.dev17 → digitalkin-0.3.2.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.2.dev17
+Version: 0.3.2.dev18
 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.dev17 → digitalkin-0.3.2.dev18}/pyproject.toml

@@ -12,7 +12,7 @@
 
     keywords = [ "digitalkin", "kin", "agent", "gprc", "sdk" ]
 
-    version = "0.3.2.dev17"
+    version = "0.3.2.dev18"
     classifiers = [
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",

{digitalkin-0.3.2.dev17 → digitalkin-0.3.2.dev18}/src/digitalkin/__version__.py

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

{digitalkin-0.3.2.dev17 → digitalkin-0.3.2.dev18}/src/digitalkin/models/module/module_context.py

@@ -8,7 +8,7 @@ from typing import Any
 from zoneinfo import ZoneInfo
 
 from digitalkin.logger import logger
-from digitalkin.models.module.tool_cache import ToolCache, ToolDefinition, ToolParameter
+from digitalkin.models.module.tool_cache import ToolCache, ToolDefinition, ToolModuleInfo, ToolParameter
 from digitalkin.services.agent.agent_strategy import AgentStrategy
 from digitalkin.services.communication.communication_strategy import CommunicationStrategy
 from digitalkin.services.cost.cost_strategy import CostStrategy
@@ -227,20 +227,20 @@ class ModuleContext:
             llm_format=llm_format,
         )
 
-    async def create_openai_style_tools(self, tool_name: str) -> list[dict[str, Any]]:
+    async def create_openai_style_tools(self, module_id: str) -> list[dict[str, Any]]:
         """Create OpenAI-style function calling schemas for a tool module.
 
         Uses tool cache (fast path) with registry fallback. Returns one schema
         per ToolDefinition (protocol) in the module.
 
         Args:
-            tool_name: Module ID to look up (checks cache first, then registry).
+            module_id: Module ID to look up (checks cache first, then registry).
 
         Returns:
             List of OpenAI-style tool schemas, one per protocol. Empty if not found.
         """
         tool_module_info = await self.tool_cache.get(
-            tool_name, registry=self.registry, communication=self.communication
+            module_id, registry=self.registry, communication=self.communication
         )
         if not tool_module_info:
             return []
@@ -299,13 +299,11 @@ class ModuleContext:
 
         communication = self.communication
         session = self.session
-        address = tool_module_info.address
-        port = tool_module_info.port
 
         result = []
         for tool_def in tool_module_info.tools:
             # Capture tool_def in closure via separate method
-            fn = ModuleContext._create_single_tool_function(communication, session, address, port, tool_def)
+            fn = ModuleContext._create_single_tool_function(communication, session, tool_module_info, tool_def)
             result.append((tool_def, fn))
 
         return result
@@ -314,8 +312,7 @@ class ModuleContext:
     def _create_single_tool_function(
         communication: CommunicationStrategy,
         session: Session,
-        address: str,
-        port: int,
+        tool_module_info: ToolModuleInfo,
         tool_def: ToolDefinition,
     ) -> Callable[..., AsyncGenerator[dict, None]]:
         """Create a single tool function for a specific protocol.
@@ -323,8 +320,7 @@ class ModuleContext:
         Args:
             communication: Communication strategy for gRPC calls.
             session: Current session with setup_id and mission_id.
-            address: Module address.
-            port: Module port.
+            tool_module_info: Tool module information containing address and port.
             tool_def: Tool definition with protocol name.
 
         Returns:
@@ -336,10 +332,10 @@ class ModuleContext:
             kwargs["protocol"] = protocol
             wrapped_input = {"root": kwargs}
             async for response in communication.call_module(
-                module_address=address,
-                module_port=port,
+                module_address=tool_module_info.address,
+                module_port=tool_module_info.port,
                 input_data=wrapped_input,
-                setup_id=session.setup_id,
+                setup_id=tool_module_info.setup_id,
                 mission_id=session.mission_id,
             ):
                 yield response

{digitalkin-0.3.2.dev17 → digitalkin-0.3.2.dev18}/src/digitalkin/models/module/tool_cache.py

@@ -52,6 +52,7 @@ class ToolModuleInfo(ModuleInfo):
     """Module info for tool modules."""
 
     tools: list[ToolDefinition]
+    setup_id: str
 
 
 class ToolCache(BaseModel):
@@ -59,22 +60,22 @@ class ToolCache(BaseModel):
 
     entries: dict[str, ToolModuleInfo] = Field(default_factory=dict)
 
-    def add(self, setup_tool_name: str, tool_module_info: ToolModuleInfo) -> None:
+    def add(self, setup_id: str, tool_module_info: ToolModuleInfo) -> None:
         """Add a tool to the cache.
 
         Args:
-            setup_tool_name: Field name from SetupModel used as cache key.
+            setup_id: Field name from SetupModel used as cache key.
             tool_module_info: Resolved tool module information.
         """
-        self.entries[setup_tool_name] = tool_module_info
+        self.entries[setup_id] = tool_module_info
         logger.debug(
             "Tool cached",
-            extra={"setup_tool_name": setup_tool_name, "module_id": tool_module_info.module_id},
+            extra={"setup_id": setup_id, "module_id": tool_module_info.module_id},
         )
 
     async def get(
         self,
-        setup_tool_name: str,
+        setup_id: str,
         *,
         registry: RegistryStrategy | None = None,
         communication: "CommunicationStrategy | None" = None,
@@ -82,28 +83,28 @@ class ToolCache(BaseModel):
         """Get a tool from cache, optionally querying registry on miss.
 
         Args:
-            setup_tool_name: Field name to look up.
+            setup_id: Field name to look up.
             registry: Optional registry to query on cache miss.
             communication: Optional communication strategy for schema fetching.
 
         Returns:
             ToolModuleInfo if found, None otherwise.
         """
-        cached = self.entries.get(setup_tool_name)
+        cached = self.entries.get(setup_id)
         if cached:
             return cached
 
         if registry and communication:
             try:
-                setup_info = registry.get_setup(setup_tool_name)
+                setup_info = registry.get_setup(setup_id)
                 if setup_info and setup_info.module_id:
                     info = registry.discover_by_id(setup_info.module_id)
                     if info:
-                        tool_info = await module_info_to_tool_module_info(info, communication)
-                        self.add(setup_tool_name, tool_info)
+                        tool_info = await module_info_to_tool_module_info(info, setup_id, communication)
+                        self.add(setup_id, tool_info)
                         return tool_info
             except Exception:
-                logger.exception("Registry lookup failed", extra={"setup_tool_name": setup_tool_name})
+                logger.exception("Registry lookup failed", extra={"setup_id": setup_id})
 
         return None
 
@@ -122,6 +123,7 @@ class ToolCache(BaseModel):
 
 async def module_info_to_tool_module_info(
     module_info: ModuleInfo,
+    setup_id: str,
     communication: "CommunicationStrategy",
     *,
     llm_format: bool = True,
@@ -133,6 +135,7 @@ async def module_info_to_tool_module_info(
 
     Args:
         module_info: Module info from registry.
+        setup_id: Setup ID from tool configuration.
         communication: Communication strategy for gRPC calls.
         llm_format: Use LLM-friendly schema format.
 
@@ -161,6 +164,7 @@ async def module_info_to_tool_module_info(
         documentation=module_info.documentation,
         status=module_info.status,
         tools=tools,
+        setup_id=setup_id,
     )
 
 

{digitalkin-0.3.2.dev17 → digitalkin-0.3.2.dev18}/src/digitalkin/models/module/tool_reference.py

@@ -115,7 +115,7 @@ class ToolReference(BaseModel):
                 self.config.module_id = setup.module_id
                 info = registry.discover_by_id(self.config.module_id)
                 if info:
-                    tool_module_info = await module_info_to_tool_module_info(info, communication)
+                    tool_module_info = await module_info_to_tool_module_info(info, self.config.setup_id, communication)
                     self._cached_info = tool_module_info
                     return tool_module_info
 
@@ -126,7 +126,9 @@ class ToolReference(BaseModel):
                 organization_id=self.config.organization_id,
             )
             if results:
-                tool_module_info = await module_info_to_tool_module_info(results[0], communication)
+                tool_module_info = await module_info_to_tool_module_info(
+                    results[0], self.config.setup_id, communication
+                )
                 self._cached_info = tool_module_info
                 self.config.module_id = tool_module_info.module_id
                 return tool_module_info

{digitalkin-0.3.2.dev17 → digitalkin-0.3.2.dev18}/src/digitalkin/utils/schema_splitter.py

@@ -55,6 +55,8 @@ class SchemaSplitter:
                 for item in value:
                     if isinstance(item, dict):
                         cls._extract_ui_properties(item, ui_target)
+            elif key in {"if", "then", "else"} and isinstance(value, dict):
+                cls._extract_ui_properties(value, ui_target)
 
     @classmethod
     def _process_object(  # noqa: C901, PLR0912
@@ -107,11 +109,15 @@ class SchemaSplitter:
                         item_json: dict[str, Any] = {}
                         cls._strip_ui_properties(item, item_json)
                         json_target["allOf"].append(item_json)
+                        # Extract UI properties from allOf item
+                        cls._extract_ui_properties(item, ui_target)
                     else:
                         json_target["allOf"].append(item)
             elif key in {"if", "then", "else"} and isinstance(value, dict):
                 json_target[key] = {}
                 cls._strip_ui_properties(value, json_target[key])
+                # Extract UI properties from conditional
+                cls._extract_ui_properties(value, ui_target)
             else:
                 json_target[key] = value
 

{digitalkin-0.3.2.dev17 → digitalkin-0.3.2.dev18}/src/digitalkin.egg-info/PKG-INFO

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