digitalkin 0.3.2.dev25__tar.gz → 0.3.2.dev27__tar.gz

{digitalkin-0.3.2.dev25 → digitalkin-0.3.2.dev27}/PKG-INFO

@@ -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 → digitalkin-0.3.2.dev27}/pyproject.toml

@@ -25,7 +25,7 @@
         "Programming Language :: Python",
         "Topic :: Software Development :: Libraries",
     ]
-    version = "0.3.2.dev25"
+    version = "0.3.2.dev27"
 
     dependencies = [
         "agentic-mesh-protocol==0.2.1.dev0",

{digitalkin-0.3.2.dev25 → digitalkin-0.3.2.dev27}/src/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-0.3.2.dev25 → digitalkin-0.3.2.dev27}/src/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-0.3.2.dev25 → digitalkin-0.3.2.dev27}/src/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-0.3.2.dev25 → digitalkin-0.3.2.dev27}/src/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 → digitalkin-0.3.2.dev27}/src/digitalkin.egg-info/PKG-INFO

@@ -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