digitalkin 0.3.2.dev25__py3-none-any.whl → 0.3.2.dev27__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.dev25"
+    __version__ = "0.3.2.dev27"

digitalkin/models/module/setup_types.py

@@ -399,7 +399,9 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
             logger.info("ToolReference '%s' has no selected tools, skipping", field_name)
             return
 
-        tools_to_resolve = [tool for tool in tool_ref.selected_tools if tool.slug and tool.slug not in resolved_tools]
+        tools_to_resolve = [
+            setup_id for setup_id in tool_ref.selected_tools if setup_id and setup_id not in resolved_tools
+        ]
 
         if not tools_to_resolve:
             logger.info("All tools for '%s' already cached", field_name)
@@ -501,8 +503,8 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
             if field_value is None:
                 continue
             if isinstance(field_value, ToolReference):
-                for tool in field_value.selected_tools:
-                    tool_module_info = self.resolved_tools.get(tool.slug or "")
+                for setup_id in field_value.selected_tools:
+                    tool_module_info = self.resolved_tools.get(setup_id)
                     if tool_module_info:
                         cache.add(tool_module_info)
             elif isinstance(field_value, BaseModel):
@@ -521,8 +523,8 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
         """
         for item in items:
             if isinstance(item, ToolReference):
-                for tool in item.selected_tools:
-                    tool_module_info = self.resolved_tools.get(tool.slug or "")
+                for setup_id in item.selected_tools:
+                    tool_module_info = self.resolved_tools.get(setup_id)
                     if tool_module_info:
                         cache.add(tool_module_info)
             elif isinstance(item, BaseModel):
@@ -537,8 +539,8 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
         """
         for item in mapping.values():
             if isinstance(item, ToolReference):
-                for tool in item.selected_tools:
-                    tool_module_info = self.resolved_tools.get(tool.slug or "")
+                for setup_id in item.selected_tools:
+                    tool_module_info = self.resolved_tools.get(setup_id)
                     if tool_module_info:
                         cache.add(tool_module_info)
             elif isinstance(item, BaseModel):

digitalkin/models/module/tool_cache.py

@@ -120,7 +120,8 @@ class ToolCache(BaseModel):
 
 async def module_info_to_tool_module_info(
     module_info: ModuleInfo,
-    tool: SelectedTool,
+    setup_id: str,
+    tool_name: str,
     communication: "CommunicationStrategy",
     *,
     llm_format: bool = True,
@@ -132,7 +133,8 @@ async def module_info_to_tool_module_info(
 
     Args:
         module_info: Module info from registry.
-        tool: Selected tool information.
+        setup_id: Setup ID of the selected tool.
+        tool_name: Name of the tool.
         communication: Communication strategy for gRPC calls.
         llm_format: Use LLM-friendly schema format.
 
@@ -161,8 +163,8 @@ async def module_info_to_tool_module_info(
         documentation=module_info.documentation,
         status=module_info.status,
         tools=tools,
-        setup_id=tool.setup_id,
-        tool_name=tool.name,
+        setup_id=setup_id,
+        tool_name=tool_name,
     )
 
 

digitalkin/models/module/tool_reference.py

@@ -2,52 +2,38 @@
 
 from typing import Annotated
 
-from pydantic import AfterValidator, BaseModel, Field
+from pydantic import AfterValidator, BaseModel, BeforeValidator, Field
 from pydantic.annotated_handlers import GetJsonSchemaHandler
 from pydantic.json_schema import JsonSchemaValue
 from pydantic_core import CoreSchema
 
-from digitalkin.models.module.tool_cache import (
-    SelectedTool,
-    ToolModuleInfo,
-    module_info_to_tool_module_info,
-)
+from digitalkin.models.module.tool_cache import ToolModuleInfo, module_info_to_tool_module_info
 from digitalkin.services.communication.communication_strategy import CommunicationStrategy
 from digitalkin.services.registry import RegistryStrategy
 
 
 class ToolReference(BaseModel):
-    """Tool selection configuration and reference."""
+    """Tool selection containing setup IDs."""
 
-    selected_tools: list[SelectedTool] = Field(default=[], description="Tools selected by the user.")
-    setup_ids: list[str] = Field(default=[], description="Setup IDs for the user to choose from.")
-    module_ids: list[str] = Field(default=[], description="Module IDs for the user to choose from.")
-    tag_ids: list[str] = Field(default=[], description="Tag IDs for the user to choose from.")
-    categories: list[str] = Field(default=[], description="Categories for the user to choose from.")
-    max_tools: int = Field(default=0, description="Maximum tools to select. 0 for unlimited.")
-    min_tools: int = Field(default=0, description="Minimum tools to select. 0 for no minimum.")
+    selected_tools: list[str] = Field(default=[], description="Setup IDs of selected tools.")
 
     async def resolve(self, registry: RegistryStrategy, communication: CommunicationStrategy) -> list[ToolModuleInfo]:
-        """Resolve this reference using the registry.
+        """Resolve selected tools using the registry.
 
         Args:
             registry: Registry service for module discovery.
             communication: Communication service for module schemas.
 
         Returns:
-            List of ToolModuleInfo if resolved.
+            List of ToolModuleInfo for resolved tools.
         """
         resolved: list[ToolModuleInfo] = []
-        for tool in self.selected_tools:
-            setup = registry.get_setup(tool.setup_id)
+        for setup_id in self.selected_tools:
+            setup = registry.get_setup(setup_id)
             if setup and setup.module_id:
                 info = registry.discover_by_id(setup.module_id)
-                tool.slug = tool.setup_id
-                tool.module_id = setup.module_id
-                tool.name = setup.name
                 if info:
-                    resolved.append(await module_info_to_tool_module_info(info, tool, communication))
-
+                    resolved.append(await module_info_to_tool_module_info(info, setup_id, setup.name, communication))
         return resolved
 
 
@@ -72,38 +58,29 @@ class _ToolReferenceInputSchema:
 
     def __get_pydantic_json_schema__(  # noqa: PLW3201
         self,
-        schema: CoreSchema,
-        handler: GetJsonSchemaHandler,
+        _schema: CoreSchema,
+        _handler: GetJsonSchemaHandler,
     ) -> JsonSchemaValue:
-        """Generate JSON schema for ToolReference with ui:options.
-
-        Args:
-            schema: The core schema from Pydantic.
-            handler: Handler to generate JSON schema from core schema.
+        """Generate JSON schema as array for UI, hiding ToolReference complexity.
 
         Returns:
-            JSON schema for ToolReference with ui:options.
+            JSON schema as array with ui:widget toolSelect.
         """
-        json_schema = handler(schema)
-        ui_options: dict[str, object] = {
+        json_schema: dict[str, object] = {
+            "type": "array",
+            "items": {"type": "string"},
+        }
+        if self.max_tools > 0:
+            json_schema["maxItems"] = self.max_tools
+        if self.min_tools > 0:
+            json_schema["minItems"] = self.min_tools
+        json_schema["ui:widget"] = "toolSelect"
+        json_schema["ui:options"] = {
             "setupIds": self.setup_ids,
             "moduleIds": self.module_ids,
             "tagIds": self.tag_ids,
             "categories": self.categories,
         }
-        if self.max_tools > 0:
-            ui_options["maxTools"] = self.max_tools
-        if self.min_tools > 0:
-            ui_options["minTools"] = self.min_tools
-        json_schema["ui:options"] = ui_options
-        json_schema["ui:widget"] = "toolSelect"
-        if self.max_tools > 0 or self.min_tools > 0:
-            resolved = handler.resolve_ref_schema(json_schema)
-            selected_tools_schema = resolved["properties"]["selected_tools"]
-            if self.max_tools > 0:
-                selected_tools_schema["maxItems"] = self.max_tools
-            if self.min_tools > 0:
-                selected_tools_schema["minItems"] = self.min_tools
         return json_schema
 
 
@@ -129,6 +106,16 @@ def tool_reference_input(
         Annotated type for use in Pydantic models.
     """
 
+    def convert_to_tool_reference(v: object) -> ToolReference | object:
+        """Convert list of setup IDs to ToolReference.
+
+        Returns:
+            ToolReference if input is list, otherwise original value.
+        """
+        if isinstance(v, list):
+            return ToolReference(selected_tools=v)
+        return v
+
     def validate_tools_count(v: ToolReference) -> ToolReference:
         """Validate selected_tools count against min/max constraints.
 
@@ -149,6 +136,7 @@ def tool_reference_input(
 
     return Annotated[  # type: ignore[return-value]
         ToolReference,
+        BeforeValidator(convert_to_tool_reference),
         AfterValidator(validate_tools_count),
         _ToolReferenceInputSchema(
             setup_ids=setup_ids,

{digitalkin-0.3.2.dev25.dist-info → digitalkin-0.3.2.dev27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.2.dev25
+Version: 0.3.2.dev27
 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.dev25.dist-info → digitalkin-0.3.2.dev27.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=wLv3PwvKkCiyENoAcO49sz7loFxjdKXH6j76y0dSfiM,196
+digitalkin/__version__.py,sha256=Sgoi_BWPmZPvGJPS33B9mfXeua1Gp0L_nfAmYARTdBE,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
@@ -55,9 +55,9 @@ digitalkin/models/module/base_types.py,sha256=oIylVNqo0idTFj4dRgCt7P19daNZ-AlvgC
 digitalkin/models/module/module.py,sha256=k0W8vfJJFth8XdDzkHm32SyTuSf3h2qF0hSrxAfGF1s,956
 digitalkin/models/module/module_context.py,sha256=kwaAobsA82Du6L0XH9Is9u6Qj1rEjhYqVk00FonMaw4,12087
 digitalkin/models/module/module_types.py,sha256=C9azCNBk76xMa-Mww8_6AiwQR8MLAsEyUOvBYxytovI,739
-digitalkin/models/module/setup_types.py,sha256=8xEI6DvCYBHSOsuoeuZjtBL5rPsR_7DwWFxQnn2bo3c,19249
-digitalkin/models/module/tool_cache.py,sha256=xAMSyY73aduYGPz6C54g0YMAa2OnXPN6QRS-W4TK_js,6568
-digitalkin/models/module/tool_reference.py,sha256=L2wh6-Am7pQTUSVFL9gQtTIagscAWnBcc1zcDGgt0Co,5968
+digitalkin/models/module/setup_types.py,sha256=Jh6zkSoKTdRTU2YsSoLGrVquLcYHvSeFUX9jpEiZyLU,19268
+digitalkin/models/module/tool_cache.py,sha256=xCOH2tr7MN0-b3B_8If3mZvoingJsJB4M032ajfdmIA,6623
+digitalkin/models/module/tool_reference.py,sha256=wX1DZFGiuZqcarxtb1TqlE0YVFxsYZb1sEQY249zj3w,5143
 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
@@ -123,7 +123,7 @@ digitalkin/utils/dynamic_schema.py,sha256=y5csxjuqVHjWDpnTUzxbcUuI_wou9-ibRVHQlB
 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=f1RGzs0wSRPn8oydO9Ojo8mYTF4TFDkRFeGUt5jbPt4,11132
-digitalkin-0.3.2.dev25.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin-0.3.2.dev27.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
 modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modules/archetype_with_tools_module.py,sha256=kJkVhAFWG0aDDqzupOXOnV3l8j3z5bEdWos_6Z9rUP8,7303
 modules/cpu_intensive_module.py,sha256=GZlirQDZdYuXrI46sv1q4RNAHZjL4EptHVQTvgK9zz8,8363
@@ -138,7 +138,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.dev25.dist-info/METADATA,sha256=FeGGqntwyyBCHErF6Zov6ymQi5T9TSj48EN3BNAxFCk,29725
-digitalkin-0.3.2.dev25.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-digitalkin-0.3.2.dev25.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
-digitalkin-0.3.2.dev25.dist-info/RECORD,,
+digitalkin-0.3.2.dev27.dist-info/METADATA,sha256=0nBhEu0M24hxgr0lnD2D4RS6FxNAYixq7GecX1h0fpg,29725
+digitalkin-0.3.2.dev27.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+digitalkin-0.3.2.dev27.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
+digitalkin-0.3.2.dev27.dist-info/RECORD,,