unique_toolkit 1.1.4__py3-none-any.whl → 1.1.6__py3-none-any.whl

unique_toolkit/_common/utils/__init__.py

@@ -0,0 +1 @@
+# Utils package for common utilities

unique_toolkit/_common/utils/structured_output/__init__.py

@@ -0,0 +1 @@
+# Structured output utilities package

unique_toolkit/agentic/tools/config.py

@@ -1,41 +1,16 @@
+import json
 from enum import StrEnum
-from typing import TYPE_CHECKING, Any
+from typing import Any, Dict
 
-import humps
 from pydantic import (
     BaseModel,
-    ConfigDict,
     Field,
     ValidationInfo,
     model_validator,
 )
-from pydantic.alias_generators import to_camel
-from pydantic.fields import ComputedFieldInfo, FieldInfo
 
-if TYPE_CHECKING:
-    from unique_toolkit.agentic.tools.schemas import BaseToolConfig
-
-
-def field_title_generator(
-    title: str,
-    info: FieldInfo | ComputedFieldInfo,
-) -> str:
-    return humps.decamelize(title).replace("_", " ").title()
-
-
-def model_title_generator(model: type) -> str:
-    return humps.decamelize(model.__name__).replace("_", " ").title()
-
-
-def get_configuration_dict(**kwargs) -> ConfigDict:
-    return ConfigDict(
-        alias_generator=to_camel,
-        field_title_generator=field_title_generator,
-        model_title_generator=model_title_generator,
-        populate_by_name=True,
-        protected_namespaces=(),
-        **kwargs,
-    )
+from unique_toolkit._common.pydantic_helpers import get_configuration_dict
+from unique_toolkit.agentic.tools.schemas import BaseToolConfig
 
 
 class ToolIcon(StrEnum):
@@ -63,7 +38,7 @@ class ToolBuildConfig(BaseModel):
     """Main tool configuration"""
 
     name: str
-    configuration: "BaseToolConfig"
+    configuration: BaseToolConfig
     display_name: str = ""
     icon: ToolIcon = ToolIcon.BOOK
     selection_policy: ToolSelectionPolicy = Field(
@@ -124,10 +99,46 @@ class ToolBuildConfig(BaseModel):
         value["configuration"] = config
         return value
 
-
-def _rebuild_config_model():
-    """Rebuild the ToolBuildConfig model to resolve forward references."""
-    # Import here to avoid circular imports
-    from unique_toolkit.agentic.tools.schemas import BaseToolConfig  # noqa: F401
-
-    ToolBuildConfig.model_rebuild()
+    def model_dump(self) -> Dict[str, Any]:
+        """
+        Returns a dict representation of the tool config that preserves
+        subclass fields from `configuration` by delegating to its own
+        model_dump. This prevents `{}` when `configuration` is typed
+        as `BaseToolConfig` but holds a subclass instance.
+        """
+        data: Dict[str, Any] = {
+            "name": self.name,
+            "configuration": self.configuration.model_dump()
+            if self.configuration
+            else None,
+            "display_name": self.display_name,
+            "icon": self.icon,
+            "selection_policy": self.selection_policy,
+            "is_exclusive": self.is_exclusive,
+            "is_sub_agent": self.is_sub_agent,
+            "is_enabled": self.is_enabled,
+        }
+        return data
+
+    def model_dump_json(self) -> str:
+        """
+        Returns a JSON string representation of the tool config.
+        Ensures `configuration` is fully serialized by using the
+        subclass's `model_dump_json()` when available.
+        """
+        config_json = (
+            self.configuration.model_dump_json() if self.configuration else None
+        )
+        config = json.loads(config_json) if config_json else None
+
+        data: Dict[str, Any] = {
+            "name": self.name,
+            "configuration": config,
+            "display_name": self.display_name,
+            "icon": self.icon,
+            "selection_policy": self.selection_policy,
+            "is_exclusive": self.is_exclusive,
+            "is_sub_agent": self.is_sub_agent,
+            "is_enabled": self.is_enabled,
+        }
+        return json.dumps(data)

unique_toolkit/agentic/tools/schemas.py

@@ -5,7 +5,7 @@ from typing import Any, Optional
 
 from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator
 
-from unique_toolkit.agentic.tools.config import get_configuration_dict
+from unique_toolkit._common.pydantic_helpers import get_configuration_dict
 from unique_toolkit.agentic.tools.utils.source_handling.schema import SourceFormatConfig
 from unique_toolkit.content.schemas import ContentChunk
 

unique_toolkit/agentic/tools/tool.py

@@ -61,6 +61,11 @@ class Tool(ABC, Generic[ConfigType]):
         """
         return False
 
+    @property
+    def configuration(self) -> BaseToolConfig:
+        """The configuration of the tool."""
+        return self.settings.configuration
+
     @abstractmethod
     def tool_description(self) -> LanguageModelToolDescription:
         raise NotImplementedError
@@ -72,18 +77,23 @@ class Tool(ABC, Generic[ConfigType]):
         else:
             return cast("dict[str, Any]", parameters)
 
+    # TODO: This method should be a property
     def tool_description_for_system_prompt(self) -> str:
         return ""
 
+    # TODO: This method should be a property
     def tool_format_information_for_system_prompt(self) -> str:
         return ""
 
+    # TODO: This method should be a property
     def tool_description_for_user_prompt(self) -> str:
         return ""
 
+    # TODO: This method should be a property
     def tool_format_information_for_user_prompt(self) -> str:
         return ""
 
+    # TODO: This method should be a property
     def tool_format_reminder_for_user_prompt(self) -> str:
         """A short reminder for the user prompt for formatting rules for the tool.
         You can use this if the LLM fails to follow the formatting rules.

unique_toolkit/agentic/tools/tool_manager.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel, Field
 
 from unique_toolkit.agentic.evaluation.schemas import EvaluationMetricName
 from unique_toolkit.agentic.tools.a2a.manager import A2AManager
-from unique_toolkit.agentic.tools.config import ToolBuildConfig, _rebuild_config_model
+from unique_toolkit.agentic.tools.config import ToolBuildConfig
 from unique_toolkit.agentic.tools.factory import ToolFactory
 from unique_toolkit.agentic.tools.mcp.manager import MCPManager
 from unique_toolkit.agentic.tools.schemas import ToolCallResponse, ToolPrompts
@@ -23,9 +23,6 @@ from unique_toolkit.language_model.schemas import (
     LanguageModelToolDescription,
 )
 
-# Rebuild the config model now that all imports are resolved
-_rebuild_config_model()
-
 
 class ForcedToolOption:
     type: str = "function"

{unique_toolkit-1.1.4.dist-info → unique_toolkit-1.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.1.4
+Version: 1.1.6
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -118,6 +118,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.6] - 2025-09-23
+- Fix model_dump for `ToolBuildConfig`
+
+## [1.1.5] - 2025-09-23
+- Fix a circular import and add tests for `ToolBuildConfig`
 
 ## [1.1.4] - 2025-09-23
 - First version human verification on api calls

{unique_toolkit-1.1.4.dist-info → unique_toolkit-1.1.6.dist-info}/RECORD

@@ -17,6 +17,8 @@ unique_toolkit/_common/pydantic_helpers.py,sha256=TVEYUaBnsXRXmjmdtaM0LV_0-7NX9S
 unique_toolkit/_common/string_utilities.py,sha256=pbsjpnz1mwGeugebHzubzmmDtlm18B8e7xJdSvLnor0,2496
 unique_toolkit/_common/token/image_token_counting.py,sha256=VpFfZyY0GIH27q_Wy4YNjk2algqvbCtJyzuuROoFQPw,2189
 unique_toolkit/_common/token/token_counting.py,sha256=gM4B_aUqKqEPvmStFNcvCWNMNNNNKbVaywBDxlbgIps,7121
+unique_toolkit/_common/utils/__init__.py,sha256=qHrEy-3zkbFPdGFriRscPbGKuQfOuPi3O7tE5Zw5VHY,37
+unique_toolkit/_common/utils/structured_output/__init__.py,sha256=nm_orZrlCXL0FPLUg0Jv6Ty1flXPkCgZ9caAWaS8rz8,38
 unique_toolkit/_common/utils/structured_output/schema.py,sha256=Tp7kDYcmKtnUhcuRkH86TSYhylRff0ZZJYb2dLkISts,131
 unique_toolkit/_common/utils/write_configuration.py,sha256=fzvr4C-XBL3OSM3Od9TbqIxeeDS9_d9CLEyTq6DDknY,1409
 unique_toolkit/_common/validate_required_values.py,sha256=Y_M1ub9gIKP9qZ45F6Zq3ZHtuIqhmOjl8Z2Vd3avg8w,588
@@ -54,17 +56,17 @@ unique_toolkit/agentic/tools/a2a/memory.py,sha256=4VFBzITCv5E_8YCc4iF4Y6FhzplS2C
 unique_toolkit/agentic/tools/a2a/schema.py,sha256=T1l5z6trtPE5nhqPzt5tvfRNDhqL_ST1Wj7_lBWJ58g,304
 unique_toolkit/agentic/tools/a2a/service.py,sha256=7n7BkJxTR-hpoQczfHLK8eS0rtATL7-YARH-4netbbI,5339
 unique_toolkit/agentic/tools/agent_chunks_hanlder.py,sha256=x32Dp1Z8cVW5i-XzXbaMwX2KHPcNGmqEU-FB4AV9ZGo,1909
-unique_toolkit/agentic/tools/config.py,sha256=1--Gq-MG2RorTKdBHHyx0EFC_d2uRynJ-L_K-fjOjvA,3899
+unique_toolkit/agentic/tools/config.py,sha256=B9Tl0uJ81XB4SjSke4kSydame4glGT2s69ZXfr0ViZU,4634
 unique_toolkit/agentic/tools/factory.py,sha256=Wt0IGSbLg8ZTq5PU9p_JTW0LtNATWLpc3336irJKXlM,1277
 unique_toolkit/agentic/tools/mcp/__init__.py,sha256=RLF_p-LDRC7GhiB3fdCi4u3bh6V9PY_w26fg61BLyco,122
 unique_toolkit/agentic/tools/mcp/manager.py,sha256=DPYwwDe6RSZyuPaxn-je49fP_qOOs0ZV46EM6GZcV4c,2748
 unique_toolkit/agentic/tools/mcp/models.py,sha256=OyCCb7Vwv1ftzC_OCpFkf3TX9Aeb74ZZagG-qK5peIU,722
 unique_toolkit/agentic/tools/mcp/tool_wrapper.py,sha256=5UdtqFtZ0aqjae2eL3zVacDMfr1hu5KiQkaoI7VkhqA,9972
-unique_toolkit/agentic/tools/schemas.py,sha256=Nk2U2WEK9WEuxyoDQ0gjegoHPHUrt_Ozck4HfFQZJAM,4833
+unique_toolkit/agentic/tools/schemas.py,sha256=0ZR8xCdGj1sEdPE0lfTIG2uSR5zqWoprUa3Seqez4C8,4837
 unique_toolkit/agentic/tools/test/test_mcp_manager.py,sha256=9F7FjpYKeOkg2Z4bt2H1WGaxu9fzB-1iiE-b7g3KzQk,15724
 unique_toolkit/agentic/tools/test/test_tool_progress_reporter.py,sha256=dod5QPqgGUInVAGXAbsAKNTEypIi6pUEWhDbJr9YfUU,6307
-unique_toolkit/agentic/tools/tool.py,sha256=8ExasfdLrdyOXWrcKi8dtvR1vYbdFV0UcS4UDf-5XXs,6369
-unique_toolkit/agentic/tools/tool_manager.py,sha256=RWz6hKzuTTqzry5KpaeSfsO84zMp6RqVfX59YWFYblc,11034
+unique_toolkit/agentic/tools/tool.py,sha256=m56VLxiHuKU2_J5foZp00xhm5lTxWEW7zRLGbIE9ssU,6744
+unique_toolkit/agentic/tools/tool_manager.py,sha256=E1eKZuc7eHPeGFqrGfdMGPNLqu3NYhrfKDjSJxMSuvU,10925
 unique_toolkit/agentic/tools/tool_progress_reporter.py,sha256=ixud9VoHey1vlU1t86cW0-WTvyTwMxNSWBon8I11SUk,7955
 unique_toolkit/agentic/tools/utils/__init__.py,sha256=iD1YYzf9LcJFv95Z8BqCAFSewNBabybZRZyvPKGfvro,27
 unique_toolkit/agentic/tools/utils/execution/__init__.py,sha256=OHiKpqBnfhBiEQagKVWJsZlHv8smPp5OI4dFIexzibw,37
@@ -126,7 +128,7 @@ unique_toolkit/short_term_memory/schemas.py,sha256=OhfcXyF6ACdwIXW45sKzjtZX_gkcJ
 unique_toolkit/short_term_memory/service.py,sha256=5PeVBu1ZCAfyDb2HLVvlmqSbyzBBuE9sI2o9Aajqjxg,8884
 unique_toolkit/smart_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_toolkit/smart_rules/compile.py,sha256=cxWjb2dxEI2HGsakKdVCkSNi7VK9mr08w5sDcFCQyWI,9553
-unique_toolkit-1.1.4.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-1.1.4.dist-info/METADATA,sha256=2BBFs3a2HGMSWyyk2MQV5gAVJUINJC3Bua6hF4VklcI,32722
-unique_toolkit-1.1.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-1.1.4.dist-info/RECORD,,
+unique_toolkit-1.1.6.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-1.1.6.dist-info/METADATA,sha256=sMJptXKLbf2ULpa6UcCWdX_mi7W-B5rQLNvHq0X1Q5A,32870
+unique_toolkit-1.1.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-1.1.6.dist-info/RECORD,,