aient 1.2.28__tar.gz → 1.2.31__tar.gz

{aient-1.2.28 → aient-1.2.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.2.28
+Version: 1.2.31
 Summary: Aient: The Awakening of Agent.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{aient-1.2.28 → aient-1.2.31}/aient/architext/architext/core.py

@@ -104,9 +104,10 @@ class ContextProvider(ABC):
         return NotImplemented
 
 class Texts(ContextProvider):
-    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: Optional[str] = None, visible: bool = True):
+    def __init__(self, text: Optional[Union[str, Callable[[], str]]] = None, name: Optional[str] = None, visible: bool = True, newline: bool = False):
         if text is None and name is None:
             raise ValueError("Either 'text' or 'name' must be provided.")
+        self.newline = newline
 
         # Ensure that non-callable inputs are treated as strings
         if not callable(text):
@@ -373,8 +374,11 @@ class Message(ABC):
         for item in self._items:
             block = item.get_content_block()
             if block and block.content is not None:
+                # Check if it's a Texts provider with newline=True
+                # and it's not the very first item with content.
+                if isinstance(item, Texts) and hasattr(item, 'newline') and item.newline and final_parts:
+                    final_parts.append("\n\n")
                 final_parts.append(block.content)
-
         return "".join(final_parts)
 
     def pop(self, name: str) -> Optional[ContextProvider]:
@@ -468,6 +472,35 @@ class Message(ABC):
         # and our custom __eq__ on ContextProvider handles the comparison logic.
         return item in self._items
 
+    def has(self, provider_type: type) -> bool:
+        """Checks if the message contains a provider of a specific type."""
+        if not isinstance(provider_type, type) or not issubclass(provider_type, ContextProvider):
+            raise TypeError("provider_type must be a subclass of ContextProvider")
+        return any(isinstance(p, provider_type) for p in self._items)
+
+    def lstrip(self, provider_type: type):
+        """
+        从消息的左侧（开头）移除所有指定类型的 provider。
+        移除操作会一直持续，直到遇到一个不同类型的 provider 为止。
+        """
+        while self._items and type(self._items[0]) is provider_type:
+            self.pop(self._items[0].name)
+
+    def rstrip(self, provider_type: type):
+        """
+        从消息的右侧（末尾）移除所有指定类型的 provider。
+        移除操作会一直持续，直到遇到一个不同类型的 provider 为止。
+        """
+        while self._items and type(self._items[-1]) is provider_type:
+            self.pop(self._items[-1].name)
+
+    def strip(self, provider_type: type):
+        """
+        从消息的两侧移除所有指定类型的 provider。
+        """
+        self.lstrip(provider_type)
+        self.rstrip(provider_type)
+
     def __bool__(self) -> bool:
         return bool(self._items)
     def get(self, key: str, default: Any = None) -> Any:

{aient-1.2.28 → aient-1.2.31}/aient/architext/test/test.py

@@ -1454,6 +1454,130 @@ Files: {Files(visible=True, name="files")}
         self.assertEqual(len(message_mixed.provider()), 1)
         self.assertIsInstance(message_mixed.provider()[0], Texts)
 
+    async def test_zaa_has_method_for_provider_type_check(self):
+        """测试 Message.has(type) 方法是否能正确检查 provider 类型"""
+        # 1. 创建一个混合类型的消息
+        message_with_text = UserMessage(Texts("hi"), Images("url"))
+
+        # 2. 测试存在的情况
+        # This line is expected to fail with an AttributeError before implementation
+        self.assertTrue(message_with_text.has(Texts))
+        self.assertTrue(message_with_text.has(Images))
+
+        # 3. 测试不存在的情况
+        self.assertFalse(message_with_text.has(Tools))
+
+        # 4. 测试空消息
+        empty_message = UserMessage()
+        self.assertFalse(empty_message.has(Texts))
+
+        # 5. 测试传入无效类型
+        with self.assertRaises(TypeError):
+            message_with_text.has(str)
+
+        with self.assertRaises(TypeError):
+            # Also test with a class that is not a subclass of ContextProvider
+            class NotAProvider: pass
+            message_with_text.has(NotAProvider)
+
+    async def test_zab_lstrip_and_rstrip(self):
+        """测试 lstrip, rstrip, 和 strip 方法是否能正确移除两侧的特定类型的 provider"""
+        # 1. 定义一个用于测试的子类
+        class SpecialTexts(Texts):
+            pass
+        url = "data:image/png;base64,FAKE_IMG"
+
+        # 2. 创建一个复杂的测试消息
+        message = UserMessage(
+            Texts("leading1"),
+            Texts("leading2"),
+            Images(url, name="image1"),
+            Texts("middle"),
+            SpecialTexts("special_middle"),
+            Images(url, name="image2"),
+            Texts("trailing1"),
+            SpecialTexts("special_trailing"), # rstrip(Texts) should stop here
+            Texts("trailing2")
+        )
+
+        # 3. 测试 rstrip(Texts)
+        r_stripped_message = UserMessage(*message.provider()) # 创建副本
+        r_stripped_message.rstrip(Texts)
+        # 应移除 "trailing2"，但在 "special_trailing" 处停止
+        self.assertEqual(len(r_stripped_message), 8)
+        self.assertIs(type(r_stripped_message[-1]), SpecialTexts)
+
+        # 4. 测试 lstrip(Texts)
+        l_stripped_message = UserMessage(*message.provider()) # 创建副本
+        l_stripped_message.lstrip(Texts)
+        # 应移除 "leading1" 和 "leading2"，但在 "image1" 处停止
+        self.assertEqual(len(l_stripped_message), 7)
+        self.assertIs(type(l_stripped_message[0]), Images)
+
+        # 5. 测试 strip(Texts)
+        stripped_message = UserMessage(*message.provider()) # 创建副本
+        stripped_message.strip(Texts)
+        # 应同时移除 "leading1", "leading2", 和 "trailing2"
+        self.assertEqual(len(stripped_message), 6)
+        self.assertIs(type(stripped_message[0]), Images)
+        self.assertIs(type(stripped_message[-1]), SpecialTexts)
+
+        # 6. 测试在一个只包含一种类型的消息上进行剥离
+        only_texts = UserMessage(Texts("a"), Texts("b"))
+        only_texts.strip(Texts)
+        self.assertEqual(len(only_texts), 0)
+
+        # 7. 测试剥离一个不包含目标类型的消息
+        only_images = UserMessage(Images("url1"), Images("url2"))
+        only_images.strip(Texts)
+        self.assertEqual(len(only_images), 2) # 不应改变
+
+        # 8. 测试在一个空消息上进行剥离
+        empty_message = UserMessage()
+        empty_message.strip(Texts)
+        self.assertEqual(len(empty_message), 0)
+
+        # 9. 测试剥离子类
+        message_ending_with_special = UserMessage(Texts("a"), SpecialTexts("b"))
+        message_ending_with_special.rstrip(SpecialTexts)
+        self.assertEqual(len(message_ending_with_special), 1)
+        self.assertIsInstance(message_ending_with_special[0], Texts)
+
+    async def test_zac_texts_join_parameter(self):
+        """测试 Texts provider 是否支持通过参数控制拼接方式"""
+        # 1. 测试默认行为：直接拼接
+        message_default = UserMessage(
+            Texts("First line."),
+            Texts("Second line.")
+        )
+        rendered_default = await message_default.render_latest()
+        self.assertEqual(rendered_default['content'], "First line.Second line.")
+
+        # 2. 测试新功能：使用 \n\n 拼接
+        # 假设新参数为 `newline=True`
+        message_newline = UserMessage(
+            Texts("First paragraph."),
+            Texts("Second paragraph.", newline=True)
+        )
+        rendered_newline = await message_newline.render_latest()
+        self.assertEqual(rendered_newline['content'], "First paragraph.\n\nSecond paragraph.")
+
+        # 3. 测试多个 provider 的情况
+        message_multiple = UserMessage(
+            Texts("First."),
+            Texts("Second.", newline=True),
+            Texts("Third.", newline=True)
+        )
+        rendered_multiple = await message_multiple.render_latest()
+        self.assertEqual(rendered_multiple['content'], "First.\n\nSecond.\n\nThird.")
+
+        # 4. 测试只有一个 provider 的情况
+        message_single = UserMessage(
+            Texts("Only one.", newline=True)
+        )
+        rendered_single = await message_single.render_latest()
+        self.assertEqual(rendered_single['content'], "Only one.")
+
 
 # ==============================================================================
 # 6. 演示

{aient-1.2.28 → aient-1.2.31}/aient/core/request.py

@@ -1,5 +1,6 @@
 import re
 import json
+import copy
 import httpx
 import base64
 import asyncio
@@ -57,7 +58,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
     try:
         request_messages = [Message(role="user", content=request.prompt)]
     except:
-        request_messages = request.messages
+        request_messages = copy.deepcopy(request.messages)
     for msg in request_messages:
         if msg.role == "assistant":
             msg.role = "model"
@@ -399,7 +400,8 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
     systemInstruction = None
     system_prompt = ""
     function_arguments = None
-    for msg in request.messages:
+    request_messages = copy.deepcopy(request.messages)
+    for msg in request_messages:
         if msg.role == "assistant":
             msg.role = "model"
         tool_calls = None

{aient-1.2.28 → aient-1.2.31}/aient/core/utils.py

@@ -228,7 +228,12 @@ async def update_initial_model(provider):
 def safe_get(data, *keys, default=None):
     for key in keys:
         try:
-            data = data[key] if isinstance(data, (dict, list)) else data.get(key)
+            if isinstance(data, (dict, list)):
+                data = data[key]
+            elif isinstance(key, str) and hasattr(data, key):
+                data = getattr(data, key)
+            else:
+                data = data.get(key)
         except (KeyError, IndexError, AttributeError, TypeError):
             return default
     if not data:

{aient-1.2.28 → aient-1.2.31}/aient/models/audio.py

@@ -4,13 +4,13 @@ import json
 from .base import BaseLLM
 
 API = os.environ.get('API', None)
-API_URL = os.environ.get('API_URL', None)
+BASE_URL = os.environ.get('BASE_URL', None)
 
 class whisper(BaseLLM):
     def __init__(
         self,
         api_key: str,
-        api_url: str = (os.environ.get("API_URL") or "https://api.openai.com/v1/audio/transcriptions"),
+        api_url: str = (os.environ.get("BASE_URL") or "https://api.openai.com/v1/audio/transcriptions"),
         timeout: float = 20,
     ):
         super().__init__(api_key, api_url=api_url, timeout=timeout)

{aient-1.2.28 → aient-1.2.31}/aient/models/base.py

@@ -11,8 +11,8 @@ class BaseLLM:
     def __init__(
         self,
         api_key: str = None,
-        engine: str = os.environ.get("GPT_ENGINE") or "gpt-3.5-turbo",
-        api_url: str = (os.environ.get("API_URL", None) or "https://api.openai.com/v1/chat/completions"),
+        engine: str = os.environ.get("MODEL") or "gpt-3.5-turbo",
+        api_url: str = (os.environ.get("BASE_URL", None) or "https://api.openai.com/v1/chat/completions"),
         system_prompt: str = prompt.chatgpt_system_prompt,
         proxy: str = None,
         timeout: float = 600,

{aient-1.2.28 → aient-1.2.31}/aient/models/chatgpt.py

@@ -17,6 +17,21 @@ from ..core.request import prepare_request_payload
 from ..core.response import fetch_response_stream, fetch_response
 from ..architext.architext import Messages, SystemMessage, UserMessage, AssistantMessage, ToolCalls, ToolResults, Texts, RoleMessage, Images, Files
 
+class ToolResult(Texts):
+    def __init__(self, tool_name: str, tool_args: str, tool_response: str, name: Optional[str] = None, visible: bool = True, newline: bool = True):
+        super().__init__(text=tool_response, name=name or f"tool_result_{tool_name}", visible=visible, newline=newline)
+        self.tool_name = tool_name
+        self.tool_args = tool_args
+
+    async def render(self) -> Optional[str]:
+        tool_response = await super().render()
+        if tool_response is None:
+            tool_response = ""
+        if self.tool_args:
+            return f"[{self.tool_name}({self.tool_args}) Result]:\n\n{tool_response}"
+        else:
+            return f"[{self.tool_name} Result]:\n\n{tool_response}"
+
 class APITimeoutError(Exception):
     """Custom exception for API timeout errors."""
     pass
@@ -74,8 +89,8 @@ class chatgpt(BaseLLM):
     def __init__(
         self,
         api_key: str = None,
-        engine: str = os.environ.get("GPT_ENGINE") or "gpt-4o",
-        api_url: str = (os.environ.get("API_URL") or "https://api.openai.com/v1/chat/completions"),
+        engine: str = os.environ.get("MODEL") or "gpt-4o",
+        api_url: str = (os.environ.get("BASE_URL") or "https://api.openai.com/v1/chat/completions"),
         system_prompt: str = "You are ChatGPT, a large language model trained by OpenAI. Respond conversationally",
         proxy: str = None,
         timeout: float = 600,
@@ -172,8 +187,8 @@ class chatgpt(BaseLLM):
                 self.conversation[convo_id].append(ToolCalls(tool_calls))
                 self.conversation[convo_id].append(ToolResults(tool_call_id=function_call_id, content=message))
             else:
-                last_user_message = self.conversation[convo_id][-1]["content"]
-                if last_user_message != message:
+                last_user_message = self.conversation[convo_id][-1]
+                if last_user_message != UserMessage(message):
                     image_message_list = UserMessage()
                     if isinstance(function_arguments, str):
                         functions_list = json.loads(function_arguments)
@@ -564,7 +579,7 @@ class chatgpt(BaseLLM):
                 tool_calls = function_parameter
 
             # 处理所有工具调用
-            all_responses = []
+            all_responses = UserMessage()
 
             for tool_info in tool_calls:
                 tool_name = tool_info['function_name']
@@ -584,27 +599,28 @@ class chatgpt(BaseLLM):
                             tool_response = chunk.replace("function_response:", "")
                         else:
                             yield chunk
-                if tool_name == "read_file" and "<tool_error>" not in tool_response:
-                    self.conversation[convo_id].provider("files").update(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 == "get_knowledge_graph_tree" and "<tool_error>" not in tool_response:
-                    self.conversation[convo_id].provider("knowledge_graph").visible = True
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nGet knowledge graph tree successfully! The knowledge graph tree has been updated in the tag <knowledge_graph_tree>.")
-                elif tool_name == "write_to_file" and "<tool_error>" not in tool_response:
-                    all_responses.append(f"[{tool_name} Result]:\n\n{tool_response}")
-                elif tool_name == "read_image" and "<tool_error>" not in tool_response:
-                    tool_info["base64_image"] = tool_response
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead image successfully!")
-                elif tool_response.startswith("data:image/") and ";base64," in tool_response and "<tool_error>" not in tool_response:
-                    tool_info["base64_image"] = tool_response
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\nRead image successfully!")
-                else:
-                    all_responses.append(f"[{tool_name}({tool_args}) Result]:\n\n{tool_response}")
+                final_tool_response = tool_response
+                if "<tool_error>" not in tool_response:
+                    if tool_name == "read_file":
+                        self.conversation[convo_id].provider("files").update(tool_info['parameter']["file_path"], tool_response)
+                        final_tool_response = "Read file successfully! The file content has been updated in the tag <latest_file_content>."
+                    elif tool_name == "get_knowledge_graph_tree":
+                        self.conversation[convo_id].provider("knowledge_graph").visible = True
+                        final_tool_response = "Get knowledge graph tree successfully! The knowledge graph tree has been updated in the tag <knowledge_graph_tree>."
+                    elif tool_name == "write_to_file":
+                        tool_args = None
+                    elif tool_name == "read_image":
+                        tool_info["base64_image"] = tool_response
+                        final_tool_response = "Read image successfully!"
+                    elif tool_response.startswith("data:image/") and ";base64," in tool_response:
+                        tool_info["base64_image"] = tool_response
+                        final_tool_response = "Read image successfully!"
+                all_responses.append(ToolResult(tool_name, tool_args, final_tool_response))
 
             # 合并所有工具响应
-            function_response = "\n\n".join(all_responses).strip()
+            function_response = all_responses
             if missing_required_params:
-                function_response += "\n\n" + "\n\n".join(missing_required_params)
+                function_response.append(Texts("\n\n".join(missing_required_params)))
 
             # 使用第一个工具的名称和参数作为历史记录
             function_call_name = tool_calls[0]['function_name']

{aient-1.2.28 → aient-1.2.31}/aient/plugins/image.py

@@ -5,13 +5,13 @@ from ..models.base import BaseLLM
 from .registry import register_tool
 
 API = os.environ.get('API', None)
-API_URL = os.environ.get('API_URL', None)
+BASE_URL = os.environ.get('BASE_URL', None)
 
 class dalle3(BaseLLM):
     def __init__(
         self,
         api_key: str,
-        api_url: str = (os.environ.get("API_URL") or "https://api.openai.com/v1/images/generations"),
+        api_url: str = (os.environ.get("BASE_URL") or "https://api.openai.com/v1/images/generations"),
         timeout: float = 20,
     ):
         super().__init__(api_key, api_url=api_url, timeout=timeout)

{aient-1.2.28 → aient-1.2.31}/aient/utils/prompt.py

@@ -90,10 +90,6 @@ chatgpt_system_prompt = (
     "You are ChatGPT, a large language model trained by OpenAI. Use simple characters to represent mathematical symbols. Do not use LaTeX commands. Respond conversationally"
 )
 
-claude_system_prompt = (
-    "You are Claude, a large language model trained by Anthropic. Use simple characters to represent mathematical symbols. Do not use LaTeX commands. Respond conversationally in {}."
-)
-
 search_system_prompt = (
     "You are ChatGPT, a large language model trained by OpenAI. Respond conversationally in {}."
     "You can break down the task into multiple steps and search the web to answer my questions one by one."

{aient-1.2.28 → aient-1.2.31}/aient/utils/scripts.py

@@ -134,14 +134,6 @@ def is_surrounded_by_chinese(text, index):
 def replace_char(string, index, new_char):
     return string[:index] + new_char + string[index+1:]
 
-def claude_replace(text):
-    Punctuation_mapping = {",": "，", ":": "：", "!": "！", "?": "？", ";": "；"}
-    key_list = list(Punctuation_mapping.keys())
-    for i in range(len(text)):
-        if is_surrounded_by_chinese(text, i) and (text[i] in key_list):
-            text = replace_char(text, i, Punctuation_mapping[text[i]])
-    return text
-
 def safe_get(data, *keys, default=None):
     for key in keys:
         try:

{aient-1.2.28 → aient-1.2.31}/aient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.2.28
+Version: 1.2.31
 Summary: Aient: The Awakening of Agent.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{aient-1.2.28 → aient-1.2.31}/aient.egg-info/SOURCES.txt

@@ -48,7 +48,5 @@ test/test_ddg_search.py
 test/test_google_search.py
 test/test_ollama.py
 test/test_plugin.py
-test/test_search.py
 test/test_url.py
-test/test_whisper.py
-test/test_yjh.py
+test/test_whisper.py

{aient-1.2.28 → aient-1.2.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aient"
-version = "1.2.28"
+version = "1.2.31"
 description = "Aient: The Awakening of Agent."
 readme = "README.md"
 requires-python = ">=3.11"

{aient-1.2.28 → aient-1.2.31}/test/test_whisper.py

@@ -10,5 +10,5 @@ files = {
     'model': (None, 'whisper-1')
 }
 
-response = requests.post(os.environ.get('API_URL', None), headers=headers, files=files)
+response = requests.post(os.environ.get('BASE_URL', None), headers=headers, files=files)
 print(response.text)

aient-1.2.28/test/test_search.py

@@ -1,18 +0,0 @@
-import os
-from aient.models import chatgpt
-
-API = os.environ.get('API', None)
-API_URL = os.environ.get('API_URL', None)
-GPT_ENGINE = os.environ.get('GPT_ENGINE', 'gpt-4o')
-
-systemprompt = (
-    "You are ChatGPT, a large language model trained by OpenAI. Respond conversationally"
-)
-bot = chatgpt(api_key=API, api_url=API_URL, engine=GPT_ENGINE, system_prompt=systemprompt, print_log=True)
-for text in bot.ask_stream("搜索上海的天气"):
-# for text in bot.ask_stream("我在广州市，想周一去香港，周四早上回来，是去游玩，请你帮我规划整个行程。包括细节，如交通，住宿，餐饮，价格，等等，最好细节到每天各个部分的时间，花费，等等，尽量具体，用户一看就能直接执行的那种"):
-# for text in bot.ask_stream("上海有哪些好玩的地方？"):
-# for text in bot.ask_stream("just say test"):
-# for text in bot.ask_stream("我在上海想去重庆旅游，我只有2000元预算，我想在重庆玩一周，你能帮我规划一下吗？"):
-# for text in bot.ask_stream("我在上海想去重庆旅游，我有一天的时间。你能帮我规划一下吗？"):
-    print(text, end="")

aient-1.2.28/test/test_yjh.py

@@ -1,21 +0,0 @@
-import os
-from datetime import datetime
-
-from aient.models import chatgpt
-from aient.utils import prompt
-
-API = os.environ.get('API', None)
-API_URL = os.environ.get('API_URL', None)
-GPT_ENGINE = os.environ.get('GPT_ENGINE', 'gpt-4o')
-LANGUAGE = os.environ.get('LANGUAGE', 'Simplified Chinese')
-
-current_date = datetime.now()
-Current_Date = current_date.strftime("%Y-%m-%d")
-
-systemprompt = os.environ.get('SYSTEMPROMPT', prompt.system_prompt.format(LANGUAGE, Current_Date))
-
-bot = chatgpt(api_key=API, api_url=API_URL, engine=GPT_ENGINE, system_prompt=systemprompt)
-for text in bot.ask_stream("arXiv:2210.10716 这篇文章讲了啥"):
-# for text in bot.ask_stream("今天的微博热搜有哪些？"):
-# for text in bot.ask_stream("你现在是什么版本？"):
-    print(text, end="")