Skip to content

Framework for orchestrating role-playing, autonomous AI agents. By fostering collaborative intelligence, CrewAI empowers agents to work together seamlessly, tackling complex tasks.

chore: refactor parser & constants, improve tools_handler, update tests

Greyson LaLondee4c4b81e63a6
diff --git a/src/crewai/agents/__init__.py b/src/crewai/agents/__init__.py
index 72a26830e..9e400098c 100644
--- a/src/crewai/agents/__init__.py
+++ b/src/crewai/agents/__init__.py
@@ -1,5 +1,5 @@
-from .cache.cache_handler import CacheHandler
-from .parser import CrewAgentParser
-from .tools_handler import ToolsHandler
+from crewai.agents.cache.cache_handler import CacheHandler
+from crewai.agents.parser import parse, AgentAction, AgentFinish, OutputParserException
+from crewai.agents.tools_handler import ToolsHandler
-__all__ = ["CacheHandler", "CrewAgentParser", "ToolsHandler"]
+__all__ = ["CacheHandler", "parse", "AgentAction", "AgentFinish", "OutputParserException", "ToolsHandler"]
diff --git a/src/crewai/agents/constants.py b/src/crewai/agents/constants.py
new file mode 100644
index 000000000..2019b1cf1
--- /dev/null
+++ b/src/crewai/agents/constants.py
@@ -0,0 +1,27 @@
+"""Constants for agent-related modules."""
+
+import re
+from typing import Final
+
+# crewai.agents.parser constants
+
+FINAL_ANSWER_ACTION: Final[str] = "Final Answer:"
+MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE: Final[str] = (
+ "I did it wrong. Invalid Format: I missed the 'Action:' after 'Thought:'. I will do right next, and don't use a tool I have already used.\n"
+)
+MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE: Final[str] = (
+ "I did it wrong. Invalid Format: I missed the 'Action Input:' after 'Action:'. I will do right next, and don't use a tool I have already used.\n"
+)
+FINAL_ANSWER_AND_PARSABLE_ACTION_ERROR_MESSAGE: Final[str] = (
+ "I did it wrong. Tried to both perform Action and give a Final Answer at the same time, I must do one or the other"
+)
+UNABLE_TO_REPAIR_JSON_RESULTS: Final[list[str]] = ['""', "{}"]
+ACTION_INPUT_REGEX: Final[re.Pattern[str]] = re.compile(
+ r"Action\s*\d*\s*:\s*(.*?)\s*Action\s*\d*\s*Input\s*\d*\s*:\s*(.*)", re.DOTALL
+)
+ACTION_REGEX: Final[re.Pattern[str]] = re.compile(
+ r"Action\s*\d*\s*:\s*(.*?)", re.DOTALL
+)
+ACTION_INPUT_ONLY_REGEX: Final[re.Pattern[str]] = re.compile(
+ r"\s*Action\s*\d*\s*Input\s*\d*\s*:\s*(.*)", re.DOTALL
+)
diff --git a/src/crewai/agents/parser.py b/src/crewai/agents/parser.py
index 58605b692..03479e4c3 100644
--- a/src/crewai/agents/parser.py
+++ b/src/crewai/agents/parser.py
@@ -1,50 +1,67 @@
-import re
-from typing import Any, Optional, Union
+"""Agent output parsing module for ReAct-style LLM responses.
+
+This module provides parsing functionality for agent outputs that follow
+the ReAct (Reasoning and Acting) format, converting them into structured
+AgentAction or AgentFinish objects.
+"""
+
+from dataclasses import dataclass
from json_repair import repair_json
+from crewai.agents.constants import (
+ ACTION_INPUT_REGEX,
+ ACTION_REGEX,
+ ACTION_INPUT_ONLY_REGEX,
+ FINAL_ANSWER_ACTION,
+ MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE,
+ MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE,
+ UNABLE_TO_REPAIR_JSON_RESULTS,
+)
from crewai.utilities import I18N
-FINAL_ANSWER_ACTION = "Final Answer:"
-MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE = "I did it wrong. Invalid Format: I missed the 'Action:' after 'Thought:'. I will do right next, and don't use a tool I have already used.\n"
-MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE = "I did it wrong. Invalid Format: I missed the 'Action Input:' after 'Action:'. I will do right next, and don't use a tool I have already used.\n"
-FINAL_ANSWER_AND_PARSABLE_ACTION_ERROR_MESSAGE = "I did it wrong. Tried to both perform Action and give a Final Answer at the same time, I must do one or the other"
+_I18N = I18N()
+@dataclass
class AgentAction:
+ """Represents an action to be taken by an agent."""
+
thought: str
tool: str
tool_input: str
text: str
- result: str
-
- def __init__(self, thought: str, tool: str, tool_input: str, text: str):
- self.thought = thought
- self.tool = tool
- self.tool_input = tool_input
- self.text = text
+ result: str | None = None
+@dataclass
class AgentFinish:
+ """Represents the final answer from an agent."""
+
thought: str
output: str
text: str
- def __init__(self, thought: str, output: str, text: str):
- self.thought = thought
- self.output = output
- self.text = text
-
class OutputParserException(Exception):
- error: str
+ """Exception raised when output parsing fails.
+
+ Attributes:
+ error: The error message.
+ """
- def __init__(self, error: str):
+ def __init__(self, error: str) -> None:
+ """Initialize OutputParserException.
+
+ Args:
+ error: The error message.
+ """
self.error = error
+ super().__init__(error)
-class CrewAgentParser:
- """Parses ReAct-style LLM calls that have a single tool input.
+def parse(text: str) -> AgentAction | AgentFinish:
+ """Parse agent output text into AgentAction or AgentFinish.
Expects output to be in one of two formats.
@@ -62,108 +79,117 @@ class CrewAgentParser:
Thought: agent thought here
Final Answer: The temperature is 100 degrees
+
+ Args:
+ text: The agent output text to parse.
+
+ Returns:
+ AgentAction or AgentFinish based on the content.
+
+ Raises:
+ OutputParserException: If the text format is invalid.
"""
+ thought = _extract_thought(text)
+ includes_answer = FINAL_ANSWER_ACTION in text
+ action_match = ACTION_INPUT_REGEX.search(text)
+
+ if includes_answer:
+ final_answer = text.split(FINAL_ANSWER_ACTION)[-1].strip()
+ # Check whether the final answer ends with triple backticks.
+ if final_answer.endswith("```"):
+ # Count occurrences of triple backticks in the final answer.
+ count = final_answer.count("```")
+ # If count is odd then it's an unmatched trailing set; remove it.
+ if count % 2 != 0:
+ final_answer = final_answer[:-3].rstrip()
+ return AgentFinish(thought=thought, output=final_answer, text=text)
+
+ elif action_match:
+ action = action_match.group(1)
+ clean_action = _clean_action(action)
+
+ action_input = action_match.group(2).strip()
+
+ tool_input = action_input.strip(" ").strip('"')
+ safe_tool_input = _safe_repair_json(tool_input)
+
+ return AgentAction(
+ thought=thought, tool=clean_action, tool_input=safe_tool_input, text=text
+ )
- _i18n: I18N = I18N()
- agent: Any = None
+ if not ACTION_REGEX.search(text):
+ raise OutputParserException(
+ f"{MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE}\n{_I18N.slice('final_answer_format')}",
+ )
+ elif not ACTION_INPUT_ONLY_REGEX.search(text):
+ raise OutputParserException(
+ MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE,
+ )
+ else:
+ err_format = _I18N.slice("format_without_tools")
+ error = f"{err_format}"
+ raise OutputParserException(
+ error,
+ )
- def __init__(self, agent: Optional[Any] = None):
- self.agent = agent
- @staticmethod
- def parse_text(text: str) -> Union[AgentAction, AgentFinish]:
- """
- Static method to parse text into an AgentAction or AgentFinish without needing to instantiate the class.
+def _extract_thought(text: str) -> str:
+ """Extract the thought portion from the text.
- Args:
- text: The text to parse.
+ Args:
+ text: The full agent output text.
- Returns:
- Either an AgentAction or AgentFinish based on the parsed content.
- """
- parser = CrewAgentParser()
- return parser.parse(text)
-
- def parse(self, text: str) -> Union[AgentAction, AgentFinish]:
- thought = self._extract_thought(text)
- includes_answer = FINAL_ANSWER_ACTION in text
- regex = (
- r"Action\s*\d*\s*:[\s]*(.*?)[\s]*Action\s*\d*\s*Input\s*\d*\s*:[\s]*(.*)"
- )
- action_match = re.search(regex, text, re.DOTALL)
- if includes_answer:
- final_answer = text.split(FINAL_ANSWER_ACTION)[-1].strip()
- # Check whether the final answer ends with triple backticks.
- if final_answer.endswith("```"):
- # Count occurrences of triple backticks in the final answer.
- count = final_answer.count("```")
- # If count is odd then it's an unmatched trailing set; remove it.
- if count % 2 != 0:
- final_answer = final_answer[:-3].rstrip()
- return AgentFinish(thought, final_answer, text)
-
- elif action_match:
- action = action_match.group(1)
- clean_action = self._clean_action(action)
-
- action_input = action_match.group(2).strip()
-
- tool_input = action_input.strip(" ").strip('"')
- safe_tool_input = self._safe_repair_json(tool_input)
-
- return AgentAction(thought, clean_action, safe_tool_input, text)
-
- if not re.search(r"Action\s*\d*\s*:[\s]*(.*?)", text, re.DOTALL):
- raise OutputParserException(
- f"{MISSING_ACTION_AFTER_THOUGHT_ERROR_MESSAGE}\n{self._i18n.slice('final_answer_format')}",
- )
- elif not re.search(
- r"[\s]*Action\s*\d*\s*Input\s*\d*\s*:[\s]*(.*)", text, re.DOTALL
- ):
- raise OutputParserException(
- MISSING_ACTION_INPUT_AFTER_ACTION_ERROR_MESSAGE,
- )
- else:
- format = self._i18n.slice("format_without_tools")
- error = f"{format}"
- raise OutputParserException(
- error,
- )
-
- def _extract_thought(self, text: str) -> str:
- thought_index = text.find("\nAction")
- if thought_index == -1:
- thought_index = text.find("\nFinal Answer")
- if thought_index == -1:
- return ""
- thought = text[:thought_index].strip()
- # Remove any triple backticks from the thought string
- thought = thought.replace("```", "").strip()
- return thought
-
- def _clean_action(self, text: str) -> str:
- """Clean action string by removing non-essential formatting characters."""
- return text.strip().strip("*").strip()
-
- def _safe_repair_json(self, tool_input: str) -> str:
- UNABLE_TO_REPAIR_JSON_RESULTS = ['""', "{}"]
-
- # Skip repair if the input starts and ends with square brackets
- # Explanation: The JSON parser has issues handling inputs that are enclosed in square brackets ('[]').
- # These are typically valid JSON arrays or strings that do not require repair. Attempting to repair such inputs
- # might lead to unintended alterations, such as wrapping the entire input in additional layers or modifying
- # the structure in a way that changes its meaning. By skipping the repair for inputs that start and end with
- # square brackets, we preserve the integrity of these valid JSON structures and avoid unnecessary modifications.
- if tool_input.startswith("[") and tool_input.endswith("]"):
- return tool_input
-
- # Before repair, handle common LLM issues:
- # 1. Replace """ with " to avoid JSON parser errors
-
- tool_input = tool_input.replace('"""', '"')
-
- result = repair_json(tool_input)
- if result in UNABLE_TO_REPAIR_JSON_RESULTS:
- return tool_input
-
- return str(result)
+ Returns:
+ The extracted thought string.
+ """
+ thought_index = text.find("\nAction")
+ if thought_index == -1:
+ thought_index = text.find("\nFinal Answer")
+ if thought_index == -1:
+ return ""
+ thought = text[:thought_index].strip()
+ # Remove any triple backticks from the thought string
+ thought = thought.replace("```", "").strip()
+ return thought
+
+
+def _clean_action(text: str) -> str:
+ """Clean action string by removing non-essential formatting characters.
+
+ Args:
+ text: The action text to clean.
+
+ Returns:
+ The cleaned action string.
+ """
+ return text.strip().strip("*").strip()
+
+
+def _safe_repair_json(tool_input: str) -> str:
+ """Safely repair JSON input.
+
+ Args:
+ tool_input: The tool input string to repair.
+
+ Returns:
+ The repaired JSON string or original if repair fails.
+ """
+ # Skip repair if the input starts and ends with square brackets
+ # Explanation: The JSON parser has issues handling inputs that are enclosed in square brackets ('[]').
+ # These are typically valid JSON arrays or strings that do not require repair. Attempting to repair such inputs
+ # might lead to unintended alterations, such as wrapping the entire input in additional layers or modifying
+ # the structure in a way that changes its meaning. By skipping the repair for inputs that start and end with
+ # square brackets, we preserve the integrity of these valid JSON structures and avoid unnecessary modifications.
+ if tool_input.startswith("[") and tool_input.endswith("]"):
+ return tool_input
+
+ # Before repair, handle common LLM issues:
+ # 1. Replace """ with " to avoid JSON parser errors
+
+ tool_input = tool_input.replace('"""', '"')
+
+ result = repair_json(tool_input)
+ if result in UNABLE_TO_REPAIR_JSON_RESULTS:
+ return tool_input
+
+ return str(result)
diff --git a/src/crewai/agents/tools_handler.py b/src/crewai/agents/tools_handler.py
index 3ec97967d..e3fd7d336 100644
--- a/src/crewai/agents/tools_handler.py
+++ b/src/crewai/agents/tools_handler.py
@@ -1,29 +1,41 @@
-from typing import Any, Optional, Union
+"""Tools handler for managing tool execution and caching."""
-from ..tools.cache_tools.cache_tools import CacheTools
-from ..tools.tool_calling import InstructorToolCalling, ToolCalling
-from .cache.cache_handler import CacheHandler
+from crewai.tools.cache_tools.cache_tools import CacheTools
+from crewai.tools.tool_calling import InstructorToolCalling, ToolCalling
+from crewai.agents.cache.cache_handler import CacheHandler
class ToolsHandler:
- """Callback handler for tool usage."""
+ """Callback handler for tool usage.
- last_used_tool: Optional[ToolCalling] = None
- cache: Optional[CacheHandler]
+ Attributes:
+ last_used_tool: The most recently used tool calling instance.
+ cache: Optional cache handler for storing tool outputs.
+ """
- def __init__(self, cache: Optional[CacheHandler] = None):
- """Initialize the callback handler."""
- self.cache = cache
- self.last_used_tool = None
+ def __init__(self, cache: CacheHandler | None = None) -> None:
+ """Initialize the callback handler.
+
+ Args:
+ cache: Optional cache handler for storing tool outputs.
+ """
+ self.cache: CacheHandler | None = cache
+ self.last_used_tool: ToolCalling | InstructorToolCalling | None = None
def on_tool_use(
self,
- calling: Union[ToolCalling, InstructorToolCalling],
+ calling: ToolCalling | InstructorToolCalling,
output: str,
should_cache: bool = True,
- ) -> Any:
- """Run when tool ends running."""
- self.last_used_tool = calling # type: ignore # BUG?: Incompatible types in assignment (expression has type "Union[ToolCalling, InstructorToolCalling]", variable has type "ToolCalling")
+ ) -> None:
+ """Run when tool ends running.
+
+ Args:
+ calling: The tool calling instance.
+ output: The output from the tool execution.
+ should_cache: Whether to cache the tool output.
+ """
+ self.last_used_tool = calling
if self.cache and should_cache and calling.tool_name != CacheTools().name:
self.cache.add(
tool=calling.tool_name,
diff --git a/src/crewai/utilities/agent_utils.py b/src/crewai/utilities/agent_utils.py
index 4289e85a8..d5be00e8b 100644
--- a/src/crewai/utilities/agent_utils.py
+++ b/src/crewai/utilities/agent_utils.py
@@ -2,12 +2,12 @@ import json
import re
from typing import Any, Callable, Dict, List, Optional, Sequence, Union
+from crewai.agents.constants import FINAL_ANSWER_AND_PARSABLE_ACTION_ERROR_MESSAGE
from crewai.agents.parser import (
- FINAL_ANSWER_AND_PARSABLE_ACTION_ERROR_MESSAGE,
AgentAction,
AgentFinish,
- CrewAgentParser,
OutputParserException,
+ parse,
)
from crewai.llm import LLM
from crewai.llms.base_llm import BaseLLM
@@ -25,6 +25,7 @@ from crewai.cli.config import Settings
console = Console()
+
def parse_tools(tools: List[BaseTool]) -> List[CrewStructuredTool]:
"""Parse tools to be used for the task."""
tools_list = []
@@ -122,7 +123,7 @@ def format_message_for_llm(prompt: str, role: str = "user") -> Dict[str, str]:
def format_answer(answer: str) -> Union[AgentAction, AgentFinish]:
"""Format a response from the LLM into an AgentAction or AgentFinish."""
try:
- return CrewAgentParser.parse_text(answer)
+ return parse(answer)
except Exception:
# If parsing fails, return a default AgentFinish
return AgentFinish(
@@ -446,9 +447,16 @@ def show_agent_logs(
def _print_current_organization():
settings = Settings()
if settings.org_uuid:
- console.print(f"Fetching agent from organization: {settings.org_name} ({settings.org_uuid})", style="bold blue")
+ console.print(
+ f"Fetching agent from organization: {settings.org_name} ({settings.org_uuid})",
+ style="bold blue",
+ )
else:
- console.print("No organization currently set. We recommend setting one before using: `crewai org switch <org_id>` command.", style="yellow")
+ console.print(
+ "No organization currently set. We recommend setting one before using: `crewai org switch <org_id>` command.",
+ style="yellow",
+ )
+
def load_agent_from_repository(from_repository: str) -> Dict[str, Any]:
attributes: Dict[str, Any] = {}
diff --git a/tests/agents/test_crew_agent_parser.py b/tests/agents/test_crew_agent_parser.py
index 18bb1d523..92563e8fd 100644
--- a/tests/agents/test_crew_agent_parser.py
+++ b/tests/agents/test_crew_agent_parser.py
@@ -5,17 +5,10 @@ from crewai.agents.crew_agent_executor import (
AgentFinish,
OutputParserException,
)
-from crewai.agents.parser import CrewAgentParser
+from crewai.agents import parser
-def parser():
- agent = MockAgent()
- p = CrewAgentParser(agent)
- return p
-
-
-def test_valid_action_parsing_special_characters(parser):
+def test_valid_action_parsing_special_characters():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: what's the temperature in SF?"
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -23,7 +16,7 @@ def test_valid_action_parsing_special_characters(parser):
assert result.tool_input == "what's the temperature in SF?"
-def test_valid_action_parsing_with_json_tool_input(parser):
+def test_valid_action_parsing_with_json_tool_input():
text = """
Thought: Let's find the information
Action: query
@@ -36,7 +29,7 @@ def test_valid_action_parsing_with_json_tool_input(parser):
assert result.tool_input == expected_tool_input
-def test_valid_action_parsing_with_quotes(parser):
+def test_valid_action_parsing_with_quotes():
text = 'Thought: Let\'s find the temperature\nAction: search\nAction Input: "temperature in SF"'
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -44,7 +37,7 @@ def test_valid_action_parsing_with_quotes(parser):
assert result.tool_input == "temperature in SF"
-def test_valid_action_parsing_with_curly_braces(parser):
+def test_valid_action_parsing_with_curly_braces():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: {temperature in SF}"
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -52,7 +45,7 @@ def test_valid_action_parsing_with_curly_braces(parser):
assert result.tool_input == "{temperature in SF}"
-def test_valid_action_parsing_with_angle_brackets(parser):
+def test_valid_action_parsing_with_angle_brackets():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: <temperature in SF>"
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -60,7 +53,7 @@ def test_valid_action_parsing_with_angle_brackets(parser):
assert result.tool_input == "<temperature in SF>"
-def test_valid_action_parsing_with_parentheses(parser):
+def test_valid_action_parsing_with_parentheses():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: (temperature in SF)"
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -68,7 +61,7 @@ def test_valid_action_parsing_with_parentheses(parser):
assert result.tool_input == "(temperature in SF)"
-def test_valid_action_parsing_with_mixed_brackets(parser):
+def test_valid_action_parsing_with_mixed_brackets():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: [temperature in {SF}]"
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -76,7 +69,7 @@ def test_valid_action_parsing_with_mixed_brackets(parser):
assert result.tool_input == "[temperature in {SF}]"
-def test_valid_action_parsing_with_nested_quotes(parser):
+def test_valid_action_parsing_with_nested_quotes():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: \"what's the temperature in 'SF'?\""
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -84,7 +77,7 @@ def test_valid_action_parsing_with_nested_quotes(parser):
assert result.tool_input == "what's the temperature in 'SF'?"
-def test_valid_action_parsing_with_incomplete_json(parser):
+def test_valid_action_parsing_with_incomplete_json():
text = 'Thought: Let\'s find the temperature\nAction: search\nAction Input: {"query": "temperature in SF"'
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -92,7 +85,7 @@ def test_valid_action_parsing_with_incomplete_json(parser):
assert result.tool_input == '{"query": "temperature in SF"}'
-def test_valid_action_parsing_with_special_characters(parser):
+def test_valid_action_parsing_with_special_characters():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: what is the temperature in SF? @$%^&*"
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -100,7 +93,7 @@ def test_valid_action_parsing_with_special_characters(parser):
assert result.tool_input == "what is the temperature in SF? @$%^&*"
-def test_valid_action_parsing_with_combination(parser):
+def test_valid_action_parsing_with_combination():
text = 'Thought: Let\'s find the temperature\nAction: search\nAction Input: "[what is the temperature in SF?]"'
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -108,7 +101,7 @@ def test_valid_action_parsing_with_combination(parser):
assert result.tool_input == "[what is the temperature in SF?]"
-def test_valid_action_parsing_with_mixed_quotes(parser):
+def test_valid_action_parsing_with_mixed_quotes():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: \"what's the temperature in SF?\""
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -116,7 +109,7 @@ def test_valid_action_parsing_with_mixed_quotes(parser):
assert result.tool_input == "what's the temperature in SF?"
-def test_valid_action_parsing_with_newlines(parser):
+def test_valid_action_parsing_with_newlines():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: what is\nthe temperature in SF?"
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -124,7 +117,7 @@ def test_valid_action_parsing_with_newlines(parser):
assert result.tool_input == "what is\nthe temperature in SF?"
-def test_valid_action_parsing_with_escaped_characters(parser):
+def test_valid_action_parsing_with_escaped_characters():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: what is the temperature in SF? \\n"
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -132,7 +125,7 @@ def test_valid_action_parsing_with_escaped_characters(parser):
assert result.tool_input == "what is the temperature in SF? \\n"
-def test_valid_action_parsing_with_json_string(parser):
+def test_valid_action_parsing_with_json_string():
text = 'Thought: Let\'s find the temperature\nAction: search\nAction Input: {"query": "temperature in SF"}'
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -140,7 +133,7 @@ def test_valid_action_parsing_with_json_string(parser):
assert result.tool_input == '{"query": "temperature in SF"}'
-def test_valid_action_parsing_with_unbalanced_quotes(parser):
+def test_valid_action_parsing_with_unbalanced_quotes():
text = "Thought: Let's find the temperature\nAction: search\nAction Input: \"what is the temperature in SF?"
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -148,61 +141,61 @@ def test_valid_action_parsing_with_unbalanced_quotes(parser):
assert result.tool_input == "what is the temperature in SF?"
-def test_clean_action_no_formatting(parser):
+def test_clean_action_no_formatting():
action = "Ask question to senior researcher"
cleaned_action = parser._clean_action(action)
assert cleaned_action == "Ask question to senior researcher"
-def test_clean_action_with_leading_asterisks(parser):
+def test_clean_action_with_leading_asterisks():
action = "** Ask question to senior researcher"
cleaned_action = parser._clean_action(action)
assert cleaned_action == "Ask question to senior researcher"
-def test_clean_action_with_trailing_asterisks(parser):
+def test_clean_action_with_trailing_asterisks():
action = "Ask question to senior researcher **"
cleaned_action = parser._clean_action(action)
assert cleaned_action == "Ask question to senior researcher"
-def test_clean_action_with_leading_and_trailing_asterisks(parser):
+def test_clean_action_with_leading_and_trailing_asterisks():
action = "** Ask question to senior researcher **"
cleaned_action = parser._clean_action(action)
assert cleaned_action == "Ask question to senior researcher"
-def test_clean_action_with_multiple_leading_asterisks(parser):
+def test_clean_action_with_multiple_leading_asterisks():
action = "**** Ask question to senior researcher"
cleaned_action = parser._clean_action(action)
assert cleaned_action == "Ask question to senior researcher"
-def test_clean_action_with_multiple_trailing_asterisks(parser):
+def test_clean_action_with_multiple_trailing_asterisks():
action = "Ask question to senior researcher ****"
cleaned_action = parser._clean_action(action)
assert cleaned_action == "Ask question to senior researcher"
-def test_clean_action_with_spaces_and_asterisks(parser):
+def test_clean_action_with_spaces_and_asterisks():
action = " ** Ask question to senior researcher ** "
cleaned_action = parser._clean_action(action)
assert cleaned_action == "Ask question to senior researcher"
-def test_clean_action_with_only_asterisks(parser):
+def test_clean_action_with_only_asterisks():
action = "****"
cleaned_action = parser._clean_action(action)
assert cleaned_action == ""
-def test_clean_action_with_empty_string(parser):
+def test_clean_action_with_empty_string():
action = ""
cleaned_action = parser._clean_action(action)
assert cleaned_action == ""
-def test_valid_final_answer_parsing(parser):
+def test_valid_final_answer_parsing():
text = (
"Thought: I found the information\nFinal Answer: The temperature is 100 degrees"
)
@@ -211,7 +204,7 @@ def test_valid_final_answer_parsing(parser):
assert result.output == "The temperature is 100 degrees"
-def test_missing_action_error(parser):
+def test_missing_action_error():
text = "Thought: Let's find the temperature\nAction Input: what is the temperature in SF?"
with pytest.raises(OutputParserException) as exc_info:
parser.parse(text)
@@ -220,27 +213,27 @@ def test_missing_action_error(parser):
)
-def test_missing_action_input_error(parser):
+def test_missing_action_input_error():
text = "Thought: Let's find the temperature\nAction: search"
with pytest.raises(OutputParserException) as exc_info:
parser.parse(text)
assert "I missed the 'Action Input:' after 'Action:'." in str(exc_info.value)
-def test_safe_repair_json(parser):
+def test_safe_repair_json():
invalid_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": Senior Researcher'
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_unrepairable(parser):
+def test_safe_repair_json_unrepairable():
invalid_json = "{invalid_json"
result = parser._safe_repair_json(invalid_json)
assert result == invalid_json # Should return the original if unrepairable
-def test_safe_repair_json_missing_quotes(parser):
+def test_safe_repair_json_missing_quotes():
invalid_json = (
'{task: "Research XAI", context: "Explainable AI", coworker: Senior Researcher}'
)
@@ -249,77 +242,77 @@ def test_safe_repair_json_missing_quotes(parser):
assert result == expected_repaired_json
-def test_safe_repair_json_unclosed_brackets(parser):
+def test_safe_repair_json_unclosed_brackets():
invalid_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"'
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_extra_commas(parser):
+def test_safe_repair_json_extra_commas():
invalid_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher",}'
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_trailing_commas(parser):
+def test_safe_repair_json_trailing_commas():
invalid_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher",}'
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_single_quotes(parser):
+def test_safe_repair_json_single_quotes():
invalid_json = "{'task': 'Research XAI', 'context': 'Explainable AI', 'coworker': 'Senior Researcher'}"
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_mixed_quotes(parser):
+def test_safe_repair_json_mixed_quotes():
invalid_json = "{'task': \"Research XAI\", 'context': \"Explainable AI\", 'coworker': 'Senior Researcher'}"
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_unescaped_characters(parser):
+def test_safe_repair_json_unescaped_characters():
invalid_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher\n"}'
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_missing_colon(parser):
+def test_safe_repair_json_missing_colon():
invalid_json = '{"task" "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_missing_comma(parser):
+def test_safe_repair_json_missing_comma():
invalid_json = '{"task": "Research XAI" "context": "Explainable AI", "coworker": "Senior Researcher"}'
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_unexpected_trailing_characters(parser):
+def test_safe_repair_json_unexpected_trailing_characters():
invalid_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"} random text'
expected_repaired_json = '{"task": "Research XAI", "context": "Explainable AI", "coworker": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_safe_repair_json_special_characters_key(parser):
+def test_safe_repair_json_special_characters_key():
invalid_json = '{"task!@#": "Research XAI", "context$%^": "Explainable AI", "coworker&*()": "Senior Researcher"}'
expected_repaired_json = '{"task!@#": "Research XAI", "context$%^": "Explainable AI", "coworker&*()": "Senior Researcher"}'
result = parser._safe_repair_json(invalid_json)
assert result == expected_repaired_json
-def test_parsing_with_whitespace(parser):
+def test_parsing_with_whitespace():
text = " Thought: Let's find the temperature \n Action: search \n Action Input: what is the temperature in SF? "
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -327,7 +320,7 @@ def test_parsing_with_whitespace(parser):
assert result.tool_input == "what is the temperature in SF?"
-def test_parsing_with_special_characters(parser):
+def test_parsing_with_special_characters():
text = 'Thought: Let\'s find the temperature\nAction: search\nAction Input: "what is the temperature in SF?"'
result = parser.parse(text)
assert isinstance(result, AgentAction)
@@ -335,7 +328,7 @@ def test_parsing_with_special_characters(parser):
assert result.tool_input == "what is the temperature in SF?"
-def test_integration_valid_and_invalid(parser):
+def test_integration_valid_and_invalid():
text = """
Thought: Let's find the temperature
Action: search
@@ -365,9 +358,4 @@ def test_integration_valid_and_invalid(parser):
assert isinstance(results[3], OutputParserException)
-class MockAgent:
- def increment_formatting_errors(self):
- pass
-
-
# TODO: ADD TEST TO MAKE SURE ** REMOVAL DOESN'T MESS UP ANYTHING