unique_toolkit 1.1.4__tar.gz → 1.1.6__tar.gz

{unique_toolkit-1.1.4 → unique_toolkit-1.1.6}/CHANGELOG.md

@@ -5,6 +5,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 → unique_toolkit-1.1.6}/PKG-INFO

@@ -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 → unique_toolkit-1.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "1.1.4"
+version = "1.1.6"
 description = ""
 authors = [
     "Cedric Klinkert <cedric.klinkert@unique.ch>",

unique_toolkit-1.1.6/unique_toolkit/_common/utils/__init__.py

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

unique_toolkit-1.1.6/unique_toolkit/_common/utils/structured_output/__init__.py

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

{unique_toolkit-1.1.4 → unique_toolkit-1.1.6}/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-1.1.4 → unique_toolkit-1.1.6}/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-1.1.4 → unique_toolkit-1.1.6}/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-1.1.4 → unique_toolkit-1.1.6}/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"