aient 1.0.30__py3-none-any.whl → 1.0.32__py3-none-any.whl

aient/core/response.py

@@ -85,7 +85,7 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
             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
-        yield "data: [DONE]" + end_of_line
+    yield "data: [DONE]" + end_of_line
 
 async def fetch_vertex_claude_response_stream(client, url, headers, payload, model):
     timestamp = int(datetime.timestamp(datetime.now()))
@@ -132,7 +132,7 @@ async def fetch_vertex_claude_response_stream(client, url, headers, payload, mod
             function_full_response = json.dumps(function_call["input"])
             sse_string = await generate_sse_response(timestamp, model, content=None, tools_id=function_call_id, function_call_name=None, function_call_content=function_full_response)
             yield sse_string
-        yield "data: [DONE]" + end_of_line
+    yield "data: [DONE]" + end_of_line
 
 async def fetch_gpt_response_stream(client, url, headers, payload):
     timestamp = int(datetime.timestamp(datetime.now()))
@@ -156,8 +156,7 @@ async def fetch_gpt_response_stream(client, url, headers, payload):
                 # logger.info("line: %s", repr(line))
                 if line and line != "data: " and line != "data:" and not line.startswith(": ") and (result:=line.lstrip("data: ").strip()):
                     if result.strip() == "[DONE]":
-                        yield "data: [DONE]" + end_of_line
-                        return
+                        break
                     line = json.loads(result)
                     line['id'] = f"chatcmpl-{random_str}"
 
@@ -242,6 +241,7 @@ async def fetch_gpt_response_stream(client, url, headers, payload):
                         if no_stream_content:
                             del line["choices"][0]["message"]
                         yield "data: " + json.dumps(line).strip() + end_of_line
+    yield "data: [DONE]" + end_of_line
 
 async def fetch_azure_response_stream(client, url, headers, payload):
     timestamp = int(datetime.timestamp(datetime.now()))
@@ -264,8 +264,7 @@ async def fetch_azure_response_stream(client, url, headers, payload):
                 if line and line != "data: " and line != "data:" and not line.startswith(": "):
                     result = line.lstrip("data: ")
                     if result.strip() == "[DONE]":
-                        yield "data: [DONE]" + end_of_line
-                        return
+                        break
                     line = json.loads(result)
                     no_stream_content = safe_get(line, "choices", 0, "message", "content", default="")
                     content = safe_get(line, "choices", 0, "delta", "content", default="")
@@ -296,7 +295,7 @@ async def fetch_azure_response_stream(client, url, headers, payload):
                         if no_stream_content:
                             del line["choices"][0]["message"]
                         yield "data: " + json.dumps(line).strip() + end_of_line
-        yield "data: [DONE]" + end_of_line
+    yield "data: [DONE]" + end_of_line
 
 async def fetch_cloudflare_response_stream(client, url, headers, payload, model):
     timestamp = int(datetime.timestamp(datetime.now()))
@@ -315,13 +314,13 @@ async def fetch_cloudflare_response_stream(client, url, headers, payload, model)
                 if line.startswith("data:"):
                     line = line.lstrip("data: ")
                     if line == "[DONE]":
-                        yield "data: [DONE]" + end_of_line
-                        return
+                        break
                     resp: dict = json.loads(line)
                     message = resp.get("response")
                     if message:
                         sse_string = await generate_sse_response(timestamp, model, content=message)
                         yield sse_string
+    yield "data: [DONE]" + end_of_line
 
 async def fetch_cohere_response_stream(client, url, headers, payload, model):
     timestamp = int(datetime.timestamp(datetime.now()))
@@ -339,12 +338,12 @@ async def fetch_cohere_response_stream(client, url, headers, payload, model):
                 # logger.info("line: %s", repr(line))
                 resp: dict = json.loads(line)
                 if resp.get("is_finished") == True:
-                    yield "data: [DONE]" + end_of_line
-                    return
+                    break
                 if resp.get("event_type") == "text-generation":
                     message = resp.get("text")
                     sse_string = await generate_sse_response(timestamp, model, content=message)
                     yield sse_string
+    yield "data: [DONE]" + end_of_line
 
 async def fetch_claude_response_stream(client, url, headers, payload, model):
     timestamp = int(datetime.timestamp(datetime.now()))
@@ -409,7 +408,7 @@ async def fetch_claude_response_stream(client, url, headers, payload, model):
                         function_call_content = delta["partial_json"]
                         sse_string = await generate_sse_response(timestamp, model, None, None, None, function_call_content)
                         yield sse_string
-        yield "data: [DONE]" + end_of_line
+    yield "data: [DONE]" + end_of_line
 
 async def fetch_response(client, url, headers, payload, engine, model):
     response = None
@@ -501,7 +500,6 @@ async def fetch_response(client, url, headers, payload, engine, model):
         yield response_json
 
 async def fetch_response_stream(client, url, headers, payload, engine, model):
-    # try:
     if engine == "gemini" or engine == "vertex-gemini":
         async for chunk in fetch_gemini_response_stream(client, url, headers, payload, model):
             yield chunk
@@ -524,8 +522,4 @@ async def fetch_response_stream(client, url, headers, payload, engine, model):
         async for chunk in fetch_cohere_response_stream(client, url, headers, payload, model):
             yield chunk
     else:
-        raise ValueError("Unknown response")
-    # except httpx.ConnectError as e:
-    #     yield {"error": f"500", "details": "fetch_response_stream Connect Error"}
-    # except httpx.ReadTimeout as e:
-    #     yield {"error": f"500", "details": "fetch_response_stream Read Response Timeout"}
+        raise ValueError("Unknown response")

aient/models/chatgpt.py

@@ -560,6 +560,8 @@ class chatgpt(BaseLLM):
             except requests.exceptions.ReadTimeout:
                 print("请求超时，请检查网络连接或增加超时时间。")
                 return
+            except httpx.RemoteProtocolError:
+                continue
             except Exception as e:
                 print(f"发生了未预料的错误：{e}")
                 if "Invalid URL" in str(e):
@@ -651,6 +653,8 @@ class chatgpt(BaseLLM):
 
                 # 成功处理，跳出重试循环
                 break
+            except httpx.RemoteProtocolError:
+                continue
             except Exception as e:
                 print(f"发生了未预料的错误：{e}")
                 import traceback

{aient-1.0.30.dist-info → aient-1.0.32.dist-info}/METADATA

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

{aient-1.0.30.dist-info → aient-1.0.32.dist-info}/RECORD

@@ -4,7 +4,7 @@ aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=8MsuiYHBHVR5UMQ_cNLkvntoxalS7NpVwaNwHA0iZmk,7379
 aient/core/request.py,sha256=Tk8ylLBHPsrA4C_fb2XUEz_ZM7tR4691mlIxn7x8LUU,48249
-aient/core/response.py,sha256=jE2d-X-ukP5Jy5FCG2VHw5VZgPzhH56_N0gQPqIVggA,26351
+aient/core/response.py,sha256=7s1Jil0E5nnbL9xQldcjHIqSp0MFeWQo9mNX_iAuvSk,25954
 aient/core/utils.py,sha256=i9ZwyywBLIhRM0fNmFSD3jF3dBL5QqVMOtSlG_ddv-I,24101
 aient/core/test/test_base_api.py,sha256=CjfFzMG26r8C4xCPoVkKb3Ac6pp9gy5NUCbZJHoSSsM,393
 aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
@@ -12,7 +12,7 @@ aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhF
 aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
 aient/models/base.py,sha256=Loyt2F2WrDMBbK-sdmTtgkLVtdUXxK5tg4qoI6nc0Xo,7527
-aient/models/chatgpt.py,sha256=-07w8jTw6S5eKMWRtyWxTAM-2QQsDI1qyUWvnsT5eLU,36921
+aient/models/chatgpt.py,sha256=d7ZGc2WTrpwevXCFzIX4HU0zZ0T_mwfYkrStZ8yW5v0,37063
 aient/models/claude.py,sha256=thK9P8qkaaoUN3OOJ9Shw4KDs-pAGKPoX4FOPGFXva8,28597
 aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -29,8 +29,8 @@ aient/plugins/websearch.py,sha256=k23xymhf3xxdc3hc0_0FFZTI9OaThCYM6csYsygCHs8,15
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=O-0IXN3mezPauFs6fw83WDDgklpXTDvcbJBNTDrsIG0,8201
-aient-1.0.30.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.0.30.dist-info/METADATA,sha256=C9oMqYMyG1GfKHa1R5J08eMqCbpcA9r-sECkSKx985Y,4986
-aient-1.0.30.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-aient-1.0.30.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.0.30.dist-info/RECORD,,
+aient-1.0.32.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.0.32.dist-info/METADATA,sha256=l2oZ7hWojO3bq4hWyjpxkxVvhuWAZAqiYwHdj5y0Dd0,4986
+aient-1.0.32.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+aient-1.0.32.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.0.32.dist-info/RECORD,,