beswarm 0.2.20__tar.gz → 0.2.21__tar.gz

{beswarm-0.2.20 → beswarm-0.2.21}/PKG-INFO

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

{beswarm-0.2.20 → beswarm-0.2.21}/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-0.2.20 → beswarm-0.2.21}/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-0.2.20 → beswarm-0.2.21}/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-0.2.20 → beswarm-0.2.21}/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-0.2.20 → beswarm-0.2.21}/beswarm.egg-info/PKG-INFO

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

{beswarm-0.2.20 → beswarm-0.2.21}/pyproject.toml

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