digitalkin 0.3.2.dev22__py3-none-any.whl → 0.3.2.dev23__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.dev22"
+    __version__ = "0.3.2.dev23"

digitalkin/models/module/__init__.py

@@ -14,7 +14,7 @@ from digitalkin.models.module.tool_cache import (
 )
 from digitalkin.models.module.tool_reference import (
     ToolReference,
-    ToolReferenceInput,
+    tool_reference_input,
 )
 from digitalkin.models.module.utility import (
     EndOfStreamOutput,
@@ -35,7 +35,7 @@ __all__ = [
     "ToolModuleInfo",
     "ToolParameter",
     "ToolReference",
-    "ToolReferenceInput",
     "UtilityProtocol",
     "UtilityRegistry",
+    "tool_reference_input",
 ]

digitalkin/models/module/tool_reference.py

@@ -2,8 +2,9 @@
 
 from typing import Annotated
 
-from pydantic import BaseModel, BeforeValidator, Field
-from pydantic.json_schema import GetJsonSchemaHandler, JsonSchemaValue
+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 (
@@ -16,20 +17,14 @@ from digitalkin.services.registry import RegistryStrategy
 
 
 class ToolReference(BaseModel):
-    """Tool selection configuration and reference.
-
-    The mode determines validation requirements and resolution behavior:
-    - FIXED: Requires setup_id, resolves to exact tool
-    - MODULE: Requires module_id, returns constraint for frontend selection
-    - TAG: Requires tag, returns constraint for frontend selection
-    - DISCOVERABLE: Optional module_id/tag constraints, returns constraint info
-    """
+    """Tool selection configuration and reference."""
 
     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.")
     tags: list[str] = Field(default=[], description="Tags 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.")
 
     async def resolve(self, registry: RegistryStrategy, communication: CommunicationStrategy) -> list[ToolModuleInfo]:
         """Resolve this reference using the registry.
@@ -55,25 +50,25 @@ class ToolReference(BaseModel):
         return resolved
 
 
-def _convert_to_tool_reference(v: object) -> "ToolReference | object":
-    """Convert list of setup IDs to ToolReference.
-
-    Args:
-        v: Input value, either a list of setup IDs or passthrough.
-
-    Returns:
-        ToolReference if input is list, otherwise original value.
-    """
-    if isinstance(v, list):
-        return ToolReference(selected_tools=[SelectedTool(setup_id=sid, slug=sid) for sid in v])
-    return v
-
-
 class _ToolReferenceInputSchema:
-    """Custom JSON schema generator that wraps ToolReference in anyOf with array option."""
+    """Custom JSON schema generator with configurable maxItems and ui:options."""
+
+    def __init__(
+        self,
+        setup_ids: list[str],
+        module_ids: list[str],
+        tags: list[str],
+        max_tools: int = 0,
+        min_tools: int = 0,
+    ) -> None:
+        self.setup_ids = setup_ids
+        self.module_ids = module_ids
+        self.tags = tags
+        self.max_tools = max_tools
+        self.min_tools = min_tools
 
-    @staticmethod
     def __get_pydantic_json_schema__(  # noqa: PLW3201
+        self,
         schema: CoreSchema,
         handler: GetJsonSchemaHandler,
     ) -> JsonSchemaValue:
@@ -84,20 +79,95 @@ class _ToolReferenceInputSchema:
             handler: Handler to generate JSON schema from core schema.
 
         Returns:
-            JSON schema with anyOf accepting array or ToolReference.
+            JSON schema with anyOf accepting array or ToolReference, plus ui:options.
         """
         json_schema = handler(schema)
+
+        array_option: dict[str, object] = {"type": "array", "items": {"type": "string"}}
+        if self.max_tools > 0 and self.max_tools >= self.min_tools:
+            array_option["maxItems"] = self.max_tools
+        if self.min_tools > 0 and self.min_tools <= self.max_tools:
+            array_option["minItems"] = self.min_tools
+
         return {
             "anyOf": [
-                {"type": "array", "items": {"type": "string"}},
+                array_option,
                 json_schema,
-            ]
+            ],
+            "ui:options": {
+                "setup_ids": self.setup_ids,
+                "module_ids": self.module_ids,
+                "tags": self.tags,
+                "max_tools": self.max_tools,
+                "min_tools": self.min_tools,
+            },
         }
 
 
-ToolReferenceInput = Annotated[
-    ToolReference,
-    BeforeValidator(_convert_to_tool_reference),
-    _ToolReferenceInputSchema,
-]
-"""Type alias for ToolReference fields that accept list[str] input from frontend."""
+def tool_reference_input(
+    setup_ids: list[str] = [],
+    module_ids: list[str] = [],
+    tags: list[str] = [],
+    max_tools: int = 0,
+    min_tools: int = 0,
+) -> type[ToolReference]:
+    """Create ToolReferenceInput type with schema options and validation.
+
+    Args:
+        setup_ids: Setup IDs for the user to choose from.
+        module_ids: Module IDs for the user to choose from.
+        tags: Tags for the user to choose from.
+        max_tools: Maximum tools allowed. 0 for unlimited.
+        min_tools: Minimum tools required. 0 for no minimum.
+
+    Returns:
+        Annotated type for use in Pydantic models.
+    """
+
+    def convert_to_tool_reference(v: object) -> ToolReference | object:
+        """Convert list of setup IDs to ToolReference with config preserved.
+
+        Returns:
+            ToolReference if input is list, otherwise original value.
+        """
+        if isinstance(v, list):
+            return ToolReference(
+                selected_tools=[SelectedTool(setup_id=sid, slug=sid) for sid in v],
+                setup_ids=setup_ids,
+                module_ids=module_ids,
+                tags=tags,
+                max_tools=max_tools,
+                min_tools=min_tools,
+            )
+        return v
+
+    def validate_tools_count(v: ToolReference) -> ToolReference:
+        """Validate selected_tools count against min/max constraints.
+
+        Returns:
+            The validated ToolReference.
+
+        Raises:
+            ValueError: If count is below min_tools or above max_tools.
+        """
+        count = len(v.selected_tools)
+        if min_tools > 0 and count < min_tools:
+            msg = f"At least {min_tools} tools required, got {count}"
+            raise ValueError(msg)
+        if max_tools > 0 and count > max_tools:
+            msg = f"At most {max_tools} tools allowed, got {count}"
+            raise ValueError(msg)
+        return v
+
+    return Annotated[  # type: ignore[return-value]
+        ToolReference,
+        BeforeValidator(convert_to_tool_reference),
+        AfterValidator(validate_tools_count),
+        _ToolReferenceInputSchema(
+            setup_ids=setup_ids,
+            module_ids=module_ids,
+            tags=tags,
+            max_tools=max_tools,
+            min_tools=min_tools,
+        ),
+    ]

digitalkin/utils/schema_splitter.py

@@ -30,7 +30,7 @@ class SchemaSplitter:
         return json_schema, ui_schema
 
     @classmethod
-    def _extract_ui_properties(
+    def _extract_ui_properties(  # noqa: C901, PLR0912
         cls,
         source: dict[str, Any],
         ui_target: dict[str, Any],
@@ -64,12 +64,11 @@ class SchemaSplitter:
                         cls._extract_ui_properties(item, ui_target, defs)
             elif key in {"if", "then", "else"} and isinstance(value, dict):
                 cls._extract_ui_properties(value, ui_target, defs)
-            elif key == "$ref" and isinstance(value, str) and defs is not None:
+            elif key == "$ref" and isinstance(value, str) and defs is not None and value.startswith("#/$defs/"):
                 # Resolve $ref and extract UI properties from the referenced definition
-                if value.startswith("#/$defs/"):
-                    def_name = value[8:]
-                    if def_name in defs:
-                        cls._extract_ui_properties(defs[def_name], ui_target, defs)
+                def_name = value[8:]
+                if def_name in defs:
+                    cls._extract_ui_properties(defs[def_name], ui_target, defs)
 
     @classmethod
     def _process_object(  # noqa: C901, PLR0912

{digitalkin-0.3.2.dev22.dist-info → digitalkin-0.3.2.dev23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.2.dev22
+Version: 0.3.2.dev23
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International
@@ -437,18 +437,18 @@ License: Attribution-NonCommercial-ShareAlike 4.0 International
 Project-URL: Homepage, https://github.com/DigitalKin-ai/digitalkin
 Project-URL: Documentation, https://github.com/DigitalKin-ai/digitalkin
 Project-URL: Issues, https://github.com/DigitalKin-ai/digitalkin/issues
-Keywords: digitalkin,kin,agent,gprc,sdk
+Keywords: agent,digitalkin,gprc,kin,sdk
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
+Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: License :: Other/Proprietary License
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE

{digitalkin-0.3.2.dev22.dist-info → digitalkin-0.3.2.dev23.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=dZgyJRHQFh_03su8ZElZY21agbb3n1gwA2QNWlIpunk,196
+digitalkin/__version__.py,sha256=RHumdYZFrCYmC-fgDaLplg-14r7IrUPHKS70yI19O3w,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
@@ -50,14 +50,14 @@ digitalkin/models/core/task_monitor.py,sha256=CW-jydSgXMV464W0pqfar0HpgqlSxqdujm
 digitalkin/models/grpc_servers/__init__.py,sha256=0tA71nPSXgRrh9DoLvx-TSwZXdYIRUEItoadpTL1cTo,42
 digitalkin/models/grpc_servers/models.py,sha256=gRX94eL71a5mLIie-lCOwE7a0As_AuGduxPPzTHbAe4,13797
 digitalkin/models/grpc_servers/types.py,sha256=rQ78s4nAet2jy-NIDj_PUWriT0kuGHr_w6ELjmjgBao,539
-digitalkin/models/module/__init__.py,sha256=XlFlLGmLUYPV4ZOgBxfGclq9wupGDXNUyWB4EB6iTXA,909
+digitalkin/models/module/__init__.py,sha256=YDOsaX-4fYaZR6Cs3ksTr6pa0LSzo7lvSzWftLZJuwU,913
 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=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=rdkke5ydAgXcFfu34yxiHyaiRGcclnNGwPJK-01B2t8,3829
+digitalkin/models/module/tool_reference.py,sha256=DjumRWlH18SzJLrGlsdsY1opDR7M1UfhI3Eyjj1iTu4,6176
 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
@@ -122,8 +122,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=6PeDrEBGEFyVEPgzGnwcCZuwxLobThmuPwJhGlRpU_0,11137
-digitalkin-0.3.2.dev22.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin/utils/schema_splitter.py,sha256=f1RGzs0wSRPn8oydO9Ojo8mYTF4TFDkRFeGUt5jbPt4,11132
+digitalkin-0.3.2.dev23.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.dev22.dist-info/METADATA,sha256=6Zn0jPPta8ZRH7ohcui_18g4PsaoCBO6bSi59U4kg9o,29725
-digitalkin-0.3.2.dev22.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-digitalkin-0.3.2.dev22.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
-digitalkin-0.3.2.dev22.dist-info/RECORD,,
+digitalkin-0.3.2.dev23.dist-info/METADATA,sha256=GpeeavGsy23lR_dj41wBw2nXaLUD8Jhph0dIB1lhu-U,29725
+digitalkin-0.3.2.dev23.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+digitalkin-0.3.2.dev23.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
+digitalkin-0.3.2.dev23.dist-info/RECORD,,