beswarm 0.2.73__py3-none-any.whl → 0.2.75__py3-none-any.whl

beswarm/agents/planact.py

@@ -12,10 +12,10 @@ from typing import List, Dict, Union
 
 from ..broker import MessageBroker
 from ..aient.aient.models import chatgpt
-from ..aient.aient.models.chatgpt import ModelNotFoundError, TaskComplete, RetryFailedError
 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
+from ..aient.aient.models.chatgpt import ModelNotFoundError, TaskComplete, RetryFailedError, InputTokenCountExceededError, BadRequestError
 
 try:
     from importlib import metadata
@@ -154,11 +154,12 @@ class InstructionAgent(BaseAgent):
             self.logger.error("❌ Commander retry failed, retrying...")
             self.broker.publish(message, self.error_topic)
             return
-
-        if "'status_code': 413" in raw_response or \
-        "'status_code': 400" in raw_response:
+        except InputTokenCountExceededError as e:
             self.broker.publish({"status": "error", "result": "The request body is too long, please try again."}, self.status_topic)
             return
+        except BadRequestError as e:
+            self.broker.publish({"status": "error", "result": "Bad request error!"}, self.status_topic)
+            return
 
         self.broker.publish({"status": "new_message", "result": "\n🤖 指令智能体:\n" + raw_response}, self.status_topic)
 

beswarm/aient/aient/core/response.py

@@ -21,13 +21,12 @@ async def check_response(response, error_log):
         return {"error": f"{error_log} HTTP Error", "status_code": response.status_code, "details": error_json}
     return None
 
-async def gemini_json_poccess(response_str):
+async def gemini_json_poccess(response_json):
     promptTokenCount = 0
     candidatesTokenCount = 0
     totalTokenCount = 0
     image_base64 = None
 
-    response_json = await asyncio.to_thread(json.loads, response_str)
     json_data = safe_get(response_json, "candidates", 0, "content", default=None)
     finishReason = safe_get(response_json, "candidates", 0 , "finishReason", default=None)
     if finishReason:
@@ -48,7 +47,7 @@ async def gemini_json_poccess(response_str):
 
     function_call_name = safe_get(json_data, "functionCall", "name", default=None)
     function_full_response = safe_get(json_data, "functionCall", "args", default="")
-    function_full_response = json.dumps(function_full_response) if function_full_response else None
+    function_full_response = await asyncio.to_thread(json.dumps, function_full_response) if function_full_response else None
 
     blockReason = safe_get(json_data, 0, "promptFeedback", "blockReason", default=None)
 
@@ -77,7 +76,7 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model, tim
                 if line.startswith("data: "):
                     parts_json = line.lstrip("data: ").strip()
                     try:
-                        await asyncio.to_thread(json.loads, parts_json)
+                        response_json = await asyncio.to_thread(json.loads, parts_json)
                     except json.JSONDecodeError:
                         logger.error(f"JSON decode error: {parts_json}")
                         continue
@@ -85,12 +84,12 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model, tim
                     parts_json += line
                     parts_json = parts_json.lstrip("[,")
                     try:
-                        await asyncio.to_thread(json.loads, parts_json)
+                        response_json = await asyncio.to_thread(json.loads, parts_json)
                     except json.JSONDecodeError:
                         continue
 
                 # https://ai.google.dev/api/generate-content?hl=zh-cn#FinishReason
-                is_thinking, reasoning_content, content, image_base64, function_call_name, function_full_response, finishReason, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount = await gemini_json_poccess(parts_json)
+                is_thinking, reasoning_content, content, image_base64, function_call_name, function_full_response, finishReason, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount = await gemini_json_poccess(response_json)
 
                 if is_thinking:
                     sse_string = await generate_sse_response(timestamp, model, reasoning_content=reasoning_content)

beswarm/aient/aient/models/chatgpt.py

@@ -37,10 +37,18 @@ class RateLimitError(Exception):
     """Custom exception for rate limit (429) errors."""
     pass
 
+class BadRequestError(Exception):
+    """Custom exception for bad request (400) errors."""
+    pass
+
 class HTTPError(Exception):
     """Custom exception for HTTP 500 errors."""
     pass
 
+class InputTokenCountExceededError(Exception):
+    """Custom exception for input token count exceeding the maximum."""
+    pass
+
 class ConfigurationError(Exception):
     """Custom exception for configuration errors."""
     pass
@@ -802,6 +810,10 @@ class chatgpt(BaseLLM):
                             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}")
+                        if "HTTP Error', 'status_code': 413" in processed_chunk:
+                            raise InputTokenCountExceededError(processed_chunk)
+                        if "HTTP Error', 'status_code': 400" in processed_chunk:
+                            raise BadRequestError(f"Bad Request: {processed_chunk}")
                         if "HTTP Error', 'status_code': " in processed_chunk:
                             raise HTTPError(f"HTTP Error: {processed_chunk}")
                     yield processed_chunk
@@ -814,7 +826,7 @@ class chatgpt(BaseLLM):
                 return # Stop iteration
             except httpx.RemoteProtocolError:
                 continue
-            except httpx.ReadError:
+            except httpx.ReadError as e:
                 self.logger.warning(f"{e}, retrying...")
                 continue
             except APITimeoutError:
@@ -826,6 +838,12 @@ class chatgpt(BaseLLM):
             except RateLimitError as e:
                 self.logger.warning(f"{e}, retrying...")
                 continue
+            except InputTokenCountExceededError as e:
+                self.logger.error(f"The request body is too long: {e}")
+                raise
+            except BadRequestError as e:
+                self.logger.error(f"Bad request error: {e}")
+                raise
             except ValidationError as e:
                 self.logger.warning(f"Validation failed: {e}. Retrying with corrective prompt.")
                 need_done_prompt = [

{beswarm-0.2.73.dist-info → beswarm-0.2.75.dist-info}/METADATA

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

{beswarm-0.2.73.dist-info → beswarm-0.2.75.dist-info}/RECORD

@@ -6,13 +6,13 @@ beswarm/prompt.py,sha256=qlH-yYCGv9j9-5grnMXl0B53CDZgfTpe4ncwBwgWg7o,32816
 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=_hunvS9Ll3rwxggLAnvFxnC_ncFQfUIhVUjg5Lwyg-c,20642
+beswarm/agents/planact.py,sha256=F5ocxYU9F70yJo3fPvm3RFcUMWUQFtkrnF_DHD9vbC4,20799
 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=KMlCRLjtq1wQHZTJGqnbWhPS2cHq6eLdnk7peKDrzR8,7490
 beswarm/aient/aient/core/request.py,sha256=QnDhyrjzcJOEQU2oauMQi_HHMRR5NxdkrX7nn5JMwTc,76675
-beswarm/aient/aient/core/response.py,sha256=aafZdgxa5YmvzdRIdLV650rWmh7ey7oee29C_fDQhNo,35629
+beswarm/aient/aient/core/response.py,sha256=waC-i5i04bwooqNAgjmX30nx0IJ1nLITPeF0RCYwRs0,35620
 beswarm/aient/aient/core/utils.py,sha256=okDFj8S4r71vnkEBYxiOqoKee63UzNyk2y_p4uhWBvY,28848
 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=jOR0az-4ULwp_BPeaZjO_BBfb_y5ViLabAt6dpQ5YZA,46222
+beswarm/aient/aient/models/chatgpt.py,sha256=-3bOA_jLsePy3B77Q5C1C3UglY0NDc9dRMDi7bAdcNw,47056
 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=OclAorPuuG9vnySoBN2ISzzoInZJV3wmLAVzdMF3FXM,10220
 beswarm/tools/worker.py,sha256=_cSkRUKRJMAiZiTfnBze_e9Kc7k7KvbB5hdxdvp4FW4,2009
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.2.73.dist-info/METADATA,sha256=q8cz5kShz6_VtPRJ3EiJSMluPqWrNhl02Xvb8y_JOCY,3878
-beswarm-0.2.73.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.73.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.73.dist-info/RECORD,,
+beswarm-0.2.75.dist-info/METADATA,sha256=FG-4-x8JV4k06CSWCF7nUFSeqVgWSP-y_-CAZl2lQ1k,3878
+beswarm-0.2.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.75.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.75.dist-info/RECORD,,