aient 1.0.98__py3-none-any.whl → 1.1.0__py3-none-any.whl

aient/core/request.py

@@ -322,6 +322,9 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
             MODEL_ID=original_model,
             stream=gemini_stream
         )
+    elif api_key is not None and api_key[2] == ".":
+        url = f"https://aiplatform.googleapis.com/v1/publishers/google/models/{original_model}:{gemini_stream}?key={api_key}"
+        headers.pop("Authorization", None)
     else:
         url = "https://{LOCATION}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
             LOCATION=await location.next(),
@@ -1675,4 +1678,4 @@ async def prepare_request_payload(provider, request_data):
 
     url, headers, payload = await get_payload(request, engine, provider, api_key=provider['api'])
 
-    return url, headers, payload, engine
+    return url, headers, payload, engine

aient/models/chatgpt.py

@@ -439,8 +439,6 @@ class chatgpt(BaseLLM):
             if function_parameter:
                 invalid_tools = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") not in self.plugins.keys()]
                 function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") in self.plugins.keys()]
-                for tool_dict in invalid_tools:
-                    full_response = full_response + f"\n\nFunction: {tool_dict.get('function_name', '')} does not exist! I must use existing functions. I need to try again."
                 if self.print_log and invalid_tools:
                     print("invalid_tools", invalid_tools)
                     print("function_parameter", function_parameter)

aient/plugins/read_file.py

@@ -1,5 +1,6 @@
 import os
 import json
+import chardet
 from pdfminer.high_level import extract_text
 
 from .registry import register_tool
@@ -99,9 +100,66 @@ Examples:
             except Exception as 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:
-                text_content = file.read()
+            # 更新：修改通用文件读取逻辑以支持多种编码
+            # 这部分替换了原有的 else 块内容
+            try:
+                with open(file_path, 'rb') as file: # 以二进制模式读取
+                    raw_data = file.read()
+
+                if not raw_data: # 处理空文件
+                    text_content = ""
+                else:
+                    detected_info = chardet.detect(raw_data)
+                    primary_encoding_to_try = detected_info['encoding']
+                    confidence = detected_info['confidence']
+
+                    decoded_successfully = False
+
+                    # 尝试1: 使用检测到的编码 (如果置信度高且编码有效)
+                    if primary_encoding_to_try and confidence > 0.7: # 您可以根据需要调整置信度阈值
+                        try:
+                            text_content = raw_data.decode(primary_encoding_to_try)
+                            decoded_successfully = True
+                        except (UnicodeDecodeError, LookupError): # LookupError 用于处理无效的编码名称
+                            # 解码失败，将尝试后备编码
+                            pass
+
+                    # 尝试2: UTF-8 (如果第一次尝试失败或未进行)
+                    if not decoded_successfully:
+                        try:
+                            text_content = raw_data.decode('utf-8')
+                            decoded_successfully = True
+                        except UnicodeDecodeError:
+                            # 解码失败，将尝试下一个后备编码
+                            pass
+
+                    # 尝试3: UTF-16 (如果之前的尝试都失败)
+                    # 'utf-16' 会处理带BOM的LE/BE编码。若无BOM，则假定为本机字节序。
+                    # chardet 通常能更准确地检测具体的 utf-16le 或 utf-16be。
+                    if not decoded_successfully:
+                        try:
+                            text_content = raw_data.decode('utf-16')
+                            decoded_successfully = True
+                        except UnicodeDecodeError:
+                            # 所有主要尝试都失败
+                            pass
+
+                    if not decoded_successfully:
+                        # 所有尝试均失败后的错误信息
+                        detected_str_part = ""
+                        if primary_encoding_to_try and confidence > 0.7: # 如果有高置信度的检测结果
+                            detected_str_part = f"检测到的编码 '{primary_encoding_to_try}' (置信度 {confidence:.2f}), "
+                        elif primary_encoding_to_try: # 如果有检测结果但置信度低
+                            detected_str_part = f"低置信度检测编码 '{primary_encoding_to_try}' (置信度 {confidence:.2f}), "
+
+                        return f"<read_file error>文件 '{file_path}' 无法解码。已尝试: {detected_str_part}UTF-8, UTF-16。</read_file error>"
+
+            except FileNotFoundError:
+                # 此处不太可能触发 FileNotFoundError，因为函数开头已有 os.path.exists 检查
+                return f"<read_file error>文件 '{file_path}' 在读取过程中未找到。</read_file error>"
+            except Exception as e:
+                # 捕获在此块中可能发生的其他错误，例如未被早期检查捕获的文件读取问题
+                return f"<read_file error>处理通用文件 '{file_path}' 时发生错误: {e}</read_file error>"
 
         # 返回文件内容
         return text_content
@@ -109,7 +167,8 @@ Examples:
     except PermissionError:
         return f"<read_file error>没有权限访问文件 '{file_path}'</read_file error>"
     except UnicodeDecodeError:
-        return f"<read_file error>文件 '{file_path}' 不是文本文件或编码不是UTF-8</read_file error>"
+        # 更新：修改全局 UnicodeDecodeError 错误信息使其更通用
+        return f"<read_file error>文件 '{file_path}' 包含无法解码的字符 (UnicodeDecodeError)。</read_file error>"
     except Exception as e:
         return f"<read_file error>读取文件时发生错误: {e}</read_file error>"
 

aient/utils/scripts.py

@@ -413,13 +413,15 @@ class XmlMatcher(Generic[R]):
         self._update(chunk)
         return self._pop()
 
-def parse_function_xml(xml_content: str) -> List[Dict[str, Any]]:
+def parse_function_xml(xml_content: str, check_line_start: bool = True) -> List[Dict[str, Any]]:
     """
     解析XML格式的函数调用信息，转换为字典数组格式
     只解析倒数两层XML标签，忽略更高层级的XML标签
+    当 check_line_start 为 True 时，只解析行首的XML标签。
 
     参数:
         xml_content: 包含一个或多个函数调用的XML字符串
+        check_line_start: 布尔值，指示是否只解析行首的XML标签
 
     返回:
         包含所有函数调用信息的字典数组，每个字典包含函数名和参数
@@ -434,6 +436,14 @@ def parse_function_xml(xml_content: str) -> List[Dict[str, Any]]:
         if tag_start == -1:
             break  # 没有找到更多的标签
 
+        # 新增：如果 check_line_start 为 True，检查标签是否在行首
+        # 如果 '<' 不在行首 (即 tag_start > 0 且其前一个字符不是换行符)，
+        # 则将其视为普通文本的一部分，移动 position 并继续搜索
+        if check_line_start:
+            if tag_start > 0 and xml_content[tag_start - 1] != '\n':
+                position = tag_start + 1  # 从 '<' 之后继续搜索
+                continue
+
         # 检查是否是XML标签的开始（不是闭合标签）
         if tag_start + 1 < len(xml_content) and xml_content[tag_start + 1] == '/':
             # 这是一个结束标签，跳过
@@ -476,8 +486,8 @@ def parse_function_xml(xml_content: str) -> List[Dict[str, Any]]:
 
         # 如果是普通辅助标签（如tool_call），则在其内部寻找函数调用
         if tag_name in ["tool_call", "function_call", "tool", "function"]:
-            # 递归处理内部内容
-            nested_functions = parse_function_xml(tag_inner_content)
+            # 递归处理内部内容，此时不再检查行首条件
+            nested_functions = parse_function_xml(tag_inner_content, check_line_start=False)
             result_functions.extend(nested_functions)
         else:
             # 将当前标签作为函数名，解析其内部标签作为参数
@@ -646,7 +656,7 @@ def convert_functions_to_xml(functions_list):
 
 if __name__ == "__main__":
 
-    # 运行本文件：python -m aient.utils.scripts
+    # 运行本文件：python -m beswarm.aient.src.aient.utils.scripts
     os.system("clear")
     test_xml = """
 ✅ 好的，我现在读取 `README.md` 文件。
@@ -656,6 +666,7 @@ if __name__ == "__main__":
 </read_file>
 </tool_call>好的，我现在读取 `README.md` 文件。
 """
+    test_xml = """首先使用read_file工具读取论文内容，然后使用excute_command工具克隆代码仓库到本地。\n```xml\n<read_file>\n<file_path>/Users/yanyuming/Downloads/GitHub/OceanSynthesis/papers/2412.06410v1.pdf</file_path>\n</read_file>\n\n<excute_command>\n<command>git clone https://github.com/bartbussmann/BatchTopK.git</command>\n</excute_command>\n```"""
     test_xml = """
 ✅ 好的，我现在读取 `README.md` 文件。
 <read_file>
@@ -670,8 +681,7 @@ if __name__ == "__main__":
 <file_path>README.md</file_path>
 </read_file>
 </tool_call>
-好的，我现在读取 `README.md` 文件。
+好的，我现在读取 `README.md` 文件。`<answer> </answer>`
 """
 
-    test_xml = """首先使用read_file工具读取论文内容，然后使用excute_command工具克隆代码仓库到本地。\n```xml\n<read_file>\n<file_path>/Users/yanyuming/Downloads/GitHub/OceanSynthesis/papers/2412.06410v1.pdf</file_path>\n</read_file>\n\n<excute_command>\n<command>git clone https://github.com/bartbussmann/BatchTopK.git</command>\n</excute_command>\n```"""
     print(parse_function_xml(test_xml))

{aient-1.0.98.dist-info → aient-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.0.98
+Version: 1.1.0
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE

{aient-1.0.98.dist-info → aient-1.1.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ aient/core/.gitignore,sha256=5JRRlYYsqt_yt6iFvvzhbqh2FTUQMqwo6WwIuFzlGR8,13
 aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=_1wYZg_n9kb2A3C8xCboyqleH2iHc9scwOvtx9DPeok,7582
-aient/core/request.py,sha256=RChzDuH49gaJE-o5g65h3nCh-OsuHPwLkq8yuyYEcbo,61431
+aient/core/request.py,sha256=eGoGL8muYGvPbamUjcnyI8qH28uZBSG4Sc6Eko5LeJw,61653
 aient/core/response.py,sha256=8bS1nAoP6QOMDeDvJvZDVAt34kZ1DpWBI3PUGyza0ZU,31447
 aient/core/utils.py,sha256=CAFqWzICaKVysH9GLHBcp-VeOShisLjWGhEsh6-beWo,26365
 aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
@@ -14,7 +14,7 @@ aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhF
 aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 aient/models/base.py,sha256=z-Z0pJfTN2x0cuwfvu0BdMRY9O-RmLwHEnBIJN1x4Fg,6719
-aient/models/chatgpt.py,sha256=q8dx4PD57m4a3gJHrzJr7v_Pl8X0RKDBCZHZEtIMxkk,45480
+aient/models/chatgpt.py,sha256=vjmMELVO96NWsptrwoqcvyDS_YQfvE_piA-4G_hQR0I,45258
 aient/models/claude.py,sha256=JezghW7y0brl4Y5qiSHvnYR5prQCFywX4RViHt39pGI,26037
 aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -27,7 +27,7 @@ aient/plugins/excute_command.py,sha256=u-JOZ21dDcDx1j3O0KVIHAsa6MNuOxHFBdV3iCnTi
 aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
 aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 aient/plugins/list_directory.py,sha256=5ubm-mfrj-tanGSDp4M_Tmb6vQb3dx2-XVfQ2yL2G8A,1394
-aient/plugins/read_file.py,sha256=cJxGnhcz1_gjkgeemVyixLUiCvf-dWm-UtDfrbFdlLE,4857
+aient/plugins/read_file.py,sha256=-RRmaj-rSl8y--5VKnxCsZ1YQHe75OhnqvsDRLJyujM,8412
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4589
 aient/plugins/websearch.py,sha256=I4tYU7CGLdyG6Hd3yK19V-PoG5IbFI9FEEVggyrshRg,15227
@@ -36,9 +36,9 @@ aient/prompt/__init__.py,sha256=GBtn6-JDT8KHFCcuPpfSNE_aGddg5p4FEyMCy4BfwGs,20
 aient/prompt/agent.py,sha256=6f5ZB66Rb8y0iQScHMRhvXZ1qMM3YsKpCBPCTAAw2rg,24917
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
-aient/utils/scripts.py,sha256=JbYHsU3LLtxBcuO_2MWbSgpHpCgtVQe9FGEFJpUyejc,25926
-aient-1.0.98.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.0.98.dist-info/METADATA,sha256=GdOJCIW3xQrHk1tnVMoPunfvOB6pWHGPC-KLUlUOnF8,4945
-aient-1.0.98.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-aient-1.0.98.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.0.98.dist-info/RECORD,,
+aient/utils/scripts.py,sha256=NXmTxcZqHoRv3S13isLsv7kvqktXnA5ej7uMsxCJUe0,26656
+aient-1.1.0.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.0.dist-info/METADATA,sha256=T5DmF0T811yIKF3FF4_zrUqG_AdQbntaKagrQ-thfn4,4944
+aient-1.1.0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+aient-1.1.0.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.0.dist-info/RECORD,,