digitalkin 0.3.2.dev24__py3-none-any.whl → 0.3.2.dev25__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.dev24"
+    __version__ = "0.3.2.dev25"

digitalkin/models/module/tool_reference.py

@@ -2,7 +2,7 @@
 
 from typing import Annotated
 
-from pydantic import AfterValidator, BaseModel, BeforeValidator, Field
+from pydantic import AfterValidator, BaseModel, Field
 from pydantic.annotated_handlers import GetJsonSchemaHandler
 from pydantic.json_schema import JsonSchemaValue
 from pydantic_core import CoreSchema
@@ -22,7 +22,8 @@ class ToolReference(BaseModel):
     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.")
+    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.")
 
@@ -57,58 +58,60 @@ class _ToolReferenceInputSchema:
         self,
         setup_ids: list[str],
         module_ids: list[str],
-        tags: list[str],
+        tag_ids: list[str],
+        categories: 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.tag_ids = tag_ids
         self.max_tools = max_tools
         self.min_tools = min_tools
+        self.categories = categories
 
     def __get_pydantic_json_schema__(  # noqa: PLW3201
         self,
         schema: CoreSchema,
         handler: GetJsonSchemaHandler,
     ) -> JsonSchemaValue:
-        """Generate JSON schema accepting both list[str] and ToolReference.
+        """Generate JSON schema for ToolReference with ui:options.
 
         Args:
             schema: The core schema from Pydantic.
             handler: Handler to generate JSON schema from core schema.
 
         Returns:
-            JSON schema with anyOf accepting array or ToolReference, plus ui:options.
+            JSON schema for ToolReference with 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 {
-            "type": ["array", "object"],
-            "anyOf": [
-                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,
-            },
+        ui_options: dict[str, object] = {
+            "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
 
 
 def tool_reference_input(
     setup_ids: list[str] = [],
     module_ids: list[str] = [],
-    tags: list[str] = [],
+    tag_ids: list[str] = [],
+    categories: list[str] = [],
     max_tools: int = 0,
     min_tools: int = 0,
 ) -> type[ToolReference]:
@@ -117,7 +120,8 @@ def tool_reference_input(
     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.
+        tag_ids: Tag IDs for the user to choose from.
+        categories: Categories for the user to choose from.
         max_tools: Maximum tools allowed. 0 for unlimited.
         min_tools: Minimum tools required. 0 for no minimum.
 
@@ -125,23 +129,6 @@ 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 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.
 
@@ -162,12 +149,12 @@ 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,
             module_ids=module_ids,
-            tags=tags,
+            tag_ids=tag_ids,
+            categories=categories,
             max_tools=max_tools,
             min_tools=min_tools,
         ),

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digitalkin
-Version: 0.3.2.dev24
+Version: 0.3.2.dev25
 Summary: SDK to build kin used in DigitalKin
 Author-email: "DigitalKin.ai" <contact@digitalkin.ai>
 License: Attribution-NonCommercial-ShareAlike 4.0 International
@@ -434,8 +434,8 @@ License: Attribution-NonCommercial-ShareAlike 4.0 International
         Creative Commons may be contacted at creativecommons.org.
         https://creativecommons.org/licenses/by-nc-sa/4.0/
         
-Project-URL: Homepage, https://github.com/DigitalKin-ai/digitalkin
 Project-URL: Documentation, https://github.com/DigitalKin-ai/digitalkin
+Project-URL: Homepage, https://github.com/DigitalKin-ai/digitalkin
 Project-URL: Issues, https://github.com/DigitalKin-ai/digitalkin/issues
 Keywords: agent,digitalkin,gprc,kin,sdk
 Classifier: Development Status :: 3 - Alpha

{digitalkin-0.3.2.dev24.dist-info → digitalkin-0.3.2.dev25.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=vA4NiacQcsBXOYEAYiPv2shFIfzddDYPmNLoVwEGFRA,196
+digitalkin/__version__.py,sha256=wLv3PwvKkCiyENoAcO49sz7loFxjdKXH6j76y0dSfiM,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
@@ -57,7 +57,7 @@ digitalkin/models/module/module_context.py,sha256=kwaAobsA82Du6L0XH9Is9u6Qj1rEjh
 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=M7IF_03V0VCDGpoWVSjJ5C4n20lu9Odx9GKsdFq5Rbw,6217
+digitalkin/models/module/tool_reference.py,sha256=L2wh6-Am7pQTUSVFL9gQtTIagscAWnBcc1zcDGgt0Co,5968
 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.dev24.dist-info/licenses/LICENSE,sha256=Ies4HFv2r2hzDRakJYxk3Y60uDFLiG-orIgeTpstnIo,20327
+digitalkin-0.3.2.dev25.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.dev24.dist-info/METADATA,sha256=g7SqPxiTjqzTaZKykLQbxavKmTliB5DID0l1uPCLwfo,29725
-digitalkin-0.3.2.dev24.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-digitalkin-0.3.2.dev24.dist-info/top_level.txt,sha256=AYVIesKrO0jnedQ-Muog9JBehG81WeTCNeOFoJgwsgE,51
-digitalkin-0.3.2.dev24.dist-info/RECORD,,
+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,,