beswarm 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

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/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/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/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"
@@ -222,6 +230,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 +272,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 +299,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"

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.dist-info → beswarm-0.2.8.dist-info}/METADATA

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

{beswarm-0.2.7.dist-info → beswarm-0.2.8.dist-info}/RECORD

@@ -1,15 +1,15 @@
 beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=_hYKZ0MUiMRs3C-1PMlFKIVgTKFcp_irla3p3wQNF3c,32015
-beswarm/utils.py,sha256=lm0drN1ebXM9haoKaW2DLzJJRCOpLmiJ864mH4jAdB4,6697
+beswarm/utils.py,sha256=xxbNifOPlfcVkKmF_qFzuEnZgF3MQg3mnOfz1EF0Qss,6697
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=rROoj5y5L8xuCRH08xVIiLgkk9BilfVZVZ3AOOIShIY,487
+beswarm/aient/setup.py,sha256=lttzm-VPC3ghnT8qQ8poVNP7evb0cTY1MnsWEBlmLKw,487
 beswarm/aient/src/aient/__init__.py,sha256=SRfF7oDVlOOAi6nGKiJIUK6B_arqYLO9iSMp-2IZZps,21
 beswarm/aient/src/aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 beswarm/aient/src/aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 beswarm/aient/src/aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
-beswarm/aient/src/aient/core/request.py,sha256=gXHdx61emExUTZbUyLng_AYmlfyKl3uOcCmlAY5eN98,72330
+beswarm/aient/src/aient/core/request.py,sha256=1iY-GUgbGCt0gXpO91QDEERIfkptI_anCHg9ElDvVVc,71765
 beswarm/aient/src/aient/core/response.py,sha256=mAVsCnNhWY09DXNe0lyPUJq-1ljtGjC67Az-Uh7ozIw,35166
-beswarm/aient/src/aient/core/utils.py,sha256=fhI5wBxr01lVEp8nMfjG9dQ859AE-VdrWyb9suLzzqM,27400
+beswarm/aient/src/aient/core/utils.py,sha256=NcXdb8zBN0GE01OGaUzg8U34RaraoFf2MaLDDGFvvC4,27492
 beswarm/aient/src/aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 beswarm/aient/src/aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
 beswarm/aient/src/aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
@@ -133,8 +133,8 @@ beswarm/tools/repomap.py,sha256=YsTPq5MXfn_Ds5begcvHDnY_Xp2d4jH-xmWqNMHnNHY,4523
 beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
 beswarm/tools/search_arxiv.py,sha256=GpuIOYX8T0iRC-X-hmuR9AUJVn15WWZq864DaoC7BUc,8004
 beswarm/tools/search_web.py,sha256=w0T0aCqOVlb6Of5hn_TtpnrGXo6bMtw2aKZdkrYjycI,12069
-beswarm/tools/worker.py,sha256=Z6ig-tgS_TUgAsWmSIIEH35UxNstXPslG3hg7Uozq4A,21192
-beswarm-0.2.7.dist-info/METADATA,sha256=BUSRRZb6xrjGudtPiI-neyEY8jswVVvPZjs-hWYiohE,3846
-beswarm-0.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.7.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.7.dist-info/RECORD,,
+beswarm/tools/worker.py,sha256=oLsg-WO99sScDE1xZBGiQOPLdK71SDPIdrsSoLot_Ro,22659
+beswarm-0.2.8.dist-info/METADATA,sha256=WCzNnkiSx_cEljs8fKxBd7nvHybrzOyW_IiOggtPLG8,3846
+beswarm-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.8.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.8.dist-info/RECORD,,