aient 1.2.42__py3-none-any.whl → 1.2.43__py3-none-any.whl

aient/core/request.py

@@ -1015,9 +1015,16 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
             for item in msg.content:
                 if item.type == "text":
                     text_message = await get_text_message(item.text, engine)
+                    if "v1/responses" in url:
+                        text_message["type"] = "input_text"
                     content.append(text_message)
                 elif item.type == "image_url" and provider.get("image", True) and "o1-mini" not in original_model:
                     image_message = await get_image_message(item.image_url.url, engine)
+                    if "v1/responses" in url:
+                        image_message = {
+                            "type": "input_image",
+                            "image_url": image_message["image_url"]["url"]
+                        }
                     content.append(image_message)
         else:
             content = msg.content
@@ -1049,10 +1056,16 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
         system_msg = messages.pop(0)
         messages[0]["content"] = system_msg["content"] + messages[0]["content"]
 
-    payload = {
-        "model": original_model,
-        "messages": messages,
-    }
+    if "v1/responses" in url:
+        payload = {
+            "model": original_model,
+            "input": messages,
+        }
+    else:
+        payload = {
+            "model": original_model,
+            "messages": messages,
+        }
 
     miss_fields = [
         'model',
@@ -1085,11 +1098,20 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
     "o3" in original_model or "o4" in original_model or \
     "gpt-oss" in original_model or "gpt-5" in original_model:
         if request.model.endswith("high"):
-            payload["reasoning_effort"] = "high"
+            if "v1/responses" in url:
+                payload["reasoning"] = {"effort": "high"}
+            else:
+                payload["reasoning_effort"] = "high"
         elif request.model.endswith("low"):
-            payload["reasoning_effort"] = "low"
+            if "v1/responses" in url:
+                payload["reasoning"] = {"effort": "low"}
+            else:
+                payload["reasoning_effort"] = "low"
         else:
-            payload["reasoning_effort"] = "medium"
+            if "v1/responses" in url:
+                payload["reasoning"] = {"effort": "medium"}
+            else:
+                payload["reasoning_effort"] = "medium"
 
         if "temperature" in payload:
             payload.pop("temperature")

aient/core/response.py

@@ -213,6 +213,10 @@ async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
 
         buffer = ""
         enter_buffer = ""
+
+        input_tokens = 0
+        output_tokens = 0
+
         async for chunk in response.aiter_text():
             buffer += chunk
             while "\n" in buffer:
@@ -221,12 +225,32 @@ async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
                 if line.startswith(": keepalive"):
                     yield line + end_of_line
                     continue
-                if line and not line.startswith(":") and (result:=line.lstrip("data: ").strip()):
+                if line and not line.startswith(":") and (result:=line.lstrip("data: ").strip()) and not line.startswith("event: "):
                     if result.strip() == "[DONE]":
                         break
                     line = await asyncio.to_thread(json.loads, result)
                     line['id'] = f"chatcmpl-{random_str}"
 
+                    # v1/responses
+                    if line.get("type") == "response.reasoning_summary_text.delta" and line.get("delta"):
+                        sse_string = await generate_sse_response(timestamp, payload["model"], reasoning_content=line.get("delta"))
+                        yield sse_string
+                        continue
+                    elif line.get("type") == "response.output_text.delta" and line.get("delta"):
+                        sse_string = await generate_sse_response(timestamp, payload["model"], content=line.get("delta"))
+                        yield sse_string
+                        continue
+                    elif line.get("type") == "response.output_text.done":
+                        sse_string = await generate_sse_response(timestamp, payload["model"], stop="stop")
+                        yield sse_string
+                        continue
+                    elif line.get("type") == "response.completed":
+                        input_tokens = safe_get(line, "response", "usage", "input_tokens", default=0)
+                        output_tokens = safe_get(line, "response", "usage", "output_tokens", default=0)
+                        continue
+                    elif line.get("type", "").startswith("response."):
+                        continue
+
                     # 处理 <think> 标签
                     content = safe_get(line, "choices", 0, "delta", "content", default="")
                     if "<think>" in content:
@@ -322,6 +346,11 @@ async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
                             del line["choices"][0]["message"]
                         json_line = await asyncio.to_thread(json.dumps, line)
                         yield "data: " + json_line.strip() + end_of_line
+
+    if input_tokens and output_tokens:
+        sse_string = await generate_sse_response(timestamp, payload["model"], None, None, None, None, None, total_tokens=input_tokens + output_tokens, prompt_tokens=input_tokens, completion_tokens=output_tokens)
+        yield sse_string
+
     yield "data: [DONE]" + end_of_line
 
 async def fetch_azure_response_stream(client, url, headers, payload, timeout):

aient/core/utils.py

@@ -50,7 +50,11 @@ class BaseAPI:
             self.v1_models: str = urlunparse(parsed_url[:2] + ("v1/models",) + ("",) * 3)
         else:
             self.v1_models: str = urlunparse(parsed_url[:2] + (before_v1 + "models",) + ("",) * 3)
-        self.chat_url: str = urlunparse(parsed_url[:2] + (before_v1 + "chat/completions",) + ("",) * 3)
+
+        if "v1/responses" in parsed_url.path:
+            self.chat_url: str = urlunparse(parsed_url[:2] + ("v1/responses",) + ("",) * 3)
+        else:
+            self.chat_url: str = urlunparse(parsed_url[:2] + (before_v1 + "chat/completions",) + ("",) * 3)
         self.image_url: str = urlunparse(parsed_url[:2] + (before_v1 + "images/generations",) + ("",) * 3)
         if parsed_url.hostname == "dashscope.aliyuncs.com":
             self.audio_transcriptions: str = urlunparse(parsed_url[:2] + ("/api/v1/services/aigc/multimodal-generation/generation",) + ("",) * 3)

aient/models/chatgpt.py

@@ -12,7 +12,7 @@ from typing import Union, Optional, Callable
 from .base import BaseLLM
 from ..plugins.registry import registry
 from ..plugins import PLUGINS, get_tools_result_async, function_call_list, update_tools_config
-from ..utils.scripts import safe_get, async_generator_to_sync, parse_function_xml, parse_continuous_json, convert_functions_to_xml, remove_xml_tags_and_content, find_most_frequent_phrase
+from ..utils.scripts import safe_get, async_generator_to_sync, parse_function_xml, parse_continuous_json, convert_functions_to_xml, remove_xml_tags_and_content
 from ..core.request import prepare_request_payload
 from ..core.response import fetch_response_stream, fetch_response
 from ..architext.architext import Messages, SystemMessage, UserMessage, AssistantMessage, ToolCalls, ToolResults, Texts, RoleMessage, Images, Files
@@ -80,7 +80,7 @@ class TaskComplete(Exception):
         self.completion_message = message
         super().__init__(f"Task completed with message: {message}")
 
-
+# 结尾重复响应错误
 class RepetitiveResponseError(Exception):
     """Custom exception for detecting repetitive and meaningless generated strings."""
     def __init__(self, message, phrase, count):
@@ -446,13 +446,6 @@ class chatgpt(BaseLLM):
 
         if not full_response.strip() and not need_function_call:
             raise EmptyResponseError("Response is empty")
-        most_frequent_phrase, most_frequent_phrase_count = find_most_frequent_phrase(full_response)
-        if most_frequent_phrase_count > 100:
-            raise RepetitiveResponseError(
-                f"Detected repetitive and meaningless content. The phrase '{most_frequent_phrase}' appeared {most_frequent_phrase_count} times.",
-                most_frequent_phrase,
-                most_frequent_phrase_count
-            )
 
         if self.print_log:
             self.logger.info(f"total_tokens: {total_tokens}")

{aient-1.2.42.dist-info → aient-1.2.43.dist-info}/METADATA

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

{aient-1.2.42.dist-info → aient-1.2.43.dist-info}/RECORD

@@ -7,9 +7,9 @@ aient/architext/test/test_save_load.py,sha256=o8DqH6gDYZkFkQy-a7blqLtJTRj5e4a-Li
 aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=KMlCRLjtq1wQHZTJGqnbWhPS2cHq6eLdnk7peKDrzR8,7490
-aient/core/request.py,sha256=w3HcsS4BOcrprPjSUWPz-sfcEnX26HxN7AZCThX2gE0,76949
-aient/core/response.py,sha256=oKAb97XX4tbgLBdzSGTedJamGTQztp7hjL5YK3ZbJFQ,36792
-aient/core/utils.py,sha256=Z8vTH9w3uS8uubBa65c_aJ11A3OKGYEzm4q0brNZDSk,31594
+aient/core/request.py,sha256=u4ebaBDJTJbi-JfdXbU1Z_HkmDOk40WQH65aqTeg7Pw,77804
+aient/core/response.py,sha256=VYpXfF6RO3Y-fTZMGV2p-bcrd73BPAKlz33gQkOcqjE,38462
+aient/core/utils.py,sha256=9T6Ze9sMnsX4NBWeYCgY3AlZdhh6HFV1LI5SojzZars,31751
 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
 aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
@@ -17,7 +17,7 @@ aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhF
 aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
 aient/models/audio.py,sha256=FNW4lxG1IhxOU7L8mvcbaeC1nXk_lpUZQlg9ijQ0h_Q,1937
 aient/models/base.py,sha256=HWIGfa2A7OTccvHK0wG1-UlHB-yaWRC7hbi4oR1Mu1Y,7228
-aient/models/chatgpt.py,sha256=3AA_jXB_efB86VzbtWw7CyTN4HPaAF7_79XoA9EzHlw,44244
+aient/models/chatgpt.py,sha256=d1ZE12AQriIl8DF6OQ3612_ieP5cbGdBhngYVUdIhKs,43814
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -33,8 +33,8 @@ aient/plugins/websearch.py,sha256=aPsBjUQ3zQ4gzNrbVq7BMh28ENj9h_fSAeJFF2h9TNk,15
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=ZvGAt_ImJ_CGbDnWgpsWskfSV5fCkpFKRpNQjYL7M7s,11100
 aient/utils/scripts.py,sha256=D_-BCLHV_PS9r6SLXsdEAyey4bVWte-jMMJJKSx0Pcg,42530
-aient-1.2.42.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.2.42.dist-info/METADATA,sha256=-26zs7nKpZR08gqULPGguhPBfOut0xUWRKDiLyljpoU,4842
-aient-1.2.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.2.42.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.2.42.dist-info/RECORD,,
+aient-1.2.43.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.2.43.dist-info/METADATA,sha256=BjCDz94qcvrgMueCkAlkPDMWbWSiUYxPyFffXQxSYTQ,4842
+aient-1.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.2.43.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.2.43.dist-info/RECORD,,