aient 1.0.42__tar.gz → 1.0.43__tar.gz

{aient-1.0.42/src/aient.egg-info → aient-1.0.43}/PKG-INFO

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

{aient-1.0.42 → aient-1.0.43}/setup.py

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

{aient-1.0.42 → aient-1.0.43}/src/aient/models/chatgpt.py

@@ -6,13 +6,13 @@ import httpx
 import asyncio
 import requests
 from typing import Set
-from typing import Union, Optional, Callable
+from typing import Union, Optional, Callable, List, Dict, Any
 from pathlib import Path
 
 
 from .base import BaseLLM
 from ..plugins import PLUGINS, get_tools_result_async, function_call_list, update_tools_config
-from ..utils.scripts import check_json, safe_get, async_generator_to_sync, parse_function_xml
+from ..utils.scripts import safe_get, async_generator_to_sync, parse_function_xml, parse_continuous_json
 from ..core.request import prepare_request_payload
 from ..core.response import fetch_response_stream
 
@@ -148,8 +148,8 @@ class chatgpt(BaseLLM):
                     })
                 self.conversation[convo_id].append({"role": role, "tool_call_id": function_call_id, "content": message})
             else:
-                self.conversation[convo_id].append({"role": "assistant", "content": "I will use tool: " + function_name + ". tool arguments:" + function_arguments + ". I will get the tool call result in the next user response."})
-                self.conversation[convo_id].append({"role": "user", "content": f"[{function_name} Result]\n\n" + message})
+                self.conversation[convo_id].append({"role": "assistant", "content": "I will use tool: " + function_arguments + ". I will get the tool call result in the next user response."})
+                self.conversation[convo_id].append({"role": "user", "content": message})
 
         else:
             print('\033[31m')
@@ -176,10 +176,6 @@ class chatgpt(BaseLLM):
                     if type(self.conversation[convo_id][message_index]["content"]) == dict \
                     and type(self.conversation[convo_id][message_index + 1]["content"]) == list:
                         self.conversation[convo_id][message_index]["content"] = [self.conversation[convo_id][message_index]["content"]]
-                    if type(self.conversation[convo_id][message_index]["content"]) == dict \
-                    and type(self.conversation[convo_id][message_index + 1]["content"]) == dict:
-                        self.conversation[convo_id][message_index]["content"] = [self.conversation[convo_id][message_index]["content"]]
-                        self.conversation[convo_id][message_index + 1]["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
@@ -407,62 +403,107 @@ class chatgpt(BaseLLM):
             response_role = "assistant"
 
         function_parameter = parse_function_xml(full_response)
-        if function_parameter['function_name']:
+        if function_parameter:
             need_function_call = True
-            function_call_name = function_parameter['function_name']
-            function_full_response = json.dumps(function_parameter['parameter'])
-            function_call_id = function_parameter['function_name'] + "_tool_call"
 
         # 处理函数调用
         if need_function_call:
             if self.print_log:
                 print("function_full_response", function_full_response)
-            function_full_response = check_json(function_full_response)
-            function_response = ""
 
-            if not self.function_calls_counter.get(function_call_name):
-                self.function_calls_counter[function_call_name] = 1
-            else:
-                self.function_calls_counter[function_call_name] += 1
-
-            has_args = safe_get(self.function_call_list, function_call_name, "parameters", "required", default=False)
-            if self.function_calls_counter[function_call_name] <= self.function_call_max_loop and (function_full_response != "{}" or not has_args):
-                function_call_max_tokens = self.truncate_limit - 1000
-                if function_call_max_tokens <= 0:
-                    function_call_max_tokens = int(self.truncate_limit / 2)
-                if self.print_log:
-                    print("\033[32m function_call", function_call_name, "max token:", function_call_max_tokens, "\033[0m")
+            function_response = ""
+            # 定义处理单个工具调用的辅助函数
+            async def process_single_tool_call(tool_name, tool_args, tool_id):
+                nonlocal function_response
 
-                # 处理函数调用结果
-                if is_async:
-                    async for chunk in get_tools_result_async(
-                        function_call_name, function_full_response, function_call_max_tokens,
-                        model or self.engine, chatgpt, kwargs.get('api_key', self.api_key),
-                        self.api_url, use_plugins=False, model=model or self.engine,
-                        add_message=self.add_to_conversation, convo_id=convo_id, language=language
-                    ):
-                        if "function_response:" in chunk:
-                            function_response = chunk.replace("function_response:", "")
-                        else:
-                            yield chunk
+                if not self.function_calls_counter.get(tool_name):
+                    self.function_calls_counter[tool_name] = 1
                 else:
-                    async def run_async():
-                        nonlocal function_response
+                    self.function_calls_counter[tool_name] += 1
+
+                tool_response = ""
+                has_args = safe_get(self.function_call_list, tool_name, "parameters", "required", default=False)
+                if self.function_calls_counter[tool_name] <= self.function_call_max_loop and (tool_args != "{}" or not has_args):
+                    function_call_max_tokens = self.truncate_limit - 1000
+                    if function_call_max_tokens <= 0:
+                        function_call_max_tokens = int(self.truncate_limit / 2)
+                    if self.print_log:
+                        print(f"\033[32m function_call {tool_name}, max token: {function_call_max_tokens} \033[0m")
+
+                    # 处理函数调用结果
+                    if is_async:
                         async for chunk in get_tools_result_async(
-                            function_call_name, function_full_response, function_call_max_tokens,
+                            tool_name, tool_args, function_call_max_tokens,
                             model or self.engine, chatgpt, kwargs.get('api_key', self.api_key),
                             self.api_url, use_plugins=False, model=model or self.engine,
                             add_message=self.add_to_conversation, convo_id=convo_id, language=language
                         ):
-                            if "function_response:" in chunk:
-                                function_response = chunk.replace("function_response:", "")
-                            else:
+                            yield chunk
+                    else:
+                        async def run_async():
+                            async for chunk in get_tools_result_async(
+                                tool_name, tool_args, function_call_max_tokens,
+                                model or self.engine, chatgpt, kwargs.get('api_key', self.api_key),
+                                self.api_url, use_plugins=False, model=model or self.engine,
+                                add_message=self.add_to_conversation, convo_id=convo_id, language=language
+                            ):
                                 yield chunk
 
-                    for chunk in async_generator_to_sync(run_async()):
-                        yield chunk
-            else:
-                function_response = "无法找到相关信息，停止使用 tools"
+                        for chunk in async_generator_to_sync(run_async()):
+                            yield chunk
+                else:
+                    tool_response = f"无法找到相关信息，停止使用工具 {tool_name}"
+
+                yield tool_response
+
+            # 使用统一的JSON解析逻辑
+            try:
+                if function_full_response:
+                    function_parameter = parse_continuous_json(function_full_response, function_call_name)
+            except Exception as e:
+                print(f"解析JSON失败: {e}")
+                # 保持原始工具调用
+                tool_calls = [{
+                    'function_name': function_call_name,
+                    'parameter': function_full_response,
+                    'function_call_id': function_call_id
+                }]
+
+            # 统一处理逻辑，将所有情况转换为列表处理
+            if isinstance(function_parameter, list) and function_parameter:
+                # 多个工具调用
+                tool_calls = function_parameter
+
+            # 处理所有工具调用
+            all_responses = []
+
+            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_id = tool_info.get('function_call_id', tool_name + "_tool_call")
+
+                tool_response = ""
+                if is_async:
+                    async for chunk in process_single_tool_call(tool_name, tool_args, tool_id):
+                        if isinstance(chunk, str) and "function_response:" in chunk:
+                            tool_response = chunk.replace("function_response:", "")
+                        else:
+                            yield chunk
+                else:
+                    for chunk in async_generator_to_sync(process_single_tool_call(tool_name, tool_args, tool_id)):
+                        if isinstance(chunk, str) and "function_response:" in chunk:
+                            tool_response = chunk.replace("function_response:", "")
+                        else:
+                            yield chunk
+                all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
+
+            # 合并所有工具响应
+            function_response = "\n\n".join(all_responses)
+
+            # 使用第一个工具的名称和参数作为历史记录
+            function_call_name = tool_calls[0]['function_name']
+            function_full_response = function_full_response or json.dumps(tool_calls) if not isinstance(tool_calls[0]['parameter'], str) else tool_calls
+            function_call_id = tool_calls[0].get('function_call_id', function_call_name + "_tool_call")
 
             response_role = "tool"
 

{aient-1.0.42 → aient-1.0.43}/src/aient/utils/scripts.py

@@ -457,95 +457,205 @@ class XmlMatcher(Generic[R]):
         self._update(chunk)
         return self._pop()
 
-def parse_function_xml(xml_content: str) -> Dict[str, Any]:
+def parse_function_xml(xml_content: str) -> List[Dict[str, Any]]:
     """
-    解析XML格式的函数调用信息，转换为字典格式
+    解析XML格式的函数调用信息，转换为字典数组格式
 
     参数:
-        xml_content: 包含函数调用的XML字符串
+        xml_content: 包含一个或多个函数调用的XML字符串
 
     返回:
-        包含函数名和参数的字典
+        包含所有函数调用信息的字典数组，每个字典包含函数名和参数
     """
-    # 首先，找出根标签（函数名）
-    # function_matcher = XmlMatcher[XmlMatcherResult]("", position=0)
-    # results = function_matcher.final(xml_content)
+    result_functions = []
 
-    # 找到第一个匹配的标签
-    function_name = ""
-    function_content = ""
+    position = 0
+    while position < len(xml_content):
+        # 寻找下一个开始标签
+        tag_start = xml_content.find("<", position)
+        if tag_start == -1:
+            break  # 没有找到更多的标签
+
+        # 检查是否是XML标签的开始（不是闭合标签）
+        if tag_start + 1 < len(xml_content) and xml_content[tag_start + 1] == '/':
+            # 这是一个结束标签，跳过
+            position = tag_start + 1
+            continue
 
-    # 寻找第一个开始标签
-    tag_start = xml_content.find("<")
-    if tag_start != -1:
         tag_end = xml_content.find(">", tag_start)
-        if tag_end != -1:
-            # 提取标签名（函数名）
-            tag_content = xml_content[tag_start+1:tag_end].strip()
-            # 处理可能有属性的情况
-            function_name = tag_content.split()[0] if " " in tag_content else tag_content
-
-            # 使用XmlMatcher提取该函数标签内的内容
-            content_matcher = XmlMatcher[XmlMatcherResult](function_name)
-            match_results = content_matcher.final(xml_content)
-
-            for result in match_results:
-                if result.matched:
-                    function_content = result.data
-                    break
-
-    # 如果没有找到函数名或内容，返回空结果
-    if not function_name or not function_content:
-        return {'function_name': '', 'parameter': {}}
-
-    # 解析参数
-    parameters = {}
-    lines = function_content.strip().split('\n')
-    current_param = None
-    current_value = []
-
-    for line in lines:
-        line = line.strip()
-        if line.startswith('<') and '>' in line:
-            # 新参数开始
+        if tag_end == -1:
+            break  # 标签未正确关闭
+
+        # 提取标签名（函数名）
+        tag_content = xml_content[tag_start+1:tag_end].strip()
+        # 处理可能有属性的情况
+        function_name = tag_content.split()[0] if " " in tag_content else tag_content
+
+        if not function_name:
+            position = tag_end + 1
+            continue  # 空标签名，跳过
+
+        # 查找整个函数调用的起止范围
+        full_start_tag = f"<{function_name}"
+        full_end_tag = f"</{function_name}>"
+
+        # 从当前位置找到开始标签
+        start_pos = xml_content.find(full_start_tag, position)
+        if start_pos == -1:
+            position = tag_end + 1
+            continue
+
+        # 找到对应的结束标签
+        end_pos = xml_content.find(full_end_tag, start_pos)
+        if end_pos == -1:
+            # 没有找到结束标签，可能是未闭合标签
+            position = tag_end + 1
+            continue
+
+        # 计算整个函数标签内容，包括开始和结束标签
+        end_pos_complete = end_pos + len(full_end_tag)
+        full_tag_content = xml_content[start_pos:end_pos_complete]
+
+        # 使用XmlMatcher提取该函数标签内的内容
+        content_matcher = XmlMatcher[XmlMatcherResult](function_name)
+        match_results = content_matcher.final(full_tag_content)
+
+        function_content = ""
+        for result in match_results:
+            if result.matched:
+                function_content = result.data
+                break
+
+        # 解析参数
+        parameters = {}
+        if function_content:
+            lines = function_content.strip().split('\n')
+            current_param = None
+            current_value = []
+
+            for line in lines:
+                line = line.strip()
+                if line.startswith('<') and '>' in line and not line.startswith('</'):
+                    # 新参数开始
+                    if current_param and current_value:
+                        # 保存之前的参数
+                        parameters[current_param] = '\n'.join(current_value).strip()
+                        current_value = []
+
+                    # 提取参数名
+                    param_start = line.find('<') + 1
+                    param_end = line.find('>', param_start)
+                    if param_end != -1:
+                        param = line[param_start:param_end]
+                        # 检查是否是闭合标签
+                        if not param.startswith('/'):
+                            current_param = param
+                            # 检查是否在同一行有值
+                            rest = line[param_end+1:]
+                            if rest and not rest.startswith('</'):
+                                current_value.append(rest)
+                elif line.startswith('</') and '>' in line:
+                    # 参数结束
+                    if current_param and current_value:
+                        param_end_tag = f"</{current_param}>"
+                        if line.strip() == param_end_tag:
+                            parameters[current_param] = '\n'.join(current_value).strip()
+                            current_param = None
+                            current_value = []
+                elif current_param:
+                    # 继续收集当前参数的值
+                    current_value.append(line)
+
+            # 处理最后一个参数
             if current_param and current_value:
-                # 保存之前的参数
                 parameters[current_param] = '\n'.join(current_value).strip()
-                current_value = []
-
-            # 提取参数名
-            param_start = line.find('<') + 1
-            param_end = line.find('>', param_start)
-            if param_end != -1:
-                param = line[param_start:param_end]
-                # 检查是否是闭合标签
-                if param.startswith('/'):
-                    if param[1:] == current_param:
-                        current_param = None
-                else:
-                    current_param = param
-                    # 检查是否在同一行有值
-                    rest = line[param_end+1:]
-                    if rest and not rest.startswith('</'):
-                        current_value.append(rest)
-        elif current_param:
-            # 继续收集当前参数的值
-            current_value.append(line)
-
-    # 处理最后一个参数
-    if current_param and current_value:
-        parameters[current_param] = '\n'.join(current_value).strip()
-
-    # 清理参数值中可能的结束标签
-    for param, value in parameters.items():
-        end_tag = f'</{param}>'
-        if value.endswith(end_tag):
-            parameters[param] = value[:-len(end_tag)].strip()
-
-    return {
-        'function_name': function_name,
-        'parameter': parameters
-    }
+
+            # 清理参数值中可能的结束标签
+            for param, value in parameters.items():
+                end_tag = f'</{param}>'
+                if value.endswith(end_tag):
+                    parameters[param] = value[:-len(end_tag)].strip()
+
+        # 将解析的函数添加到结果数组
+        result_functions.append({
+            'function_name': function_name,
+            'parameter': parameters
+        })
+
+        # 更新位置到当前标签之后，继续查找下一个函数
+        position = end_pos_complete
+
+    return result_functions
+
+def parse_continuous_json(json_str: str, function_name: str = "") -> List[Dict[str, Any]]:
+    """
+    解析JSON字符串，无论是单个JSON对象还是多个连续的JSON对象
+    都能正确解析并转换为结构化的函数调用格式列表
+
+    Args:
+        json_str: JSON字符串，可能是单个JSON对象或多个连续JSON对象
+        function_name: 函数名称，默认为空字符串
+
+    Returns:
+        包含函数调用信息的字典列表
+    """
+    if not json_str or not json_str.strip():
+        return []
+
+    # 尝试直接解析为单个JSON
+    try:
+        json_obj = json.loads(json_str)
+        tool_id = function_name + "_single" if function_name else "tool_single"
+        return [{
+            'function_name': function_name or "default_function",
+            'parameter': json_obj,
+            'function_call_id': tool_id
+        }]
+    except json.JSONDecodeError:
+        # 如果不是单个JSON，尝试解析为连续JSON
+        pass
+
+    result = []
+    idx = 0
+    length = len(json_str)
+
+    while idx < length:
+        # 找到JSON对象的开始
+        if json_str[idx] != '{':
+            idx += 1
+            continue
+
+        # 跟踪括号的平衡
+        balance = 1
+        start = idx
+        idx += 1
+
+        # 寻找匹配的右括号
+        while idx < length and balance > 0:
+            if json_str[idx] == '{':
+                balance += 1
+            elif json_str[idx] == '}':
+                balance -= 1
+            idx += 1
+
+        if balance == 0:
+            # 提取出一个完整的JSON对象
+            json_obj_str = json_str[start:idx]
+            try:
+                # 解析JSON对象
+                json_obj = json.loads(json_obj_str)
+                # 构造函数调用信息
+                tool_id = function_name + "_" + str(len(result)) if function_name else "tool_" + str(len(result))
+                result.append({
+                    'function_name': function_name or "default_function",
+                    'parameter': json_obj,
+                    'function_call_id': tool_id
+                })
+            except json.JSONDecodeError:
+                # 忽略解析错误
+                pass
+
+    return result
 
 if __name__ == "__main__":
     os.system("clear")

{aient-1.0.42 → aient-1.0.43/src/aient.egg-info}/PKG-INFO

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