|
38 | 38 | from haystack.dataclasses import ChatMessage |
39 | 39 | from haystack.dataclasses.breakpoints import AgentBreakpoint, ToolBreakpoint |
40 | 40 | from haystack.dataclasses.streaming_chunk import StreamingCallbackT |
41 | | -from haystack.tools import Tool, Toolset, deserialize_tools_or_toolset_inplace |
| 41 | +from haystack.tools import ToolsType, deserialize_tools_or_toolset_inplace |
42 | 42 | from haystack.utils.callable_serialization import deserialize_callable |
43 | 43 | from haystack.utils.deserialization import deserialize_chatgenerator_inplace |
44 | 44 |
|
@@ -121,7 +121,7 @@ def __init__( |
121 | 121 | self, |
122 | 122 | *, |
123 | 123 | chat_generator: ChatGenerator, |
124 | | - tools: Optional[Union[list[Tool], Toolset]] = None, |
| 124 | + tools: Optional[ToolsType] = None, |
125 | 125 | system_prompt: Optional[str] = None, |
126 | 126 | exit_conditions: Optional[list[str]] = None, |
127 | 127 | state_schema: Optional[dict[str, Any]] = None, |
@@ -171,7 +171,7 @@ def _initialize_fresh_execution( |
171 | 171 | requires_async: bool, |
172 | 172 | *, |
173 | 173 | system_prompt: Optional[str] = None, |
174 | | - tools: Optional[Union[list[Tool], Toolset, list[str]]] = None, |
| 174 | + tools: Optional[Union[ToolsType, list[str]]] = None, |
175 | 175 | **kwargs: dict[str, Any], |
176 | 176 | ) -> _ExecutionContext: |
177 | 177 | """ |
@@ -212,7 +212,7 @@ def _initialize_from_snapshot( # type: ignore[override] |
212 | 212 | streaming_callback: Optional[StreamingCallbackT], |
213 | 213 | requires_async: bool, |
214 | 214 | *, |
215 | | - tools: Optional[Union[list[Tool], Toolset, list[str]]] = None, |
| 215 | + tools: Optional[Union[ToolsType, list[str]]] = None, |
216 | 216 | ) -> _ExecutionContext: |
217 | 217 | """ |
218 | 218 | Initialize execution context from an AgentSnapshot. |
@@ -250,7 +250,7 @@ def run( # noqa: PLR0915 |
250 | 250 | break_point: Optional[AgentBreakpoint] = None, |
251 | 251 | snapshot: Optional[AgentSnapshot] = None, # type: ignore[override] |
252 | 252 | system_prompt: Optional[str] = None, |
253 | | - tools: Optional[Union[list[Tool], Toolset, list[str]]] = None, |
| 253 | + tools: Optional[Union[ToolsType, list[str]]] = None, |
254 | 254 | **kwargs: Any, |
255 | 255 | ) -> dict[str, Any]: |
256 | 256 | """ |
@@ -434,7 +434,7 @@ async def run_async( |
434 | 434 | break_point: Optional[AgentBreakpoint] = None, |
435 | 435 | snapshot: Optional[AgentSnapshot] = None, # type: ignore[override] |
436 | 436 | system_prompt: Optional[str] = None, |
437 | | - tools: Optional[Union[list[Tool], Toolset, list[str]]] = None, |
| 437 | + tools: Optional[Union[ToolsType, list[str]]] = None, |
438 | 438 | **kwargs: Any, |
439 | 439 | ) -> dict[str, Any]: |
440 | 440 | """ |
|
0 commit comments