digitalkin 0.3.2.dev17__py3-none-any.whl → 0.3.2.dev18__py3-none-any.whl

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/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/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/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/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.dist-info → digitalkin-0.3.2.dev18.dist-info}/METADATA

@@ -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.dist-info → digitalkin-0.3.2.dev18.dist-info}/RECORD

@@ -7,7 +7,7 @@ base_server/mock/__init__.py,sha256=YZFT-F1l_TpvJYuIPX-7kTeE1CfOjhx9YmNRXVoi-jQ,
 base_server/mock/mock_pb2.py,sha256=sETakcS3PAAm4E-hTCV1jIVaQTPEAIoVVHupB8Z_k7Y,1843
 base_server/mock/mock_pb2_grpc.py,sha256=BbOT70H6q3laKgkHfOx1QdfmCS_HxCY4wCOX84YAdG4,3180
 digitalkin/__init__.py,sha256=7LLBAba0th-3SGqcpqFO-lopWdUkVLKzLZiMtB-mW3M,162
-digitalkin/__version__.py,sha256=Y3kvX8EPStPR7XivYOXc5tCfaRbBYw08EWY8LQ_zjgM,196
+digitalkin/__version__.py,sha256=6eu1NkqoRgH4x9vy4KK1UNb25WQD1SomFTIF5afEldM,196
 digitalkin/logger.py,sha256=8ze_tjt2G6mDTuQcsf7-UTXWP3UHZ7LZVSs_iqF4rX4,4685
 digitalkin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 digitalkin/core/__init__.py,sha256=FJRcJ-B1Viyn-38L8XpOpZ8KOnf1I7PCDOAmKXLQhqc,71
@@ -53,11 +53,11 @@ digitalkin/models/grpc_servers/types.py,sha256=rQ78s4nAet2jy-NIDj_PUWriT0kuGHr_w
 digitalkin/models/module/__init__.py,sha256=e2a_AUmobkpyITQKvMkDaDxvb-GOMHhDF9fn0q5_EnQ,959
 digitalkin/models/module/base_types.py,sha256=oIylVNqo0idTFj4dRgCt7P19daNZ-AlvgCPpL9TJvto,1850
 digitalkin/models/module/module.py,sha256=k0W8vfJJFth8XdDzkHm32SyTuSf3h2qF0hSrxAfGF1s,956
-digitalkin/models/module/module_context.py,sha256=u4yvvtYNwbSJSnV0omLasGN7wRZgaLS7trBBneeT2CI,12178
+digitalkin/models/module/module_context.py,sha256=QDdjZdhIJpvU_2Tn7kkJsZ1givB4dM1-ksopdF4VySw,12176
 digitalkin/models/module/module_types.py,sha256=C9azCNBk76xMa-Mww8_6AiwQR8MLAsEyUOvBYxytovI,739
 digitalkin/models/module/setup_types.py,sha256=namyC-0iA4ryHqKCzjYsVYeFDduwMqYCYRmQSSH8414,19356
-digitalkin/models/module/tool_cache.py,sha256=bWZAjL2UMJIpQw0SeoOGa0S1flU6V8eKUYe09mluNog,7111
-digitalkin/models/module/tool_reference.py,sha256=DBOw22_ZtmOwooejl2J8QZ_gRazNkhGyeD-CvnMpHvE,4388
+digitalkin/models/module/tool_cache.py,sha256=5e30A_GxT2W-w1LZFmVUqOxDjPcrZ8s_eW7p9impO64,7153
+digitalkin/models/module/tool_reference.py,sha256=eIWJrT6syyEaXAWRXIlWYTst-j0XuvtU_va9m3tj_KU,4470
 digitalkin/models/module/utility.py,sha256=gnbYfWpXGbomUI0fWf7T-Qm_VvT-LXDv1OuA9zObwVg,5589
 digitalkin/models/services/__init__.py,sha256=jhfVw6egq0OcHmos_fypH9XFehbHTBw09wluVFVFEyw,226
 digitalkin/models/services/cost.py,sha256=9PXvd5RrIk9vCrRjcUGQ9ZyAokEbwLg4s0RfnE-aLP4,1616
@@ -121,8 +121,8 @@ digitalkin/utils/development_mode_action.py,sha256=2hznh0ajW_4ZTysfoc0Y49161f_PQ
 digitalkin/utils/dynamic_schema.py,sha256=y5csxjuqVHjWDpnTUzxbcUuI_wou9-ibRVHQlBs_btY,15275
 digitalkin/utils/llm_ready_schema.py,sha256=JjMug_lrQllqFoanaC091VgOqwAd-_YzcpqFlS7p778,2375
 digitalkin/utils/package_discover.py,sha256=sa6Zp5Kape1Zr4iYiNrnZxiHDnqM06ODk6yfWHom53w,13465
-digitalkin/utils/schema_splitter.py,sha256=KMvYRHDHlwdhh_c6FJxkWvLStZo9Kbj-jd3pIGPZfxk,9317
-digitalkin-0.3.2.dev17.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin/utils/schema_splitter.py,sha256=9PHC-bvEDQudyYZNgXyjFtp7EJlmw4C_gPCJ-JmGDk0,9704
+digitalkin-0.3.2.dev18.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
 modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modules/archetype_with_tools_module.py,sha256=PXTS6IXmC_OjxTmVrL_pYVI0MKwXjD5I1UJO_2xa10Q,7632
 modules/cpu_intensive_module.py,sha256=GZlirQDZdYuXrI46sv1q4RNAHZjL4EptHVQTvgK9zz8,8363
@@ -137,7 +137,7 @@ monitoring/digitalkin_observability/prometheus.py,sha256=gDmM9ySaVwPAe7Yg84pLxmE
 monitoring/tests/test_metrics.py,sha256=ugnYfAwqBPO6zA8z4afKTlyBWECTivacYSN-URQCn2E,5856
 services/filesystem_module.py,sha256=U4dgqtuDadaXz8PJ1d_uQ_1EPncBqudAQCLUICF9yL4,7421
 services/storage_module.py,sha256=Wz2MzLvqs2D_bnBBgtnujYcAKK2V2KFMk8K21RoepSE,6972
-digitalkin-0.3.2.dev17.dist-info/METADATA,sha256=rhqhGY-Zx3iq_pSrr0nRpsygx7UhYYsVLjUoVDzXMq8,29725
-digitalkin-0.3.2.dev17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-digitalkin-0.3.2.dev17.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
-digitalkin-0.3.2.dev17.dist-info/RECORD,,
+digitalkin-0.3.2.dev18.dist-info/METADATA,sha256=sJPrEQfDsIC_mcsZfFttiA3fybX3J7KbVT7zozw3qMw,29725
+digitalkin-0.3.2.dev18.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+digitalkin-0.3.2.dev18.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
+digitalkin-0.3.2.dev18.dist-info/RECORD,,

{digitalkin-0.3.2.dev17.dist-info → digitalkin-0.3.2.dev18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any