beswarm 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

beswarm/agents/planact.py

@@ -194,6 +194,9 @@ class WorkerAgent(BaseAgent):
         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
         except RetryFailedError as e:
             self.logger.error("❌ Worker retry failed, retrying...")
             self.broker.publish(message, self.error_topic)

beswarm/aient/aient/models/chatgpt.py

@@ -108,6 +108,7 @@ class chatgpt(BaseLLM):
         cache_messages: list = None,
         logger: logging.Logger = None,
         check_done: bool = False,
+        retry_count: int = 999999,
     ) -> None:
         """
         Initialize Chatbot with API key (from https://platform.openai.com/account/api-keys)
@@ -119,7 +120,7 @@ class chatgpt(BaseLLM):
         self.function_calls_counter = {}
         self.function_call_max_loop = function_call_max_loop
         self.check_done = check_done
-
+        self.retry_count = retry_count
         if logger:
             self.logger = logger
         else:
@@ -659,17 +660,6 @@ class chatgpt(BaseLLM):
             self.add_to_conversation(full_response, response_role, convo_id=convo_id, total_tokens=total_tokens, pass_history=pass_history)
             self.function_calls_counter = {}
 
-            # 清理翻译引擎相关的历史记录
-            if pass_history <= 2 and len(self.conversation[convo_id]) >= 2 \
-            and (
-                "You are a translation engine" in self.conversation[convo_id][-2]["content"] \
-                or "You are a translation engine" in safe_get(self.conversation, convo_id, -2, "content", 0, "text", default="") \
-                or "你是一位精通简体中文的专业翻译" in self.conversation[convo_id][-2]["content"] \
-                or "你是一位精通简体中文的专业翻译" in safe_get(self.conversation, convo_id, -2, "content", 0, "text", default="")
-            ):
-                self.conversation[convo_id].pop(-1)
-                self.conversation[convo_id].pop(-1)
-
     async def _ask_stream_handler(
         self,
         prompt: list,
@@ -708,7 +698,8 @@ class chatgpt(BaseLLM):
         # 发送请求并处理响应
         retry_times = 0
         error_to_raise = None
-        while True:
+        while retry_times < self.retry_count:
+            retry_times += 1
             tmp_post_json = copy.deepcopy(json_post)
             if need_done_prompt:
                 tmp_post_json["messages"].extend(need_done_prompt)
@@ -821,8 +812,7 @@ class chatgpt(BaseLLM):
                     error_message = "您输入了无效的API URL，请使用正确的URL并使用`/start`命令重新设置API URL。具体错误如下：\n\n" + str(e)
                     raise ConfigurationError(error_message)
                 # 最后一次重试失败，向上抛出异常
-                retry_times += 1
-                if retry_times == 9:
+                if retry_times == self.retry_count:
                     raise RetryFailedError(str(e))
 
         if error_to_raise:

{beswarm-0.3.4.dist-info → beswarm-0.3.6.dist-info}/METADATA

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

{beswarm-0.3.4.dist-info → beswarm-0.3.6.dist-info}/RECORD

@@ -7,7 +7,7 @@ beswarm/prompt.py,sha256=45onnyoY9plKM86KQefbPw5z9QJMn-mVnjlFQZcrjz0,34373
 beswarm/taskmanager.py,sha256=2Uz_cthW9rWkQMJdzgsXAMlfN8Ni2Qj_DOq_L-p6XZc,12662
 beswarm/utils.py,sha256=0J-b38P5QGT-A_38co7FjzaUNJykaskI7mbbcQ4w_68,8215
 beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,12012
-beswarm/agents/planact.py,sha256=wYIyrAsBY6Z_Hc8rx76vbfUTsagqYFIBOfPi43ze708,18361
+beswarm/agents/planact.py,sha256=F9sGj8R8bgy3NB_mowhzLfq-lK-0iL-3GFoEHaezU8c,18521
 beswarm/aient/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/aient/architext/architext/__init__.py,sha256=79Ih1151rfcqZdr7F8HSZSTs_iT2SKd1xCkehMsXeXs,19
 beswarm/aient/aient/architext/architext/core.py,sha256=k5Sza5mrIuv_34T0qUmnFGqAZMFwWhudO96qVlnyA8c,34135
@@ -27,7 +27,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=FNW4lxG1IhxOU7L8mvcbaeC1nXk_lpUZQlg9ijQ0h_Q,1937
 beswarm/aient/aient/models/base.py,sha256=HWIGfa2A7OTccvHK0wG1-UlHB-yaWRC7hbi4oR1Mu1Y,7228
-beswarm/aient/aient/models/chatgpt.py,sha256=DOm0_tieWj8V_xIQCZy_33PGCebZ8nvKIXXYpzYWw6Y,43601
+beswarm/aient/aient/models/chatgpt.py,sha256=nnsyCp-rVZiV83jR_35fGr8GpTfkkXXa-sYijIElXTQ,42955
 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
@@ -121,8 +121,8 @@ beswarm/tools/search_web.py,sha256=0fTeczXiOX_LJQGaLEGbuJtIPzofeuquGWEt3yDMtVw,1
 beswarm/tools/subtasks.py,sha256=NHDnmUhUPgDQKBACnpgErpFJRcsH0w_Q9VsyQjNvNHA,12658
 beswarm/tools/worker.py,sha256=mQ1qdrQ8MgL99byAbTvxfEByFFGN9mty3UHqHjARMQ8,2331
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.3.4.dist-info/METADATA,sha256=ZypZoU4XNVT0XC2xy89Pc0DK0UY9d5Sf-xV7aJdxGwM,3877
-beswarm-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.3.4.dist-info/entry_points.txt,sha256=URK7Y4PDzBgxIecQnxsWTu4O-eaFa1CoAcNTWh5R7LM,45
-beswarm-0.3.4.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.3.4.dist-info/RECORD,,
+beswarm-0.3.6.dist-info/METADATA,sha256=o8aUVyPMu-fT-VPwzyyrMIx5EIvU8A25nFqAVhNNtUk,3877
+beswarm-0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.3.6.dist-info/entry_points.txt,sha256=URK7Y4PDzBgxIecQnxsWTu4O-eaFa1CoAcNTWh5R7LM,45
+beswarm-0.3.6.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.3.6.dist-info/RECORD,,