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

beswarm/agents/planact.py

@@ -95,15 +95,17 @@ class InstructionAgent(BaseAgent):
                 conversation_history[0]["content"].append({"type": "text", "text": extracted_content})
 
             for message in conversation_history:
-                if message.get("content") and isinstance(message["content"], str) \
-                and "<knowledge_graph_tree>" in message["content"] and self.graph_tree:
-                    message["content"] = replace_xml_content(message["content"], "knowledge_graph_tree", self.graph_tree)
+                if message.get("content") and isinstance(message["content"], str):
+                    if "<knowledge_graph_tree>" in message["content"] and self.graph_tree:
+                        message["content"] = replace_xml_content(message["content"], "knowledge_graph_tree", self.graph_tree)
 
         for index, message in enumerate(raw_conversation_history):
-            if message.get("content") and isinstance(message["content"], str) \
-            and "<knowledge_graph_tree>" in message["content"] and self.graph_tree:
-                message["content"] = replace_xml_content(message["content"], "knowledge_graph_tree", self.graph_tree)
-                raw_conversation_history[index] = message
+            if message.get("content") and isinstance(message["content"], str):
+                if "<knowledge_graph_tree>" in message["content"] and self.graph_tree:
+                    message["content"] = replace_xml_content(message["content"], "knowledge_graph_tree", self.graph_tree)
+                    raw_conversation_history[index] = message
+                if "\n\nYour message **must** end with [done] to signify the end of your output." in message["content"]:
+                    message["content"] = message["content"].replace("\n\nYour message **must** end with [done] to signify the end of your output.", "")
 
         return conversation_history
 
@@ -166,7 +168,7 @@ class InstructionAgent(BaseAgent):
                     "现在开始执行第一步：\n"
                     f"{instruction}"
                 )
-            self.broker.publish({"instruction": instruction, "conversation": message["conversation"]}, self.publish_topic)
+            self.broker.publish({"instruction": instruction + "\n\nYour message **must** end with [done] to signify the end of your output.", "conversation": message["conversation"]}, self.publish_topic)
             self.last_instruction = None
         else:
             self.logger.error("\n❌ 指令智能体生成的指令不符合要求，正在重新生成。")
@@ -301,7 +303,8 @@ class BrokerWorker:
                 shell=os.getenv('SHELL', 'Unknown'), current_time=datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
                 tools_list=self.tools_json
             ),
-            "print_log": True, "temperature": 0.5, "function_call_max_loop": 100, "logger": self.logger
+            "print_log": True, "temperature": 0.5, "function_call_max_loop": 100, "logger": self.logger,
+            "check_done": True
         }
 
         instruction_agent = InstructionAgent(

beswarm/aient/aient/core/request.py

@@ -27,8 +27,6 @@ from .utils import (
 gemini_max_token_65k_models = ["gemini-2.5-pro", "gemini-2.0-pro", "gemini-2.0-flash-thinking", "gemini-2.5-flash"]
 
 async def get_gemini_payload(request, engine, provider, api_key=None):
-    import re
-
     headers = {
         'Content-Type': 'application/json'
     }
@@ -176,6 +174,24 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
     ]
     generation_config = {}
 
+    def process_tool_parameters(data):
+        if isinstance(data, dict):
+            # 移除 Gemini 不支持的 'additionalProperties'
+            data.pop("additionalProperties", None)
+
+            # 将 'default' 值移入 'description'
+            if "default" in data:
+                default_value = data.pop("default")
+                description = data.get("description", "")
+                data["description"] = f"{description}\nDefault: {default_value}"
+
+            # 递归处理
+            for value in data.values():
+                process_tool_parameters(value)
+        elif isinstance(data, list):
+            for item in data:
+                process_tool_parameters(item)
+
     for field, value in request.model_dump(exclude_unset=True).items():
         if field not in miss_fields and value is not None:
             if field == "tools" and "gemini-2.0-flash-thinking" in original_model:
@@ -185,22 +201,9 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                 processed_tools = []
                 for tool in value:
                     function_def = tool["function"]
-                    # gemini不支持parameters里面的additionalProperties字段，需要删除
-                    if safe_get(function_def, "parameters", "additionalProperties", default=None) is not None:
-                        del function_def["parameters"]["additionalProperties"]
-
-                    # 处理 parameters.properties 中的 default 字段
-                    if safe_get(function_def, "parameters", "properties", default=None):
-                        for prop_value in function_def["parameters"]["properties"].values():
-                            if "additionalProperties" in prop_value:
-                                del prop_value["additionalProperties"]
-                            if "default" in prop_value:
-                                # 将 default 值添加到 description 中
-                                default_value = prop_value["default"]
-                                description = prop_value.get("description", "")
-                                prop_value["description"] = f"{description}\nDefault: {default_value}"
-                                # 删除 default 字段
-                                del prop_value["default"]
+                    if "parameters" in function_def:
+                        process_tool_parameters(function_def["parameters"])
+
                     if function_def["name"] != "googleSearch" and function_def["name"] != "googleSearch":
                         processed_tools.append({"function": function_def})
 

beswarm/aient/aient/models/chatgpt.py

@@ -67,6 +67,7 @@ class chatgpt(BaseLLM):
         cut_history_by_function_name: str = "",
         cache_messages: list = None,
         logger: logging.Logger = None,
+        check_done: bool = False,
     ) -> None:
         """
         Initialize Chatbot with API key (from https://platform.openai.com/account/api-keys)
@@ -86,6 +87,7 @@ class chatgpt(BaseLLM):
         self.function_call_max_loop = function_call_max_loop
         self.cut_history_by_function_name = cut_history_by_function_name
         self.latest_file_content = {}
+        self.check_done = check_done
 
         if logger:
             self.logger = logger
@@ -465,6 +467,12 @@ class chatgpt(BaseLLM):
         missing_required_params = []
 
         if self.use_plugins == True:
+            if self.check_done:
+                # 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}")
+                else:
+                    full_response = full_response.strip().rstrip('[done]')
             full_response = full_response.replace("<tool_code>", "").replace("</tool_code>", "")
             function_parameter = parse_function_xml(full_response)
             if function_parameter:
@@ -711,7 +719,7 @@ class chatgpt(BaseLLM):
             self.logger.info(f"api_key: {kwargs.get('api_key', self.api_key)}")
 
         # 发送请求并处理响应
-        for i in range(3):
+        for i in range(10):
             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)
@@ -763,6 +771,9 @@ 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}")
+                    continue
                 self.logger.error(f"发生了未预料的错误：{e}")
                 import traceback
                 self.logger.error(traceback.format_exc())
@@ -770,7 +781,7 @@ class chatgpt(BaseLLM):
                     e = "您输入了无效的API URL，请使用正确的URL并使用`/start`命令重新设置API URL。具体错误如下：\n\n" + str(e)
                     raise Exception(f"{e}")
                 # 最后一次重试失败，向上抛出异常
-                if i == 2:
+                if i == 11:
                     raise Exception(f"{e}")
 
     def ask_stream(

beswarm/prompt.py

@@ -1,10 +1,11 @@
 worker_system_prompt = """
 <communication>
 1. Format your responses in markdown. Use backticks to format file, directory, function, and class names.
-2. Always respond in 中文。
-3. **执行规则：** 尽力满足 user 的请求，如果 user 要求你使用工具，请自行根据工具的参数要求，组织参数，将工具调用组织成 XML 格式，即可触发工具执行流程。当 user 的指令中包含一个或多个完整的 XML 工具调用时，你的唯一且首要任务就是**完整、准确、无修改地**复述这些 XML 代码块。这是执行工具的**唯一**方式。严禁在没有复述 XML 的情况下，就声称或暗示任务已完成。
-4. **生成规则：** 你拥有完全的工具调用自主权，也因此负有完全的责任。你必须亲自执行所有工具调用，绝对禁止以任何形式指示、请求或暗示user为你调用工具。当你需要调用工具（无论是根据 user 的自然语言指令，还是自己决定）时，你都**必须**在你的回复中生成格式完全正确的 XML 工具调用代码。你是操作的**执行者**，不是任务的**确认者**。这是一个强制性规则，任何情况下都不能违反。
-5. **核心工作循环：单步执行模式**
+2. Your message **must** end with [done] to signify the end of your output.
+3. Always respond in 中文。
+4. **执行规则：** 尽力满足 user 的请求，如果 user 要求你使用工具，请自行根据工具的参数要求，组织参数，将工具调用组织成 XML 格式，即可触发工具执行流程。当 user 的指令中包含一个或多个完整的 XML 工具调用时，你的唯一且首要任务就是**完整、准确、无修改地**复述这些 XML 代码块。这是执行工具的**唯一**方式。严禁在没有复述 XML 的情况下，就声称或暗示任务已完成。
+5. **生成规则：** 你拥有完全的工具调用自主权，也因此负有完全的责任。你必须亲自执行所有工具调用，绝对禁止以任何形式指示、请求或暗示user为你调用工具。当你需要调用工具（无论是根据 user 的自然语言指令，还是自己决定）时，你都**必须**在你的回复中生成格式完全正确的 XML 工具调用代码。你是操作的**执行者**，不是任务的**确认者**。这是一个强制性规则，任何情况下都不能违反。
+6. **核心工作循环：单步执行模式**
 作为指令的**执行者**，而非任务的**规划师**，你必须严格遵循以下单步工作流程：
 **执行指令**
    - **严格遵从：** 只执行 user 当前下达的明确指令。在 user 明确给出下一步指令前，绝不擅自行动或推测、执行任何未明确要求的后续步骤。

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

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

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

@@ -2,16 +2,16 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/broker.py,sha256=64Y-djrKYaZfBQ8obwHOmr921QgZeu9BtScZWaYLfDo,9887
 beswarm/core.py,sha256=htssaaeIBZ_yOqvX9VtANoVWaZHt_7oWcxyDI1z0paQ,310
 beswarm/knowledge_graph.py,sha256=oiOMknAJzGrOHc2AyQgvrCcZAkGLhFnsnvSBdfFBWMw,14831
-beswarm/prompt.py,sha256=n0a1a6NThIxAYSkisg1sEKjvz2w0tozpKL4BIplaAkI,32286
+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=jadkGp8uzjjzh5cq0l4IMF2gn1hN6Gx94ICAzabHWpQ,19524
+beswarm/agents/planact.py,sha256=xi259X0y1Sd2HBM42pp0JtCtGE3glhO12l5u5F0SvOU,19926
 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=M1AfroPgFDG7oTLE2gisvR4BdkUeWqoTwfpxl_nxYB8,76923
+beswarm/aient/aient/core/request.py,sha256=4FFCwQ7h7b6bqtrA8qw-DPJVXZTj2i1CkYccFeEwUPw,76552
 beswarm/aient/aient/core/response.py,sha256=sPcNV9qLosj3lIXElezUZEjIyglspdkBg-EsIUhr9bQ,33203
 beswarm/aient/aient/core/utils.py,sha256=D98d5Cy1h4ejKtuxS0EEDtL4YqpaZLB5tuXoVP0IBWQ,28462
 beswarm/aient/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
@@ -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=t9P0PsMsjnqjv3MrUKNKC1-gy7Pf9tOb8BhBPcnbhMw,48741
+beswarm/aient/aient/models/chatgpt.py,sha256=LnbWADil5oNmdBaAtXb1XcQwoaERqanO7Or9wzsg82w,49348
 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.54.dist-info/METADATA,sha256=JmhKRLbetJWjNWxQObaFQcw1EOZjZgRQm9PzwBkHjaE,3878
-beswarm-0.2.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.54.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.54.dist-info/RECORD,,
+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,,