feat: Add MaxCountPerStepToolRule (#1319)
This commit is contained in:
@@ -2,7 +2,7 @@ import pytest
|
||||
|
||||
from letta.helpers import ToolRulesSolver
|
||||
from letta.helpers.tool_rule_solver import ToolRuleValidationError
|
||||
from letta.schemas.tool_rule import ChildToolRule, ConditionalToolRule, InitToolRule, TerminalToolRule
|
||||
from letta.schemas.tool_rule import ChildToolRule, ConditionalToolRule, InitToolRule, MaxCountPerStepToolRule, TerminalToolRule
|
||||
|
||||
# Constants for tool names used in the tests
|
||||
START_TOOL = "start_tool"
|
||||
@@ -15,145 +15,163 @@ UNRECOGNIZED_TOOL = "unrecognized_tool"
|
||||
|
||||
|
||||
def test_get_allowed_tool_names_with_init_rules():
|
||||
# Setup: Initial tool rule configuration
|
||||
init_rule_1 = InitToolRule(tool_name=START_TOOL)
|
||||
init_rule_2 = InitToolRule(tool_name=PREP_TOOL)
|
||||
solver = ToolRulesSolver(init_tool_rules=[init_rule_1, init_rule_2], tool_rules=[], terminal_tool_rules=[])
|
||||
solver = ToolRulesSolver(tool_rules=[init_rule_1, init_rule_2])
|
||||
|
||||
# Action: Get allowed tool names when no tool has been called
|
||||
allowed_tools = solver.get_allowed_tool_names()
|
||||
allowed_tools = solver.get_allowed_tool_names(set())
|
||||
|
||||
# Assert: Both init tools should be allowed initially
|
||||
assert allowed_tools == [START_TOOL, PREP_TOOL], "Should allow only InitToolRule tools at the start"
|
||||
|
||||
|
||||
def test_get_allowed_tool_names_with_subsequent_rule():
|
||||
# Setup: Tool rule sequence
|
||||
init_rule = InitToolRule(tool_name=START_TOOL)
|
||||
rule_1 = ChildToolRule(tool_name=START_TOOL, children=[NEXT_TOOL, HELPER_TOOL])
|
||||
solver = ToolRulesSolver(init_tool_rules=[init_rule], tool_rules=[rule_1], terminal_tool_rules=[])
|
||||
solver = ToolRulesSolver(tool_rules=[init_rule, rule_1])
|
||||
|
||||
# Action: Update usage and get allowed tools
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
allowed_tools = solver.get_allowed_tool_names()
|
||||
allowed_tools = solver.get_allowed_tool_names({START_TOOL, NEXT_TOOL, HELPER_TOOL})
|
||||
|
||||
# Assert: Only children of "start_tool" should be allowed
|
||||
assert allowed_tools == [NEXT_TOOL, HELPER_TOOL], "Should allow only children of the last tool used"
|
||||
assert sorted(allowed_tools) == sorted([NEXT_TOOL, HELPER_TOOL]), "Should allow only children of the last tool used"
|
||||
|
||||
|
||||
def test_is_terminal_tool():
|
||||
# Setup: Terminal tool rule configuration
|
||||
init_rule = InitToolRule(tool_name=START_TOOL)
|
||||
terminal_rule = TerminalToolRule(tool_name=END_TOOL)
|
||||
solver = ToolRulesSolver(init_tool_rules=[init_rule], tool_rules=[], terminal_tool_rules=[terminal_rule])
|
||||
solver = ToolRulesSolver(tool_rules=[init_rule, terminal_rule])
|
||||
|
||||
# Action & Assert: Verify terminal and non-terminal tools
|
||||
assert solver.is_terminal_tool(END_TOOL) is True, "Should recognize 'end_tool' as a terminal tool"
|
||||
assert solver.is_terminal_tool(START_TOOL) is False, "Should not recognize 'start_tool' as a terminal tool"
|
||||
|
||||
|
||||
def test_get_allowed_tool_names_no_matching_rule_warning():
|
||||
# Setup: Tool rules with no matching rule for the last tool
|
||||
init_rule = InitToolRule(tool_name=START_TOOL)
|
||||
solver = ToolRulesSolver(init_tool_rules=[init_rule], tool_rules=[], terminal_tool_rules=[])
|
||||
|
||||
# Action: Set last tool to an unrecognized tool and check warnings
|
||||
solver.update_tool_usage(UNRECOGNIZED_TOOL)
|
||||
|
||||
# # NOTE: removed for now since this warning is getting triggered on every LLM call
|
||||
# with warnings.catch_warnings(record=True) as w:
|
||||
# allowed_tools = solver.get_allowed_tool_names()
|
||||
|
||||
# # Assert: Expecting a warning and an empty list of allowed tools
|
||||
# assert len(w) == 1, "Expected a warning for no matching rule"
|
||||
# assert "resolved to no more possible tool calls" in str(w[-1].message)
|
||||
# assert allowed_tools == [], "Should return an empty list if no matching rule"
|
||||
|
||||
|
||||
def test_get_allowed_tool_names_no_matching_rule_error():
|
||||
# Setup: Tool rules with no matching rule for the last tool
|
||||
init_rule = InitToolRule(tool_name=START_TOOL)
|
||||
solver = ToolRulesSolver(init_tool_rules=[init_rule], tool_rules=[], terminal_tool_rules=[])
|
||||
solver = ToolRulesSolver(tool_rules=[init_rule])
|
||||
|
||||
# Action & Assert: Set last tool to an unrecognized tool and expect ValueError
|
||||
solver.update_tool_usage(UNRECOGNIZED_TOOL)
|
||||
with pytest.raises(ValueError, match=f"No tool rule found for {UNRECOGNIZED_TOOL}"):
|
||||
solver.get_allowed_tool_names(error_on_empty=True)
|
||||
with pytest.raises(ValueError, match=f"No valid tools found based on tool rules."):
|
||||
solver.get_allowed_tool_names(set(), error_on_empty=True)
|
||||
|
||||
|
||||
def test_update_tool_usage_and_get_allowed_tool_names_combined():
|
||||
# Setup: More complex rule chaining
|
||||
init_rule = InitToolRule(tool_name=START_TOOL)
|
||||
rule_1 = ChildToolRule(tool_name=START_TOOL, children=[NEXT_TOOL])
|
||||
rule_2 = ChildToolRule(tool_name=NEXT_TOOL, children=[FINAL_TOOL])
|
||||
terminal_rule = TerminalToolRule(tool_name=FINAL_TOOL)
|
||||
solver = ToolRulesSolver(init_tool_rules=[init_rule], tool_rules=[rule_1, rule_2], terminal_tool_rules=[terminal_rule])
|
||||
solver = ToolRulesSolver(tool_rules=[init_rule, rule_1, rule_2, terminal_rule])
|
||||
|
||||
# Step 1: Initially allowed tools
|
||||
assert solver.get_allowed_tool_names() == [START_TOOL], "Initial allowed tool should be 'start_tool'"
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [START_TOOL], "Initial allowed tool should be 'start_tool'"
|
||||
|
||||
# Step 2: After using 'start_tool'
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
assert solver.get_allowed_tool_names() == [NEXT_TOOL], "After 'start_tool', should allow 'next_tool'"
|
||||
assert solver.get_allowed_tool_names({NEXT_TOOL}) == [NEXT_TOOL], "After 'start_tool', should allow 'next_tool'"
|
||||
|
||||
# Step 3: After using 'next_tool'
|
||||
solver.update_tool_usage(NEXT_TOOL)
|
||||
assert solver.get_allowed_tool_names() == [FINAL_TOOL], "After 'next_tool', should allow 'final_tool'"
|
||||
assert solver.get_allowed_tool_names({FINAL_TOOL}) == [FINAL_TOOL], "After 'next_tool', should allow 'final_tool'"
|
||||
|
||||
# Step 4: 'final_tool' should be terminal
|
||||
assert solver.is_terminal_tool(FINAL_TOOL) is True, "Should recognize 'final_tool' as terminal"
|
||||
|
||||
|
||||
def test_conditional_tool_rule():
|
||||
# Setup: Define a conditional tool rule
|
||||
init_rule = InitToolRule(tool_name=START_TOOL)
|
||||
terminal_rule = TerminalToolRule(tool_name=END_TOOL)
|
||||
rule = ConditionalToolRule(tool_name=START_TOOL, default_child=None, child_output_mapping={True: END_TOOL, False: START_TOOL})
|
||||
solver = ToolRulesSolver(tool_rules=[init_rule, rule, terminal_rule])
|
||||
|
||||
# Action & Assert: Verify the rule properties
|
||||
# Step 1: Initially allowed tools
|
||||
assert solver.get_allowed_tool_names() == [START_TOOL], "Initial allowed tool should be 'start_tool'"
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [START_TOOL], "Initial allowed tool should be 'start_tool'"
|
||||
|
||||
# Step 2: After using 'start_tool'
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
assert solver.get_allowed_tool_names(last_function_response='{"message": "true"}') == [
|
||||
assert solver.get_allowed_tool_names({END_TOOL}, last_function_response='{"message": "true"}') == [
|
||||
END_TOOL
|
||||
], "After 'start_tool' returns true, should allow 'end_tool'"
|
||||
assert solver.get_allowed_tool_names(last_function_response='{"message": "false"}') == [
|
||||
assert solver.get_allowed_tool_names({START_TOOL}, last_function_response='{"message": "false"}') == [
|
||||
START_TOOL
|
||||
], "After 'start_tool' returns false, should allow 'start_tool'"
|
||||
|
||||
# Step 3: After using 'end_tool'
|
||||
assert solver.is_terminal_tool(END_TOOL) is True, "Should recognize 'end_tool' as terminal"
|
||||
|
||||
|
||||
def test_invalid_conditional_tool_rule():
|
||||
# Setup: Define an invalid conditional tool rule
|
||||
init_rule = InitToolRule(tool_name=START_TOOL)
|
||||
terminal_rule = TerminalToolRule(tool_name=END_TOOL)
|
||||
invalid_rule_1 = ConditionalToolRule(tool_name=START_TOOL, default_child=END_TOOL, child_output_mapping={})
|
||||
|
||||
# Test 1: Missing child output mapping
|
||||
with pytest.raises(ToolRuleValidationError, match="Conditional tool rule must have at least one child tool."):
|
||||
ToolRulesSolver(tool_rules=[init_rule, invalid_rule_1, terminal_rule])
|
||||
|
||||
|
||||
def test_tool_rules_with_invalid_path():
|
||||
# Setup: Define tool rules with both connected, disconnected nodes and a cycle
|
||||
init_rule = InitToolRule(tool_name=START_TOOL)
|
||||
rule_1 = ChildToolRule(tool_name=START_TOOL, children=[NEXT_TOOL])
|
||||
rule_2 = ChildToolRule(tool_name=NEXT_TOOL, children=[HELPER_TOOL])
|
||||
rule_3 = ChildToolRule(tool_name=HELPER_TOOL, children=[START_TOOL]) # This creates a cycle: start -> next -> helper -> start
|
||||
rule_4 = ChildToolRule(tool_name=FINAL_TOOL, children=[END_TOOL]) # Disconnected rule, no cycle here
|
||||
rule_3 = ChildToolRule(tool_name=HELPER_TOOL, children=[START_TOOL])
|
||||
rule_4 = ChildToolRule(tool_name=FINAL_TOOL, children=[END_TOOL])
|
||||
terminal_rule = TerminalToolRule(tool_name=END_TOOL)
|
||||
|
||||
ToolRulesSolver(tool_rules=[init_rule, rule_1, rule_2, rule_3, rule_4, terminal_rule])
|
||||
|
||||
# Now: add a path from the start tool to the final tool
|
||||
rule_5 = ConditionalToolRule(
|
||||
tool_name=HELPER_TOOL,
|
||||
default_child=FINAL_TOOL,
|
||||
child_output_mapping={True: START_TOOL, False: FINAL_TOOL},
|
||||
)
|
||||
ToolRulesSolver(tool_rules=[init_rule, rule_1, rule_2, rule_3, rule_4, rule_5, terminal_rule])
|
||||
|
||||
|
||||
def test_max_count_per_step_tool_rule():
|
||||
init_rule = InitToolRule(tool_name=START_TOOL)
|
||||
rule_1 = MaxCountPerStepToolRule(tool_name=START_TOOL, max_count_limit=2)
|
||||
solver = ToolRulesSolver(tool_rules=[init_rule, rule_1])
|
||||
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [START_TOOL], "Initially should allow 'start_tool'"
|
||||
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [START_TOOL], "After first use, should still allow 'start_tool'"
|
||||
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [], "After reaching max count, 'start_tool' should no longer be allowed"
|
||||
|
||||
|
||||
def test_max_count_per_step_tool_rule_allows_usage_up_to_limit():
|
||||
"""Ensure the tool is allowed exactly max_count_limit times."""
|
||||
rule = MaxCountPerStepToolRule(tool_name=START_TOOL, max_count_limit=3)
|
||||
solver = ToolRulesSolver(tool_rules=[rule])
|
||||
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [START_TOOL], "Initially should allow 'start_tool'"
|
||||
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [START_TOOL], "Should still allow 'start_tool' after 1 use"
|
||||
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [START_TOOL], "Should still allow 'start_tool' after 2 uses"
|
||||
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [], "Should no longer allow 'start_tool' after 3 uses"
|
||||
|
||||
|
||||
def test_max_count_per_step_tool_rule_does_not_affect_other_tools():
|
||||
"""Ensure exceeding max count for one tool does not impact others."""
|
||||
rule = MaxCountPerStepToolRule(tool_name=START_TOOL, max_count_limit=2)
|
||||
another_tool_rules = ChildToolRule(tool_name=NEXT_TOOL, children=[HELPER_TOOL])
|
||||
solver = ToolRulesSolver(tool_rules=[rule, another_tool_rules])
|
||||
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
|
||||
assert sorted(solver.get_allowed_tool_names({START_TOOL, NEXT_TOOL, HELPER_TOOL})) == sorted(
|
||||
[NEXT_TOOL, HELPER_TOOL]
|
||||
), "Other tools should still be allowed even if 'start_tool' is over limit"
|
||||
|
||||
|
||||
def test_max_count_per_step_tool_rule_resets_on_clear():
|
||||
"""Ensure clearing tool history resets the rule's limit."""
|
||||
rule = MaxCountPerStepToolRule(tool_name=START_TOOL, max_count_limit=2)
|
||||
solver = ToolRulesSolver(tool_rules=[rule])
|
||||
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
solver.update_tool_usage(START_TOOL)
|
||||
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [], "Should not allow 'start_tool' after reaching limit"
|
||||
|
||||
solver.clear_tool_history()
|
||||
|
||||
assert solver.get_allowed_tool_names({START_TOOL}) == [START_TOOL], "Should allow 'start_tool' again after clearing history"
|
||||
|
||||
Reference in New Issue
Block a user