mirror of
https://github.com/deepset-ai/haystack.git
synced 2026-01-01 09:37:36 +00:00
9bc59c3806
* Tools warmup initial * Fix lint * Improve pydocs for warm_up * Further improve pydocs for warm_up * No need to warm_up tools in Agent as they are warmed up by ToolInvoker * Simplify Toolset __add__ logic * Simplify _ToolsetWrapper * Add unit tests * ToolInvoker warm_up * Improve Tool pydoc * Resurrect serde_utils.py * Update tests * Call ToolInvoker warm_up in agent warm_up * Lint * Move warm_up tests to ToolInvoker * Update tests * Remove tests * Pydoc nit * PR feedback * ToolInvoker's warm_up is idempotent * Add reno note * Update releasenotes/notes/tools-warm-up-support-e16cc043fed3653f.yaml Co-authored-by: Sebastian Husch Lee <10526848+sjrl@users.noreply.github.com> * Make ComponentTool warm_up idempotent * Update warm_up_tools to use ToolsType * Linting * Add warm up test for mixed list of Tool/Toolset instances --------- Co-authored-by: Sebastian Husch Lee <10526848+sjrl@users.noreply.github.com>
121 lines
3.4 KiB
Python
121 lines
3.4 KiB
Python
# SPDX-FileCopyrightText: 2022-present deepset GmbH <info@deepset.ai>
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
import pytest
|
|
|
|
from haystack.components.agents import Agent
|
|
from haystack.components.tools import ToolInvoker
|
|
from haystack.core.component.component import component
|
|
from haystack.tools import Tool, Toolset, warm_up_tools
|
|
from haystack.tools.toolset import _ToolsetWrapper
|
|
|
|
|
|
# Test fixtures
|
|
def add_numbers(a: int, b: int) -> int:
|
|
"""Add two numbers."""
|
|
return a + b
|
|
|
|
|
|
def multiply_numbers(a: int, b: int) -> int:
|
|
"""Multiply two numbers."""
|
|
return a * b
|
|
|
|
|
|
def subtract_numbers(a: int, b: int) -> int:
|
|
"""Subtract b from a."""
|
|
return a - b
|
|
|
|
|
|
@pytest.fixture
|
|
def add_tool():
|
|
return Tool(
|
|
name="add",
|
|
description="Add two numbers",
|
|
parameters={
|
|
"type": "object",
|
|
"properties": {"a": {"type": "integer"}, "b": {"type": "integer"}},
|
|
"required": ["a", "b"],
|
|
},
|
|
function=add_numbers,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def multiply_tool():
|
|
return Tool(
|
|
name="multiply",
|
|
description="Multiply two numbers",
|
|
parameters={
|
|
"type": "object",
|
|
"properties": {"a": {"type": "integer"}, "b": {"type": "integer"}},
|
|
"required": ["a", "b"],
|
|
},
|
|
function=multiply_numbers,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def subtract_tool():
|
|
return Tool(
|
|
name="subtract",
|
|
description="Subtract two numbers",
|
|
parameters={
|
|
"type": "object",
|
|
"properties": {"a": {"type": "integer"}, "b": {"type": "integer"}},
|
|
"required": ["a", "b"],
|
|
},
|
|
function=subtract_numbers,
|
|
)
|
|
|
|
|
|
class TestToolsetWrapper:
|
|
"""Tests for the _ToolsetWrapper class"""
|
|
|
|
def test_toolset_plus_toolset_creates_wrapper(self, add_tool, multiply_tool):
|
|
"""Test that combining two Toolsets creates a _ToolsetWrapper and works correctly."""
|
|
toolset1 = Toolset([add_tool])
|
|
toolset2 = Toolset([multiply_tool])
|
|
|
|
result = toolset1 + toolset2
|
|
|
|
assert isinstance(result, _ToolsetWrapper)
|
|
assert len(result) == 2
|
|
assert add_tool in result
|
|
assert multiply_tool in result
|
|
|
|
def test_wrapper_with_agent(self, add_tool, multiply_tool):
|
|
"""Test that _ToolsetWrapper works with Agent."""
|
|
|
|
@component
|
|
class MockChatGenerator:
|
|
def run(self, messages, tools=None, **kwargs):
|
|
return {"replies": messages}
|
|
|
|
def warm_up(self):
|
|
pass
|
|
|
|
toolset1 = Toolset([add_tool])
|
|
toolset2 = Toolset([multiply_tool])
|
|
wrapper = toolset1 + toolset2
|
|
|
|
agent = Agent(chat_generator=MockChatGenerator(), tools=wrapper)
|
|
agent.warm_up()
|
|
|
|
assert len(list(agent.tools)) == 2
|
|
|
|
def test_wrapper_chaining_and_duplicate_detection(self, add_tool, multiply_tool, subtract_tool):
|
|
"""Test chaining operations and that duplicates are still detected."""
|
|
toolset1 = Toolset([add_tool])
|
|
toolset2 = Toolset([multiply_tool])
|
|
toolset3 = Toolset([subtract_tool])
|
|
|
|
# Chaining should work
|
|
result = toolset1 + toolset2 + toolset3
|
|
assert len(result) == 3
|
|
|
|
# Duplicates should be detected
|
|
toolset_with_dup = Toolset([add_tool])
|
|
with pytest.raises(ValueError, match="Duplicate tool names found"):
|
|
_ = result + toolset_with_dup
|