aient 1.1.53__tar.gz → 1.1.55__tar.gz

{aient-1.1.53/src/aient.egg-info → aient-1.1.55}/PKG-INFO

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

{aient-1.1.53 → aient-1.1.55}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.1.53",
+    version="1.1.55",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

{aient-1.1.53 → aient-1.1.55}/src/aient/core/request.py

@@ -1071,7 +1071,9 @@ async def get_gpt_payload(request, engine, provider, api_key=None):
         elif request.model.endswith("low"):
             payload["reasoning_effort"] = "low"
 
-    if "o1" in original_model or "o3" in original_model or "o4" in original_model:
+    if "o1" in original_model or \
+    "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"
         elif request.model.endswith("low"):
@@ -1354,7 +1356,8 @@ async def get_openrouter_payload(request, engine, provider, api_key=None):
 
     messages = []
     for msg in request.messages:
-        name = None
+        tool_calls = None
+        tool_call_id = None
         if isinstance(msg.content, list):
             content = []
             for item in msg.content:
@@ -1366,9 +1369,25 @@ async def get_openrouter_payload(request, engine, provider, api_key=None):
                     content.append(image_message)
         else:
             content = msg.content
-            name = msg.name
-        if name:
-            messages.append({"role": msg.role, "name": name, "content": content})
+            tool_calls = msg.tool_calls
+            tool_call_id = msg.tool_call_id
+
+        if tool_calls:
+            tool_calls_list = []
+            for tool_call in tool_calls:
+                tool_calls_list.append({
+                    "id": tool_call.id,
+                    "type": tool_call.type,
+                    "function": {
+                        "name": tool_call.function.name,
+                        "arguments": tool_call.function.arguments
+                    }
+                })
+                if provider.get("tools"):
+                    messages.append({"role": msg.role, "tool_calls": tool_calls_list})
+        elif tool_call_id:
+            if provider.get("tools"):
+                messages.append({"role": msg.role, "tool_call_id": tool_call_id, "content": content})
         else:
             # print("content", content)
             if isinstance(content, list):

{aient-1.1.53 → aient-1.1.55}/src/aient/core/response.py

@@ -34,19 +34,22 @@ def gemini_json_poccess(response_str):
         candidatesTokenCount = safe_get(response_json, "usageMetadata", "candidatesTokenCount", default=0)
         totalTokenCount = safe_get(response_json, "usageMetadata", "totalTokenCount", default=0)
 
-    content = safe_get(json_data, "parts", 0, "text", default="")
+    content = reasoning_content = safe_get(json_data, "parts", 0, "text", default="")
     b64_json = safe_get(json_data, "parts", 0, "inlineData", "data", default="")
     if b64_json:
         image_base64 = b64_json
 
     is_thinking = safe_get(json_data, "parts", 0, "thought", default=False)
+    if is_thinking:
+        content = safe_get(json_data, "parts", 1, "text", default="")
 
     function_call_name = safe_get(json_data, "functionCall", "name", default=None)
-    function_full_response = json.dumps(safe_get(json_data, "functionCall", "args", default=""))
+    function_full_response = safe_get(json_data, "functionCall", "args", default="")
+    function_full_response = json.dumps(function_full_response) if function_full_response else None
 
     blockReason = safe_get(json_data, 0, "promptFeedback", "blockReason", default=None)
 
-    return is_thinking, content, image_base64, function_call_name, function_full_response, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount
+    return is_thinking, reasoning_content, content, image_base64, function_call_name, function_full_response, finishReason, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount
 
 async def fetch_gemini_response_stream(client, url, headers, payload, model):
     timestamp = int(datetime.timestamp(datetime.now()))
@@ -62,12 +65,18 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
         parts_json = ""
         async for chunk in response.aiter_text():
             buffer += chunk
-            cache_buffer += chunk
+            if buffer and "\n" not in buffer:
+                buffer += "\n"
 
             while "\n" in buffer:
                 line, buffer = buffer.split("\n", 1)
                 if line.startswith("data: "):
                     parts_json = line.lstrip("data: ").strip()
+                    try:
+                        json.loads(parts_json)
+                    except json.JSONDecodeError:
+                        logger.error(f"JSON decode error: {parts_json}")
+                        continue
                 else:
                     parts_json += line
                     parts_json = parts_json.lstrip("[,")
@@ -77,12 +86,12 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
                         continue
 
                 # https://ai.google.dev/api/generate-content?hl=zh-cn#FinishReason
-                is_thinking, content, image_base64, function_call_name, function_full_response, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount = gemini_json_poccess(parts_json)
+                is_thinking, reasoning_content, content, image_base64, function_call_name, function_full_response, finishReason, blockReason, promptTokenCount, candidatesTokenCount, totalTokenCount = gemini_json_poccess(parts_json)
 
                 if is_thinking:
-                    sse_string = await generate_sse_response(timestamp, model, reasoning_content=content)
+                    sse_string = await generate_sse_response(timestamp, model, reasoning_content=reasoning_content)
                     yield sse_string
-                elif not image_base64 and content:
+                if not image_base64 and content:
                     sse_string = await generate_sse_response(timestamp, model, content=content)
                     yield sse_string
 
@@ -99,9 +108,10 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
                 if parts_json == "[]" or blockReason == "PROHIBITED_CONTENT":
                     sse_string = await generate_sse_response(timestamp, model, stop="PROHIBITED_CONTENT")
                     yield sse_string
-                else:
+                elif finishReason:
                     sse_string = await generate_sse_response(timestamp, model, stop="stop")
                     yield sse_string
+                    break
 
                 parts_json = ""
 

{aient-1.1.53 → aient-1.1.55}/src/aient/models/chatgpt.py

@@ -187,7 +187,8 @@ class chatgpt(BaseLLM):
         #     print(json.dumps(replaced_text, indent=4, ensure_ascii=False))
         while message_index < conversation_len:
             if self.conversation[convo_id][message_index]["role"] == self.conversation[convo_id][message_index + 1]["role"]:
-                if self.conversation[convo_id][message_index].get("content") and self.conversation[convo_id][message_index + 1].get("content"):
+                if self.conversation[convo_id][message_index].get("content") and self.conversation[convo_id][message_index + 1].get("content") \
+                and self.conversation[convo_id][message_index].get("content") != self.conversation[convo_id][message_index + 1].get("content"):
                     if type(self.conversation[convo_id][message_index + 1]["content"]) == str \
                     and type(self.conversation[convo_id][message_index]["content"]) == list:
                         self.conversation[convo_id][message_index + 1]["content"] = [{"type": "text", "text": self.conversation[convo_id][message_index + 1]["content"]}]
@@ -754,8 +755,8 @@ class chatgpt(BaseLLM):
 
         # 打印日志
         if self.print_log:
-            print("api_url", kwargs.get('api_url', self.api_url.chat_url) == url)
-            print("api_url", kwargs.get('api_url', self.api_url.chat_url))
+            # print("api_url", kwargs.get('api_url', self.api_url.chat_url) == url)
+            # print("api_url", kwargs.get('api_url', self.api_url.chat_url))
             print("api_url", url)
             # print("headers", headers)
             print("api_key", kwargs.get('api_key', self.api_key))

{aient-1.1.53 → aient-1.1.55/src/aient.egg-info}/PKG-INFO

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