beswarm 0.2.20__py3-none-any.whl → 0.2.22__py3-none-any.whl

beswarm/aient/setup.py

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

@@ -70,9 +70,11 @@ async def get_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}]
             tool_calls = msg.tool_calls
+        elif msg.content is None:
+            continue
 
         if tool_calls:
             tool_call = tool_calls[0]

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

@@ -28,6 +28,7 @@ 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
@@ -45,6 +46,7 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
         #     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)
@@ -139,8 +141,12 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
             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
 
-        sse_string = await generate_sse_response(timestamp, model, stop="stop")
-        yield sse_string
+        if cache_buffer == "[]":
+            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
 
         sse_string = await generate_sse_response(timestamp, model, None, None, None, None, None, totalTokenCount, promptTokenCount, candidatesTokenCount)
         yield sse_string

beswarm/tools/search_web.py

@@ -2,6 +2,7 @@ import re
 import os
 import json
 import httpx
+from urllib.parse import quote_plus
 import threading
 
 from ..aient.src.aient.plugins import register_tool, get_url_content # Assuming a similar plugin structure
@@ -36,7 +37,7 @@ async def search_web(query: str):
         "Authorization": f"Bearer {api_key}"  # 请注意：硬编码的 API 密钥
     }
     payload = {
-        "url": f"https://www.google.com/search?q={query}"
+        "url": f"https://www.google.com/search?q={quote_plus(query)}"
     }
     results = []
 
@@ -76,7 +77,10 @@ async def search_web(query: str):
         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", "")
+        html_content = results.get("html", "")
+        # print(html_content)
+        if "Your search did not match any documents" in html_content:
+            return "Your search did not match any documents"
         if html_content:
             # 使用正则表达式查找所有 URL
             # 导入 html 和 urllib.parse 模块
@@ -284,7 +288,8 @@ if __name__ == '__main__':
 
     async def main():
         # 示例用法
-        search_query = "美国"
+        # search_query = "美国"
+        search_query = "machine learning models for higher heating value prediction using proximate vs ultimate analysis"
         print(f"Performing web search for: '{search_query}'")
         results = await search_web(search_query)  # results is a list of URLs
 

beswarm/tools/worker.py

@@ -158,7 +158,7 @@ async def worker(goal, tools, work_dir, cache_messages=None):
                     "在 tag <work_agent_conversation_start>...</work_agent_conversation_end> 之前的对话历史都是工作智能体的对话历史。\n\n",
                     "根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复'任务已完成'。\n\n",
                 ])
-            if last_instruction:
+            if last_instruction and 'fetch_gpt_response_stream HTTP Error' not in last_instruction:
                 instruction_prompt = (
                     f"{instruction_prompt}\n\n"
                     "你生成的指令格式错误，必须把给assistant的指令放在<instructions>...</instructions>标签内。请重新生成格式正确的指令。"
@@ -358,7 +358,7 @@ async def worker_gen(goal, tools, work_dir, cache_messages=None):
                     "在 tag <work_agent_conversation_start>...</work_agent_conversation_end> 之前的对话历史都是工作智能体的对话历史。\n\n",
                     "根据以上对话历史和目标，请生成下一步指令。如果任务已完成，请回复'任务已完成'。\n\n",
                 ])
-            if last_instruction:
+            if last_instruction and 'fetch_gpt_response_stream HTTP Error' not in last_instruction:
                 instruction_prompt = (
                     f"{instruction_prompt}\n\n"
                     "你生成的指令格式错误，必须把给assistant的指令放在<instructions>...</instructions>标签内。请重新生成格式正确的指令。"

{beswarm-0.2.20.dist-info → beswarm-0.2.22.dist-info}/METADATA

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

{beswarm-0.2.20.dist-info → beswarm-0.2.22.dist-info}/RECORD

@@ -2,13 +2,13 @@ beswarm/__init__.py,sha256=HZjUOJtZR5QhMuDbq-wukQQn1VrBusNWai_ysGo-VVI,20
 beswarm/prompt.py,sha256=_hYKZ0MUiMRs3C-1PMlFKIVgTKFcp_irla3p3wQNF3c,32015
 beswarm/utils.py,sha256=xxbNifOPlfcVkKmF_qFzuEnZgF3MQg3mnOfz1EF0Qss,6697
 beswarm/aient/main.py,sha256=SiYAIgQlLJqYusnTVEJOx1WNkSJKMImhgn5aWjfroxg,3814
-beswarm/aient/setup.py,sha256=Hcq_uOqTwoWjE-xk10RUtoaw-Ekw1vSgowdluWGHK7A,487
+beswarm/aient/setup.py,sha256=TTd2yaKXQpCf2v-b35OeJhLMXEJ-QRkhO48wTq7edKk,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=90Mit0vrwoDJYQQVJmBltQdTnMaGKSmZNBMRXsoJ19A,72406
-beswarm/aient/src/aient/core/response.py,sha256=mAVsCnNhWY09DXNe0lyPUJq-1ljtGjC67Az-Uh7ozIw,35166
+beswarm/aient/src/aient/core/request.py,sha256=r8IvC62GZ6NuBXx82Fd0hiPjYrtqhW3hKz2jdqVY8L0,72473
+beswarm/aient/src/aient/core/response.py,sha256=_FVvvakplKAvBMljXy8jm9hMGJ8xgHGrsU8Aio9Xk1o,35408
 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
@@ -133,10 +133,10 @@ beswarm/tools/repomap.py,sha256=YsTPq5MXfn_Ds5begcvHDnY_Xp2d4jH-xmWqNMHnNHY,4523
 beswarm/tools/request_input.py,sha256=gXNAJPOJektMqxJVyzNTFOeMQ7xUkO-wWMYH-r2Rdwk,942
 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=Zxt2Mpeuqa40sKttCxeI71O_TWnoANw7na7CdlGknvg,11659
+beswarm/tools/search_web.py,sha256=tLdw63doMTorrCG3ZoQkKvQPYBdx-m-SJskAXxfdim8,11958
 beswarm/tools/taskmanager.py,sha256=oB_768qy6Lb58JNIcSLVgbPrgNB3duIq9DawbVHRbrg,6270
-beswarm/tools/worker.py,sha256=W-NqcO8T6Y_gsgVvNaKk4hbpqA8_odz18v6qb17s64w,23674
-beswarm-0.2.20.dist-info/METADATA,sha256=IZ_X1o3xFa3WDr5RoFPjKzWGobRlMqyTee91YwIk6UQ,3847
-beswarm-0.2.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-beswarm-0.2.20.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
-beswarm-0.2.20.dist-info/RECORD,,
+beswarm/tools/worker.py,sha256=Rxc8OnbqSrNeZc1ZvEPSKgFHbJnlG_fO6NF61m6f4OU,23808
+beswarm-0.2.22.dist-info/METADATA,sha256=62WXG9mPgoiF0gsEpdQfzpTueuvBJIi_5W4r4uVD2yc,3847
+beswarm-0.2.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+beswarm-0.2.22.dist-info/top_level.txt,sha256=pJw4O87wvt5882smuSO6DfByJz7FJ8SxxT8h9fHCmpo,8
+beswarm-0.2.22.dist-info/RECORD,,