aient 1.0.29__py3-none-any.whl → 1.0.31__py3-none-any.whl

aient/core/response.py

@@ -156,8 +156,8 @@ 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
+                        # yield "data: [DONE]" + end_of_line
+                        break
                     line = json.loads(result)
                     line['id'] = f"chatcmpl-{random_str}"
 
@@ -242,6 +242,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 +265,8 @@ 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
+                        # yield "data: [DONE]" + end_of_line
+                        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="")
@@ -315,13 +316,14 @@ 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
+                        # yield "data: [DONE]" + end_of_line
+                        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 +341,13 @@ 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
+                    # yield "data: [DONE]" + end_of_line
+                    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()))

aient/plugins/websearch.py

@@ -115,10 +115,11 @@ def jina_ai_Web_crawler(url: str, isSearch=False) -> str:
         if result.count("\"") > 1000:
             result = ""
     except Exception as e:
-        print('\033[31m')
-        print("error: jina_ai_Web_crawler url", url)
-        print("error", e)
-        print('\033[0m')
+        # print('\033[31m')
+        # print("error: jina_ai_Web_crawler url", url)
+        # print("error", e)
+        # print('\033[0m')
+        pass
     # print(result + "\n\n")
     return result
 
@@ -132,9 +133,9 @@ def get_url_content(url: str) -> str:
     """
     markdown_content = url_to_markdown(url)
     # print(markdown_content)
-    print('-----------------------------')
+    # print('-----------------------------')
     jina_content = jina_ai_Web_crawler(url)
-    print('-----------------------------')
+    # print('-----------------------------')
 
     # 定义评分函数
     def score_content(content):
@@ -162,17 +163,17 @@ def get_url_content(url: str) -> str:
     else:
         jina_score = score_content(jina_content)
 
-    print(f"url_to_markdown 得分： {markdown_score}")
-    print(f"jina_ai_Web_crawler 得分： {jina_score}")
+    # print(f"url_to_markdown 得分： {markdown_score}")
+    # print(f"jina_ai_Web_crawler 得分： {jina_score}")
 
     if markdown_score > jina_score:
-        print("choose: 选择 url_to_markdown 的结果")
+        # print("choose: 选择 url_to_markdown 的结果")
         return markdown_content
     elif markdown_score == jina_score and jina_score < 0:
         print("choose: 两者都无法访问")
         return ""
     else:
-        print("choose: 选择 jina_ai_Web_crawler 的结果")
+        # print("choose: 选择 jina_ai_Web_crawler 的结果")
         return jina_content
 
 def getddgsearchurl(query, max_results=4):

{aient-1.0.29.dist-info → aient-1.0.31.dist-info}/METADATA

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

{aient-1.0.29.dist-info → aient-1.0.31.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=buyzyD971msbPgNCiTlCGX13RGI90u4_qOejqERdrVU,26484
 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
@@ -25,12 +25,12 @@ aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
 aient/plugins/registry.py,sha256=YknzhieU_8nQ3oKlUSSWDB4X7t2Jx0JnqT2Jd9Xsvfk,3574
 aient/plugins/run_python.py,sha256=dgcUwBunMuDkaSKR5bToudVzSdrXVewktDDFUz_iIOQ,4589
 aient/plugins/today.py,sha256=btnXJNqWorJDKPvH9PBTdHaExpVI1YPuSAeRrq-fg9A,667
-aient/plugins/websearch.py,sha256=RY0BaYgPC3OTTTDlezakXm6JvXixMEXUqHN5MXpXijw,15144
+aient/plugins/websearch.py,sha256=k23xymhf3xxdc3hc0_0FFZTI9OaThCYM6csYsygCHs8,15177
 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.29.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.0.29.dist-info/METADATA,sha256=BmMRouk-Oict-XOBDYh8toZrKz54jBi2r9XHtzceiOY,4986
-aient-1.0.29.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-aient-1.0.29.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.0.29.dist-info/RECORD,,
+aient-1.0.31.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.0.31.dist-info/METADATA,sha256=NnEBkrEZDpwteENWvGWy0fdljoc3fJl_SoMba_7ebPc,4986
+aient-1.0.31.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+aient-1.0.31.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.0.31.dist-info/RECORD,,