beswarm 0.2.81__py3-none-any.whl → 0.2.82__py3-none-any.whl

beswarm/aient/aient/architext/test/test_save_load.py

@@ -0,0 +1,93 @@
+import asyncio
+import os
+import sys
+
+# Add the project root to the Python path
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+
+from architext.core import (
+    Messages,
+    SystemMessage,
+    UserMessage,
+    AssistantMessage,
+    ToolCalls,
+    ToolResults,
+    Texts,
+    Tools,
+    Files,
+)
+
+async def main():
+    """
+    Tests the save and load functionality of the Messages class using pickle.
+    """
+    print("--- Test Save/Load (pickle) ---")
+
+    # 1. Create an initial Messages object
+    messages = Messages(
+        SystemMessage(Texts("system_prompt", "You are a helpful assistant.")),
+        UserMessage(Texts("user_input", "What is the weather in Shanghai?")),
+        AssistantMessage(Texts("thought", "I should call a tool for this.")),
+        ToolCalls(tool_calls=[{
+            'id': 'call_1234',
+            'type': 'function',
+            'function': {'name': 'get_weather', 'arguments': '{"location": "Shanghai"}'}
+        }]),
+        ToolResults(tool_call_id="call_1234", content='{"temperature": "25°C"}')
+    )
+
+    # Add a message with Files provider
+    files_provider = Files()
+    files_provider.update("test.txt", "This is a test file.")
+    messages.append(UserMessage(files_provider))
+
+    # Render the original messages
+    original_render = await messages.render_latest()
+    print("Original Messages Render:")
+    print(original_render)
+
+    # 2. Save the messages to a file
+    file_path = "test_messages.pkl"
+    messages.save(file_path)
+    print(f"\nMessages saved to {file_path}")
+
+    assert os.path.exists(file_path), "Save file was not created."
+
+    # 3. Load the messages from the file
+    loaded_messages = Messages.load(file_path)
+    print("\nMessages loaded from file.")
+
+    assert loaded_messages is not None, "Loaded messages should not be None."
+
+    # Render the loaded messages
+    loaded_render = await loaded_messages.render_latest()
+    print("\nLoaded Messages Render:")
+    print(loaded_render)
+
+    # 4. Compare the original and loaded content
+    assert original_render == loaded_render, "Rendered content of original and loaded messages do not match."
+    print("\n✅ Assertion passed: Original and loaded message renders are identical.")
+
+    # 5. Check if the loaded object retains its class structure and methods
+    print(f"\nType of loaded object: {type(loaded_messages)}")
+    assert isinstance(loaded_messages, Messages), "Loaded object is not a Messages instance."
+
+    # Test pop functionality on the loaded object
+    popped_item = loaded_messages.pop(0)
+    assert isinstance(popped_item, SystemMessage), "Popped item is not a SystemMessage."
+    print(f"Popped first message: {popped_item}")
+
+    popped_render = await loaded_messages.render_latest()
+    print("\nRender after popping first message from loaded object:")
+    print(popped_render)
+    assert len(popped_render) == len(original_render) - 1, "Popping a message did not reduce the message count."
+    print("✅ Assertion passed: Pop functionality works on the loaded object.")
+
+    # 6. Clean up the test file
+    os.remove(file_path)
+    print(f"\nCleaned up {file_path}.")
+
+    print("\n--- Test Completed Successfully ---")
+
+if __name__ == "__main__":
+    asyncio.run(main())

beswarm/aient/aient/models/chatgpt.py

@@ -14,6 +14,7 @@ from ..plugins import PLUGINS, get_tools_result_async, function_call_list, updat
 from ..utils.scripts import safe_get, async_generator_to_sync, parse_function_xml, parse_continuous_json, convert_functions_to_xml, remove_xml_tags_and_content
 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 APITimeoutError(Exception):
     """Custom exception for API timeout errors."""
@@ -88,7 +89,6 @@ class chatgpt(BaseLLM):
         print_log: bool = False,
         tools: Optional[Union[list, str, Callable]] = [],
         function_call_max_loop: int = 3,
-        cut_history_by_function_name: str = "",
         cache_messages: list = None,
         logger: logging.Logger = None,
         check_done: bool = False,
@@ -109,8 +109,6 @@ class chatgpt(BaseLLM):
             self.conversation["default"] = cache_messages
         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 = {}
         self.check_done = check_done
 
         if logger:
@@ -164,95 +162,48 @@ class chatgpt(BaseLLM):
         if convo_id not in self.conversation:
             self.reset(convo_id=convo_id)
         if function_name == "" and message:
-            self.conversation[convo_id].append({"role": role, "content": message})
+            self.conversation[convo_id].append(RoleMessage(role, message))
         elif function_name != "" and message:
-            # 删除从 cut_history_by_function_name 以后的所有历史记录
-            if function_name == self.cut_history_by_function_name:
-                matching_message = next(filter(lambda x: safe_get(x, "tool_calls", 0, "function", "name", default="") == 'get_next_pdf', self.conversation[convo_id]), None)
-                if matching_message is not None:
-                    self.conversation[convo_id] = self.conversation[convo_id][:self.conversation[convo_id].index(matching_message)]
-
             if not (all(value == False for value in self.plugins.values()) or self.use_plugins == False):
-                self.conversation[convo_id].append({
-                    "role": "assistant",
-                    "tool_calls": [
-                        {
-                            "id": function_call_id,
-                            "type": "function",
-                            "function": {
-                                "name": function_name,
-                                "arguments": function_arguments,
-                            },
-                        }
-                    ],
-                    })
-                self.conversation[convo_id].append({"role": role, "tool_call_id": function_call_id, "content": message})
+                tool_calls = [
+                    {
+                        "id": function_call_id,
+                        "type": "function",
+                        "function": {
+                            "name": function_name,
+                            "arguments": function_arguments,
+                        },
+                    }
+                ]
+                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:
-                    image_message_list = []
+                    image_message_list = UserMessage()
                     if isinstance(function_arguments, str):
                         functions_list = json.loads(function_arguments)
                     else:
                         functions_list = function_arguments
                     for tool_info in functions_list:
                         if tool_info.get("base64_image"):
-                            image_message_list.append({"type": "text", "text": safe_get(tool_info, "parameter", "image_path", default="") + " image:"})
-                            image_message_list.append({
-                                "type": "image_url",
-                                "image_url": {
-                                    "url": tool_info["base64_image"],
-                                }
-                            })
-                    self.conversation[convo_id].append({"role": "assistant", "content": convert_functions_to_xml(function_arguments)})
+                            image_message_list.extend([
+                                safe_get(tool_info, "parameter", "image_path", default="") + " image:",
+                                Images(tool_info["base64_image"]),
+                            ])
+                    self.conversation[convo_id].append(AssistantMessage(convert_functions_to_xml(function_arguments)))
                     if image_message_list:
-                        self.conversation[convo_id].append({"role": "user", "content": [{"type": "text", "text": message}] + image_message_list})
+                        self.conversation[convo_id].append(UserMessage(message + image_message_list))
                     else:
-                        self.conversation[convo_id].append({"role": "user", "content": message})
+                        self.conversation[convo_id].append(UserMessage(message))
                 else:
-                    self.conversation[convo_id].append({"role": "assistant", "content": "我已经执行过这个工具了，接下来我需要做什么？"})
-
+                    self.conversation[convo_id].append(AssistantMessage("我已经执行过这个工具了，接下来我需要做什么？"))
         else:
             self.logger.error(f"error: add_to_conversation message is None or empty, role: {role}, function_name: {function_name}, message: {message}")
 
-        conversation_len = len(self.conversation[convo_id]) - 1
-        message_index = 0
         # if self.print_log:
         #     replaced_text = json.loads(re.sub(r';base64,([A-Za-z0-9+/=]+)', ';base64,***', json.dumps(self.conversation[convo_id])))
         #     self.logger.info(json.dumps(replaced_text, indent=4, ensure_ascii=False))
-        while message_index < conversation_len:
-            if self.conversation[convo_id][message_index]["role"] == self.conversation[convo_id][message_index + 1]["role"]:
-                if self.conversation[convo_id][message_index].get("content") and self.conversation[convo_id][message_index + 1].get("content") \
-                and self.conversation[convo_id][message_index].get("content") != self.conversation[convo_id][message_index + 1].get("content"):
-                    if type(self.conversation[convo_id][message_index + 1]["content"]) == str \
-                    and type(self.conversation[convo_id][message_index]["content"]) == list:
-                        self.conversation[convo_id][message_index + 1]["content"] = [{"type": "text", "text": self.conversation[convo_id][message_index + 1]["content"]}]
-                    if type(self.conversation[convo_id][message_index]["content"]) == str \
-                    and type(self.conversation[convo_id][message_index + 1]["content"]) == list:
-                        self.conversation[convo_id][message_index]["content"] = [{"type": "text", "text": 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"]) == str:
-                        self.conversation[convo_id][message_index]["content"] = [self.conversation[convo_id][message_index]["content"]]
-                        self.conversation[convo_id][message_index + 1]["content"] = [{"type": "text", "text": self.conversation[convo_id][message_index + 1]["content"]}]
-                    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"]]
-                    if type(self.conversation[convo_id][message_index]["content"]) == list \
-                    and type(self.conversation[convo_id][message_index + 1]["content"]) == dict:
-                        self.conversation[convo_id][message_index + 1]["content"] = [self.conversation[convo_id][message_index + 1]["content"]]
-                    if type(self.conversation[convo_id][message_index]["content"]) == str \
-                    and type(self.conversation[convo_id][message_index + 1]["content"]) == str \
-                    and self.conversation[convo_id][message_index].get("content").endswith(self.conversation[convo_id][message_index + 1].get("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
-            else:
-                message_index = message_index + 1
 
         history_len = len(self.conversation[convo_id])
 
@@ -290,27 +241,6 @@ 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,
@@ -321,8 +251,6 @@ class chatgpt(BaseLLM):
         stream: bool = True,
         **kwargs,
     ):
-        self.conversation[convo_id][0] = {"role": "system","content": self.system_prompt + "\n\n" + self.get_latest_file_content()}
-
         # 构造 provider 信息
         provider = {
             "provider": "openai",
@@ -336,10 +264,10 @@ 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 + "\n\n" + self.get_latest_file_content()},
-                {"role": role, "content": prompt}
-            ],
+            "messages": self.conversation[convo_id].render_latest() if pass_history else Messages(
+                SystemMessage(self.system_prompt, self.conversation[convo_id].provider("files")),
+                UserMessage(prompt)
+            ),
             "stream": stream,
             "temperature": kwargs.get("temperature", self.temperature)
         }
@@ -655,7 +583,7 @@ class chatgpt(BaseLLM):
                         else:
                             yield chunk
                 if tool_name == "read_file" and "<tool_error>" not in tool_response:
-                    self.latest_file_content[tool_info['parameter']["file_path"]] = 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 == "write_to_file" and "<tool_error>" not in tool_response:
                     all_responses.append(f"[{tool_name} Result]:\n\n{tool_response}")
@@ -998,9 +926,8 @@ 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},
-        ]
+        self.conversation[convo_id] = Messages(
+            SystemMessage(Texts("system_prompt", self.system_prompt), self.conversation[convo_id].provider("files")),
+        )
         self.tokens_usage[convo_id] = 0
         self.current_tokens[convo_id] = 0

{beswarm-0.2.81.dist-info → beswarm-0.2.82.dist-info}/METADATA

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

{beswarm-0.2.81.dist-info → beswarm-0.2.82.dist-info}/RECORD

@@ -8,6 +8,11 @@ beswarm/utils.py,sha256=0J-b38P5QGT-A_38co7FjzaUNJykaskI7mbbcQ4w_68,8215
 beswarm/agents/chatgroup.py,sha256=PzrmRcDKAbB7cxL16nMod_CzPosDV6bfTmXxQVuv-AQ,12012
 beswarm/agents/planact.py,sha256=d5j0tX0-CNtwisqIJep8K3rXPgsLqROq3nWyq8qtqw0,21001
 beswarm/aient/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
+beswarm/aient/aient/architext/architext/__init__.py,sha256=79Ih1151rfcqZdr7F8HSZSTs_iT2SKd1xCkehMsXeXs,19
+beswarm/aient/aient/architext/architext/core.py,sha256=i8UGEwoAS7Cwat3wB-jU8EC23gSwAXjFiwEc8QknE-k,17875
+beswarm/aient/aient/architext/test/openai_client.py,sha256=Dqtbmubv6vwF8uBqcayG0kbsiO65of7sgU2-DRBi-UM,4590
+beswarm/aient/aient/architext/test/test.py,sha256=CeFyloj-RJRk8hr6QDLjnRETG-KylD2bo3MVq5GVKPA,40597
+beswarm/aient/aient/architext/test/test_save_load.py,sha256=o8DqH6gDYZkFkQy-a7blqLtJTRj5e4a-Lil48pJ0V3g,3260
 beswarm/aient/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 beswarm/aient/aient/core/models.py,sha256=KMlCRLjtq1wQHZTJGqnbWhPS2cHq6eLdnk7peKDrzR8,7490
@@ -21,7 +26,7 @@ beswarm/aient/aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9
 beswarm/aient/aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 beswarm/aient/aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 beswarm/aient/aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
-beswarm/aient/aient/models/chatgpt.py,sha256=2RaObZmliqJlGveOSWbwgpscjPWk7R1RmxwbEAH0xXo,47315
+beswarm/aient/aient/models/chatgpt.py,sha256=EqvIcB6R_JGmvD5kEfR1ZRQYLfyGpmy4PvfRx8hMIKE,42019
 beswarm/aient/aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 beswarm/aient/aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 beswarm/aient/aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -116,7 +121,7 @@ beswarm/tools/search_web.py,sha256=0fTeczXiOX_LJQGaLEGbuJtIPzofeuquGWEt3yDMtVw,1
 beswarm/tools/subtasks.py,sha256=4wJWNAqRFgvwmDOP12SddYo_OteWBU5cLhLBh6xILk8,10492
 beswarm/tools/worker.py,sha256=mQ1qdrQ8MgL99byAbTvxfEByFFGN9mty3UHqHjARMQ8,2331
 beswarm/tools/write_csv.py,sha256=u0Hq18Ksfheb52MVtyLNCnSDHibITpsYBPs2ub7USYA,1466
-beswarm-0.2.81.dist-info/METADATA,sha256=DzYRWhHYqpacaXDliKKtcnet4Yn9zWfYSB6Sntut0KI,3878
-beswarm-0.2.81.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.81.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.81.dist-info/RECORD,,
+beswarm-0.2.82.dist-info/METADATA,sha256=kvRhwbSZxAC17S180fQp-ZNxIe3DXe1Jns4jdaRgJ5Q,3878
+beswarm-0.2.82.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.82.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.82.dist-info/RECORD,,