beswarm 0.1.56__py3-none-any.whl → 0.1.58__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.12",
+    version="1.1.13",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

beswarm/aient/src/aient/core/request.py

@@ -48,6 +48,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
 
     messages = []
     systemInstruction = None
+    system_prompt = ""
     function_arguments = None
     for msg in request.messages:
         if msg.role == "assistant":
@@ -102,7 +103,8 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             messages.append({"role": msg.role, "parts": content})
         elif msg.role == "system":
             content[0]["text"] = re.sub(r"_+", "_", content[0]["text"])
-            systemInstruction = {"parts": content}
+            system_prompt = system_prompt + "\n\n" + content[0]["text"]
+    systemInstruction = {"parts": [{"text": system_prompt}]}
 
     if any(off_model in original_model for off_model in gemini_max_token_65k_models):
         safety_settings = "OFF"
@@ -212,23 +214,35 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
         else:
             payload["generationConfig"]["maxOutputTokens"] = 8192
 
-    # 从请求模型名中检测思考预算设置
-    m = re.match(r".*-think-(-?\d+)", request.model)
-    if m:
-        try:
-            val = int(m.group(1))
-            if val < 0:
-                val = 0
-            elif val > 24576:
-                val = 24576
-            payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": val}
-        except ValueError:
-            # 如果转换为整数失败，忽略思考预算设置
-            pass
-
-    # 检测search标签
-    if request.model.endswith("-search"):
-        payload["tools"] = [{"googleSearch": {}}]
+    if "gemini-2.5" in original_model:
+        payload["generationConfig"]["thinkingConfig"] = {
+            "includeThoughts": True,
+        }
+        # 从请求模型名中检测思考预算设置
+        m = re.match(r".*-think-(-?\d+)", request.model)
+        if m:
+            try:
+                val = int(m.group(1))
+                if val < 0:
+                    val = 0
+                elif val > 24576:
+                    val = 24576
+                payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+            except ValueError:
+                # 如果转换为整数失败，忽略思考预算设置
+                pass
+
+    # # 检测search标签
+    # if request.model.endswith("-search"):
+    #     payload["tools"] = [{"googleSearch": {}}]
+
+    if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
+        for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
+            if key == request.model:
+                for k, v in value.items():
+                    payload[k] = v
+            elif all(_model not in request.model for _model in ["gemini", "gpt", "claude"]):
+                payload[key] = value
 
     return url, headers, payload
 
@@ -303,16 +317,16 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         gemini_stream = "generateContent"
     model_dict = get_model_dict(provider)
     original_model = model_dict[request.model]
-    search_tool = None
+    # search_tool = None
 
     # https://cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/2-0-flash?hl=zh-cn
     pro_models = ["gemini-2.5", "gemini-2.0"]
     if any(pro_model in original_model for pro_model in pro_models):
         location = gemini2
-        search_tool = {"googleSearch": {}}
+        # search_tool = {"googleSearch": {}}
     else:
         location = gemini1
-        search_tool = {"googleSearchRetrieval": {}}
+        # search_tool = {"googleSearchRetrieval": {}}
 
     if "google-vertex-ai" in provider.get("base_url", ""):
         url = provider.get("base_url").rstrip('/') + "/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
@@ -334,6 +348,7 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
 
     messages = []
     systemInstruction = None
+    system_prompt = ""
     function_arguments = None
     for msg in request.messages:
         if msg.role == "assistant":
@@ -387,7 +402,8 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         elif msg.role != "system":
             messages.append({"role": msg.role, "parts": content})
         elif msg.role == "system":
-            systemInstruction = {"parts": content}
+            system_prompt = system_prompt + "\n\n" + content[0]["text"]
+    systemInstruction = {"parts": [{"text": system_prompt}]}
 
     if any(off_model in original_model for off_model in gemini_max_token_65k_models):
         safety_settings = "OFF"
@@ -469,8 +485,34 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
         else:
             payload["generationConfig"]["max_output_tokens"] = 8192
 
-    if request.model.endswith("-search"):
-        payload["tools"] = [search_tool]
+    if "gemini-2.5" in original_model:
+        payload["generationConfig"]["thinkingConfig"] = {
+            "includeThoughts": True,
+        }
+        # 从请求模型名中检测思考预算设置
+        m = re.match(r".*-think-(-?\d+)", request.model)
+        if m:
+            try:
+                val = int(m.group(1))
+                if val < 0:
+                    val = 0
+                elif val > 24576:
+                    val = 24576
+                payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
+            except ValueError:
+                # 如果转换为整数失败，忽略思考预算设置
+                pass
+
+    # if request.model.endswith("-search"):
+    #     payload["tools"] = [search_tool]
+
+    if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
+        for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
+            if key == request.model:
+                for k, v in value.items():
+                    payload[k] = v
+            elif all(_model not in request.model for _model in ["gemini", "gpt", "claude"]):
+                payload[key] = value
 
     return url, headers, payload
 
@@ -1010,7 +1052,11 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
 
     if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
         for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
-            payload[key] = value
+            if key == request.model:
+                for k, v in value.items():
+                    payload[k] = v
+            elif all(_model not in request.model for _model in ["gemini", "gpt", "claude"]):
+                payload[key] = value
 
     return url, headers, payload
 
@@ -1104,7 +1150,11 @@ async def get_azure_payload(request, engine, provider, api_key=None):
 
     if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
         for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
-            payload[key] = value
+            if key == request.model:
+                for k, v in value.items():
+                    payload[k] = v
+            elif all(_model not in request.model for _model in ["gemini", "gpt", "claude"]):
+                payload[key] = value
 
     return url, headers, payload
 
@@ -1433,9 +1483,13 @@ async def get_claude_payload(request, engine, provider, api_key=None):
             message_index = message_index + 1
 
     if "claude-3-7-sonnet" in original_model:
-        max_tokens = 20000
+        max_tokens = 128000
     elif "claude-3-5-sonnet" in original_model:
         max_tokens = 8192
+    elif "claude-sonnet-4" in original_model:
+        max_tokens = 64000
+    elif "claude-opus-4" in original_model:
+        max_tokens = 32000
     else:
         max_tokens = 4096
 

beswarm/aient/src/aient/core/response.py

@@ -535,15 +535,25 @@ async def fetch_response(client, url, headers, payload, engine, model):
         # print("parsed_data", json.dumps(parsed_data, indent=4, ensure_ascii=False))
         content = ""
         reasoning_content = ""
-        for item in parsed_data:
-            chunk = safe_get(item, "candidates", 0, "content", "parts", 0, "text")
-            is_think = safe_get(item, "candidates", 0, "content", "parts", 0, "thought", default=False)
+        parts_list = safe_get(parsed_data, 0, "candidates", 0, "content", "parts", default=[])
+        for item in parts_list:
+            chunk = safe_get(item, "text")
+            is_think = safe_get(item, "thought", default=False)
             # logger.info(f"chunk: {repr(chunk)}")
             if chunk:
                 if is_think:
                     reasoning_content += chunk
                 else:
                     content += chunk
+        # for item in parsed_data:
+        #     chunk = safe_get(item, "candidates", 0, "content", "parts", 0, "text")
+        #     is_think = safe_get(item, "candidates", 0, "content", "parts", 0, "thought", default=False)
+        #     # logger.info(f"chunk: {repr(chunk)}")
+        #     if chunk:
+        #         if is_think:
+        #             reasoning_content += chunk
+        #         else:
+        #             content += chunk
 
         usage_metadata = safe_get(parsed_data, -1, "usageMetadata")
         prompt_tokens = safe_get(usage_metadata, "promptTokenCount", default=0)

beswarm/aient/src/aient/core/utils.py

@@ -96,6 +96,7 @@ def get_engine(provider, endpoint=None, original_model=""):
     and "o3" not in original_model \
     and "o4" not in original_model \
     and "gemini" not in original_model \
+    and "gemma" not in original_model \
     and "learnlm" not in original_model \
     and "grok" not in original_model \
     and parsed_url.netloc != 'api.cloudflare.com' \

beswarm/tools/edit_file.py

@@ -157,4 +157,24 @@ def edit_file(file_path, diff_content, match_precision=0.8):
     except UnicodeDecodeError:
         return f"错误: 文件 '{file_path}' 不是文本文件或编码不是UTF-8，无法进行编码解析"
     except Exception as e:
-        return f"编辑文件时发生错误: {e}"
+        print(f"content: {content}")
+        print(f"file_path: {file_path}")
+        print(f"diff_content: {diff_content}")
+        import traceback
+        traceback.print_exc()
+        return f"编辑文件时发生错误: {e}"
+
+if __name__ == "__main__":
+    edit_str = """
+<<<<<<< SEARCH
+    parser.add_argument('--dataset', type=str, default='cifar10', choices=['cifar10', 'cifar100', 'imagenet'], help="Dataset to use.")
+=======
+    parser.add_argument('--dataset', type=str, default='cifar10', choices=['cifar10', 'cifar100', 'imagenet', 'tinyimagenet'], help="Dataset to use.")
+>>>>>>> REPLACE
+"""
+
+    file_path = "train.py"
+# 编辑文件时发生错误: '>' not supported between instances of 'str' and 'float'
+    print(edit_file(file_path, edit_str))
+
+# python -m beswarm.tools.edit_file

beswarm/tools/repomap.py

@@ -1,5 +1,6 @@
 import os
 import math
+import json
 import time
 import random
 import shutil
@@ -634,7 +635,23 @@ class RepoMap:
         return data
 
     def get_tags_raw(self, fname, rel_fname):
-        lang = filename_to_lang(str(self.root / Path(fname)))
+        # 检查是否为 .ipynb 文件，如果是则转换为 Python 代码再处理
+        if fname.endswith('.ipynb'):
+            # 读取 ipynb 文件内容
+            ipynb_content = self.io.read_text(str(self.root / Path(fname)))
+            if not ipynb_content:
+                return
+
+            # 转换为 Python 代码
+            py_content = self.convert_ipynb_to_py_content(ipynb_content)
+            if not py_content:
+                return
+
+            # 使用 Python 语言处理转换后的内容
+            lang = "python"
+        else:
+            lang = filename_to_lang(str(self.root / Path(fname)))
+
         # print(f"lang1: {lang}")
         if not lang:
             return
@@ -653,7 +670,11 @@ class RepoMap:
             return
         query_scm = query_scm.read_text()
 
-        code = self.io.read_text(str(self.root / Path(fname)))
+        # 根据文件类型选择代码内容
+        if fname.endswith('.ipynb'):
+            code = py_content
+        else:
+            code = self.io.read_text(str(self.root / Path(fname)))
         # print(f"code: {code}")
         if not code:
             return
@@ -1090,13 +1111,23 @@ class RepoMap:
             or self.tree_context_cache[rel_fname]["mtime"] != mtime
         ):
             # print(f"abs_fname: {abs_fname}")
-            code = self.io.read_text(abs_fname) or ""
+            # 处理 .ipynb 文件
+            if str(abs_fname).endswith('.ipynb'):
+                # 读取 ipynb 文件并转换
+                ipynb_content = self.io.read_text(abs_fname) or ""
+                code = self.convert_ipynb_to_py_content(ipynb_content) or ""
+                # 使用虚拟的 .py 文件名以便 TreeContext 能识别
+                context_filename = rel_fname.replace('.ipynb', '.py')
+            else:
+                code = self.io.read_text(abs_fname) or ""
+                context_filename = rel_fname
+
             # print(f"code: {code}")
             if not code.endswith("\n"):
                 code += "\n"
 
             context = TreeContext(
-                rel_fname,
+                context_filename,
                 code,
                 color=False,
                 line_number=False,
@@ -1161,6 +1192,73 @@ class RepoMap:
 
         return output
 
+    def convert_ipynb_to_py_content(self, ipynb_content):
+        """
+        将 .ipynb 文件内容转换为 Python 代码字符串
+        Markdown cells 转换为注释
+        Code cells 保持为 Python 代码
+        """
+        try:
+            notebook_data = json.loads(ipynb_content)
+        except json.JSONDecodeError:
+            return None
+
+        py_lines = []
+
+        for cell in notebook_data.get('cells', []):
+            cell_type = cell.get('cell_type')
+            source = cell.get('source', [])
+
+            if not isinstance(source, list):
+                source = [source]
+
+            source_lines = "".join(source).splitlines()
+
+            if cell_type == 'markdown':
+                for line in source_lines:
+                    py_lines.append(f"# {line}")
+                py_lines.append("")
+            elif cell_type == 'code':
+                for line in source_lines:
+                    if line.startswith("!") or line.startswith("%"):
+                        py_lines.append(f"# {line}")
+                    else:
+                        py_lines.append(line)
+
+                outputs = cell.get('outputs', [])
+                has_output_comment = False
+                for output in outputs:
+                    output_type = output.get('output_type')
+                    if output_type == 'stream':
+                        if not has_output_comment:
+                            py_lines.append("# --- Output ---")
+                            has_output_comment = True
+                        text_output = output.get('text', [])
+                        if isinstance(text_output, list):
+                            for line in "".join(text_output).splitlines():
+                                py_lines.append(f"# {line}")
+                        else:
+                            for line in text_output.splitlines():
+                                 py_lines.append(f"# {line}")
+                    elif output_type == 'execute_result':
+                        data = output.get('data', {})
+                        if 'text/plain' in data:
+                            if not has_output_comment:
+                                py_lines.append("# --- Output ---")
+                                has_output_comment = True
+                            text_output = data['text/plain']
+                            if isinstance(text_output, list):
+                                for line in "".join(text_output).splitlines():
+                                    py_lines.append(f"# {line}")
+                            else:
+                                for line in text_output.splitlines():
+                                    py_lines.append(f"# {line}")
+                if has_output_comment:
+                     py_lines.append("# --- End Output ---")
+                py_lines.append("")
+
+        return '\n'.join(py_lines)
+
 
 def find_src_files(directory):
     if not os.path.isdir(directory):
@@ -1287,6 +1385,7 @@ if __name__ == "__main__":
     # print(get_code_repo_map("."))
     # print(get_code_repo_map("/Users/yanyuming/Downloads/GitHub/uni-api"))
     # print(get_code_repo_map("/Users/yanyuming/Downloads/GitHub/text-to-motion"))
-    print(get_code_repo_map("/Users/yanyuming/Downloads/GitHub/beswarm/work/secretary/secretary"))
+    # print(get_code_repo_map("/Users/yanyuming/Downloads/GitHub/beswarm/work/secretary/secretary"))
+    print(get_code_repo_map("/Users/yanyuming/Downloads/GitHub/beswarm/work/fer/fer"))
 
 # python -m beswarm.tools.repomap

{beswarm-0.1.56.dist-info → beswarm-0.1.58.dist-info}/METADATA

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

{beswarm-0.1.56.dist-info → beswarm-0.1.58.dist-info}/RECORD

@@ -1,14 +1,14 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/utils.py,sha256=AdDCcqAIIKQEMl7PfryVgeT9G5sHe7QNsZnrvmTGA8E,283
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=6ygixQucKMW9S7_9BHl6IsJJN8lqDYcuKC1wOPsrzp8,487
+beswarm/aient/setup.py,sha256=5aE5yVcM8sk5NULSs8Y9sJi1pRQGKZwdscZVOzPGvB0,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/src/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/src/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 beswarm/aient/src/aient/core/models.py,sha256=kF-HLi1I2k_G5r153ZHuiGH8_NmpTlFMfK0_myB28YQ,7366
-beswarm/aient/src/aient/core/request.py,sha256=VItemXnWzqzS10W-RuLVrARki1w7MZMBZdyqyA5axw8,61943
-beswarm/aient/src/aient/core/response.py,sha256=BNHLazjfQT8mVg7LnPLzlX429aQM3S03pumPbOpczCI,31518
-beswarm/aient/src/aient/core/utils.py,sha256=n3dyaApN4rrSduI8cjZbeD0mv8_O5LPTTbwRkj1_v4w,26540
+beswarm/aient/src/aient/core/request.py,sha256=AmTnQ_Ri_ACRxDsWmPhhD6e79hNfwLxbsyBnpbAnmNA,64490
+beswarm/aient/src/aient/core/response.py,sha256=Z0Bjl_QvpUguyky1LIcsVks4BKKqT0eYEpDmKa_cwpQ,31978
+beswarm/aient/src/aient/core/utils.py,sha256=-naFCv8V-qhnqvDUd8BNbW1HR9CVAPxISrXoAz464Qg,26580
 beswarm/aient/src/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 beswarm/aient/src/aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
 beswarm/aient/src/aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
@@ -122,14 +122,14 @@ beswarm/queries/tree-sitter-languages/typescript-tags.scm,sha256=OMdCeedPiA24ky8
 beswarm/tools/UIworker.py,sha256=1sEC76VGFwo48lSx6KOvhJwhgBj7UWAHAAH9BG_lp-M,6439
 beswarm/tools/__init__.py,sha256=jOfYY4EYkwmz-FTJGrI1CyaIYkGWsmGzZBGsoupeX9M,1088
 beswarm/tools/click.py,sha256=TygaekCXTmU3fIu6Uom7ZcyzEgYMlCC_GX-5SmWHuLI,20762
-beswarm/tools/edit_file.py,sha256=hfpLaE4ekDiAya0Le0fJuYa-xUefWHLTxc3F6zGZd7M,6912
+beswarm/tools/edit_file.py,sha256=xlAD0HB_xM0yZYc0eJwLE-9mAkywXa2UQPNHzG1OaW4,7664
 beswarm/tools/planner.py,sha256=lguBCS6kpwNPoXQvqH-WySabVubT82iyWOkJnjt6dXw,1265
-beswarm/tools/repomap.py,sha256=CwvwoN5Swr42EzrORTTeV8MMb7mPviy4a4b0fxBu50k,40828
+beswarm/tools/repomap.py,sha256=N09K0UgwjCN7Zjg_5TYlVsulp3n2fztYlS8twalChU8,45003
 beswarm/tools/search_arxiv.py,sha256=9slwBemXjEqrd7-YgVmyMijPXlkhZCybEDRVhWVQ9B0,7937
 beswarm/tools/search_web.py,sha256=B24amOnGHnmdV_6S8bw8O2PdhZRRIDtJjg-wXcfP7dQ,11859
 beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
 beswarm/tools/worker.py,sha256=b-FvSEP27-zMYNcqaQeVBoWxaSf2cX_7_1p1GAF6h04,6191
-beswarm-0.1.56.dist-info/METADATA,sha256=zMyHHm9nSqpzxzlrL27dLMtMEF7PzFTkDqr6HCwOOPQ,3553
-beswarm-0.1.56.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-beswarm-0.1.56.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.56.dist-info/RECORD,,
+beswarm-0.1.58.dist-info/METADATA,sha256=gquIkiIp96CLCAU56qpaYkmzPkGm3mGtsyDG8y9JzPQ,3553
+beswarm-0.1.58.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+beswarm-0.1.58.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.58.dist-info/RECORD,,