beswarm 0.2.71__tar.gz → 0.2.73__tar.gz

{beswarm-0.2.71 → beswarm-0.2.73}/PKG-INFO

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

{beswarm-0.2.71 → beswarm-0.2.73}/beswarm/agents/planact.py

@@ -231,7 +231,7 @@ class WorkerAgent(BaseAgent):
             return
 
         if response.strip() == '':
-            self.logger.error("\n❌ 工作智能体回复为空，请重新生成指令。")
+            self.logger.error("\n❌ Worker response is empty, retrying...")
             self.broker.publish(message, self.error_topic)
         else:
             self.broker.publish({"status": "new_message", "result": "\n✅ 工作智能体:\n" + response}, self.status_topic)

{beswarm-0.2.71 → beswarm-0.2.73}/beswarm/aient/aient/core/response.py

@@ -56,7 +56,8 @@ async def gemini_json_poccess(response_str):
 
 async def fetch_gemini_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_gemini_response_stream")
         if error_message:
             yield error_message
@@ -125,7 +126,8 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model, tim
 
 async def fetch_vertex_claude_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_vertex_claude_response_stream")
         if error_message:
             yield error_message
@@ -198,7 +200,8 @@ async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
     is_thinking = False
     has_send_thinking = False
     ark_tag = False
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_gpt_response_stream")
         if error_message:
             yield error_message
@@ -312,7 +315,8 @@ async def fetch_azure_response_stream(client, url, headers, payload, timeout):
     is_thinking = False
     has_send_thinking = False
     ark_tag = False
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_azure_response_stream")
         if error_message:
             yield error_message
@@ -365,7 +369,8 @@ async def fetch_azure_response_stream(client, url, headers, payload, timeout):
 
 async def fetch_cloudflare_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_cloudflare_response_stream")
         if error_message:
             yield error_message
@@ -390,7 +395,8 @@ async def fetch_cloudflare_response_stream(client, url, headers, payload, model,
 
 async def fetch_cohere_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_cohere_response_stream")
         if error_message:
             yield error_message
@@ -413,7 +419,8 @@ async def fetch_cohere_response_stream(client, url, headers, payload, model, tim
 
 async def fetch_claude_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_claude_response_stream")
         if error_message:
             yield error_message
@@ -466,7 +473,8 @@ async def fetch_claude_response_stream(client, url, headers, payload, model, tim
 
 async def fetch_aws_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_aws_response_stream")
         if error_message:
             yield error_message
@@ -521,7 +529,8 @@ async def fetch_response(client, url, headers, payload, engine, model, timeout=2
         file = payload.pop("file")
         response = await client.post(url, headers=headers, data=payload, files={"file": file}, timeout=timeout)
     else:
-        response = await client.post(url, headers=headers, json=payload, timeout=timeout)
+        json_payload = await asyncio.to_thread(json.dumps, payload)
+        response = await client.post(url, headers=headers, content=json_payload, timeout=timeout)
     error_message = await check_response(response, "fetch_response")
     if error_message:
         yield error_message

{beswarm-0.2.71 → beswarm-0.2.73}/beswarm/aient/aient/models/chatgpt.py

@@ -236,6 +236,10 @@ class chatgpt(BaseLLM):
                     if type(self.conversation[convo_id][message_index]["content"]) == list \
                     and type(self.conversation[convo_id][message_index + 1]["content"]) == dict:
                         self.conversation[convo_id][message_index + 1]["content"] = [self.conversation[convo_id][message_index + 1]["content"]]
+                    if type(self.conversation[convo_id][message_index]["content"]) == str \
+                    and type(self.conversation[convo_id][message_index + 1]["content"]) == str \
+                    and self.conversation[convo_id][message_index].get("content").endswith(self.conversation[convo_id][message_index + 1].get("content")):
+                        self.conversation[convo_id][message_index + 1]["content"] = ""
                     self.conversation[convo_id][message_index]["content"] += self.conversation[convo_id][message_index + 1]["content"]
                 self.conversation[convo_id].pop(message_index + 1)
                 conversation_len = conversation_len - 1
@@ -744,7 +748,8 @@ class chatgpt(BaseLLM):
         need_done_prompt = False
 
         # 发送请求并处理响应
-        for i in range(10):
+        retry_times = 0
+        while True:
             tmp_post_json = copy.deepcopy(json_post)
             if need_done_prompt:
                 tmp_post_json["messages"].extend(need_done_prompt)
@@ -843,7 +848,8 @@ class chatgpt(BaseLLM):
                     error_message = "您输入了无效的API URL，请使用正确的URL并使用`/start`命令重新设置API URL。具体错误如下：\n\n" + str(e)
                     raise ConfigurationError(error_message)
                 # 最后一次重试失败，向上抛出异常
-                if i == 10:
+                retry_times += 1
+                if retry_times == 9:
                     raise RetryFailedError(str(e))
 
     def ask_stream(

{beswarm-0.2.71 → beswarm-0.2.73}/beswarm/tools/subtasks.py

@@ -36,11 +36,14 @@ def create_task(goal, tools, work_dir):
         }
     ]
 
+    if work_dir == str(task_manager.root_path):
+        return f"<tool_error>子任务的工作目录位置在主任务的工作目录的子目录。子任务工作目录**禁止**设置为主任务目录本身。请重新创建子任务。当前主任务工作目录：{task_manager.root_path}</tool_error>"
+
     # 调用新的批量创建接口
     task_ids = task_manager.create_tasks_batch(worker_fun, tasks_params)
 
     # 返回新创建的单个任务ID
-    return f"子任务已提交到队列，ID: {task_ids[0]}" if task_ids else "任务提交失败"
+    return f"子任务已提交到队列，ID: {task_ids[0]}" if task_ids else "<tool_error>任务提交失败</tool_error>"
 
 @register_tool()
 def resume_task(task_id, goal):

{beswarm-0.2.71 → beswarm-0.2.73}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.71 → beswarm-0.2.73}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beswarm"
-version = "0.2.71"
+version = "0.2.73"
 description = "MAS"
 readme = "README.md"
 requires-python = ">=3.11"