beswarm 0.1.20__py3-none-any.whl → 0.1.22__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.0.79",
+    version="1.0.81",
     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

@@ -300,7 +300,8 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
     original_model = model_dict[request.model]
     search_tool = None
 
-    pro_models = ["gemini-2.5", "gemini-2.0", "gemini-exp"]
+    # https://cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/2-0-flash?hl=zh-cn
+    pro_models = ["gemini-2.5"]
     if any(pro_model in original_model for pro_model in pro_models):
         location = gemini2
         search_tool = {"googleSearch": {}}
@@ -946,7 +947,8 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
 
     if "api.x.ai" in url:
         payload.pop("stream_options", None)
-        payload.pop("presencePenalty", None)
+        payload.pop("presence_penalty", None)
+        payload.pop("frequency_penalty", None)
 
     if "grok-3-mini" in original_model:
         if request.model.endswith("high"):
@@ -995,7 +997,7 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
 
     return url, headers, payload
 
-def build_azure_endpoint(base_url, deployment_id, api_version="2024-10-21"):
+def build_azure_endpoint(base_url, deployment_id, api_version="2025-01-01-preview"):
     # 移除base_url末尾的斜杠(如果有)
     base_url = base_url.rstrip('/')
     final_url = base_url

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

@@ -551,30 +551,27 @@ async def generate_no_stream_response(timestamp, model, content=None, tools_id=N
 
     return json_data
 
-def get_image_format(file_content):
+def get_image_format(file_content: bytes):
     try:
         img = Image.open(io.BytesIO(file_content))
         return img.format.lower()
     except:
         return None
 
-def encode_image(image_path):
-    with open(image_path, "rb") as image_file:
-        file_content = image_file.read()
-        img_format = get_image_format(file_content)
-        if not img_format:
-            raise ValueError("无法识别的图片格式")
-        base64_encoded = base64.b64encode(file_content).decode('utf-8')
-
-        if img_format == 'png':
-            return f"data:image/png;base64,{base64_encoded}"
-        elif img_format in ['jpg', 'jpeg']:
-            return f"data:image/jpeg;base64,{base64_encoded}"
-        else:
-            raise ValueError(f"不支持的图片格式: {img_format}")
+def encode_image(file_content: bytes):
+    img_format = get_image_format(file_content)
+    if not img_format:
+        raise ValueError("无法识别的图片格式")
+    base64_encoded = base64.b64encode(file_content).decode('utf-8')
+
+    if img_format == 'png':
+        return f"data:image/png;base64,{base64_encoded}"
+    elif img_format in ['jpg', 'jpeg']:
+        return f"data:image/jpeg;base64,{base64_encoded}"
+    else:
+        raise ValueError(f"不支持的图片格式: {img_format}")
 
-async def get_doc_from_url(url):
-    filename = urllib.parse.unquote(url.split("/")[-1])
+async def get_image_from_url(url):
     transport = httpx.AsyncHTTPTransport(
         http2=True,
         verify=False,
@@ -586,19 +583,19 @@ async def get_doc_from_url(url):
                 url,
                 timeout=30.0
             )
-            with open(filename, 'wb') as f:
-                f.write(response.content)
+            response.raise_for_status()
+            return response.content
 
         except httpx.RequestError as e:
-            print(f"An error occurred while requesting {e.request.url!r}.")
-
-    return filename
+            logger.error(f"请求 URL 时出错 {e.request.url!r}: {e}")
+            raise HTTPException(status_code=400, detail=f"无法从 URL 获取内容: {url}")
+        except httpx.HTTPStatusError as e:
+            logger.error(f"获取 URL 时发生 HTTP 错误 {e.request.url!r}: {e.response.status_code}")
+            raise HTTPException(status_code=e.response.status_code, detail=f"获取 URL 时出错: {url}")
 
 async def get_encode_image(image_url):
-    filename = await get_doc_from_url(image_url)
-    image_path = os.getcwd() + "/" + filename
-    base64_image = encode_image(image_path)
-    os.remove(image_path)
+    file_content = await get_image_from_url(image_url)
+    base64_image = encode_image(file_content)
     return base64_image
 
 # from PIL import Image

beswarm/aient/src/aient/models/chatgpt.py

@@ -81,6 +81,7 @@ class chatgpt(BaseLLM):
         self.function_calls_counter = {}
         self.function_call_max_loop = function_call_max_loop
         self.cut_history_by_function_name = cut_history_by_function_name
+        self.latest_file_content = {}
 
 
         # 注册和处理传入的工具
@@ -228,6 +229,27 @@ class chatgpt(BaseLLM):
             else:
                 break
 
+    def get_latest_file_content(self) -> str:
+        """
+        获取最新文件内容
+        """
+        result = ""
+        if self.latest_file_content:
+            for file_path, content in self.latest_file_content.items():
+                result += (
+                    "<file>"
+                    f"<file_path>{file_path}</file_path>"
+                    f"<file_content>{content}</file_content>"
+                    "</file>\n\n"
+                )
+            if result:
+                result = (
+                    "<latest_file_content>"
+                    f"{result}"
+                    "</latest_file_content>"
+                )
+        return result
+
     async def get_post_body(
         self,
         prompt: str,
@@ -237,7 +259,7 @@ class chatgpt(BaseLLM):
         pass_history: int = 9999,
         **kwargs,
     ):
-        self.conversation[convo_id][0] = {"role": "system","content": self.system_prompt}
+        self.conversation[convo_id][0] = {"role": "system","content": self.system_prompt + "\n\n" + self.get_latest_file_content()}
 
         # 构造 provider 信息
         provider = {
@@ -253,7 +275,7 @@ class chatgpt(BaseLLM):
         request_data = {
             "model": model or self.engine,
             "messages": copy.deepcopy(self.conversation[convo_id]) if pass_history else [
-                {"role": "system","content": self.system_prompt},
+                {"role": "system","content": self.system_prompt + "\n\n" + self.get_latest_file_content()},
                 {"role": role, "content": prompt}
             ],
             "stream": True,
@@ -499,7 +521,7 @@ class chatgpt(BaseLLM):
 
             for tool_info in tool_calls:
                 tool_name = tool_info['function_name']
-                tool_args = json.dumps(tool_info['parameter']) if not isinstance(tool_info['parameter'], str) else tool_info['parameter']
+                tool_args = json.dumps(tool_info['parameter'], ensure_ascii=False) if not isinstance(tool_info['parameter'], str) else tool_info['parameter']
                 tool_id = tool_info.get('function_call_id', tool_name + "_tool_call")
 
                 tool_response = ""
@@ -515,7 +537,13 @@ class chatgpt(BaseLLM):
                             tool_response = chunk.replace("function_response:", "")
                         else:
                             yield chunk
-                all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
+                if tool_name == "read_file" and "<read_file error>" not in tool_response:
+                    self.latest_file_content[tool_info['parameter']["file_path"]] = tool_response
+                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead file successfully! The file content has been updated in the tag <latest_file_content>.")
+                elif tool_name == "write_to_file":
+                    all_responses.append(f"[{tool_name}(...) Result]:\n\n{tool_response}")
+                else:
+                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
 
             # 合并所有工具响应
             function_response = "\n\n".join(all_responses)
@@ -795,6 +823,7 @@ class chatgpt(BaseLLM):
         Reset the conversation
         """
         self.system_prompt = system_prompt or self.system_prompt
+        self.latest_file_content = {}
         self.conversation[convo_id] = [
             {"role": "system", "content": self.system_prompt},
         ]

beswarm/aient/src/aient/plugins/excute_command.py

@@ -27,7 +27,11 @@ ls -l && echo 'Hello, World!'
         # 使用subprocess.run捕获命令输出
         result = subprocess.run(command, shell=True, check=True, capture_output=True, text=True)
         # 返回命令的标准输出
-        return f"执行命令成功:\n{result.stdout}"
+        if "pip install" in command:
+            stdout_log = "\n".join([x for x in result.stdout.split('\n') if '━━' not in x])
+        else:
+            stdout_log = result.stdout
+        return f"执行命令成功:\n{stdout_log}"
     except subprocess.CalledProcessError as e:
         # 如果命令执行失败，返回错误信息和错误输出
         return f"执行命令失败 (退出码 {e.returncode}):\n错误: {e.stderr}\n输出: {e.stdout}"

beswarm/aient/src/aient/plugins/read_file.py

@@ -50,11 +50,11 @@ Examples:
     try:
         # 检查文件是否存在
         if not os.path.exists(file_path):
-            return f"错误: 文件 '{file_path}' 不存在"
+            return f"<read_file error>文件 '{file_path}' 不存在</read_file error>"
 
         # 检查是否为文件
         if not os.path.isfile(file_path):
-            return f"错误: '{file_path}' 不是一个文件"
+            return f"<read_file error>'{file_path}' 不是一个文件</read_file error>"
 
         # 检查文件扩展名
         if file_path.lower().endswith('.pdf'):
@@ -63,7 +63,7 @@ Examples:
 
             # 如果提取结果为空
             if not text_content:
-                return f"错误: 无法从 '{file_path}' 提取文本内容"
+                return f"<read_file error>无法从 '{file_path}' 提取文本内容</read_file error>"
         elif file_path.lower().endswith('.ipynb'):
             try:
                 with open(file_path, 'r', encoding='utf-8') as file:
@@ -95,9 +95,9 @@ Examples:
 
                 text_content = json.dumps(notebook_content, indent=2, ensure_ascii=False)
             except json.JSONDecodeError:
-                return f"错误: 文件 '{file_path}' 不是有效的JSON格式 (IPython Notebook)。"
+                return f"<read_file error>文件 '{file_path}' 不是有效的JSON格式 (IPython Notebook)。</read_file error>"
             except Exception as e:
-                return f"处理IPython Notebook文件 '{file_path}' 时发生错误: {e}"
+                return f"<read_file error>处理IPython Notebook文件 '{file_path}' 时发生错误: {e}</read_file error>"
         else:
             # 读取文件内容
             with open(file_path, 'r', encoding='utf-8') as file:
@@ -107,11 +107,11 @@ Examples:
         return text_content
 
     except PermissionError:
-        return f"错误: 没有权限访问文件 '{file_path}'"
+        return f"<read_file error>没有权限访问文件 '{file_path}'</read_file error>"
     except UnicodeDecodeError:
-        return f"错误: 文件 '{file_path}' 不是文本文件或编码不是UTF-8"
+        return f"<read_file error>文件 '{file_path}' 不是文本文件或编码不是UTF-8</read_file error>"
     except Exception as e:
-        return f"读取文件时发生错误: {e}"
+        return f"<read_file error>读取文件时发生错误: {e}</read_file error>"
 
 if __name__ == "__main__":
     # python -m beswarm.aient.src.aient.plugins.read_file

beswarm/aient/src/aient/plugins/write_file.py

@@ -48,4 +48,4 @@ Example: Requesting to write to frontend-config.json
     with open(path, mode, encoding='utf-8') as file:
         file.write(content)
 
-    return f"文件已成功写入：{path}"
+    return f"已成功写入文件：{path}"

beswarm/aient/src/aient/utils/scripts.py

@@ -28,20 +28,6 @@ def cut_message(message: str, max_tokens: int, model_name: str):
     encode_text = encoding.encode(message, disallowed_special=())
     return message, len(encode_text)
 
-import imghdr
-def encode_image(image_path):
-    with open(image_path, "rb") as image_file:
-        file_content = image_file.read()
-        file_type = imghdr.what(None, file_content)
-        base64_encoded = base64.b64encode(file_content).decode('utf-8')
-
-        if file_type == 'png':
-            return f"data:image/png;base64,{base64_encoded}"
-        elif file_type in ['jpeg', 'jpg']:
-            return f"data:image/jpeg;base64,{base64_encoded}"
-        else:
-            raise ValueError(f"不支持的图片格式: {file_type}")
-
 def get_doc_from_url(url):
     filename = urllib.parse.unquote(url.split("/")[-1])
     response = requests.get(url, stream=True)
@@ -50,13 +36,6 @@ def get_doc_from_url(url):
             f.write(chunk)
     return filename
 
-def get_encode_image(image_url):
-    filename = get_doc_from_url(image_url)
-    image_path = os.getcwd() + "/" + filename
-    base64_image = encode_image(image_path)
-    os.remove(image_path)
-    return base64_image
-
 from io import BytesIO
 def get_audio_message(file_bytes):
     try:

{beswarm-0.1.20.dist-info → beswarm-0.1.22.dist-info}/METADATA

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

{beswarm-0.1.20.dist-info → beswarm-0.1.22.dist-info}/RECORD

@@ -1,21 +1,21 @@
 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=EzoroFZIKVg3AI6yCw9_O8zbBKEUmPzLYs5ls_Gdh9E,487
+beswarm/aient/setup.py,sha256=2clD7tuxd3hJrDJeJBsAqDtIyd6qpLLzb4a4-8nz-VE,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=_1wYZg_n9kb2A3C8xCboyqleH2iHc9scwOvtx9DPeok,7582
-beswarm/aient/src/aient/core/request.py,sha256=PF3hBBzl5RZTda2bAT_Vlp7DiXFhYMzk2Egp7irKVPk,60810
+beswarm/aient/src/aient/core/request.py,sha256=DzjOtWb7rm1frsyKRIsnhONCuttURfwtqERc_qJqHgg,60931
 beswarm/aient/src/aient/core/response.py,sha256=CSAOQmybBu3i2Yq2YUyi91dZWTN1tmtJEBTI8RFwj_s,30594
-beswarm/aient/src/aient/core/utils.py,sha256=R4oKj1oVsdfePdQReaW-ZU4VRTCetvdCKPz_OOTOU_w,26072
+beswarm/aient/src/aient/core/utils.py,sha256=Pmr_ghNsmhKTG65g8_M8BBc_pHGgnD88-SNsJNPJFw4,26158
 beswarm/aient/src/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 beswarm/aient/src/aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
 beswarm/aient/src/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhFkw,2755
 beswarm/aient/src/aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 beswarm/aient/src/aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/src/aient/models/base.py,sha256=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
-beswarm/aient/src/aient/models/chatgpt.py,sha256=fWow2ezxduRU3sQxjoK7ZTOAQeY0byP-lCwYf-JcJUM,43105
+beswarm/aient/src/aient/models/chatgpt.py,sha256=AqWgn79hKsfMEx1IEtxU3SaZfJAQ5aFUFN7kKrjZsII,44489
 beswarm/aient/src/aient/models/claude.py,sha256=thK9P8qkaaoUN3OOJ9Shw4KDs-pAGKPoX4FOPGFXva8,28597
 beswarm/aient/src/aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 beswarm/aient/src/aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -24,20 +24,20 @@ beswarm/aient/src/aient/models/vertex.py,sha256=qVD5l1Q538xXUPulxG4nmDjXE1VoV4yu
 beswarm/aient/src/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/src/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/src/aient/plugins/config.py,sha256=KnZ5xtb5o41FI2_qvxTEQhssdd3WJc7lIAFNR85INQw,7817
-beswarm/aient/src/aient/plugins/excute_command.py,sha256=0sQZGLCaRfh0yMM63fXU8XZV7jlo9FKeyEbM-rfgTFg,1209
+beswarm/aient/src/aient/plugins/excute_command.py,sha256=ixSN1q2d3JoJK8OipRB9M2XGMnf4R1b1o_E7F5cUSOU,1392
 beswarm/aient/src/aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 beswarm/aient/src/aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 beswarm/aient/src/aient/plugins/list_directory.py,sha256=5ubm-mfrj-tanGSDp4M_Tmb6vQb3dx2-XVfQ2yL2G8A,1394
-beswarm/aient/src/aient/plugins/read_file.py,sha256=v07127SXOhS8YGJ6X82Gw2xlk-nlKvX7SdxzZVe1z0Y,4625
+beswarm/aient/src/aient/plugins/read_file.py,sha256=cJxGnhcz1_gjkgeemVyixLUiCvf-dWm-UtDfrbFdlLE,4857
 beswarm/aient/src/aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 beswarm/aient/src/aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4589
 beswarm/aient/src/aient/plugins/websearch.py,sha256=yiBzqXK5X220ibR-zko3VDsn4QOnLu1k6E2YOygCeTQ,15185
-beswarm/aient/src/aient/plugins/write_file.py,sha256=qYbNvcDTGs00pWYb0UOSYSeN4kw5_DMDxjaSlxtlAkU,1732
+beswarm/aient/src/aient/plugins/write_file.py,sha256=FfQgAaojwtHiUORLBBt98mKWddoWgjd3o2UD1v1mgUI,1732
 beswarm/aient/src/aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p4FEyMCy4BfwGs,20
 beswarm/aient/src/aient/prompt/agent.py,sha256=WLs0KiNZs29FJ5w7N3kQZYLVEeS7K8vxIOUw06LcXVE,23825
 beswarm/aient/src/aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 beswarm/aient/src/aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
-beswarm/aient/src/aient/utils/scripts.py,sha256=n0jR5eXCBIK12W4bIx-xU1FVl1hZ4zDC7hq_BWQHYJU,27537
+beswarm/aient/src/aient/utils/scripts.py,sha256=PPwaJEigPkpciJHUXOag483iq1GjvaLReHDHjkinv6c,26780
 beswarm/aient/test/chatgpt.py,sha256=Hvl7FuDt1c74N5TVBmhErOPvJbJJzA7FNp5VoZM4u30,4957
 beswarm/aient/test/claude.py,sha256=IyB4qI1eJLwlSfDNSnt2FhbQWYyBighHUjJxEXc3osQ,1095
 beswarm/aient/test/test.py,sha256=rldnoLQdtRR8IKFSIzTti7eIK2MpPMoi9gL5qD8_K44,29
@@ -125,7 +125,7 @@ beswarm/tools/repomap.py,sha256=CwvwoN5Swr42EzrORTTeV8MMb7mPviy4a4b0fxBu50k,4082
 beswarm/tools/search_arxiv.py,sha256=9slwBemXjEqrd7-YgVmyMijPXlkhZCybEDRVhWVQ9B0,7937
 beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
 beswarm/tools/worker.py,sha256=JZkMT4JAkrV_0-CBATLAPVZzVGEMMEM2XUTTMGmED0E,5245
-beswarm-0.1.20.dist-info/METADATA,sha256=k7N6PewO59xBaDZoNU2ZfhzIdx8E3RQu2K7iVCZs0ug,2870
-beswarm-0.1.20.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-beswarm-0.1.20.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.20.dist-info/RECORD,,
+beswarm-0.1.22.dist-info/METADATA,sha256=TvB5VYiqaoxoW7nsqcf8D2mBRRwL8cSxPzeI_QSBYE8,2870
+beswarm-0.1.22.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+beswarm-0.1.22.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.22.dist-info/RECORD,,