unique_toolkit 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

unique_toolkit/agentic/tools/config.py

@@ -1,5 +1,6 @@
+import json
 from enum import StrEnum
-from typing import Any
+from typing import Any, Dict
 
 from pydantic import (
     BaseModel,
@@ -98,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/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"