beswarm 0.2.34__tar.gz → 0.2.35__tar.gz

{beswarm-0.2.34 → beswarm-0.2.35}/PKG-INFO

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

{beswarm-0.2.34 → beswarm-0.2.35}/beswarm/aient/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.52",
+    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-0.2.34 → beswarm-0.2.35}/beswarm/aient/src/aient/core/request.py

@@ -74,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]
@@ -110,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"])
@@ -409,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:
@@ -445,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"]

{beswarm-0.2.34 → beswarm-0.2.35}/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

{beswarm-0.2.34 → beswarm-0.2.35}/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: 当任务成功完成时，返回字符串 "任务已完成"。

{beswarm-0.2.34 → beswarm-0.2.35}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.34 → beswarm-0.2.35}/pyproject.toml

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