beswarm 0.2.7__tar.gz → 0.2.9__tar.gz

{beswarm-0.2.7 → beswarm-0.2.9}/PKG-INFO

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

{beswarm-0.2.7 → beswarm-0.2.9}/beswarm/aient/setup.py

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

{beswarm-0.2.7 → beswarm-0.2.9}/beswarm/aient/src/aient/core/request.py

@@ -10,6 +10,7 @@ from .utils import (
     c3o,
     c3h,
     c35s,
+    c4,
     gemini1,
     gemini2,
     gemini2_5_pro_exp,
@@ -576,6 +577,8 @@ async def get_vertex_claude_payload(request, engine, provider, api_key=None):
         location = c35s
     elif "claude-3-opus" in original_model:
         location = c3o
+    elif "claude-sonnet-4" in original_model or "claude-opus-4" in original_model:
+        location = c4
     elif "claude-3-sonnet" in original_model:
         location = c3s
     elif "claude-3-haiku" in original_model:
@@ -798,23 +801,6 @@ async def get_aws_payload(request, engine, provider, api_key=None):
     # url = f"{base_url}/model/{original_model}/invoke"
     url = f"{base_url}/model/{original_model}/invoke-with-response-stream"
 
-    # if "claude-3-5-sonnet" in original_model or "claude-3-7-sonnet" in original_model:
-    #     location = c35s
-    # elif "claude-3-opus" in original_model:
-    #     location = c3o
-    # elif "claude-3-sonnet" in original_model:
-    #     location = c3s
-    # elif "claude-3-haiku" in original_model:
-    #     location = c3h
-
-    # claude_stream = "streamRawPredict"
-    # url = "https://{LOCATION}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/anthropic/models/{MODEL}:{stream}".format(
-    #     LOCATION=await location.next(),
-    #     PROJECT_ID=project_id,
-    #     MODEL=original_model,
-    #     stream=claude_stream
-    # )
-
     messages = []
     system_prompt = None
     tool_id = None

{beswarm-0.2.7 → beswarm-0.2.9}/beswarm/aient/src/aient/core/utils.py

@@ -436,6 +436,7 @@ provider_api_circular_list = defaultdict(ThreadSafeCircularList)
 c35s = ThreadSafeCircularList(["us-east5", "europe-west1"])
 c3s = ThreadSafeCircularList(["us-east5", "us-central1", "asia-southeast1"])
 c3o = ThreadSafeCircularList(["us-east5"])
+c4 = ThreadSafeCircularList(["us-east5", "us-central1", "europe-west4", "asia-southeast1"])
 c3h = ThreadSafeCircularList(["us-east5", "us-central1", "europe-west1", "europe-west4"])
 gemini1 = ThreadSafeCircularList(["us-central1", "us-east4", "us-west1", "us-west4", "europe-west1", "europe-west2"])
 gemini2 = ThreadSafeCircularList(["us-central1"])

{beswarm-0.2.7 → beswarm-0.2.9}/beswarm/tools/worker.py

@@ -2,6 +2,7 @@ import os
 import re
 import copy
 import json
+import difflib
 import platform
 from pathlib import Path
 from datetime import datetime
@@ -34,6 +35,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     start_time = datetime.now()
     os.chdir(Path(work_dir).absolute())
     finish_flag = 0
+    goal_diff = None
 
     mcp_list = [item for item in tools if isinstance(item, dict)]
     if mcp_list:
@@ -75,6 +77,14 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                 with cache_file_path.open("r", encoding="utf-8") as f:
                     cache_messages = json.load(f)
         if cache_messages and isinstance(cache_messages, list) and len(cache_messages) > 1:
+            old_goal = extract_xml_content(cache_messages[1]["content"], "goal")
+            if old_goal.strip() != goal.strip():
+                diff_generator = difflib.ndiff(old_goal.splitlines(), goal.splitlines())
+                changed_lines = []
+                for line in diff_generator:
+                    if (line.startswith('+ ') or line.startswith('- ')) and line[2:].strip():
+                        changed_lines.append(line)
+                goal_diff = '\n'.join(changed_lines).strip()
             first_user_message = replace_xml_content(cache_messages[1]["content"], "goal", goal)
             work_agent_config["cache_messages"] = cache_messages[0:1] + [{"role": "user", "content": first_user_message}] + cache_messages[2:]
 
@@ -94,15 +104,13 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     async def instruction_agent_task():
         last_instruction = None
         while True:
-
-            instruction_prompt = f"""
-</work_agent_conversation_end>
-任务目标: {goal}
-
-在 tag <work_agent_conversation_start>...</work_agent_conversation_end> 之前的对话历史都是工作智能体的对话历史。
-
-根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复"任务已完成"。
-            """
+            instruction_prompt = "".join([
+                    "</work_agent_conversation_end>\n\n",
+                    f"任务目标: {goal}\n\n",
+                    f"任务目标新变化：\n{goal_diff}\n\n" if goal_diff else "",
+                    "在 tag <work_agent_conversation_start>...</work_agent_conversation_end> 之前的对话历史都是工作智能体的对话历史。\n\n",
+                    "根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复'任务已完成'。\n\n",
+                ])
             if last_instruction:
                 instruction_prompt = (
                     f"{instruction_prompt}\n\n"
@@ -156,8 +164,6 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                 raise Exception(f"The request body is too long, please try again.")
             if "任务已完成" == next_instruction.strip():
                 break
-            if "<instructions>" in next_instruction and "</instructions>" not in next_instruction:
-                next_instruction = next_instruction + "\n</instructions>"
             last_instruction = next_instruction
             next_instruction = extract_xml_content(next_instruction, "instructions")
             if not next_instruction:
@@ -222,6 +228,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
     start_time = datetime.now()
     os.chdir(Path(work_dir).absolute())
     finish_flag = 0
+    goal_diff = None
 
     mcp_list = [item for item in tools if isinstance(item, dict)]
     if mcp_list:
@@ -263,6 +270,14 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                 with cache_file_path.open("r", encoding="utf-8") as f:
                     cache_messages = json.load(f)
         if cache_messages and isinstance(cache_messages, list) and len(cache_messages) > 1:
+            old_goal = extract_xml_content(cache_messages[1]["content"], "goal")
+            if old_goal.strip() != goal.strip():
+                diff_generator = difflib.ndiff(old_goal.splitlines(), goal.splitlines())
+                changed_lines = []
+                for line in diff_generator:
+                    if (line.startswith('+ ') or line.startswith('- ')) and line[2:].strip():
+                        changed_lines.append(line)
+                goal_diff = '\n'.join(changed_lines).strip()
             first_user_message = replace_xml_content(cache_messages[1]["content"], "goal", goal)
             work_agent_config["cache_messages"] = cache_messages[0:1] + [{"role": "user", "content": first_user_message}] + cache_messages[2:]
 
@@ -282,15 +297,13 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
     async def instruction_agent_task():
         last_instruction = None
         while True:
-
-            instruction_prompt = f"""
-</work_agent_conversation_end>
-任务目标: {goal}
-
-在 tag <work_agent_conversation_start>...</work_agent_conversation_end> 之前的对话历史都是工作智能体的对话历史。
-
-根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复"任务已完成"。
-            """
+            instruction_prompt = "".join([
+                    "</work_agent_conversation_end>\n\n",
+                    f"任务目标: {goal}\n\n",
+                    f"任务目标新变化：\n{goal_diff}\n\n" if goal_diff else "",
+                    "在 tag <work_agent_conversation_start>...</work_agent_conversation_end> 之前的对话历史都是工作智能体的对话历史。\n\n",
+                    "根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复'任务已完成'。\n\n",
+                ])
             if last_instruction:
                 instruction_prompt = (
                     f"{instruction_prompt}\n\n"
@@ -344,8 +357,6 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                 raise Exception(f"The request body is too long, please try again.")
             if "任务已完成" == next_instruction.strip():
                 break
-            if "<instructions>" in next_instruction and "</instructions>" not in next_instruction:
-                next_instruction = next_instruction + "\n</instructions>"
             last_instruction = next_instruction
             next_instruction = extract_xml_content(next_instruction, "instructions")
             if not next_instruction:

{beswarm-0.2.7 → beswarm-0.2.9}/beswarm/utils.py

@@ -2,13 +2,13 @@ import re
 
 def extract_xml_content(text, xml_tag):
     result = ''
-    pattern = rf'^<{xml_tag}>$\n*([\D\d\s]+?)\n*^<\/{xml_tag}>$'
+    pattern = rf'^<{xml_tag}>([\D\d\s]+?)<\/{xml_tag}>$'
     match = re.search(pattern, text, re.MULTILINE)
     if match:
         result = match.group(1)
     if not result:
         return ''
-    return result
+    return result.strip()
 
 def replace_xml_content(original_string: str, tag_name: str, replacement_content: str) -> str:
     """

{beswarm-0.2.7 → beswarm-0.2.9}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.7 → beswarm-0.2.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "beswarm"
-version = "0.2.7"
+version = "0.2.9"
 description = "MAS"
 readme = "README.md"
 requires-python = ">=3.11"