mirror of
https://github.com/crewAIInc/crewAI.git
synced 2026-07-08 16:35:08 +00:00
Compare commits
1 Commits
devin/1739
...
devin/1744
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
434d8e6c7f |
17
src/crewai/agents/cache/cache_handler.py
vendored
17
src/crewai/agents/cache/cache_handler.py
vendored
@@ -1,15 +1,28 @@
|
||||
from typing import Any, Dict, Optional
|
||||
import threading
|
||||
from threading import local
|
||||
|
||||
from pydantic import BaseModel, PrivateAttr
|
||||
|
||||
|
||||
_thread_local = local()
|
||||
|
||||
|
||||
class CacheHandler(BaseModel):
|
||||
"""Callback handler for tool usage."""
|
||||
|
||||
_cache: Dict[str, Any] = PrivateAttr(default_factory=dict)
|
||||
|
||||
def _get_lock(self):
|
||||
"""Get a thread-local lock to avoid pickling issues."""
|
||||
if not hasattr(_thread_local, "cache_lock"):
|
||||
_thread_local.cache_lock = threading.Lock()
|
||||
return _thread_local.cache_lock
|
||||
|
||||
def add(self, tool, input, output):
|
||||
self._cache[f"{tool}-{input}"] = output
|
||||
with self._get_lock():
|
||||
self._cache[f"{tool}-{input}"] = output
|
||||
|
||||
def read(self, tool, input) -> Optional[str]:
|
||||
return self._cache.get(f"{tool}-{input}")
|
||||
with self._get_lock():
|
||||
return self._cache.get(f"{tool}-{input}")
|
||||
|
||||
@@ -88,7 +88,7 @@ class Crew(BaseModel):
|
||||
_rpm_controller: RPMController = PrivateAttr()
|
||||
_logger: Logger = PrivateAttr()
|
||||
_file_handler: FileHandler = PrivateAttr()
|
||||
_cache_handler: InstanceOf[CacheHandler] = PrivateAttr(default=CacheHandler())
|
||||
_cache_handler: InstanceOf[CacheHandler] = PrivateAttr()
|
||||
_short_term_memory: Optional[InstanceOf[ShortTermMemory]] = PrivateAttr()
|
||||
_long_term_memory: Optional[InstanceOf[LongTermMemory]] = PrivateAttr()
|
||||
_entity_memory: Optional[InstanceOf[EntityMemory]] = PrivateAttr()
|
||||
|
||||
@@ -4,11 +4,15 @@ import asyncio
|
||||
import json
|
||||
import os
|
||||
import platform
|
||||
import threading
|
||||
import warnings
|
||||
from contextlib import contextmanager
|
||||
from importlib.metadata import version
|
||||
from threading import local
|
||||
from typing import TYPE_CHECKING, Any, Optional
|
||||
|
||||
_thread_local = local()
|
||||
|
||||
|
||||
@contextmanager
|
||||
def suppress_warnings():
|
||||
@@ -76,12 +80,20 @@ class Telemetry:
|
||||
raise # Re-raise the exception to not interfere with system signals
|
||||
self.ready = False
|
||||
|
||||
def _get_lock(self):
|
||||
"""Get a thread-local lock to avoid pickling issues."""
|
||||
if not hasattr(_thread_local, "telemetry_lock"):
|
||||
_thread_local.telemetry_lock = threading.Lock()
|
||||
return _thread_local.telemetry_lock
|
||||
|
||||
def set_tracer(self):
|
||||
if self.ready and not self.trace_set:
|
||||
try:
|
||||
with suppress_warnings():
|
||||
trace.set_tracer_provider(self.provider)
|
||||
self.trace_set = True
|
||||
with self._get_lock():
|
||||
if not self.trace_set: # Double-check to avoid race condition
|
||||
with suppress_warnings():
|
||||
trace.set_tracer_provider(self.provider)
|
||||
self.trace_set = True
|
||||
except Exception:
|
||||
self.ready = False
|
||||
self.trace_set = False
|
||||
@@ -90,7 +102,8 @@ class Telemetry:
|
||||
if not self.ready:
|
||||
return
|
||||
try:
|
||||
operation()
|
||||
with self._get_lock():
|
||||
operation()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
from .base_tool import BaseTool, tool
|
||||
from .human_tool import HumanTool
|
||||
|
||||
@@ -1,98 +0,0 @@
|
||||
"""Tool for handling human input using LangGraph's interrupt mechanism."""
|
||||
|
||||
import logging
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
from crewai.tools import BaseTool
|
||||
|
||||
|
||||
class HumanToolSchema(BaseModel):
|
||||
"""Schema for HumanTool input validation."""
|
||||
query: str = Field(
|
||||
...,
|
||||
description="The question to ask the user. Must be a non-empty string."
|
||||
)
|
||||
timeout: Optional[float] = Field(
|
||||
default=None,
|
||||
description="Optional timeout in seconds for waiting for user response"
|
||||
)
|
||||
|
||||
class HumanTool(BaseTool):
|
||||
"""Tool for getting human input using LangGraph's interrupt mechanism.
|
||||
|
||||
This tool allows agents to request input from users through LangGraph's
|
||||
interrupt mechanism. It supports timeout configuration and input validation.
|
||||
"""
|
||||
|
||||
name: str = "human"
|
||||
description: str = "Useful to ask user to enter input."
|
||||
args_schema: type[BaseModel] = HumanToolSchema
|
||||
result_as_answer: bool = False # Don't use the response as final answer
|
||||
|
||||
def _run(self, query: str, timeout: Optional[float] = None) -> str:
|
||||
"""Execute the human input tool.
|
||||
|
||||
Args:
|
||||
query: The question to ask the user
|
||||
timeout: Optional timeout in seconds
|
||||
|
||||
Returns:
|
||||
The user's response
|
||||
|
||||
Raises:
|
||||
ImportError: If LangGraph is not installed
|
||||
TimeoutError: If response times out
|
||||
ValueError: If query is invalid
|
||||
"""
|
||||
if not query or not isinstance(query, str):
|
||||
raise ValueError("Query must be a non-empty string")
|
||||
|
||||
try:
|
||||
from langgraph.prebuilt.state_graphs import interrupt
|
||||
logging.info(f"Requesting human input: {query}")
|
||||
human_response = interrupt({"query": query, "timeout": timeout})
|
||||
return human_response["data"]
|
||||
except ImportError:
|
||||
logging.error("LangGraph not installed")
|
||||
raise ImportError(
|
||||
"LangGraph is required for HumanTool. "
|
||||
"Install with `pip install langgraph`"
|
||||
)
|
||||
except Exception as e:
|
||||
logging.error(f"Error during human input: {str(e)}")
|
||||
raise
|
||||
|
||||
async def _arun(self, query: str, timeout: Optional[float] = None) -> str:
|
||||
"""Execute the human input tool asynchronously.
|
||||
|
||||
Args:
|
||||
query: The question to ask the user
|
||||
timeout: Optional timeout in seconds
|
||||
|
||||
Returns:
|
||||
The user's response
|
||||
|
||||
Raises:
|
||||
ImportError: If LangGraph is not installed
|
||||
TimeoutError: If response times out
|
||||
ValueError: If query is invalid
|
||||
"""
|
||||
if not query or not isinstance(query, str):
|
||||
raise ValueError("Query must be a non-empty string")
|
||||
|
||||
try:
|
||||
from langgraph.prebuilt.state_graphs import interrupt
|
||||
logging.info(f"Requesting async human input: {query}")
|
||||
human_response = interrupt({"query": query, "timeout": timeout})
|
||||
return human_response["data"]
|
||||
except ImportError:
|
||||
logging.error("LangGraph not installed")
|
||||
raise ImportError(
|
||||
"LangGraph is required for HumanTool. "
|
||||
"Install with `pip install langgraph`"
|
||||
)
|
||||
except Exception as e:
|
||||
logging.error(f"Error during async human input: {str(e)}")
|
||||
raise
|
||||
@@ -182,10 +182,6 @@ class ToolUsage:
|
||||
else:
|
||||
result = tool.invoke(input={})
|
||||
except Exception as e:
|
||||
# Check if this is a LangGraph interrupt that should be propagated
|
||||
if hasattr(e, '__class__') and e.__class__.__name__ == 'Interrupt':
|
||||
raise e # Propagate interrupt up
|
||||
|
||||
self.on_tool_error(tool=tool, tool_calling=calling, e=e)
|
||||
self._run_attempts += 1
|
||||
if self._run_attempts > self._max_parsing_attempts:
|
||||
|
||||
186
tests/concurrency_test.py
Normal file
186
tests/concurrency_test.py
Normal file
@@ -0,0 +1,186 @@
|
||||
import asyncio
|
||||
import time
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
import pytest
|
||||
from unittest.mock import patch
|
||||
|
||||
from crewai import Agent, Crew, Task
|
||||
|
||||
|
||||
class MockLLM:
|
||||
"""Mock LLM for testing."""
|
||||
def __init__(self, model="gpt-3.5-turbo", **kwargs):
|
||||
self.model = model
|
||||
self.stop = None
|
||||
self.timeout = None
|
||||
self.temperature = None
|
||||
self.top_p = None
|
||||
self.n = None
|
||||
self.max_completion_tokens = None
|
||||
self.max_tokens = None
|
||||
self.presence_penalty = None
|
||||
self.frequency_penalty = None
|
||||
self.logit_bias = None
|
||||
self.response_format = None
|
||||
self.seed = None
|
||||
self.logprobs = None
|
||||
self.top_logprobs = None
|
||||
self.base_url = None
|
||||
self.api_version = None
|
||||
self.api_key = None
|
||||
self.callbacks = []
|
||||
self.context_window_size = 8192
|
||||
self.kwargs = {}
|
||||
|
||||
for key, value in kwargs.items():
|
||||
setattr(self, key, value)
|
||||
|
||||
def complete(self, prompt, **kwargs):
|
||||
"""Mock completion method."""
|
||||
return f"Mock response for: {prompt[:20]}..."
|
||||
|
||||
def chat_completion(self, messages, **kwargs):
|
||||
"""Mock chat completion method."""
|
||||
return {"choices": [{"message": {"content": "Mock response"}}]}
|
||||
|
||||
def function_call(self, messages, functions, **kwargs):
|
||||
"""Mock function call method."""
|
||||
return {
|
||||
"choices": [
|
||||
{
|
||||
"message": {
|
||||
"content": "Mock response",
|
||||
"function_call": {
|
||||
"name": "test_function",
|
||||
"arguments": '{"arg1": "value1"}'
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
def supports_stop_words(self):
|
||||
"""Mock supports_stop_words method."""
|
||||
return False
|
||||
|
||||
def supports_function_calling(self):
|
||||
"""Mock supports_function_calling method."""
|
||||
return True
|
||||
|
||||
def get_context_window_size(self):
|
||||
"""Mock get_context_window_size method."""
|
||||
return self.context_window_size
|
||||
|
||||
def call(self, messages, callbacks=None):
|
||||
"""Mock call method."""
|
||||
return "Mock response from call method"
|
||||
|
||||
def set_callbacks(self, callbacks):
|
||||
"""Mock set_callbacks method."""
|
||||
self.callbacks = callbacks
|
||||
|
||||
def set_env_callbacks(self):
|
||||
"""Mock set_env_callbacks method."""
|
||||
pass
|
||||
|
||||
|
||||
def create_test_crew():
|
||||
"""Create a simple test crew for concurrency testing."""
|
||||
with patch("crewai.agent.LLM", MockLLM):
|
||||
agent = Agent(
|
||||
role="Test Agent",
|
||||
goal="Test concurrent execution",
|
||||
backstory="I am a test agent for concurrent execution",
|
||||
)
|
||||
|
||||
task = Task(
|
||||
description="Test task for concurrent execution",
|
||||
expected_output="Test output",
|
||||
agent=agent,
|
||||
)
|
||||
|
||||
crew = Crew(
|
||||
agents=[agent],
|
||||
tasks=[task],
|
||||
verbose=False,
|
||||
)
|
||||
|
||||
return crew
|
||||
|
||||
|
||||
def test_threading_concurrency():
|
||||
"""Test concurrent execution using ThreadPoolExecutor."""
|
||||
num_threads = 5
|
||||
results = []
|
||||
|
||||
def generate_response(idx):
|
||||
try:
|
||||
crew = create_test_crew()
|
||||
with patch("crewai.agent.LLM", MockLLM):
|
||||
output = crew.kickoff(inputs={"test_input": f"input_{idx}"})
|
||||
return output
|
||||
except Exception as e:
|
||||
pytest.fail(f"Exception in thread {idx}: {e}")
|
||||
return None
|
||||
|
||||
with ThreadPoolExecutor(max_workers=num_threads) as executor:
|
||||
futures = [executor.submit(generate_response, i) for i in range(num_threads)]
|
||||
|
||||
for future in as_completed(futures):
|
||||
result = future.result()
|
||||
assert result is not None
|
||||
results.append(result)
|
||||
|
||||
assert len(results) == num_threads
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_asyncio_concurrency():
|
||||
"""Test concurrent execution using asyncio."""
|
||||
num_tasks = 5
|
||||
sem = asyncio.Semaphore(num_tasks)
|
||||
|
||||
async def generate_response_async(idx):
|
||||
async with sem:
|
||||
try:
|
||||
crew = create_test_crew()
|
||||
with patch("crewai.agent.LLM", MockLLM):
|
||||
output = await crew.kickoff_async(inputs={"test_input": f"input_{idx}"})
|
||||
return output
|
||||
except Exception as e:
|
||||
pytest.fail(f"Exception in task {idx}: {e}")
|
||||
return None
|
||||
|
||||
tasks = [generate_response_async(i) for i in range(num_tasks)]
|
||||
results = await asyncio.gather(*tasks)
|
||||
|
||||
assert len(results) == num_tasks
|
||||
assert all(result is not None for result in results)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_extended_asyncio_concurrency():
|
||||
"""Extended test for asyncio concurrency with more iterations."""
|
||||
num_tasks = 5 # Reduced from 10 for faster testing
|
||||
iterations = 2 # Reduced from 3 for faster testing
|
||||
sem = asyncio.Semaphore(num_tasks)
|
||||
|
||||
async def generate_response_async(idx):
|
||||
async with sem:
|
||||
crew = create_test_crew()
|
||||
for i in range(iterations):
|
||||
try:
|
||||
with patch("crewai.agent.LLM", MockLLM):
|
||||
output = await crew.kickoff_async(
|
||||
inputs={"test_input": f"input_{idx}_{i}"}
|
||||
)
|
||||
assert output is not None
|
||||
except Exception as e:
|
||||
pytest.fail(f"Exception in task {idx}, iteration {i}: {e}")
|
||||
return False
|
||||
return True
|
||||
|
||||
tasks = [generate_response_async(i) for i in range(num_tasks)]
|
||||
results = await asyncio.gather(*tasks)
|
||||
|
||||
assert all(results)
|
||||
@@ -1,83 +0,0 @@
|
||||
"""Test HumanTool functionality."""
|
||||
|
||||
from unittest.mock import patch
|
||||
import pytest
|
||||
|
||||
from crewai.tools import HumanTool
|
||||
|
||||
def test_human_tool_basic():
|
||||
"""Test basic HumanTool creation and attributes."""
|
||||
tool = HumanTool()
|
||||
assert tool.name == "human"
|
||||
assert "ask user to enter input" in tool.description.lower()
|
||||
assert not tool.result_as_answer
|
||||
|
||||
@pytest.mark.vcr(filter_headers=["authorization"])
|
||||
def test_human_tool_with_langgraph_interrupt():
|
||||
"""Test HumanTool with LangGraph interrupt handling."""
|
||||
tool = HumanTool()
|
||||
|
||||
with patch('langgraph.prebuilt.state_graphs.interrupt') as mock_interrupt:
|
||||
mock_interrupt.return_value = {"data": "test response"}
|
||||
result = tool._run("test query")
|
||||
assert result == "test response"
|
||||
mock_interrupt.assert_called_with({"query": "test query", "timeout": None})
|
||||
|
||||
|
||||
def test_human_tool_timeout():
|
||||
"""Test HumanTool timeout handling."""
|
||||
tool = HumanTool()
|
||||
timeout = 30.0
|
||||
|
||||
with patch('langgraph.prebuilt.state_graphs.interrupt') as mock_interrupt:
|
||||
mock_interrupt.return_value = {"data": "test response"}
|
||||
result = tool._run("test query", timeout=timeout)
|
||||
assert result == "test response"
|
||||
mock_interrupt.assert_called_with({"query": "test query", "timeout": timeout})
|
||||
|
||||
|
||||
def test_human_tool_invalid_input():
|
||||
"""Test HumanTool input validation."""
|
||||
tool = HumanTool()
|
||||
|
||||
with pytest.raises(ValueError, match="Query must be a non-empty string"):
|
||||
tool._run("")
|
||||
|
||||
with pytest.raises(ValueError, match="Query must be a non-empty string"):
|
||||
tool._run(None)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_human_tool_async():
|
||||
"""Test async HumanTool functionality."""
|
||||
tool = HumanTool()
|
||||
|
||||
with patch('langgraph.prebuilt.state_graphs.interrupt') as mock_interrupt:
|
||||
mock_interrupt.return_value = {"data": "test response"}
|
||||
result = await tool._arun("test query")
|
||||
assert result == "test response"
|
||||
mock_interrupt.assert_called_with({"query": "test query", "timeout": None})
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_human_tool_async_timeout():
|
||||
"""Test async HumanTool timeout handling."""
|
||||
tool = HumanTool()
|
||||
timeout = 30.0
|
||||
|
||||
with patch('langgraph.prebuilt.state_graphs.interrupt') as mock_interrupt:
|
||||
mock_interrupt.return_value = {"data": "test response"}
|
||||
result = await tool._arun("test query", timeout=timeout)
|
||||
assert result == "test response"
|
||||
mock_interrupt.assert_called_with({"query": "test query", "timeout": timeout})
|
||||
|
||||
|
||||
def test_human_tool_without_langgraph():
|
||||
"""Test HumanTool behavior when LangGraph is not installed."""
|
||||
tool = HumanTool()
|
||||
|
||||
with patch.dict('sys.modules', {'langgraph': None}):
|
||||
with pytest.raises(ImportError) as exc_info:
|
||||
tool._run("test query")
|
||||
assert "LangGraph is required" in str(exc_info.value)
|
||||
assert "pip install langgraph" in str(exc_info.value)
|
||||
@@ -1,13 +1,12 @@
|
||||
import json
|
||||
import random
|
||||
from unittest.mock import MagicMock, patch
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
from crewai import Agent, Task
|
||||
from crewai.tools import BaseTool
|
||||
from crewai.tools.tool_calling import ToolCalling
|
||||
from crewai.tools.tool_usage import ToolUsage
|
||||
|
||||
|
||||
@@ -86,36 +85,6 @@ def test_random_number_tool_schema():
|
||||
)
|
||||
|
||||
|
||||
def test_tool_usage_interrupt_handling():
|
||||
"""Test that tool usage properly propagates LangGraph interrupts."""
|
||||
class InterruptingTool(BaseTool):
|
||||
name: str = "interrupt_test"
|
||||
description: str = "A tool that raises LangGraph interrupts"
|
||||
|
||||
def _run(self, query: str) -> str:
|
||||
raise type('Interrupt', (Exception,), {})("test interrupt")
|
||||
|
||||
tool = InterruptingTool()
|
||||
tool_usage = ToolUsage(
|
||||
tools_handler=MagicMock(),
|
||||
tools=[tool],
|
||||
original_tools=[tool],
|
||||
tools_description="Sample tool for testing",
|
||||
tools_names="interrupt_test",
|
||||
task=MagicMock(),
|
||||
function_calling_llm=MagicMock(),
|
||||
agent=MagicMock(),
|
||||
action=MagicMock(),
|
||||
)
|
||||
|
||||
# Test that interrupt is propagated
|
||||
with pytest.raises(Exception) as exc_info:
|
||||
tool_usage.use(
|
||||
ToolCalling(tool_name="interrupt_test", arguments={"query": "test"}, log="test"),
|
||||
"test"
|
||||
)
|
||||
assert "test interrupt" in str(exc_info.value)
|
||||
|
||||
def test_tool_usage_render():
|
||||
tool = RandomNumberTool()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user