digitalkin 0.3.3.dev9__tar.gz → 0.3.4.dev1__tar.gz

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.3.dev9
+Version: 0.3.4.dev1
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International
@@ -453,7 +453,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: agentic-mesh-protocol==0.2.3
-Requires-Dist: anyio==4.12.1
+Requires-Dist: anyio==4.13.0
 Requires-Dist: grpcio-health-checking==1.78.0
 Requires-Dist: grpcio-reflection==1.78.0
 Requires-Dist: grpcio-status==1.78.0

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/pyproject.toml

@@ -28,13 +28,13 @@
 
     dependencies = [
         "agentic-mesh-protocol==0.2.3",
-        "anyio==4.12.1",
+        "anyio==4.13.0",
         "grpcio-health-checking==1.78.0",
         "grpcio-reflection==1.78.0",
         "grpcio-status==1.78.0",
         "pydantic==2.12.5",
     ]
-    version = "0.3.3.dev9"
+    version = "0.3.4.dev1"
 
     [project.optional-dependencies]
         profiling = [
@@ -60,7 +60,7 @@
 
 [dependency-groups]
     dev = [
-        "build==1.4.0",
+        "build==1.4.1",
         "bump-my-version==1.2.7",
         "cryptography==46.0.5",
         "mypy==1.19.1",

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/src/digitalkin/__version__.py

@@ -5,4 +5,4 @@ from importlib.metadata import PackageNotFoundError, version
 try:
     __version__ = version("digitalkin")
 except PackageNotFoundError:
-    __version__ = "0.3.3.dev9"
+    __version__ = "0.3.4.dev1"

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/src/digitalkin/models/module/__init__.py

@@ -12,7 +12,6 @@ from digitalkin.models.module.tool_cache import (
     ToolCache,
     ToolDefinition,
     ToolModuleInfo,
-    ToolParameter,
 )
 from digitalkin.models.module.tool_reference import (
     ToolReference,
@@ -38,7 +37,6 @@ __all__ = [
     "ToolCache",
     "ToolDefinition",
     "ToolModuleInfo",
-    "ToolParameter",
     "ToolReference",
     "ToolSelection",
     "UtilityProtocol",

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/src/digitalkin/models/module/module_context.py

@@ -9,7 +9,7 @@ from zoneinfo import ZoneInfo
 
 from digitalkin.logger import logger
 from digitalkin.models.module.request_metadata import RequestMetadata
-from digitalkin.models.module.tool_cache import ToolCache, ToolDefinition, ToolModuleInfo, ToolParameter
+from digitalkin.models.module.tool_cache import ToolCache, ToolDefinition, ToolModuleInfo
 from digitalkin.services.agent.agent_strategy import AgentStrategy
 from digitalkin.services.communication.communication_strategy import CommunicationStrategy
 from digitalkin.services.cost.cost_strategy import CostStrategy
@@ -225,29 +225,13 @@ class ModuleContext:
                     "toolkit_name": tool_module_info.tool_name or "undefined",
                     "name": tool_module_info.slug + "__" + tool_def.name,
                     "description": tool_def.description + cost_description,
-                    "parameters": ModuleContext._build_parameters_schema(tool_def.parameters),
+                    "parameters": tool_def.parameters_schema,
                 },
                 "cost_info": cost_info,
             }
             for tool_def in tool_module_info.tools
         ]
 
-    @staticmethod
-    def _build_parameters_schema(params: list[ToolParameter]) -> dict[str, Any]:
-        """Convert ToolParameter list to JSON Schema.
-
-        Args:
-            params: List of tool parameters.
-
-        Returns:
-            JSON Schema object with properties and required fields.
-        """
-        return {
-            "type": "object",
-            "properties": {p.name: {"type": p.type, "description": p.description or ""} for p in params},
-            "required": [p.name for p in params if p.required],
-        }
-
     @staticmethod
     def _build_cost_info(cost_config: dict[str, Any]) -> dict[str, Any]:
         """Build cost information structure for tool metadata.

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/src/digitalkin/models/module/setup_types.py

@@ -79,12 +79,11 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
                 if has_dynamic(field_info):
                     current_field_info = await cls._refresh_field_schema(name, field_info)
 
-                if (nested_model := cls._get_base_model_type(current_annotation)) is not None:
-                    refreshed_nested = await cls._refresh_nested_model(nested_model)
-                    if refreshed_nested is not nested_model:
-                        current_annotation = refreshed_nested
-                        current_field_info = copy.deepcopy(current_field_info)
-                        current_field_info.annotation = current_annotation
+                refreshed_annotation = await cls._refresh_annotation(current_annotation)
+                if refreshed_annotation is not None:
+                    current_annotation = refreshed_annotation
+                    current_field_info = copy.deepcopy(current_field_info)
+                    current_field_info.annotation = current_annotation
 
             clean_fields[name] = (current_annotation, current_field_info)
 
@@ -223,6 +222,119 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
                 return result
         return None
 
+    @classmethod
+    def _find_all_base_models_in_args(
+        cls,
+        args: "tuple[type, ...]",
+    ) -> "list[type[BaseModel]]":
+        """Find all BaseModel subclasses in type args.
+
+        Args:
+            args: Type arguments to search.
+
+        Returns:
+            List of BaseModel subclasses found.
+        """
+        results: list[type[BaseModel]] = []
+        for arg in args:
+            if arg is type(None):
+                continue
+            if (result := cls._check_base_model(arg)) is not None:
+                results.append(result)
+        return results
+
+    @classmethod
+    async def _refresh_annotation(cls, annotation: "type | None") -> "type | None":
+        """Refresh dynamic fields in an annotation, handling Unions and single models.
+
+        Args:
+            annotation: Type annotation to refresh.
+
+        Returns:
+            Refreshed annotation, or None if no changes were made.
+        """
+        if annotation is None:
+            return None
+
+        refreshed_union = await cls._refresh_union_variants(annotation)
+        if refreshed_union is not None:
+            return refreshed_union
+
+        nested_model = cls._get_base_model_type(annotation)
+        if nested_model is None:
+            return None
+
+        refreshed = await cls._refresh_nested_model(nested_model)
+        if refreshed is nested_model:
+            return None
+
+        return cls._rebuild_generic_annotation(annotation, nested_model, refreshed)
+
+    @classmethod
+    def _rebuild_generic_annotation(
+        cls, annotation: type, original: "type[BaseModel]", refreshed: "type[BaseModel]"
+    ) -> type:
+        """Rebuild a generic annotation replacing the original BaseModel with the refreshed one.
+
+        Args:
+            annotation: Original generic annotation (e.g. list[MyModel]).
+            original: The original BaseModel subclass found in the annotation.
+            refreshed: The refreshed replacement model.
+
+        Returns:
+            Rebuilt annotation, or the refreshed model if annotation is not generic.
+        """
+        origin = get_origin(annotation)
+        if origin is None:
+            return refreshed
+
+        args = get_args(annotation)
+        new_args = tuple(refreshed if a is original else a for a in args)
+        if origin in {list, set, frozenset}:
+            return origin[new_args[0]]  # type: ignore[index]
+        if origin is dict:
+            return dict[new_args[0], new_args[1]]  # type: ignore[misc,index,valid-type]
+        if origin is tuple:
+            return tuple[new_args]  # type: ignore[misc,index,valid-type]
+        return refreshed
+
+    @classmethod
+    async def _refresh_union_variants(
+        cls,
+        annotation: "type",
+    ) -> "type | None":
+        """Refresh dynamic fields in all BaseModel variants of a Union annotation.
+
+        Args:
+            annotation: A Union type annotation potentially containing multiple BaseModel subclasses.
+
+        Returns:
+            Rebuilt annotation with refreshed variants, or None if no changes were made.
+        """
+        origin = get_origin(annotation)
+        if origin is not typing.Union and origin is not types.UnionType:
+            return None
+
+        args = get_args(annotation)
+        models = cls._find_all_base_models_in_args(args)
+        if len(models) <= 1:
+            return None
+
+        replacements: dict[type, type] = {}
+        for model in models:
+            refreshed = await cls._refresh_nested_model(model)
+            if refreshed is not model:
+                replacements[model] = refreshed
+
+        if not replacements:
+            return None
+
+        new_args = [replacements.get(a, a) for a in args]  # type: ignore[arg-type]
+        rebuilt = new_args[0]
+        for arg in new_args[1:]:
+            rebuilt |= arg  # type: ignore[operator]
+        return rebuilt  # type: ignore[return-value]
+
     @classmethod
     async def _refresh_nested_model(cls, model_cls: "type[BaseModel]") -> "type[BaseModel]":
         """Refresh dynamic fields in a nested BaseModel.
@@ -244,13 +356,12 @@ class SetupModel(BaseModel, Generic[SetupModelT]):
                 current_field_info = await cls._refresh_field_schema(name, field_info)
                 has_changes = True
 
-            if (nested_model := cls._get_base_model_type(current_annotation)) is not None:
-                refreshed_nested = await cls._refresh_nested_model(nested_model)
-                if refreshed_nested is not nested_model:
-                    current_annotation = refreshed_nested
-                    current_field_info = copy.deepcopy(current_field_info)
-                    current_field_info.annotation = current_annotation
-                    has_changes = True
+            refreshed_annotation = await cls._refresh_annotation(current_annotation)
+            if refreshed_annotation is not None:
+                current_annotation = refreshed_annotation
+                current_field_info = copy.deepcopy(current_field_info)
+                current_field_info.annotation = current_annotation
+                has_changes = True
 
             clean_fields[name] = (current_annotation, current_field_info)
 

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/src/digitalkin/models/module/tool_cache.py

@@ -7,6 +7,7 @@ from pydantic import BaseModel, Field
 
 from digitalkin.logger import logger
 from digitalkin.models.services.registry import ModuleInfo
+from digitalkin.utils.llm_ready_schema import inline_refs
 
 
 class SelectedTool(BaseModel):
@@ -22,40 +23,30 @@ if TYPE_CHECKING:
     from digitalkin.services.communication import CommunicationStrategy
 
 
-class ToolParameter(BaseModel):
-    """Definition of a single tool parameter.
-
-    Attributes:
-        name: Parameter name.
-        type: JSON Schema type (string, integer, number, boolean, array, object).
-        description: Parameter description for the LLM.
-        required: Whether this parameter is required.
-        enum: Optional list of allowed values.
-        items: Optional schema for array item types.
-        properties: Optional schema for object properties.
-    """
-
-    name: str
-    type: str
-    description: str
-    required: bool = True
-    enum: list[str] | None = None
-    items: dict[str, Any] | None = None
-    properties: dict[str, Any] | None = None
-
-
 class ToolDefinition(BaseModel):
-    """Complete definition of an LLM tool with grouped parameters.
+    """Complete definition of an LLM tool with resolved JSON Schema parameters.
 
     Attributes:
         name: Tool name (from protocol const or trigger class name).
         description: Tool description (from trigger docstring).
-        parameters: List of parameter definitions.
+        parameters_schema: JSON Schema object describing the tool's parameters.
     """
 
     name: str
     description: str
-    parameters: list[ToolParameter] = Field(default_factory=list)
+    parameters_schema: dict[str, Any] = Field(
+        default_factory=lambda: {"type": "object", "properties": {}, "required": []}
+    )
+
+    @property
+    def parameter_names(self) -> set[str]:
+        """Return the set of parameter names from the schema."""
+        return set[str](self.parameters_schema.get("properties", {}).keys())
+
+    @property
+    def parameter_count(self) -> int:
+        """Return the number of parameters in the schema."""
+        return len(self.parameters_schema.get("properties", {}))
 
 
 class ToolModuleInfo(ModuleInfo):
@@ -192,14 +183,44 @@ async def module_info_to_tool_module_info(
     )
 
 
+def _build_parameters_from_schema(def_schema: dict[str, Any]) -> dict[str, Any]:
+    """Build parameters_schema directly from an inlined JSON Schema.
+
+    Extracts tool parameters from the trigger's JSON Schema, skipping
+    internal fields (``protocol``, ``created_at``).
+
+    Args:
+        def_schema: JSON Schema for the trigger with all ``$ref`` already inlined.
+
+    Returns:
+        JSON Schema dict with properties and required fields.
+    """
+    properties = def_schema.get("properties", {})
+    required_fields = set[Any](def_schema.get("required", []))
+    param_properties: dict[str, Any] = {}
+    required_list: list[str] = []
+
+    for prop_name, prop_info in properties.items():
+        if prop_name in {"protocol", "created_at"}:
+            continue
+        param_properties[prop_name] = dict[Any, Any](prop_info.items())
+        if prop_name in required_fields:
+            required_list.append(prop_name)
+
+    return {"type": "object", "properties": param_properties, "required": required_list}
+
+
 def _extract_tools_from_schema(schema: dict[str, Any]) -> list[ToolDefinition]:
     """Extract tool definitions from a discriminated union input schema.
 
+    Inlines ``$ref`` references and extracts parameters directly from the
+    JSON Schema — no intermediate Python model reconstruction needed.
+
     Args:
         schema: JSON schema with $defs containing protocol-based types.
 
     Returns:
-        List of ToolDefinition with parameters grouped by trigger.
+        List of ToolDefinition with parameters_schema per trigger.
     """
     tools: list[ToolDefinition] = []
     defs = schema.get("$defs", {})
@@ -220,33 +241,18 @@ def _extract_tools_from_schema(schema: dict[str, Any]) -> list[ToolDefinition]:
         if "const" not in protocol_prop:
             continue
 
-        # Extract tool-level info from trigger
         tool_name = protocol_prop.get("const", def_name)
         tool_description = def_schema.get("description", "")
 
-        required_fields = set[Any](def_schema.get("required", []))
-        parameters: list[ToolParameter] = []
-
-        for prop_name, prop_info in properties.items():
-            if prop_name in {"protocol", "created_at"}:
-                continue
-
-            param = ToolParameter(
-                name=prop_name,
-                type=prop_info.get("type", "string"),
-                description=prop_info.get("description", ""),
-                required=prop_name in required_fields,
-                enum=prop_info.get("enum"),
-                items=prop_info.get("items"),
-                properties=prop_info.get("properties"),
-            )
-            parameters.append(param)
+        # Inline $ref references so properties are self-contained
+        inlined = inline_refs({**def_schema, "$defs": defs})
+        parameters_schema = _build_parameters_from_schema(inlined)
 
         tools.append(
             ToolDefinition(
                 name=tool_name,
                 description=tool_description,
-                parameters=parameters,
+                parameters_schema=parameters_schema,
             )
         )
 

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/src/digitalkin/modules/_base_module.py

@@ -626,12 +626,18 @@ class BaseModule(  # Module SDK base class requires many public methods # noqa:
                         await handler.flush_file_history(self.context)
             except Exception:
                 logger.warning("Failed to flush handler history during stop", exc_info=True)
-            await self.context.callbacks.send_message(
-                DataModel(
-                    root=EndOfStreamOutput(),
-                    annotations={"role": BaseRole.SYSTEM},
+            try:
+                await self.context.callbacks.send_message(
+                    DataModel[EndOfStreamOutput](
+                        root=EndOfStreamOutput(),
+                        annotations={"role": BaseRole.SYSTEM},
+                    )
+                )
+            except AttributeError:
+                logger.warning(
+                    "send_message callback not set, skipping end-of-stream"
+                    " (expected for start_config_setup which does not register send_message)"
                 )
-            )
             self._status = ModuleStatus.STOPPED
             logger.debug("Module %s cleaned", self.name)
         except Exception:

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/src/digitalkin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.3.dev9
+Version: 0.3.4.dev1
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International
@@ -453,7 +453,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: agentic-mesh-protocol==0.2.3
-Requires-Dist: anyio==4.12.1
+Requires-Dist: anyio==4.13.0
 Requires-Dist: grpcio-health-checking==1.78.0
 Requires-Dist: grpcio-reflection==1.78.0
 Requires-Dist: grpcio-status==1.78.0

{digitalkin-0.3.3.dev9 → digitalkin-0.3.4.dev1}/src/digitalkin.egg-info/requires.txt

@@ -1,5 +1,5 @@
 agentic-mesh-protocol==0.2.3
-anyio==4.12.1
+anyio==4.13.0
 grpcio-health-checking==1.78.0
 grpcio-reflection==1.78.0
 grpcio-status==1.78.0