aient 1.1.45__py3-none-any.whl → 1.1.47__py3-none-any.whl

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/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/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.dist-info → aient-1.1.47.dist-info}/METADATA

@@ -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.dist-info → aient-1.1.47.dist-info}/RECORD

@@ -4,8 +4,8 @@ aient/core/.gitignore,sha256=5JRRlYYsqt_yt6iFvvzhbqh2FTUQMqwo6WwIuFzlGR8,13
 aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=d4MISNezTSe0ls0-fjuToI2SoT-sk5fWqAJuKVinIlo,7502
-aient/core/request.py,sha256=90Mit0vrwoDJYQQVJmBltQdTnMaGKSmZNBMRXsoJ19A,72406
-aient/core/response.py,sha256=mAVsCnNhWY09DXNe0lyPUJq-1ljtGjC67Az-Uh7ozIw,35166
+aient/core/request.py,sha256=8HlSFaBhWMs5thhL4C5qj-hvuDZWUXCYWwVShFR99QU,72263
+aient/core/response.py,sha256=xSOmc4aBFeoT-Cx42B6GrRvsxalx-dOiGdjN1WByyXs,35673
 aient/core/utils.py,sha256=NcXdb8zBN0GE01OGaUzg8U34RaraoFf2MaLDDGFvvC4,27492
 aient/core/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
@@ -32,13 +32,13 @@ aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9ujcXGyuqlGTJMd7ac,4
 aient/plugins/readonly.py,sha256=qK5-kBM3NDH1b-otFxFHpAjV5BXEY_e7cTWBcpP7G5k,710
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 aient/plugins/run_python.py,sha256=MohvdtZUTDLrHBDtJ9L2_Qu1pWAGrkbzsGmmn5tMN20,4614
-aient/plugins/websearch.py,sha256=51tNjEe3pAElXY3SIxaXFYjRrHdGiY6nkmVPU1lTWoY,15258
+aient/plugins/websearch.py,sha256=LPS5NmHrY-Rc0FCPlhHrUWE90XJmXF_AvShLHTV_Zqc,15285
 aient/plugins/write_file.py,sha256=hExFLuoNPtjYxJI3pVbofZRpokvUabpXdEkd3mZJPPc,3778
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=h7EA2xBydUF_wdZLsPgjCq4Egdycx1gf2qrdrm0I7y0,40909
-aient-1.1.45.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.1.45.dist-info/METADATA,sha256=odZHF3piyTukdpJhM9WWX4Cn37vEfllSBI2uf5bHlpA,4968
-aient-1.1.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.1.45.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.1.45.dist-info/RECORD,,
+aient-1.1.47.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.1.47.dist-info/METADATA,sha256=HRox8OdYBJaWJjcC28C7COuZ9SQfEfGSDJehFJAXk7U,4968
+aient-1.1.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.1.47.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.1.47.dist-info/RECORD,,