beswarm 0.2.55__py3-none-any.whl → 0.2.57__py3-none-any.whl

beswarm/agents/planact.py

@@ -210,6 +210,9 @@ class WorkerAgent(BaseAgent):
         if response.strip() == '':
             self.logger.error("\n❌ 工作智能体回复为空，请重新生成指令。")
             self.broker.publish(message, self.error_topic)
+        elif "HTTP Error', 'status_code': 524" in response:
+            self.logger.error("\n❌ 工作智能体回复超时 100 秒，请重新生成指令。")
+            self.broker.publish(message, self.error_topic)
         else:
             self.broker.publish({"status": "new_message", "result": "\n✅ 工作智能体:\n" + response}, self.status_topic)
             self.broker.publish({

beswarm/aient/aient/core/response.py

@@ -390,7 +390,7 @@ async def fetch_cloudflare_response_stream(client, url, headers, payload, model)
 async def fetch_cohere_response_stream(client, url, headers, payload, model):
     timestamp = int(datetime.timestamp(datetime.now()))
     async with client.stream('POST', url, headers=headers, json=payload) as response:
-        error_message = await check_response(response, "fetch_gpt_response_stream")
+        error_message = await check_response(response, "fetch_cohere_response_stream")
         if error_message:
             yield error_message
             return

beswarm/aient/aient/models/chatgpt.py

@@ -6,9 +6,8 @@ import httpx
 import asyncio
 import logging
 import inspect
-import requests
 from typing import Set
-from typing import Union, Optional, Callable, List, Dict, Any
+from typing import Union, Optional, Callable
 from pathlib import Path
 
 
@@ -360,6 +359,7 @@ class chatgpt(BaseLLM):
         system_prompt=None,
         pass_history=9999,
         is_async=False,
+        stream: bool = True,
         **kwargs
     ):
         """
@@ -388,6 +388,7 @@ class chatgpt(BaseLLM):
             elif isinstance(line, (dict, list)):
                 if isinstance(line, dict) and safe_get(line, "choices", 0, "message", "content"):
                     full_response = line["choices"][0]["message"]["content"]
+                    total_tokens = safe_get(line, "usage", "total_tokens", default=0)
                     return full_response
                 else:
                     return str(line)
@@ -471,6 +472,8 @@ class chatgpt(BaseLLM):
                 # self.logger.info(f"worker Response: {full_response}")
                 if not full_response.strip().endswith('[done]'):
                     raise Exception(f"Response is not ended with [done]: {full_response}")
+                elif not full_response.strip():
+                    raise Exception(f"Response is empty")
                 else:
                     full_response = full_response.strip().rstrip('[done]')
             full_response = full_response.replace("<tool_code>", "").replace("</tool_code>", "")
@@ -635,6 +638,9 @@ class chatgpt(BaseLLM):
                 else:
                     all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
 
+                if self.check_done:
+                    all_responses.append("Your message **must** end with [done] to signify the end of your output.")
+
             # 合并所有工具响应
             function_response = "\n\n".join(all_responses).strip()
             if missing_required_params:
@@ -655,7 +661,7 @@ class chatgpt(BaseLLM):
                     model=model or self.engine, function_arguments=function_full_response,
                     function_call_id=function_call_id, api_key=kwargs.get('api_key', self.api_key),
                     api_url=kwargs.get('api_url', self.api_url.chat_url),
-                    plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt
+                    plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt, stream=stream
                 ):
                     yield chunk
             else:
@@ -665,7 +671,7 @@ class chatgpt(BaseLLM):
                     model=model or self.engine, function_arguments=function_full_response,
                     function_call_id=function_call_id, api_key=kwargs.get('api_key', self.api_key),
                     api_url=kwargs.get('api_url', self.api_url.chat_url),
-                    plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt
+                    plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt, stream=stream
                 ):
                     yield chunk
         else:
@@ -719,7 +725,7 @@ class chatgpt(BaseLLM):
             self.logger.info(f"api_key: {kwargs.get('api_key', self.api_key)}")
 
         # 发送请求并处理响应
-        for i in range(10):
+        for i in range(30):
             if self.print_log:
                 replaced_text = json.loads(re.sub(r';base64,([A-Za-z0-9+/=]+)', ';base64,***', json.dumps(json_post)))
                 replaced_text_str = json.dumps(replaced_text, indent=4, ensure_ascii=False)
@@ -759,7 +765,7 @@ class chatgpt(BaseLLM):
                     generator, convo_id=convo_id, function_name=function_name,
                     total_tokens=total_tokens, function_arguments=function_arguments,
                     function_call_id=function_call_id, model=model, language=language,
-                    system_prompt=system_prompt, pass_history=pass_history, is_async=True, **kwargs
+                    system_prompt=system_prompt, pass_history=pass_history, is_async=True, stream=stream, **kwargs
                 ):
                     yield processed_chunk
 
@@ -771,8 +777,8 @@ class chatgpt(BaseLLM):
             except httpx.RemoteProtocolError:
                 continue
             except Exception as e:
-                if "Response is not ended with [done]:" in str(e):
-                    self.logger.error(f"Response is not ended with [done]: {e}")
+                if "Response is" in str(e):
+                    self.logger.error(f"{e}")
                     continue
                 self.logger.error(f"发生了未预料的错误：{e}")
                 import traceback
@@ -862,7 +868,7 @@ class chatgpt(BaseLLM):
             convo_id=convo_id,
             pass_history=pass_history,
             model=model or self.engine,
-            stream=False,
+            stream=True,
             **kwargs,
         )
         full_response: str = "".join([r async for r in response])
@@ -886,7 +892,7 @@ class chatgpt(BaseLLM):
             convo_id=convo_id,
             pass_history=pass_history,
             model=model or self.engine,
-            stream=False,
+            stream=True,
             **kwargs,
         )
         full_response: str = "".join([r for r in response])

{beswarm-0.2.55.dist-info → beswarm-0.2.57.dist-info}/METADATA

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

{beswarm-0.2.55.dist-info → beswarm-0.2.57.dist-info}/RECORD

@@ -6,13 +6,13 @@ beswarm/prompt.py,sha256=INVRWQZP6lysvGUcPOYI_er5-bi1gGe_qa6BTov7PmY,32362
 beswarm/taskmanager.py,sha256=ErgZa9_aBeWdmt5neRw6sDVdwSWewxip458gAjeQhS4,12188
 beswarm/utils.py,sha256=0J-b38P5QGT-A_38co7FjzaUNJykaskI7mbbcQ4w_68,8215
 beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,12012
-beswarm/agents/planact.py,sha256=xi259X0y1Sd2HBM42pp0JtCtGE3glhO12l5u5F0SvOU,19926
+beswarm/agents/planact.py,sha256=ndsisPbGhHN04O85Htc12bC1UWPdgq_CNA1077nxeD0,20147
 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
 beswarm/aient/aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
 beswarm/aient/aient/core/request.py,sha256=4FFCwQ7h7b6bqtrA8qw-DPJVXZTj2i1CkYccFeEwUPw,76552
-beswarm/aient/aient/core/response.py,sha256=sPcNV9qLosj3lIXElezUZEjIyglspdkBg-EsIUhr9bQ,33203
+beswarm/aient/aient/core/response.py,sha256=tYKWOeexYEhWK4napIAfYjCn2rQ1zpxRvknsBBWrv2M,33206
 beswarm/aient/aient/core/utils.py,sha256=D98d5Cy1h4ejKtuxS0EEDtL4YqpaZLB5tuXoVP0IBWQ,28462
 beswarm/aient/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 beswarm/aient/aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
@@ -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=LnbWADil5oNmdBaAtXb1XcQwoaERqanO7Or9wzsg82w,49348
+beswarm/aient/aient/models/chatgpt.py,sha256=4Pv-OW2iP2K9FmSyJruqpWlFOdAP8TAb0aEJzYrCpY8,49675
 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=2DXH-LP9KGl_P4467chJu3q4AAbX5nSn4DIkdI0aYH8,7105
@@ -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.55.dist-info/METADATA,sha256=iUHDB2olCdaPgC5J8ppmSdqdH6NXChIfnDsclhikhpY,3878
-beswarm-0.2.55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.55.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.55.dist-info/RECORD,,
+beswarm-0.2.57.dist-info/METADATA,sha256=lT4Ai8xT6sA0ulnKU_SvtbKpkNTYBn5bkDCZgEYj0GE,3878
+beswarm-0.2.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.57.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.57.dist-info/RECORD,,