beswarm 0.2.33__py3-none-any.whl → 0.2.35__py3-none-any.whl

beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.51",
+    version="1.1.53",
     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

@@ -3,6 +3,8 @@ import json
 import httpx
 import base64
 import urllib.parse
+from io import IOBase
+from typing import Tuple
 
 from .models import RequestModel, Message
 from .utils import (
@@ -72,9 +74,8 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                     content.append(image_message)
         elif msg.content:
             content = [{"text": msg.content}]
-            tool_calls = msg.tool_calls
         elif msg.content is None:
-            continue
+            tool_calls = msg.tool_calls
 
         if tool_calls:
             tool_call = tool_calls[0]
@@ -108,7 +109,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                     }]
                 }
             )
-        elif msg.role != "system":
+        elif msg.role != "system" and content:
             messages.append({"role": msg.role, "parts": content})
         elif msg.role == "system":
             content[0]["text"] = re.sub(r"_+", "_", content[0]["text"])
@@ -239,7 +240,6 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             ]
 
     if "gemini-2.5" in original_model:
-        generation_config = payload.get("generationConfig", {})
         # 从请求模型名中检测思考预算设置
         m = re.match(r".*-think-(-?\d+)", request.model)
         if m:
@@ -254,7 +254,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                         budget = 32768
                     else: # 128 <= val <= 32768
                         budget = val
-                
+
                 # gemini-2.5-flash-lite: [0] or [512, 24576]
                 elif "gemini-2.5-flash-lite" in original_model:
                     if val > 0 and val < 512:
@@ -270,9 +270,9 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                         budget = 24576
                     else: # Includes 0 and valid range, and clamps invalid negatives
                         budget = val if val >= 0 else 0
-                
+
                 payload["generationConfig"]["thinkingConfig"] = {
-                    "includeThoughts": True,
+                    "includeThoughts": True if budget else False,
                     "thinkingBudget": budget
                 }
             except ValueError:
@@ -282,11 +282,6 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
             payload["generationConfig"]["thinkingConfig"] = {
                 "includeThoughts": True,
             }
-        payload["generationConfig"] = generation_config
-
-    # # 检测search标签
-    # if request.model.endswith("-search"):
-    #     payload["tools"] = [{"googleSearch": {}}]
 
     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():
@@ -372,16 +367,12 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
     # search_tool = None
 
     # https://cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/2-0-flash?hl=zh-cn
-    pro_models = ["gemini-2.5", "gemini-2.0"]
+    pro_models = ["gemini-2.5"]
     if any(pro_model in original_model for pro_model in pro_models):
-        location = gemini2
+        location = gemini2_5_pro_exp
     else:
         location = gemini1
 
-    if "gemini-2.5-flash-lite-preview-06-17" == original_model or \
-    "gemini-2.5-pro-preview-06-05" == original_model:
-        location = gemini2_5_pro_exp
-
     if "google-vertex-ai" in provider.get("base_url", ""):
         url = provider.get("base_url").rstrip('/') + "/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
             LOCATION=await location.next(),
@@ -390,24 +381,8 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
             stream=gemini_stream
         )
     elif api_key is not None and api_key[2] == ".":
-        if provider.get("project_id") and "gemini-2.5-pro-preview-06-05" == original_model:
-            if isinstance(provider.get("project_id"), list):
-                api_key_index = provider.get("api").index(api_key)
-                project_id = provider.get("project_id")[api_key_index]
-            else:
-                project_id = provider.get("project_id")
-            url = f"https://aiplatform.googleapis.com/v1/projects/{project_id}/locations/global/publishers/google/models/{original_model}:{gemini_stream}?key={api_key}"
-        else:
-            url = f"https://aiplatform.googleapis.com/v1/publishers/google/models/{original_model}:{gemini_stream}?key={api_key}"
+        url = f"https://aiplatform.googleapis.com/v1/publishers/google/models/{original_model}:{gemini_stream}?key={api_key}"
         headers.pop("Authorization", None)
-    elif "gemini-2.5-flash-lite-preview-06-17" == original_model or \
-    "gemini-2.5-pro-preview-06-05" == original_model:
-        url = "https://aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
-            LOCATION=await location.next(),
-            PROJECT_ID=project_id,
-            MODEL_ID=original_model,
-            stream=gemini_stream
-        )
     else:
         url = "https://{LOCATION}-aiplatform.googleapis.com/v1/projects/{PROJECT_ID}/locations/{LOCATION}/publishers/google/models/{MODEL_ID}:{stream}".format(
             LOCATION=await location.next(),
@@ -433,8 +408,9 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
                 elif item.type == "image_url" and provider.get("image", True):
                     image_message = await get_image_message(item.image_url.url, engine)
                     content.append(image_message)
-        else:
+        elif msg.content:
             content = [{"text": msg.content}]
+        elif msg.content is None:
             tool_calls = msg.tool_calls
 
         if tool_calls:
@@ -469,7 +445,7 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
                     }]
                 }
             )
-        elif msg.role != "system":
+        elif msg.role != "system" and content:
             messages.append({"role": msg.role, "parts": content})
         elif msg.role == "system":
             system_prompt = system_prompt + "\n\n" + content[0]["text"]
@@ -573,7 +549,7 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
                         budget = 32768
                     else: # 128 <= val <= 32768
                         budget = val
-                
+
                 # gemini-2.5-flash-lite: [0] or [512, 24576]
                 elif "gemini-2.5-flash-lite" in original_model:
                     if val > 0 and val < 512:
@@ -589,9 +565,9 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
                         budget = 24576
                     else: # Includes 0 and valid range, and clamps invalid negatives
                         budget = val if val >= 0 else 0
-                
+
                 payload["generationConfig"]["thinkingConfig"] = {
-                    "includeThoughts": True,
+                    "includeThoughts": True if budget else False,
                     "thinkingBudget": budget
                 }
             except ValueError:
@@ -602,9 +578,6 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
                 "includeThoughts": True,
             }
 
-    # if request.model.endswith("-search"):
-    #     payload["tools"] = [search_tool]
-
     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:
@@ -1822,21 +1795,98 @@ async def get_dalle_payload(request, engine, provider, api_key=None):
 
     return url, headers, payload
 
+async def get_upload_certificate(client: httpx.AsyncClient, api_key: str, model: str) -> dict:
+    """第一步：获取文件上传凭证"""
+    # print("步骤 1: 正在获取上传凭证...")
+    headers = {"Authorization": f"Bearer {api_key}"}
+    params = {"action": "getPolicy", "model": model}
+    try:
+        response = await client.get("https://dashscope.aliyuncs.com/api/v1/uploads", headers=headers, params=params)
+        response.raise_for_status()  # 如果请求失败则抛出异常
+        cert_data = response.json()
+        # print("凭证获取成功。")
+        return cert_data.get("data")
+    except httpx.HTTPStatusError as e:
+        print(f"获取凭证失败: HTTP {e.response.status_code}")
+        print(f"响应内容: {e.response.text}")
+        return None
+    except Exception as e:
+        print(f"获取凭证时发生未知错误: {e}")
+        return None
+
+from mimetypes import guess_type
+
+async def upload_file_to_oss(client: httpx.AsyncClient, certificate: dict, file: Tuple[str, IOBase, str]) -> str:
+    """第二步：使用凭证将文件内容上传到OSS"""
+    upload_host = certificate.get("upload_host")
+    upload_dir = certificate.get("upload_dir")
+    object_key = f"{upload_dir}/{file[0]}"
+
+    form_data = {
+        "key": object_key,
+        "policy": certificate.get("policy"),
+        "OSSAccessKeyId": certificate.get("oss_access_key_id"),
+        "signature": certificate.get("signature"),
+        "success_action_status": "200",
+        "x-oss-object-acl": certificate.get("x_oss_object_acl"),
+        "x-oss-forbid-overwrite": certificate.get("x_oss_forbid_overwrite"),
+    }
+
+    files = {"file": file}
+
+    try:
+        response = await client.post(upload_host, data=form_data, files=files, timeout=3600)
+        response.raise_for_status()
+        # print("文件上传成功！")
+        oss_url = f"oss://{object_key}"
+        # print(f"文件OSS URL: {oss_url}")
+        return oss_url
+    except httpx.HTTPStatusError as e:
+        print(f"上传文件失败: HTTP {e.response.status_code}")
+        print(f"响应内容: {e.response.text}")
+        return None
+    except Exception as e:
+        print(f"上传文件时发生未知错误: {e}")
+        return None
+
 async def get_whisper_payload(request, engine, provider, api_key=None):
     model_dict = get_model_dict(provider)
     original_model = model_dict[request.model]
-    headers = {
-        # "Content-Type": "multipart/form-data",
-    }
+    headers = {}
     if api_key:
         headers['Authorization'] = f"Bearer {api_key}"
     url = provider['base_url']
     url = BaseAPI(url).audio_transcriptions
 
-    payload = {
-        "model": original_model,
-        "file": request.file,
-    }
+    if "dashscope.aliyuncs.com" in url:
+        client = httpx.AsyncClient()
+        certificate = await get_upload_certificate(client, api_key, original_model)
+        if not certificate:
+            return
+
+        # 步骤 2: 上传文件
+        oss_url = await upload_file_to_oss(client, certificate, request.file)
+        headers = {
+            "Authorization": f"Bearer {api_key}",
+            "Content-Type": "application/json",
+            "X-DashScope-OssResourceResolve": "enable"
+        }
+        payload = {
+            "model": original_model,
+            "input": {
+                "messages": [
+                    {
+                        "role": "user",
+                        "content": [{"audio": oss_url}]
+                    }
+                ]
+            }
+        }
+    else:
+        payload = {
+            "model": original_model,
+            "file": request.file,
+        }
 
     if request.prompt:
         payload["prompt"] = request.prompt
@@ -1906,11 +1956,20 @@ async def get_tts_payload(request, engine, provider, api_key=None):
     url = provider['base_url']
     url = BaseAPI(url).audio_speech
 
-    payload = {
-        "model": original_model,
-        "input": request.input,
-        "voice": request.voice,
-    }
+    if "api.minimaxi.com" in url:
+        payload = {
+            "model": original_model,
+            "text": request.input,
+            "voice_setting": {
+                "voice_id": request.voice
+            }
+        }
+    else:
+        payload = {
+            "model": original_model,
+            "input": request.input,
+            "voice": request.voice,
+        }
 
     if request.response_format:
         payload["response_format"] = request.response_format

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

@@ -20,6 +20,34 @@ async def check_response(response, error_log):
         return {"error": f"{error_log} HTTP Error", "status_code": response.status_code, "details": error_json}
     return None
 
+def gemini_json_poccess(response_str):
+    promptTokenCount = 0
+    candidatesTokenCount = 0
+    totalTokenCount = 0
+    image_base64 = None
+
+    response_json = json.loads(response_str)
+    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)
+
+    function_call_name = safe_get(json_data, "functionCall", "name", default=None)
+    function_full_response = json.dumps(safe_get(json_data, "functionCall", "args", default=""))
+
+    blockReason = safe_get(json_data, 0, "promptFeedback", "blockReason", default=None)
+
+    return is_thinking, content, image_base64, function_call_name, function_full_response, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount
+
 async def fetch_gemini_response_stream(client, url, headers, payload, model):
     timestamp = int(datetime.timestamp(datetime.now()))
     async with client.stream('POST', url, headers=headers, json=payload) as response:
@@ -28,131 +56,54 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
             yield error_message
             return
         buffer = ""
-        cache_buffer = ""
-        revicing_function_call = False
-        function_full_response = "{"
-        need_function_call = False
-        is_finish = False
         promptTokenCount = 0
         candidatesTokenCount = 0
         totalTokenCount = 0
         parts_json = ""
-        image_base64 = ""
-        # line_index = 0
-        # last_text_line = 0
-        # if "thinking" in model:
-        #     is_thinking = True
-        # else:
-        #     is_thinking = False
         async for chunk in response.aiter_text():
             buffer += chunk
             cache_buffer += chunk
 
             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:
-                    if "stop" not in line.lower():
-                        logger.error(f"finishReason: {line}")
-                    is_finish = True
-                if is_finish and '\"promptTokenCount\": ' in line:
-                    json_data = parse_json_safely( "{" + line + "}")
-                    promptTokenCount = json_data.get('promptTokenCount', 0)
-                if is_finish and '\"candidatesTokenCount\": ' in line:
-                    json_data = parse_json_safely( "{" + line + "}")
-                    candidatesTokenCount = json_data.get('candidatesTokenCount', 0)
-                if is_finish and '\"totalTokenCount\": ' in line:
-                    json_data = parse_json_safely( "{" + line + "}")
-                    totalTokenCount = json_data.get('totalTokenCount', 0)
-
-                if (line and '"parts": [' in line or parts_json != "") and is_finish == False:
+                    parts_json = line.lstrip("data: ").strip()
+                else:
                     parts_json += line
-                if parts_json != "" and line and '],' == line.strip():
-                    # tmp_parts_json =  "{" + parts_json.split("}        ]      },")[0].strip().rstrip("}], ").replace("\n", "\\n").lstrip("{") + "}]}"
-                    tmp_parts_json =  "{" + parts_json.split("}        ]      },")[0].strip().rstrip("}], ").replace("\n", "\\n").lstrip("{")
-                    if "inlineData" in tmp_parts_json:
-                        tmp_parts_json = tmp_parts_json + "}}]}"
-                    else:
-                        tmp_parts_json = tmp_parts_json + "}]}"
+                    parts_json = parts_json.lstrip("[,")
                     try:
-                        json_data = json.loads(tmp_parts_json)
-
-                        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
+                        json.loads(parts_json)
                     except json.JSONDecodeError:
-                        logger.error(f"无法解析JSON: {parts_json}")
-                    parts_json = ""
-
-                if line and ('\"functionCall\": {' in line or revicing_function_call):
-                    revicing_function_call = True
-                    need_function_call = True
-                    if ']' in line:
-                        revicing_function_call = False
                         continue
 
-                    function_full_response += line
+                # https://ai.google.dev/api/generate-content?hl=zh-cn#FinishReason
+                is_thinking, content, image_base64, function_call_name, function_full_response, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount = gemini_json_poccess(parts_json)
 
-        if image_base64:
-            yield await generate_no_stream_response(timestamp, model, content=content, tools_id=None, function_call_name=None, function_call_content=None, role=None, total_tokens=totalTokenCount, prompt_tokens=promptTokenCount, completion_tokens=candidatesTokenCount, image_base64=image_base64)
-            return
+                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
 
-        if need_function_call:
-            function_call = json.loads(function_full_response)
-            function_call_name = function_call["functionCall"]["name"]
-            sse_string = await generate_sse_response(timestamp, model, content=None, tools_id="chatcmpl-9inWv0yEtgn873CxMBzHeCeiHctTV", function_call_name=function_call_name)
-            yield sse_string
-            function_full_response = json.dumps(function_call["functionCall"]["args"])
-            sse_string = await generate_sse_response(timestamp, model, content=None, tools_id="chatcmpl-9inWv0yEtgn873CxMBzHeCeiHctTV", function_call_name=None, function_call_content=function_full_response)
-            yield sse_string
+                if image_base64:
+                    yield await generate_no_stream_response(timestamp, model, content=content, tools_id=None, function_call_name=None, function_call_content=None, role=None, total_tokens=totalTokenCount, prompt_tokens=promptTokenCount, completion_tokens=candidatesTokenCount, image_base64=image_base64)
 
-        cache_buffer_json = {}
-        try:
-            cache_buffer_json = json.loads(cache_buffer)
-        except json.JSONDecodeError:
-            cache_buffer_json = {}
+                if function_call_name:
+                    sse_string = await generate_sse_response(timestamp, model, content=None, tools_id="chatcmpl-9inWv0yEtgn873CxMBzHeCeiHctTV", function_call_name=function_call_name)
+                    yield sse_string
+                if function_full_response:
+                    sse_string = await generate_sse_response(timestamp, model, content=None, tools_id="chatcmpl-9inWv0yEtgn873CxMBzHeCeiHctTV", function_call_name=None, function_call_content=function_full_response)
+                    yield sse_string
 
-        if cache_buffer == "[]" or safe_get(cache_buffer_json, 0, "promptFeedback", "blockReason") == "PROHIBITED_CONTENT":
-            sse_string = await generate_sse_response(timestamp, model, stop="PROHIBITED_CONTENT")
-            yield sse_string
-        else:
-            sse_string = await generate_sse_response(timestamp, model, stop="stop")
-            yield sse_string
+                if parts_json == "[]" or blockReason == "PROHIBITED_CONTENT":
+                    sse_string = await generate_sse_response(timestamp, model, stop="PROHIBITED_CONTENT")
+                    yield sse_string
+                else:
+                    sse_string = await generate_sse_response(timestamp, model, stop="stop")
+                    yield sse_string
+
+                parts_json = ""
 
         sse_string = await generate_sse_response(timestamp, model, None, None, None, None, None, totalTokenCount, promptTokenCount, candidatesTokenCount)
         yield sse_string
@@ -666,6 +617,10 @@ async def fetch_response(client, url, headers, payload, engine, model):
 
         yield response_json
 
+    elif "dashscope.aliyuncs.com" in url and "multimodal-generation" in url:
+        response_json = response.json()
+        content = safe_get(response_json, "output", "choices", 0, "message", "content", 0, default=None)
+        yield content
     else:
         response_json = response.json()
         yield response_json

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

@@ -49,10 +49,16 @@ class BaseAPI:
         self.v1_models: str = urlunparse(parsed_url[:2] + (before_v1 + "models",) + ("",) * 3)
         self.chat_url: str = urlunparse(parsed_url[:2] + (before_v1 + "chat/completions",) + ("",) * 3)
         self.image_url: str = urlunparse(parsed_url[:2] + (before_v1 + "images/generations",) + ("",) * 3)
-        self.audio_transcriptions: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/transcriptions",) + ("",) * 3)
+        if parsed_url.hostname == "dashscope.aliyuncs.com":
+            self.audio_transcriptions: str = urlunparse(parsed_url[:2] + ("/api/v1/services/aigc/multimodal-generation/generation",) + ("",) * 3)
+        else:
+            self.audio_transcriptions: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/transcriptions",) + ("",) * 3)
         self.moderations: str = urlunparse(parsed_url[:2] + (before_v1 + "moderations",) + ("",) * 3)
         self.embeddings: str = urlunparse(parsed_url[:2] + (before_v1 + "embeddings",) + ("",) * 3)
-        self.audio_speech: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/speech",) + ("",) * 3)
+        if parsed_url.hostname == "api.minimaxi.com":
+            self.audio_speech: str = urlunparse(parsed_url[:2] + ("v1/t2a_v2",) + ("",) * 3)
+        else:
+            self.audio_speech: str = urlunparse(parsed_url[:2] + (before_v1 + "audio/speech",) + ("",) * 3)
 
         if parsed_url.hostname == "generativelanguage.googleapis.com":
             self.base_url = api_url
@@ -440,8 +446,23 @@ c4 = ThreadSafeCircularList(["us-east5", "us-central1", "europe-west4", "asia-so
 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"])
-gemini2_5_pro_exp = ThreadSafeCircularList(["global"])
-
+# gemini2_5_pro_exp = ThreadSafeCircularList(["global"])
+gemini2_5_pro_exp = ThreadSafeCircularList([
+  "us-central1",
+  "us-east1",
+  "us-east4",
+  "us-east5",
+  "us-south1",
+  "us-west1",
+  "us-west4",
+  "europe-central2",
+  "europe-north1",
+  "europe-southwest1",
+  "europe-west1",
+  "europe-west4",
+  "europe-west8",
+  "europe-west9"
+])
 
 
 # end_of_line = "\n\r\n"

beswarm/tools/taskmanager.py

@@ -34,6 +34,7 @@ class TaskManager:
         self.task_cache_file.touch(exist_ok=True)
         self.read_tasks_cache()
         self.set_task_cache("root_path", str(self.root_path))
+        self.resume_all_running_task()
 
     def set_task_cache(self, *keys_and_value):
         """
@@ -86,6 +87,12 @@ class TaskManager:
             self.set_task_cache(task_id, "status", TaskStatus.RUNNING.value)
         return task_ids
 
+    def resume_all_running_task(self):
+        running_task_id_list = [task_id for task_id, task in self.tasks_cache.items() if task_id != "root_path" and task.get("status") == "RUNNING"]
+        for task_id in running_task_id_list:
+            tasks_params = self.tasks_cache[task_id]["args"]
+            task_id = task_manager.resume_task(task_id, worker_fun, tasks_params)
+
     def resume_task(self, task_id, task_coro, args):
         """
         恢复一个任务。
@@ -95,7 +102,7 @@ class TaskManager:
             return TaskStatus.NOT_FOUND
 
         coro = task_coro(**args)
-        task_id = self.create_task(coro)
+        task_id = self.create_task(coro, task_id)
         self.set_task_cache(task_id, "args", args)
         self.set_task_cache(task_id, "status", TaskStatus.RUNNING.value)
         print(f"任务已恢复: ID={task_id}, Name={task_id}")
@@ -103,7 +110,7 @@ class TaskManager:
         print(f"self.tasks_cache: {json.dumps(self.tasks_cache, ensure_ascii=False, indent=4)}")
         return task_id
 
-    def create_task(self, coro):
+    def create_task(self, coro, task_id=None):
         """
         创建并注册一个新任务。
 
@@ -114,7 +121,8 @@ class TaskManager:
         Returns:
             str: 任务的唯一ID。
         """
-        task_id = str(uuid.uuid4())
+        if task_id == None:
+            task_id = str(uuid.uuid4())
         task_name = f"Task-{task_id[:8]}"
 
         # 使用 asyncio.create_task() 创建任务
@@ -233,7 +241,7 @@ def create_task(goal, tools, work_dir):
     Args:
         goal (str): 需要完成的具体任务目标描述。子任务将围绕此目标进行工作。必须清晰、具体。必须包含背景信息，完成指标等。写清楚什么时候算任务完成，同时交代清楚任务的背景信息，这个背景信息可以是需要读取的文件等一切有助于完成任务的信息。
         tools (list[str]): 一个包含可用工具函数对象的列表。子任务在执行任务时可能会调用这些工具来与环境交互（例如读写文件、执行命令等）。
-        work_dir (str): 工作目录的绝对路径。子任务将在此目录上下文中执行操作。子任务的工作目录位置在主任务的工作目录的子目录。
+        work_dir (str): 工作目录的绝对路径。子任务将在此目录上下文中执行操作。子任务的工作目录位置在主任务的工作目录的子目录。子任务工作目录**禁止**设置为主任务目录本身。
 
     Returns:
         str: 当任务成功完成时，返回字符串 "任务已完成"。
@@ -276,6 +284,9 @@ async def get_task_result():
     Returns:
         str: 子任务的执行结果。
     """
+    running_tasks_num = len([task_id for task_id, task in task_manager.tasks_cache.items() if task_id != "root_path" and task.get("status") == "RUNNING"])
+    if running_tasks_num == 0:
+        return "All tasks are finished."
     task_id, status, result = await task_manager.get_next_result()
 
     unfinished_tasks = [task_id for task_id, task in task_manager.tasks_cache.items() if task_id != "root_path" and task.get("status") != "DONE"]

{beswarm-0.2.33.dist-info → beswarm-0.2.35.dist-info}/METADATA

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

{beswarm-0.2.33.dist-info → beswarm-0.2.35.dist-info}/RECORD

@@ -2,14 +2,14 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=5JMfOuXWHscsaeDzwBn223mj9N85eAQdOHXQZk7zeWE,32238
 beswarm/utils.py,sha256=xxbNifOPlfcVkKmF_qFzuEnZgF3MQg3mnOfz1EF0Qss,6697
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=MglF5g_LQLmX62ZgR1FmQUZanljhQx2EwLPPJjT4zac,487
+beswarm/aient/setup.py,sha256=LqjY1x8CQrcvFrHKFSyZpm5h6iBuosHIpZqXdCPnPes,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=7KpHHDyu0t2g4IQGqlV_UxK0zAAjN_-CZpyd7S5pxS0,74263
-beswarm/aient/src/aient/core/response.py,sha256=-28HYKuzgfC1y7VOrYLk75_QH5yh6c1IS024yoQM0mg,35671
-beswarm/aient/src/aient/core/utils.py,sha256=NcXdb8zBN0GE01OGaUzg8U34RaraoFf2MaLDDGFvvC4,27492
+beswarm/aient/src/aient/core/request.py,sha256=1tedDQf8GRv5Y7rYNE_596vQb4o7e1icaKAA7lIl4YY,76114
+beswarm/aient/src/aient/core/response.py,sha256=Ba0BwsIN2ozZC_UInkGS07qKlpo3dIei6rw0INQ66BE,33086
+beswarm/aient/src/aient/core/utils.py,sha256=8TR442o3VV7Kl9l6f6LlmOUQ1UDZ-aXMzQqm-qIrqE4,28166
 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
@@ -135,9 +135,9 @@ beswarm/tools/request_input.py,sha256=gXNAJPOJektMqxJVyzNTFOeMQ7xUkO-wWMYH-r2Rdw
 beswarm/tools/screenshot.py,sha256=u6t8FCgW5YHJ_Oc4coo8e0F3wTusWE_-H8dFh1rBq9Q,1011
 beswarm/tools/search_arxiv.py,sha256=caVIUOzMhFu-r_gVgJZrH2EO9xI5iV_qLAg0b3Ie9Xg,8095
 beswarm/tools/search_web.py,sha256=ybbdbJq80plooXLMiyjAMOSCEyZJ0hquGUpabBhfFx0,16195
-beswarm/tools/taskmanager.py,sha256=rVLB0xwteT-5y9svmJ68K65U3JuX9BJGvqNzyxPvjaI,12178
+beswarm/tools/taskmanager.py,sha256=n7G6cH96Tcz57MfiOffISMMAfUtr49_uikkeoCDCeRg,12940
 beswarm/tools/worker.py,sha256=s6tN4JhA07qzTlP7xWiB0MjnBIJ6XSrtlJTA_RqG1_A,23539
-beswarm-0.2.33.dist-info/METADATA,sha256=76JECSt37iGRe_rmvWVqtcXfVcdL_iTfwtktCfnHKyY,3878
-beswarm-0.2.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.33.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.33.dist-info/RECORD,,
+beswarm-0.2.35.dist-info/METADATA,sha256=cfwB-Cq_qEDmpCNZyzrFNjDtnikxw8IqmrKf0MZd_Yk,3878
+beswarm-0.2.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.35.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.35.dist-info/RECORD,,