Fix bug where generics causes tools to roundtrip and loose properties. (#195)

Author: monoxgas

dreadnode/__init__.py

@@ -37,6 +37,7 @@
 
 if t.TYPE_CHECKING:
     from dreadnode import agent, airt, eval, optimization, scorers, transforms  # noqa: A004
+    from dreadnode.agent import Agent, tool, tool_method
     from dreadnode.data_types import Audio, Image, Table, Video
 
 logger.disable("dreadnode")
@@ -75,6 +76,7 @@
 
 __all__ = [
     "DEFAULT_INSTANCE",
+    "Agent",
     "Audio",
     "Code",
     "Config",
@@ -138,6 +140,8 @@
     "task",
     "task_and_run",
     "task_span",
+    "tool",
+    "tool_method",
     "transforms",
 ]
 
@@ -147,6 +151,9 @@
     "Image": "dreadnode.data_types",
     "Table": "dreadnode.data_types",
     "Video": "dreadnode.data_types",
+    "Agent": "dreadnode.agent",
+    "tool": "dreadnode.agent",
+    "tool_method": "dreadnode.agent",
 }
 
 

dreadnode/agent/__init__.py

@@ -4,6 +4,7 @@
 from dreadnode.agent.agent import Agent
 from dreadnode.agent.result import AgentResult
 from dreadnode.agent.thread import Thread
+from dreadnode.agent.tools import tool, tool_method
 
 Agent.model_rebuild()
 Thread.model_rebuild()
@@ -20,5 +21,7 @@
     "reactions",
     "result",
     "stop",
+    "tool",
+    "tool_method",
     "tools",
 ]

dreadnode/agent/agent.py

@@ -4,7 +4,7 @@
 from copy import deepcopy
 
 import rigging as rg
-from pydantic import ConfigDict, Field, PrivateAttr, field_validator
+from pydantic import ConfigDict, Field, PrivateAttr, SkipValidation, field_validator
 from rigging.message import inject_system_content  # can't access via rg
 
 from dreadnode.agent.error import MaxStepsError
@@ -83,7 +83,7 @@ class Agent(Model):
     caching: rg.caching.CacheMode | None = Config(default=None, repr=False)
     """How to handle cache_control entries on inference messages."""
 
-    tools: list[AnyTool | Toolset] = Config(default_factory=list)
+    tools: t.Annotated[list[AnyTool | Toolset], SkipValidation] = Config(default_factory=list)
     """Tools the agent can use."""
     tool_mode: ToolMode = Config(default="auto", repr=False)
     """The tool calling mode to use."""

dreadnode/agent/tools/__init__.py

@@ -3,7 +3,12 @@
 
 from dreadnode.agent.tools.base import (
     AnyTool,
+    FunctionCall,
+    FunctionDefinition,
     Tool,
+    ToolCall,
+    ToolDefinition,
+    ToolMode,
     Toolset,
     discover_tools_on_obj,
     tool,
@@ -15,7 +20,12 @@
 
 __all__ = [
     "AnyTool",
+    "FunctionCall",
+    "FunctionDefinition",
     "Tool",
+    "ToolCall",
+    "ToolDefinition",
+    "ToolMode",
     "Toolset",
     "discover_tools_on_obj",
     "fs",

dreadnode/agent/tools/base.py

@@ -8,6 +8,10 @@
 
 Tool = tools.Tool
 ToolMode = tools.ToolMode
+ToolCall = tools.ToolCall
+FunctionCall = tools.FunctionCall
+ToolDefinition = tools.ToolDefinition
+FunctionDefinition = tools.FunctionDefinition
 
 AnyTool = Tool[t.Any, t.Any]