andre/crewAI
1
0
Fork 0
mirror of https://github.com/crewAIInc/crewAI.git synced 2026-01-28 09:38:17 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

More clean up

Browse Source
This commit is contained in:
Brandon Hancock
2025-01-24 12:06:50 -05:00
parent 63fcc74faf
commit e125b136b9
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/crewai/agent.py
View File

@@ -1,15 +1,13 @@
import os
import shutil import shutil
import subprocess import subprocess
from typing import Any, Dict, List, Literal, Optional, Union from typing import Any, Dict, List, Literal, Optional, Union
from litellm import AuthenticationError as LiteLLMAuthenticationError from litellm.llms.base_llm.chat.transformation import BaseLLMException
from pydantic import Field, InstanceOf, PrivateAttr, model_validator from pydantic import Field, InstanceOf, PrivateAttr, model_validator
from crewai.agents import CacheHandler from crewai.agents import CacheHandler
from crewai.agents.agent_builder.base_agent import BaseAgent from crewai.agents.agent_builder.base_agent import BaseAgent
from crewai.agents.crew_agent_executor import CrewAgentExecutor from crewai.agents.crew_agent_executor import CrewAgentExecutor
from crewai.cli.constants import ENV_VARS, LITELLM_PARAMS
from crewai.knowledge.knowledge import Knowledge from crewai.knowledge.knowledge import Knowledge
from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource from crewai.knowledge.source.base_knowledge_source import BaseKnowledgeSource
from crewai.knowledge.utils.knowledge_utils import extract_knowledge_context from crewai.knowledge.utils.knowledge_utils import extract_knowledge_context
@@ -262,7 +260,7 @@ class Agent(BaseAgent):
} }
)["output"] )["output"]
except Exception as e: except Exception as e:
if e.__class__.__module__.startswith("litellm.exceptions"): if isinstance(e, BaseLLMException):
# Do not retry on litellm errors # Do not retry on litellm errors
raise e raise e
self._times_executed += 1 self._times_executed += 1

7
src/crewai/agents/crew_agent_executor.py
View File

@@ -4,6 +4,7 @@ from dataclasses import dataclass
from typing import Any, Callable, Dict, List, Optional, Union from typing import Any, Callable, Dict, List, Optional, Union
from litellm.exceptions import AuthenticationError as LiteLLMAuthenticationError from litellm.exceptions import AuthenticationError as LiteLLMAuthenticationError
from litellm.llms.base_llm.chat.transformation import BaseLLMException
from crewai.agents.agent_builder.base_agent import BaseAgent from crewai.agents.agent_builder.base_agent import BaseAgent
from crewai.agents.agent_builder.base_agent_executor_mixin import CrewAgentExecutorMixin from crewai.agents.agent_builder.base_agent_executor_mixin import CrewAgentExecutorMixin
@@ -142,10 +143,10 @@ class CrewAgentExecutor(CrewAgentExecutorMixin):
self._invoke_step_callback(formatted_answer) self._invoke_step_callback(formatted_answer)
self._append_message(formatted_answer.text, role="assistant") self._append_message(formatted_answer.text, role="assistant")
except OutputParserException as e:
formatted_answer = self._handle_output_parser_exception(e)
except Exception as e: except Exception as e:
if isinstance(e, BaseLLMException):
# Stop execution on litellm errors
raise e
if self._is_context_length_exceeded(e): if self._is_context_length_exceeded(e):
self._handle_context_length() self._handle_context_length()
continue continue

12
tests/agent_test.py
View File

@@ -1623,7 +1623,7 @@ def test_litellm_auth_error_handling():
agent=agent, agent=agent,
) )
# Mock the LLM call to raise LiteLLMAuthenticationError # Mock the LLM call to raise AuthenticationError
with ( with (
patch.object(LLM, "call") as mock_llm_call, patch.object(LLM, "call") as mock_llm_call,
pytest.raises(LiteLLMAuthenticationError, match="Invalid API key"), pytest.raises(LiteLLMAuthenticationError, match="Invalid API key"),
@@ -1639,7 +1639,7 @@ def test_litellm_auth_error_handling():
def test_crew_agent_executor_litellm_auth_error(): def test_crew_agent_executor_litellm_auth_error():
"""Test that CrewAgentExecutor handles LiteLLM authentication errors by raising them.""" """Test that CrewAgentExecutor handles LiteLLM authentication errors by raising them."""
from litellm import AuthenticationError as LiteLLMAuthenticationError from litellm.exceptions import AuthenticationError
from crewai.agents.tools_handler import ToolsHandler from crewai.agents.tools_handler import ToolsHandler
from crewai.utilities import Printer from crewai.utilities import Printer
@@ -1672,13 +1672,13 @@ def test_crew_agent_executor_litellm_auth_error():
tools_handler=ToolsHandler(), tools_handler=ToolsHandler(),
) )
# Mock the LLM call to raise LiteLLMAuthenticationError # Mock the LLM call to raise AuthenticationError
with ( with (
patch.object(LLM, "call") as mock_llm_call, patch.object(LLM, "call") as mock_llm_call,
patch.object(Printer, "print") as mock_printer, patch.object(Printer, "print") as mock_printer,
pytest.raises(LiteLLMAuthenticationError, match="Invalid API key"), pytest.raises(AuthenticationError, match="Invalid API key"),
): ):
mock_llm_call.side_effect = LiteLLMAuthenticationError( mock_llm_call.side_effect = AuthenticationError(
message="Invalid API key", llm_provider="openai", model="gpt-4" message="Invalid API key", llm_provider="openai", model="gpt-4"
) )
executor.invoke( executor.invoke(
@@ -1711,7 +1711,7 @@ def test_litellm_anthropic_error_handling():
role="test role", role="test role",
goal="test goal", goal="test goal",
backstory="test backstory", backstory="test backstory",
llm=LLM(model="claude-3.5-sonnet-20240620"), llm=LLM(model="claude-3.5-sonnet-20240620"),
max_retry_limit=0, max_retry_limit=0,
) )