aient 1.1.45__tar.gz → 1.1.47__tar.gz

{aient-1.1.45/src/aient.egg-info → aient-1.1.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.45
+Version: 1.1.47
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE

{aient-1.1.45 → aient-1.1.47}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.45",
+    version="1.1.47",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

{aient-1.1.45 → aient-1.1.47}/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]
@@ -254,8 +256,6 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
-                if val == 0:
-                    payload["generationConfig"].pop("thinkingConfig", None)
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass
@@ -552,8 +552,6 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
                 elif val > 24576:
                     val = 24576
                 payload["generationConfig"]["thinkingConfig"]["thinkingBudget"] = val
-                if val == 0:
-                    payload["generationConfig"].pop("thinkingConfig", None)
             except ValueError:
                 # 如果转换为整数失败，忽略思考预算设置
                 pass

{aient-1.1.45 → aient-1.1.47}/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,18 @@ 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
+        cache_buffer_json = {}
+        try:
+            cache_buffer_json = json.loads(cache_buffer)
+        except json.JSONDecodeError:
+            cache_buffer_json = {}
+
+        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
 
         sse_string = await generate_sse_response(timestamp, model, None, None, None, None, None, totalTokenCount, promptTokenCount, candidatesTokenCount)
         yield sse_string

{aient-1.1.45 → aient-1.1.47}/src/aient/plugins/websearch.py

@@ -83,7 +83,7 @@ def jina_ai_Web_crawler(url: str, isSearch=False) -> str:
         from bs4 import BeautifulSoup
         requests.packages.urllib3.disable_warnings()
         url = "https://r.jina.ai/" + url
-        response = requests.get(url, headers=headers, verify=False, timeout=5, stream=True)
+        response = requests.get(url, headers=headers, verify=False, timeout=20, stream=True)
         if response.status_code == 404:
             print("Page not found:", url)
             return "抱歉，网页不存在，目前无法访问该网页。@Trash@"
@@ -133,6 +133,7 @@ def get_url_content(url: str) -> str:
     # print(markdown_content)
     # print('-----------------------------')
     jina_content = jina_ai_Web_crawler(url)
+    # print(jina_content)
     # print('-----------------------------')
 
     # 定义评分函数

{aient-1.1.45 → aient-1.1.47/src/aient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.45
+Version: 1.1.47
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE