beswarm 0.1.92__py3-none-any.whl → 0.1.94__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.35",
+    version="1.1.36",
     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/models.py

@@ -105,6 +105,7 @@ class RequestModel(BaseRequest):
     response_format: Optional[ResponseFormat] = None
     thinking: Optional[Thinking] = None
     stream_options: Optional[StreamOptions] = None
+    chat_template_kwargs: Optional[Dict[str, Any]] = None
 
     def get_last_text_message(self) -> Optional[str]:
         for message in reversed(self.messages):

beswarm/aient/src/aient/core/request.py

@@ -1197,6 +1197,126 @@ async def get_azure_payload(request, engine, provider, api_key=None):
 
     return url, headers, payload
 
+async def get_azure_databricks_payload(request, engine, provider, api_key=None):
+    api_key = base64.b64encode(f"token:{api_key}".encode()).decode()
+    headers = {
+        'Content-Type': 'application/json',
+        'Authorization': f"Basic {api_key}",
+    }
+    model_dict = get_model_dict(provider)
+    original_model = model_dict[request.model]
+
+    base_url=provider['base_url']
+    url = urllib.parse.urljoin(base_url, f"/serving-endpoints/{original_model}/invocations")
+
+    messages = []
+    for msg in request.messages:
+        tool_calls = None
+        tool_call_id = None
+        if isinstance(msg.content, list):
+            content = []
+            for item in msg.content:
+                if item.type == "text":
+                    text_message = await get_text_message(item.text, engine)
+                    content.append(text_message)
+                elif item.type == "image_url" and provider.get("image", True) and "o1-mini" not in original_model:
+                    image_message = await get_image_message(item.image_url.url, engine)
+                    content.append(image_message)
+        else:
+            content = msg.content
+            tool_calls = msg.tool_calls
+            tool_call_id = msg.tool_call_id
+
+        if tool_calls:
+            tool_calls_list = []
+            for tool_call in tool_calls:
+                tool_calls_list.append({
+                    "id": tool_call.id,
+                    "type": tool_call.type,
+                    "function": {
+                        "name": tool_call.function.name,
+                        "arguments": tool_call.function.arguments
+                    }
+                })
+                if provider.get("tools"):
+                    messages.append({"role": msg.role, "tool_calls": tool_calls_list})
+        elif tool_call_id:
+            if provider.get("tools"):
+                messages.append({"role": msg.role, "tool_call_id": tool_call_id, "content": content})
+        else:
+            messages.append({"role": msg.role, "content": content})
+
+    if "claude-3-7-sonnet" in original_model:
+        max_tokens = 128000
+    elif "claude-3-5-sonnet" in original_model:
+        max_tokens = 8192
+    elif "claude-sonnet-4" in original_model:
+        max_tokens = 64000
+    elif "claude-opus-4" in original_model:
+        max_tokens = 32000
+    else:
+        max_tokens = 4096
+
+    payload = {
+        "model": original_model,
+        "messages": messages,
+        "max_tokens": max_tokens,
+    }
+
+    if request.max_tokens:
+        payload["max_tokens"] = int(request.max_tokens)
+
+    miss_fields = [
+        'model',
+        'messages',
+    ]
+
+    for field, value in request.model_dump(exclude_unset=True).items():
+        if field not in miss_fields and value is not None:
+            if field == "max_tokens" and "o1" in original_model:
+                payload["max_completion_tokens"] = value
+            else:
+                payload[field] = value
+
+    if provider.get("tools") == False or "o1" in original_model or "chatgpt-4o-latest" in original_model or "grok" in original_model:
+        payload.pop("tools", None)
+        payload.pop("tool_choice", None)
+
+    if "think" in request.model.lower():
+        payload["thinking"] = {
+            "budget_tokens": 4096,
+            "type": "enabled"
+        }
+        payload["temperature"] = 1
+        payload.pop("top_p", None)
+        payload.pop("top_k", None)
+        if request.model.split("-")[-1].isdigit():
+            think_tokens = int(request.model.split("-")[-1])
+            if think_tokens < max_tokens:
+                payload["thinking"] = {
+                    "budget_tokens": think_tokens,
+                    "type": "enabled"
+                }
+
+    if request.thinking:
+        payload["thinking"] = {
+            "budget_tokens": request.thinking.budget_tokens,
+            "type": request.thinking.type
+        }
+        payload["temperature"] = 1
+        payload.pop("top_p", None)
+        payload.pop("top_k", None)
+
+    if safe_get(provider, "preferences", "post_body_parameter_overrides", default=None):
+        for key, value in safe_get(provider, "preferences", "post_body_parameter_overrides", default={}).items():
+            if key == request.model:
+                for k, v in value.items():
+                    payload[k] = v
+            elif all(_model not in request.model.lower() for _model in ["gemini", "gpt", "claude"]):
+                payload[key] = value
+
+    return url, headers, payload
+
 async def get_openrouter_payload(request, engine, provider, api_key=None):
     headers = {
         'Content-Type': 'application/json'
@@ -1765,6 +1885,8 @@ async def get_payload(request: RequestModel, engine, provider, api_key=None):
         return await get_vertex_claude_payload(request, engine, provider, api_key)
     elif engine == "azure":
         return await get_azure_payload(request, engine, provider, api_key)
+    elif engine == "azure-databricks":
+        return await get_azure_databricks_payload(request, engine, provider, api_key)
     elif engine == "claude":
         return await get_claude_payload(request, engine, provider, api_key)
     elif engine == "gpt":

beswarm/aient/src/aient/core/response.py

@@ -49,6 +49,30 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
             while "\n" in buffer:
                 line, buffer = buffer.split("\n", 1)
                 # line_index += 1
+                if line.startswith("data: "):
+                    json_line = line.lstrip("data: ").strip()
+                    response_json = json.loads(json_line)
+                    json_data = safe_get(response_json, "candidates", 0, "content", default=None)
+                    finishReason = safe_get(response_json, "candidates", 0 , "finishReason", default=None)
+                    if finishReason:
+                        promptTokenCount = safe_get(response_json, "usageMetadata", "promptTokenCount", default=0)
+                        candidatesTokenCount = safe_get(response_json, "usageMetadata", "candidatesTokenCount", default=0)
+                        totalTokenCount = safe_get(response_json, "usageMetadata", "totalTokenCount", default=0)
+
+                    content = safe_get(json_data, "parts", 0, "text", default="")
+                    b64_json = safe_get(json_data, "parts", 0, "inlineData", "data", default="")
+                    if b64_json:
+                        image_base64 = b64_json
+
+                    is_thinking = safe_get(json_data, "parts", 0, "thought", default=False)
+                    if is_thinking:
+                        sse_string = await generate_sse_response(timestamp, model, reasoning_content=content)
+                        yield sse_string
+                    elif not image_base64 and content:
+                        sse_string = await generate_sse_response(timestamp, model, content=content)
+                        yield sse_string
+
+                    continue
 
                 # https://ai.google.dev/api/generate-content?hl=zh-cn#FinishReason
                 if line and '\"finishReason\": \"' in line:
@@ -270,8 +294,15 @@ async def fetch_gpt_response_stream(client, url, headers, payload):
 
                     no_stream_content = safe_get(line, "choices", 0, "message", "content", default=None)
                     openrouter_reasoning = safe_get(line, "choices", 0, "delta", "reasoning", default="")
+                    azure_databricks_claude_summary_content = safe_get(line, "choices", 0, "delta", "content", 0, "summary", 0, "text", default="")
+                    azure_databricks_claude_signature_content = safe_get(line, "choices", 0, "delta", "content", 0, "summary", 0, "signature", default="")
                     # print("openrouter_reasoning", repr(openrouter_reasoning), openrouter_reasoning.endswith("\\\\"), openrouter_reasoning.endswith("\\"))
-                    if openrouter_reasoning:
+                    if azure_databricks_claude_signature_content:
+                        pass
+                    elif azure_databricks_claude_summary_content:
+                        sse_string = await generate_sse_response(timestamp, payload["model"], reasoning_content=azure_databricks_claude_summary_content)
+                        yield sse_string
+                    elif openrouter_reasoning:
                         if openrouter_reasoning.endswith("\\"):
                             enter_buffer += openrouter_reasoning
                             continue
@@ -640,15 +671,12 @@ async def fetch_response_stream(client, url, headers, payload, engine, model):
     elif engine == "aws":
         async for chunk in fetch_aws_response_stream(client, url, headers, payload, model):
             yield chunk
-    elif engine == "gpt":
+    elif engine == "gpt" or engine == "openrouter" or engine == "azure-databricks":
         async for chunk in fetch_gpt_response_stream(client, url, headers, payload):
             yield chunk
     elif engine == "azure":
         async for chunk in fetch_azure_response_stream(client, url, headers, payload):
             yield chunk
-    elif engine == "openrouter":
-        async for chunk in fetch_gpt_response_stream(client, url, headers, payload):
-            yield chunk
     elif engine == "cloudflare":
         async for chunk in fetch_cloudflare_response_stream(client, url, headers, payload, model):
             yield chunk

beswarm/aient/src/aient/core/utils.py

@@ -75,6 +75,8 @@ def get_engine(provider, endpoint=None, original_model=""):
         engine = "vertex"
     elif parsed_url.netloc.rstrip('/').endswith('azure.com'):
         engine = "azure"
+    elif parsed_url.netloc.rstrip('/').endswith('azuredatabricks.net'):
+        engine = "azure-databricks"
     elif parsed_url.netloc == 'api.cloudflare.com':
         engine = "cloudflare"
     elif parsed_url.netloc == 'api.anthropic.com' or parsed_url.path.endswith("v1/messages"):
@@ -482,7 +484,6 @@ async def generate_sse_response(timestamp, model, content=None, tools_id=None, f
     if role:
         sample_data["choices"][0]["delta"] = {"role": role, "content": ""}
     if total_tokens:
-        total_tokens = prompt_tokens + completion_tokens
         sample_data["usage"] = {"prompt_tokens": prompt_tokens, "completion_tokens": completion_tokens, "total_tokens": total_tokens}
         sample_data["choices"] = []
     if stop:
@@ -574,7 +575,6 @@ async def generate_no_stream_response(timestamp, model, content=None, tools_id=N
         }
 
     if total_tokens:
-        total_tokens = prompt_tokens + completion_tokens
         sample_data["usage"] = {"prompt_tokens": prompt_tokens, "completion_tokens": completion_tokens, "total_tokens": total_tokens}
 
     json_data = json.dumps(sample_data, ensure_ascii=False)
@@ -674,7 +674,7 @@ async def get_image_message(base64_image, engine = None):
         base64_image = f"data:image/png;base64,{png_base64}"
         image_type = "image/png"
 
-    if "gpt" == engine or "openrouter" == engine or "azure" == engine:
+    if "gpt" == engine or "openrouter" == engine or "azure" == engine or "azure-databricks" == engine:
         return {
             "type": "image_url",
             "image_url": {
@@ -702,7 +702,9 @@ async def get_image_message(base64_image, engine = None):
     raise ValueError("Unknown engine")
 
 async def get_text_message(message, engine = None):
-    if "gpt" == engine or "claude" == engine or "openrouter" == engine or "vertex-claude" == engine or "azure" == engine or "aws" == engine:
+    if "gpt" == engine or "claude" == engine or "openrouter" == engine or \
+    "vertex-claude" == engine or "azure" == engine or "aws" == engine or \
+    "azure-databricks" == engine:
         return {"type": "text", "text": message}
     if "gemini" == engine or "vertex-gemini" == engine:
         return {"text": message}
@@ -734,7 +736,7 @@ def parse_json_safely(json_str):
             return json.loads(json_str, strict=False)
         except json.JSONDecodeError as e:
             # 两种方法都失败，抛出异常
-            raise Exception(f"无法解析JSON字符串: {e}")
+            raise Exception(f"无法解析JSON字符串: {e}, {json_str}")
 
 if __name__ == "__main__":
     provider = {

beswarm/tools/search_web.py

@@ -48,27 +48,32 @@ async def search_web(query: str):
     except httpx.HTTPStatusError as e:
         return {
             "error": f"HTTP error occurred: {e.response.status_code} - {e.response.text}",
-            "status_code": e.response.status_code
+            "status_code": e.response.status_code,
+            "code": 400
         }
     except httpx.RequestError as e:
         return {
             "error": f"An error occurred while requesting {e.request.url!r}: {e}",
-            "request_url": str(e.request.url)
+            "request_url": str(e.request.url),
+            "code": 400
         }
     except json.JSONDecodeError:
         return {
             "error": "Failed to decode JSON response from the API.",
-            "response_text": response.text if 'response' in locals() else "No response text available"
+            "response_text": response.text if 'response' in locals() else "No response text available",
+            "code": 400
         }
     except Exception as e:
         return {
-            "error": f"An unexpected error occurred: {str(e)}"
+            "error": f"An unexpected error occurred: {str(e)}",
+            "code": 400
         }
 
     unique_urls = []
-    if "error" in results:
-        print(f"Error fetching search results for '{query}':")
+    if "error" in results or results.get("code", 200) != 200:
+        # print(f"Error fetching search results for '{query}':")
         print(json.dumps(results, indent=2, ensure_ascii=False))
+        raise Exception(f"Error fetching search results for '{query}':")
     else:
         # print(f"Search results for '{query}':")
         html_content = results.get("data", {}).get("result", {}).get("html", "")

beswarm/tools/worker.py

@@ -72,7 +72,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
             if cache_file_path.exists():
                 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) > 0:
+        if cache_messages and isinstance(cache_messages, list) and len(cache_messages) > 1:
             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:]
 
@@ -90,6 +90,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
     # 工作agent初始化
     work_agent = chatgpt(**work_agent_config)
     async def instruction_agent_task():
+        last_instruction = None
         while True:
 
             instruction_prompt = f"""
@@ -100,6 +101,12 @@ async def worker(goal, tools, work_dir, cache_messages=None):
 
 根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复"任务已完成"。
             """
+            if last_instruction:
+                instruction_prompt = (
+                    f"{instruction_prompt}\n\n"
+                    "你生成的指令格式错误，必须把给assistant的指令放在<instructions>...</instructions>标签内。请重新生成格式正确的指令。"
+                    f"这是你上次给assistant的错误格式的指令：\n{last_instruction}"
+                )
             # 让指令agent分析对话历史并生成新指令
             instruction_agent = chatgpt(**instruction_agent_config)
             conversation_history = copy.deepcopy(work_agent.conversation["default"])
@@ -149,6 +156,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                 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:
                 print("\n❌ 指令智能体生成的指令不符合要求，请重新生成。")
@@ -240,7 +248,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
             if cache_file_path.exists():
                 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) > 0:
+        if cache_messages and isinstance(cache_messages, list) and len(cache_messages) > 1:
             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:]
 
@@ -258,6 +266,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
     # 工作agent初始化
     work_agent = chatgpt(**work_agent_config)
     async def instruction_agent_task():
+        last_instruction = None
         while True:
 
             instruction_prompt = f"""
@@ -268,6 +277,12 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
 
 根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复"任务已完成"。
             """
+            if last_instruction:
+                instruction_prompt = (
+                    f"{instruction_prompt}\n\n"
+                    "你生成的指令格式错误，必须把给assistant的指令放在<instructions>...</instructions>标签内。请重新生成格式正确的指令。"
+                    f"这是你上次给assistant的错误格式的指令：\n{last_instruction}"
+                )
             # 让指令agent分析对话历史并生成新指令
             instruction_agent = chatgpt(**instruction_agent_config)
             conversation_history = copy.deepcopy(work_agent.conversation["default"])
@@ -318,6 +333,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                 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:
                 print("\n❌ 指令智能体生成的指令不符合要求，请重新生成。")

{beswarm-0.1.92.dist-info → beswarm-0.1.94.dist-info}/METADATA

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

{beswarm-0.1.92.dist-info → beswarm-0.1.94.dist-info}/RECORD

@@ -2,14 +2,14 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=cBz8sSmFj0edIGOZjCMg0rg3pFXQYo8xGvXSA8Py1hg,31591
 beswarm/utils.py,sha256=lm0drN1ebXM9haoKaW2DLzJJRCOpLmiJ864mH4jAdB4,6697
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=IUr9oCEhGFNVvz7v8J9tedwE_JK6Hlf8XpnENoq2K2s,487
+beswarm/aient/setup.py,sha256=gXGWJdyTOLlVJUiH-3m5BA4q4-VfUOxnywMFVKTEQqI,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=oUGsytAVBuhE_MLco7PqIQGwWD8lEYkZxgb8HEuynmA,7444
-beswarm/aient/src/aient/core/request.py,sha256=7IaN5iFYQgDK9W8ej-OZCom4bSZiPN5t_S_91DBRb28,67313
-beswarm/aient/src/aient/core/response.py,sha256=WIJhvf3Th3-XW3MsDq8QdzxXcNe5q1mCKcCZx8pzm2A,33213
-beswarm/aient/src/aient/core/utils.py,sha256=zidsBUBd3KskzcxQcPB1y5x1RhtWcbZeWvmgb4LAadA,27318
+beswarm/aient/src/aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
+beswarm/aient/src/aient/core/request.py,sha256=6Nwduj7kFuubFaZ0ZLkT_zd03XpT-bFhgrKVOZiGBOQ,71918
+beswarm/aient/src/aient/core/response.py,sha256=RYy70Ld_txixHHd61Dqtlo0tKHMU_OIXqxGWd6EfATI,35315
+beswarm/aient/src/aient/core/utils.py,sha256=fhI5wBxr01lVEp8nMfjG9dQ859AE-VdrWyb9suLzzqM,27400
 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
@@ -131,10 +131,10 @@ beswarm/tools/planner.py,sha256=lguBCS6kpwNPoXQvqH-WySabVubT82iyWOkJnjt6dXw,1265
 beswarm/tools/repomap.py,sha256=N09K0UgwjCN7Zjg_5TYlVsulp3n2fztYlS8twalChU8,45003
 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=B24amOnGHnmdV_6S8bw8O2PdhZRRIDtJjg-wXcfP7dQ,11859
+beswarm/tools/search_web.py,sha256=w0T0aCqOVlb6Of5hn_TtpnrGXo6bMtw2aKZdkrYjycI,12069
 beswarm/tools/think.py,sha256=WLw-7jNIsnS6n8MMSYUin_f-BGLENFmnKM2LISEp0co,1760
-beswarm/tools/worker.py,sha256=hqfOOW0PeLHYgmB2eHPIPd4wpI_RMsDGGkH5DMy0SLo,17597
-beswarm-0.1.92.dist-info/METADATA,sha256=5b6zhFvaxJGQxuoaSMYmM4jsoiaQTNx7JTqsVfMvLp8,3584
-beswarm-0.1.92.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.1.92.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.1.92.dist-info/RECORD,,
+beswarm/tools/worker.py,sha256=4gII0s83gXf8Y453NK4Cs7tLyN89b2q0v9vic92RlrU,18579
+beswarm-0.1.94.dist-info/METADATA,sha256=1WUIZWN43CmVJLxPFkVtiyQqMGojfb7CZSDIuWr3bOg,3584
+beswarm-0.1.94.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.1.94.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.1.94.dist-info/RECORD,,