beswarm 0.2.61__py3-none-any.whl → 0.2.63__py3-none-any.whl

beswarm/agents/planact.py

@@ -17,6 +17,18 @@ from ..aient.aient.plugins import get_function_call_list, registry
 from ..prompt import worker_system_prompt, instruction_system_prompt
 from ..utils import extract_xml_content, get_current_screen_image_message, replace_xml_content, register_mcp_tools, setup_logger
 
+try:
+    from importlib import metadata
+    version = metadata.version("beswarm")
+except metadata.PackageNotFoundError:
+    try:
+        beswarm_dir = Path(__file__).parent.parent.parent
+        with open(beswarm_dir / "pyproject.toml", "rb") as f:
+            pyproject_data = tomllib.load(f)
+            version = pyproject_data["project"]["version"]
+    except FileNotFoundError:
+        version = "unknown"
+
 class BaseAgent:
     """Base class for agents, handling common initialization and disposal."""
     def __init__(self, goal: str, tools_json: List, agent_config: Dict, work_dir: str, cache_messages: Union[bool, List[Dict]], broker: MessageBroker, listen_topic: str, publish_topic: str, status_topic: str, graph_update_topic: str = None):
@@ -255,14 +267,9 @@ class BrokerWorker:
         # 创建一个文件处理器，将日志写入任务自己的目录
         log_file_path = cache_dir / "agent.log"
         self.logger = setup_logger(f"task_{self.work_dir.name}", log_file_path)
+        self.logger.info(f"beswarm version: {version}")
         self.logger.info(f"Logger for task '{self.goal}' initialized. Log file: {log_file_path}")
 
-        beswarm_dir = Path(__file__).parent.parent.parent
-        with open(beswarm_dir / "pyproject.toml", "rb") as f:
-            pyproject_data = tomllib.load(f)
-            version = pyproject_data["project"]["version"]
-            self.logger.info(f"beswarm version: {version}")
-
     async def _configure_tools(self):
         mcp_list = [item for item in self.tools if isinstance(item, dict)]
         if mcp_list:

beswarm/aient/aient/models/chatgpt.py

@@ -33,6 +33,10 @@ class ModelNotFoundError(Exception):
     """Custom exception for model not found (404) errors."""
     pass
 
+class RateLimitError(Exception):
+    """Custom exception for rate limit (429) errors."""
+    pass
+
 class TaskComplete(Exception):
     """Exception-like signal to indicate the task is complete."""
     def __init__(self, message):
@@ -778,6 +782,8 @@ class chatgpt(BaseLLM):
                             raise APITimeoutError("Response timeout")
                         if "HTTP Error', 'status_code': 404" in processed_chunk:
                             raise ModelNotFoundError(f"Model: {model or self.engine} not found!")
+                        if "HTTP Error', 'status_code': 429" in processed_chunk:
+                            raise RateLimitError(f"Rate limit exceeded for model: {model or self.engine}")
                     yield processed_chunk
                     index += 1
 
@@ -791,6 +797,9 @@ class chatgpt(BaseLLM):
             except APITimeoutError:
                 self.logger.warning("API response timeout (524), retrying...")
                 continue
+            except RateLimitError as e:
+                self.logger.warning(f"{e}, retrying...")
+                continue
             except ValidationError as e:
                 self.logger.warning(f"Validation failed: {e}. Retrying with corrective prompt.")
                 need_done_prompt = [
@@ -941,4 +950,4 @@ class chatgpt(BaseLLM):
             {"role": "system", "content": self.system_prompt},
         ]
         self.tokens_usage[convo_id] = 0
-        self.current_tokens[convo_id] = 0
+        self.current_tokens[convo_id] = 0

{beswarm-0.2.61.dist-info → beswarm-0.2.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beswarm
-Version: 0.2.61
+Version: 0.2.63
 Summary: MAS
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{beswarm-0.2.61.dist-info → beswarm-0.2.63.dist-info}/RECORD

@@ -6,7 +6,7 @@ beswarm/prompt.py,sha256=INVRWQZP6lysvGUcPOYI_er5-bi1gGe_qa6BTov7PmY,32362
 beswarm/taskmanager.py,sha256=vMmcoZ4FlNvjEliRkv3AniPji50NcY4Q1_2HETzR0DU,12226
 beswarm/utils.py,sha256=0J-b38P5QGT-A_38co7FjzaUNJykaskI7mbbcQ4w_68,8215
 beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,12012
-beswarm/agents/planact.py,sha256=y6NtiiQC1SIkJCWeK4REoR8yRoMllRda5aiVeXhDZdE,20082
+beswarm/agents/planact.py,sha256=z-RDEgDilrT6hNIN4G_3m04iJ698qyovZ5WG6QdywdA,20265
 beswarm/aient/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
@@ -21,7 +21,7 @@ beswarm/aient/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9
 beswarm/aient/aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 beswarm/aient/aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
-beswarm/aient/aient/models/chatgpt.py,sha256=q62B6cbtHqKrqsQjM24k_1wi_5-UiuxkXa7e2yG_Clg,44661
+beswarm/aient/aient/models/chatgpt.py,sha256=37Vafo8iqV1CNvTT2Ai7ar2QAmWsSiwt1o9y-d9kXcI,45071
 beswarm/aient/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -116,7 +116,7 @@ beswarm/tools/search_web.py,sha256=NYrb5KL_WUGPm-fOKT8Cyjon04lxBU-gaLdrVjeYgGo,1
 beswarm/tools/subtasks.py,sha256=mIjA2QrRy9Fos4rYm8fCfu2QrsE_MGnQI9IR8dOxsGs,9885
 beswarm/tools/worker.py,sha256=_cSkRUKRJMAiZiTfnBze_e9Kc7k7KvbB5hdxdvp4FW4,2009
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.2.61.dist-info/METADATA,sha256=s14zUG7R6_2LWhXRMX-UZF0MQeh06d0bmX84pH5KlhU,3878
-beswarm-0.2.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.61.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.61.dist-info/RECORD,,
+beswarm-0.2.63.dist-info/METADATA,sha256=lMyXTP2gr3sg_Dz7ibk9o--waz6bv5f6CASmSYOdAsQ,3878
+beswarm-0.2.63.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.63.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.63.dist-info/RECORD,,