aient 1.1.83__tar.gz → 1.1.85__tar.gz

{aient-1.1.83 → aient-1.1.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.83
+Version: 1.1.85
 Summary: Aient: The Awakening of Agent.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{aient-1.1.83 → aient-1.1.85}/aient/core/response.py

@@ -21,13 +21,12 @@ async def check_response(response, error_log):
         return {"error": f"{error_log} HTTP Error", "status_code": response.status_code, "details": error_json}
     return None
 
-async def gemini_json_poccess(response_str):
+async def gemini_json_poccess(response_json):
     promptTokenCount = 0
     candidatesTokenCount = 0
     totalTokenCount = 0
     image_base64 = None
 
-    response_json = await asyncio.to_thread(json.loads, response_str)
     json_data = safe_get(response_json, "candidates", 0, "content", default=None)
     finishReason = safe_get(response_json, "candidates", 0 , "finishReason", default=None)
     if finishReason:
@@ -48,7 +47,7 @@ async def gemini_json_poccess(response_str):
 
     function_call_name = safe_get(json_data, "functionCall", "name", default=None)
     function_full_response = safe_get(json_data, "functionCall", "args", default="")
-    function_full_response = json.dumps(function_full_response) if function_full_response else None
+    function_full_response = await asyncio.to_thread(json.dumps, function_full_response) if function_full_response else None
 
     blockReason = safe_get(json_data, 0, "promptFeedback", "blockReason", default=None)
 
@@ -56,7 +55,8 @@ async def gemini_json_poccess(response_str):
 
 async def fetch_gemini_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_gemini_response_stream")
         if error_message:
             yield error_message
@@ -76,7 +76,7 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model, tim
                 if line.startswith("data: "):
                     parts_json = line.lstrip("data: ").strip()
                     try:
-                        await asyncio.to_thread(json.loads, parts_json)
+                        response_json = await asyncio.to_thread(json.loads, parts_json)
                     except json.JSONDecodeError:
                         logger.error(f"JSON decode error: {parts_json}")
                         continue
@@ -84,12 +84,12 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model, tim
                     parts_json += line
                     parts_json = parts_json.lstrip("[,")
                     try:
-                        await asyncio.to_thread(json.loads, parts_json)
+                        response_json = await asyncio.to_thread(json.loads, parts_json)
                     except json.JSONDecodeError:
                         continue
 
                 # https://ai.google.dev/api/generate-content?hl=zh-cn#FinishReason
-                is_thinking, reasoning_content, content, image_base64, function_call_name, function_full_response, finishReason, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount = await gemini_json_poccess(parts_json)
+                is_thinking, reasoning_content, content, image_base64, function_call_name, function_full_response, finishReason, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount = await gemini_json_poccess(response_json)
 
                 if is_thinking:
                     sse_string = await generate_sse_response(timestamp, model, reasoning_content=reasoning_content)
@@ -125,7 +125,8 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model, tim
 
 async def fetch_vertex_claude_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_vertex_claude_response_stream")
         if error_message:
             yield error_message
@@ -198,7 +199,8 @@ async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
     is_thinking = False
     has_send_thinking = False
     ark_tag = False
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_gpt_response_stream")
         if error_message:
             yield error_message
@@ -312,7 +314,8 @@ async def fetch_azure_response_stream(client, url, headers, payload, timeout):
     is_thinking = False
     has_send_thinking = False
     ark_tag = False
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_azure_response_stream")
         if error_message:
             yield error_message
@@ -365,7 +368,8 @@ async def fetch_azure_response_stream(client, url, headers, payload, timeout):
 
 async def fetch_cloudflare_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_cloudflare_response_stream")
         if error_message:
             yield error_message
@@ -390,7 +394,8 @@ async def fetch_cloudflare_response_stream(client, url, headers, payload, model,
 
 async def fetch_cohere_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_cohere_response_stream")
         if error_message:
             yield error_message
@@ -413,7 +418,8 @@ async def fetch_cohere_response_stream(client, url, headers, payload, model, tim
 
 async def fetch_claude_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_claude_response_stream")
         if error_message:
             yield error_message
@@ -466,7 +472,8 @@ async def fetch_claude_response_stream(client, url, headers, payload, model, tim
 
 async def fetch_aws_response_stream(client, url, headers, payload, model, timeout):
     timestamp = int(datetime.timestamp(datetime.now()))
-    async with client.stream('POST', url, headers=headers, json=payload, timeout=timeout) as response:
+    json_payload = await asyncio.to_thread(json.dumps, payload)
+    async with client.stream('POST', url, headers=headers, content=json_payload, timeout=timeout) as response:
         error_message = await check_response(response, "fetch_aws_response_stream")
         if error_message:
             yield error_message
@@ -521,7 +528,8 @@ async def fetch_response(client, url, headers, payload, engine, model, timeout=2
         file = payload.pop("file")
         response = await client.post(url, headers=headers, data=payload, files={"file": file}, timeout=timeout)
     else:
-        response = await client.post(url, headers=headers, json=payload, timeout=timeout)
+        json_payload = await asyncio.to_thread(json.dumps, payload)
+        response = await client.post(url, headers=headers, content=json_payload, timeout=timeout)
     error_message = await check_response(response, "fetch_response")
     if error_message:
         yield error_message

{aient-1.1.83 → aient-1.1.85}/aient/models/chatgpt.py

@@ -236,6 +236,10 @@ class chatgpt(BaseLLM):
                     if type(self.conversation[convo_id][message_index]["content"]) == list \
                     and type(self.conversation[convo_id][message_index + 1]["content"]) == dict:
                         self.conversation[convo_id][message_index + 1]["content"] = [self.conversation[convo_id][message_index + 1]["content"]]
+                    if type(self.conversation[convo_id][message_index]["content"]) == str \
+                    and type(self.conversation[convo_id][message_index + 1]["content"]) == str \
+                    and self.conversation[convo_id][message_index].get("content").endswith(self.conversation[convo_id][message_index + 1].get("content")):
+                        self.conversation[convo_id][message_index + 1]["content"] = ""
                     self.conversation[convo_id][message_index]["content"] += self.conversation[convo_id][message_index + 1]["content"]
                 self.conversation[convo_id].pop(message_index + 1)
                 conversation_len = conversation_len - 1
@@ -744,7 +748,8 @@ class chatgpt(BaseLLM):
         need_done_prompt = False
 
         # 发送请求并处理响应
-        for i in range(10):
+        retry_times = 0
+        while True:
             tmp_post_json = copy.deepcopy(json_post)
             if need_done_prompt:
                 tmp_post_json["messages"].extend(need_done_prompt)
@@ -809,7 +814,7 @@ class chatgpt(BaseLLM):
                 return # Stop iteration
             except httpx.RemoteProtocolError:
                 continue
-            except httpx.ReadError:
+            except httpx.ReadError as e:
                 self.logger.warning(f"{e}, retrying...")
                 continue
             except APITimeoutError:
@@ -843,7 +848,8 @@ class chatgpt(BaseLLM):
                     error_message = "您输入了无效的API URL，请使用正确的URL并使用`/start`命令重新设置API URL。具体错误如下：\n\n" + str(e)
                     raise ConfigurationError(error_message)
                 # 最后一次重试失败，向上抛出异常
-                if i == 10:
+                retry_times += 1
+                if retry_times == 9:
                     raise RetryFailedError(str(e))
 
     def ask_stream(

{aient-1.1.83 → aient-1.1.85}/aient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.1.83
+Version: 1.1.85
 Summary: Aient: The Awakening of Agent.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{aient-1.1.83 → aient-1.1.85}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aient"
-version = "1.1.83"
+version = "1.1.85"
 description = "Aient: The Awakening of Agent."
 readme = "README.md"
 requires-python = ">=3.11"