🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
enhance: Improve agent pool efficiency and add performance metrics PR… (#3108)
Wendong-Fan9f91e8e164cc
diff --git a/camel/societies/workforce/single_agent_worker.py b/camel/societies/workforce/single_agent_worker.pyindex ae8f8eeac..cc9ef30d5 100644--- a/camel/societies/workforce/single_agent_worker.py+++ b/camel/societies/workforce/single_agent_worker.py@@ -17,7 +17,7 @@ import asyncioimport datetimeimport timefrom collections import deque-from typing import Any, Dict, List, Optional+from typing import Any, List, Optionalfrom colorama import Fore@@ -35,8 +35,8 @@ from camel.tasks.task import Task, TaskState, is_task_result_insufficientclass AgentPool:r"""A pool of agent instances for efficient reuse.- This pool manages a collection of pre-cloned agents. It supports- auto-scaling based ondemand and intelligent reuse of existing agents.+ This pool manages a collection of pre-cloned agents with automatic+ scaling and idle timeout cleanup.Args:base_agent (ChatAgent): The base agent to clone from.@@ -48,6 +48,8 @@ class AgentPool:(default: :obj:`True`)idle_timeout (float): Time in seconds after which idle agents areremoved. (default: :obj:`180.0`)+ cleanup_interval (float): Fixed interval in seconds between cleanup+ checks. (default: :obj:`60.0`)"""def __init__(@@ -57,18 +59,13 @@ class AgentPool:max_size: int = 10,auto_scale: bool = True,idle_timeout: float = 180.0,- max_tasks_per_agent: int = 10,- min_cleanup_interval: float = 15.0,- max_cleanup_interval: float = 120.0,+ cleanup_interval: float = 60.0,):self.base_agent = base_agentself.max_size = max_sizeself.auto_scale = auto_scaleself.idle_timeout = idle_timeout- self._max_tasks_per_agent = max_tasks_per_agent- self.min_cleanup_interval = min_cleanup_interval- self.max_cleanup_interval = max_cleanup_interval- self._agent_metadata_pool: Dict[int, Dict[str, Any]] = {}+ self.cleanup_interval = cleanup_interval# Pool managementself._available_agents: deque = deque()@@ -81,8 +78,6 @@ class AgentPool:self._total_clones_created = 0self._pool_hits = 0self._agents_cleaned = 0- self._tasks_waited = 0- self._total_wait_time = 0.0# Initialize poolself._initialize_pool(initial_size)@@ -92,112 +87,59 @@ class AgentPool:for _ in range(min(size, self.max_size)):agent = self._create_fresh_agent()self._available_agents.append(agent)+ self._agent_last_used[id(agent)] = time.time()def _create_fresh_agent(self) -> ChatAgent:r"""Create a fresh agent instance."""agent = self.base_agent.clone(with_memory=False)- self._agent_metadata_pool[id(agent)] = {- 'task_count': 0,- 'error_count': 0,- 'total_tokens_used': 0,- 'average_tokens_per_task': 0,- }self._total_clones_created += 1return agent- def _calculate_affinity_score(- self,- agent: ChatAgent,- metric_weights: Optional[List[float]] = None,- default_fresh_agent_score: float = 0.75,- ) -> float:- r"""Calculate the affinity score of a task based on its metadata."""- if metric_weights is None:- metric_weights = [0.7, 0.3]- metadata = self._agent_metadata_pool.get(id(agent), {})-- success_rate = (- 1 - (metadata['error_count'] / metadata['task_count'])- if metadata['task_count'] > 0- else default_fresh_agent_score- )-- freshness = 1.0 - (metadata['task_count'] / self._max_tasks_per_agent)-- return (metric_weights[0] * success_rate) + (- metric_weights[1] * max(freshness, 0.0)- )-- async def get_agent(- self,- metric_weights: Optional[List[float]] = None,- default_fresh_agent_score: float = 0.75,- ) -> ChatAgent:+ async def get_agent(self) -> ChatAgent:r"""Get an agent from the pool, creating one if necessary."""async with self._lock:self._total_borrows += 1- best_agent: Optional[ChatAgent] = None- metric_weights = metric_weights or [0.7, 0.3]if self._available_agents:- best_agent = max(- self._available_agents,- key=lambda agent: self._calculate_affinity_score(- agent, metric_weights, default_fresh_agent_score- ),- )- self._available_agents.remove(best_agent)+ agent = self._available_agents.popleft()+ self._in_use_agents.add(id(agent))self._pool_hits += 1+ return agent- elif len(self._in_use_agents) < self.max_size or self.auto_scale:- best_agent = self._create_fresh_agent()+ # Check if we can create a new agent+ if len(self._in_use_agents) < self.max_size or self.auto_scale:+ agent = self._create_fresh_agent()+ self._in_use_agents.add(id(agent))+ return agent- else:- wait_start = time.time()- self._tasks_waited += 1- while not self._available_agents:- await asyncio.sleep(0.1)- self._total_wait_time += time.time() - wait_start-- best_agent = max(- self._available_agents,- key=lambda agent: self._calculate_affinity_score(- agent, metric_weights, default_fresh_agent_score- ),- )- self._available_agents.remove(best_agent)- self._pool_hits += 1-- best_agent.reset()- self._in_use_agents.add(id(best_agent))- return best_agent-- async def return_agent(- self, agent: ChatAgent, task_status: Optional[str] = None- ) -> None:+ # Wait for available agent+ while True:+ async with self._lock:+ if self._available_agents:+ agent = self._available_agents.popleft()+ self._in_use_agents.add(id(agent))+ self._pool_hits += 1+ return agent+ await asyncio.sleep(0.05)++ async def return_agent(self, agent: ChatAgent) -> None:r"""Return an agent to the pool."""+ agent_id = id(agent)+async with self._lock:- agent_id = id(agent)if agent_id not in self._in_use_agents:return- if agent_id in self._agent_metadata_pool:- metadata = self._agent_metadata_pool.get(agent_id, {})- metadata['task_count'] += 1- if task_status == 'FAILED':- metadata['error_count'] += 1+ self._in_use_agents.discard(agent_id)- _, final_token_count = agent.memory.get_context()- metadata['total_tokens_used'] += final_token_count- metadata['average_tokens_per_task'] = (- metadata['total_tokens_used'] / metadata['task_count']- )-- self._agent_last_used[agent_id] = time.time()-- self._in_use_agents.remove(agent_id)+ # Only add back to pool if under max sizeif len(self._available_agents) < self.max_size:+ agent.reset()+ self._agent_last_used[agent_id] = time.time()self._available_agents.append(agent)+ else:+ # Remove tracking for agents not returned to pool+ self._agent_last_used.pop(agent_id, None)async def cleanup_idle_agents(self) -> None:r"""Remove idle agents from the pool to free memory."""@@ -205,48 +147,35 @@ class AgentPool:returnasync with self._lock:+ if not self._available_agents:+ return+current_time = time.time()agents_to_remove = []for agent in list(self._available_agents):agent_id = id(agent)last_used = self._agent_last_used.get(agent_id, current_time)-- agent_metadata = self._agent_metadata_pool.get(agent_id, {})- agent_token_limit = (- agent.memory.get_context_creator().token_limit- )-- if (- current_time - last_used > self.idle_timeout- or agent_metadata['task_count']- >= self._max_tasks_per_agent- or agent_metadata['total_tokens_used']- >= agent_token_limit * 0.8- ):+ if current_time - last_used > self.idle_timeout:agents_to_remove.append(agent)- self._agents_cleaned += len(agents_to_remove)-for agent in agents_to_remove:self._available_agents.remove(agent)self._agent_last_used.pop(id(agent), None)- self._agent_metadata_pool.pop(id(agent), None)+ self._agents_cleaned += 1def get_stats(self) -> dict:r"""Get pool statistics."""return {"available_agents": len(self._available_agents),"in_use_agents": len(self._in_use_agents),- "pool_size": len(self._agent_metadata_pool),+ "pool_size": len(self._available_agents)+ + len(self._in_use_agents),"total_borrows": self._total_borrows,"total_clones_created": self._total_clones_created,"pool_hits": self._pool_hits,"hit_rate": self._pool_hits / max(self._total_borrows, 1),"agents_cleaned_up": self._agents_cleaned,- "tasks_had_to_wait": self._tasks_waited,- "average_wait_time": self._total_wait_time- / max(self._tasks_waited, 1),}@@ -333,12 +262,10 @@ class SingleAgentWorker(Worker):# Fallback to original cloning approachreturn self.worker.clone(with_memory=False)- async def _return_worker_agent(- self, agent: ChatAgent, task_stat: str- ) -> None:+ async def _return_worker_agent(self, agent: ChatAgent) -> None:r"""Return a worker agent to the pool if pooling is enabled."""if self.use_agent_pool and self.agent_pool:- await self.agent_pool.return_agent(agent, task_stat)+ await self.agent_pool.return_agent(agent)# If not using pool, agent will be garbage collectedasync def _process_task(@@ -468,7 +395,7 @@ class SingleAgentWorker(Worker):return TaskState.FAILEDfinally:# Return agent to pool or let it be garbage collected- await self._return_worker_agent(worker_agent, task.state.value)+ await self._return_worker_agent(worker_agent)# Populate additional_info with worker attempt detailsif task.additional_info is None:@@ -554,23 +481,8 @@ class SingleAgentWorker(Worker):r"""Periodically clean up idle agents from the pool."""while True:try:- idle_ratio = (- len(self.agent_pool.get_stats()["available_agents"])- / self.agent_pool.max_size- if self.agent_pool.max_size > 0- else 0.0- )-- sleep_duration = (- self.agent_pool.min_cleanup_interval- + (- self.agent_pool.max_cleanup_interval- - self.agent_pool.min_cleanup_interval- )- * idle_ratio- )-- await asyncio.sleep(sleep_duration)+ # Fixed interval cleanup+ await asyncio.sleep(self.agent_pool.cleanup_interval)if self.agent_pool:await self.agent_pool.cleanup_idle_agents()diff --git a/pyproject.toml b/pyproject.tomlindex 1e1cc4da0..cf116020c 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -655,7 +655,8 @@ module = ["pgvector.*","reportlab.*","surrealdb.*",- "microsandbox.*"+ "microsandbox.*",+ "sentence_transformers.*"]ignore_missing_imports = true