aient 1.2.36__py3-none-any.whl → 1.2.38__py3-none-any.whl

aient/core/request.py

@@ -196,7 +196,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
 
     for field, value in request.model_dump(exclude_unset=True).items():
         if field not in miss_fields and value is not None:
-            if field == "tools" and "gemini-2.0-flash-thinking" in original_model:
+            if field == "tools" and ("gemini-2.0-flash-thinking" in original_model or "gemini-2.5-flash-image" in original_model):
                 continue
             if field == "tools":
                 # 处理每个工具的 function 定义
@@ -221,6 +221,8 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                         }
                     })
             elif field == "temperature":
+                if "gemini-2.5-flash-image" in original_model:
+                    value = 1
                 generation_config["temperature"] = value
             elif field == "max_tokens":
                 if value > 65536:
@@ -244,7 +246,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
                 "Image",
             ]
 
-    if "gemini-2.5" in original_model:
+    if "gemini-2.5" in original_model and "gemini-2.5-flash-image" not in original_model:
         # 从请求模型名中检测思考预算设置
         m = re.match(r".*-think-(-?\d+)", request.model)
         if m:

aient/core/response.py

@@ -78,7 +78,7 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model, tim
                     try:
                         response_json = await asyncio.to_thread(json.loads, parts_json)
                     except json.JSONDecodeError:
-                        logger.error(f"JSON decode error: {parts_json}")
+                        # logger.error(f"JSON decode error: {parts_json}")
                         continue
                 else:
                     parts_json += line
@@ -99,7 +99,12 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model, tim
                     yield sse_string
 
                 if image_base64:
-                    yield await generate_no_stream_response(timestamp, model, content=content, tools_id=None, function_call_name=None, function_call_content=None, role=None, total_tokens=totalTokenCount, prompt_tokens=promptTokenCount, completion_tokens=candidatesTokenCount, image_base64=image_base64)
+                    if "gemini-2.5-flash-image" not in model:
+                        yield await generate_no_stream_response(timestamp, model, content=content, tools_id=None, function_call_name=None, function_call_content=None, role=None, total_tokens=totalTokenCount, prompt_tokens=promptTokenCount, completion_tokens=candidatesTokenCount, image_base64=image_base64)
+                    else:
+                        image_url = await upload_image_to_0x0st("data:image/png;base64," + image_base64)
+                        sse_string = await generate_sse_response(timestamp, model, content=f"\n\n![image]({image_url})")
+                        yield sse_string
 
                 if function_call_name:
                     sse_string = await generate_sse_response(timestamp, model, content=None, tools_id="chatcmpl-9inWv0yEtgn873CxMBzHeCeiHctTV", function_call_name=function_call_name)

aient/models/chatgpt.py

@@ -108,6 +108,7 @@ class chatgpt(BaseLLM):
         cache_messages: list = None,
         logger: logging.Logger = None,
         check_done: bool = False,
+        retry_count: int = 999999,
     ) -> None:
         """
         Initialize Chatbot with API key (from https://platform.openai.com/account/api-keys)
@@ -119,7 +120,7 @@ class chatgpt(BaseLLM):
         self.function_calls_counter = {}
         self.function_call_max_loop = function_call_max_loop
         self.check_done = check_done
-
+        self.retry_count = retry_count
         if logger:
             self.logger = logger
         else:
@@ -708,7 +709,8 @@ class chatgpt(BaseLLM):
         # 发送请求并处理响应
         retry_times = 0
         error_to_raise = None
-        while True:
+        while retry_times < self.retry_count:
+            retry_times += 1
             tmp_post_json = copy.deepcopy(json_post)
             if need_done_prompt:
                 tmp_post_json["messages"].extend(need_done_prompt)
@@ -821,8 +823,7 @@ class chatgpt(BaseLLM):
                     error_message = "您输入了无效的API URL，请使用正确的URL并使用`/start`命令重新设置API URL。具体错误如下：\n\n" + str(e)
                     raise ConfigurationError(error_message)
                 # 最后一次重试失败，向上抛出异常
-                retry_times += 1
-                if retry_times == 9:
+                if retry_times == self.retry_count:
                     raise RetryFailedError(str(e))
 
         if error_to_raise:

{aient-1.2.36.dist-info → aient-1.2.38.dist-info}/METADATA

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

{aient-1.2.36.dist-info → aient-1.2.38.dist-info}/RECORD

@@ -7,8 +7,8 @@ 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=-KEBd4jWLVC9QYUhb1ZfgkLf4nKE7HKL0A58iULkY7o,76757
-aient/core/response.py,sha256=nwJcqThjqUdcbLnmE-2xfPCetAwo3US4nYHLQjnzNv4,36431
+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/test/test_base_api.py,sha256=pWnycRJbuPSXKKU9AQjWrMAX1wiLC_014Qc9hh5C2Pw,524
 aient/core/test/test_geminimask.py,sha256=HFX8jDbNg_FjjgPNxfYaR-0-roUrOO-ND-FVsuxSoiw,13254
@@ -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=DOm0_tieWj8V_xIQCZy_33PGCebZ8nvKIXXYpzYWw6Y,43601
+aient/models/chatgpt.py,sha256=SNgfFaAZ-ESOJmvViThS0vbro2ZAcrPtN1A0NHx3oZc,43711
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
@@ -35,8 +35,8 @@ aient/plugins/write_file.py,sha256=Jt8fOEwqhYiSWpCbwfAr1xoi_BmFnx3076GMhuL06uI,3
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=ZvGAt_ImJ_CGbDnWgpsWskfSV5fCkpFKRpNQjYL7M7s,11100
 aient/utils/scripts.py,sha256=Q0tS7E9AmdikO7GeDBd_3Ii5opXHCvKjDGqHsXen6_A,40622
-aient-1.2.36.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.2.36.dist-info/METADATA,sha256=saoXdXmCNTcRpt6pY1xgr_SpqNHFfglwjZIBzjVmmAs,4842
-aient-1.2.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.2.36.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.2.36.dist-info/RECORD,,
+aient-1.2.38.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.2.38.dist-info/METADATA,sha256=A3NYlZmG4UU3xryjyt8LdXhFnLQ9cXtx2eg7SGaoJR4,4842
+aient-1.2.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.2.38.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.2.38.dist-info/RECORD,,