aient 1.2.27__py3-none-any.whl → 1.2.30__py3-none-any.whl

aient/core/request.py

@@ -1,5 +1,6 @@
 import re
 import json
+import copy
 import httpx
 import base64
 import asyncio
@@ -57,7 +58,7 @@ async def get_gemini_payload(request, engine, provider, api_key=None):
     try:
         request_messages = [Message(role="user", content=request.prompt)]
     except:
-        request_messages = request.messages
+        request_messages = copy.deepcopy(request.messages)
     for msg in request_messages:
         if msg.role == "assistant":
             msg.role = "model"
@@ -399,7 +400,8 @@ async def get_vertex_gemini_payload(request, engine, provider, api_key=None):
     systemInstruction = None
     system_prompt = ""
     function_arguments = None
-    for msg in request.messages:
+    request_messages = copy.deepcopy(request.messages)
+    for msg in request_messages:
         if msg.role == "assistant":
             msg.role = "model"
         tool_calls = None

aient/core/response.py

@@ -8,7 +8,7 @@ from datetime import datetime
 
 from .log_config import logger
 
-from .utils import safe_get, generate_sse_response, generate_no_stream_response, end_of_line, parse_json_safely
+from .utils import safe_get, generate_sse_response, generate_no_stream_response, end_of_line, parse_json_safely, upload_image_to_0x0st
 
 async def check_response(response, error_log):
     if response and not (200 <= response.status_code < 300):
@@ -277,7 +277,8 @@ async def fetch_gpt_response_stream(client, url, headers, payload, timeout):
                     openrouter_reasoning = safe_get(line, "choices", 0, "delta", "reasoning", default="")
                     openrouter_base64_image = safe_get(line, "choices", 0, "delta", "images", 0, "image_url", "url", default="")
                     if openrouter_base64_image:
-                        sse_string = await generate_sse_response(timestamp, payload["model"], content=f"\n\n![image]({openrouter_base64_image})")
+                        image_url = await upload_image_to_0x0st(openrouter_base64_image)
+                        sse_string = await generate_sse_response(timestamp, payload["model"], content=f"\n\n![image]({image_url})")
                         yield sse_string
                         continue
                     azure_databricks_claude_summary_content = safe_get(line, "choices", 0, "delta", "content", 0, "summary", 0, "text", default="")

aient/core/utils.py

@@ -228,7 +228,12 @@ async def update_initial_model(provider):
 def safe_get(data, *keys, default=None):
     for key in keys:
         try:
-            data = data[key] if isinstance(data, (dict, list)) else data.get(key)
+            if isinstance(data, (dict, list)):
+                data = data[key]
+            elif isinstance(key, str) and hasattr(data, key):
+                data = getattr(data, key)
+            else:
+                data = data.get(key)
         except (KeyError, IndexError, AttributeError, TypeError):
             return default
     if not data:
@@ -797,6 +802,44 @@ def parse_json_safely(json_str):
             # 两种方法都失败，抛出异常
             raise Exception(f"无法解析JSON字符串: {e}, {json_str}")
 
+async def upload_image_to_0x0st(base64_image: str):
+    """
+    Uploads a base64 encoded image to 0x0.st.
+
+    Args:
+        base64_image: The base64 encoded image string.
+
+    Returns:
+        The URL of the uploaded image.
+    """
+    if "," in base64_image:
+        base64_image_split = base64_image.split(",")[1]
+
+    image_data = base64.b64decode(base64_image_split)
+
+    img_format = get_image_format(image_data)
+    if not img_format:
+        img_format = 'png'  # 如果无法检测到格式，则默认为 png
+
+    content_type = f'image/{img_format}'
+    file_name = f'image.{img_format}'
+
+    files = {'file': (file_name, image_data, content_type)}
+    data = {'expires': '24', 'secret': '123456'}
+
+    async with httpx.AsyncClient() as client:
+        try:
+            response = await client.post("https://0x0.st", files=files, data=data)
+            response.raise_for_status()
+            return response.text.strip()
+        except httpx.RequestError as e:
+            logger.error(f"请求 0x0.st 时出错: {e}")
+            # raise HTTPException(status_code=500, detail="上传图片到 0x0.st 失败")
+        except httpx.HTTPStatusError as e:
+            logger.error(f"上传图片到 0x0.st 时发生 HTTP 错误: {e.response.status_code}")
+            # raise HTTPException(status_code=e.response.status_code, detail=f"上传图片到 0x0.st 失败: {e.response.text}")
+        return base64_image
+
 if __name__ == "__main__":
     provider = {
         "base_url": "https://gateway.ai.cloudflare.com/v1/%7Baccount_id%7D/%7Bgateway_id%7D/google-vertex-ai",

aient/models/audio.py

@@ -4,13 +4,13 @@ import json
 from .base import BaseLLM
 
 API = os.environ.get('API', None)
-API_URL = os.environ.get('API_URL', None)
+BASE_URL = os.environ.get('BASE_URL', None)
 
 class whisper(BaseLLM):
     def __init__(
         self,
         api_key: str,
-        api_url: str = (os.environ.get("API_URL") or "https://api.openai.com/v1/audio/transcriptions"),
+        api_url: str = (os.environ.get("BASE_URL") or "https://api.openai.com/v1/audio/transcriptions"),
         timeout: float = 20,
     ):
         super().__init__(api_key, api_url=api_url, timeout=timeout)

aient/models/base.py

@@ -11,8 +11,8 @@ class BaseLLM:
     def __init__(
         self,
         api_key: str = None,
-        engine: str = os.environ.get("GPT_ENGINE") or "gpt-3.5-turbo",
-        api_url: str = (os.environ.get("API_URL", None) or "https://api.openai.com/v1/chat/completions"),
+        engine: str = os.environ.get("MODEL") or "gpt-3.5-turbo",
+        api_url: str = (os.environ.get("BASE_URL", None) or "https://api.openai.com/v1/chat/completions"),
         system_prompt: str = prompt.chatgpt_system_prompt,
         proxy: str = None,
         timeout: float = 600,

aient/models/chatgpt.py

@@ -74,8 +74,8 @@ class chatgpt(BaseLLM):
     def __init__(
         self,
         api_key: str = None,
-        engine: str = os.environ.get("GPT_ENGINE") or "gpt-4o",
-        api_url: str = (os.environ.get("API_URL") or "https://api.openai.com/v1/chat/completions"),
+        engine: str = os.environ.get("MODEL") or "gpt-4o",
+        api_url: str = (os.environ.get("BASE_URL") or "https://api.openai.com/v1/chat/completions"),
         system_prompt: str = "You are ChatGPT, a large language model trained by OpenAI. Respond conversationally",
         proxy: str = None,
         timeout: float = 600,

aient/plugins/image.py

@@ -5,13 +5,13 @@ from ..models.base import BaseLLM
 from .registry import register_tool
 
 API = os.environ.get('API', None)
-API_URL = os.environ.get('API_URL', None)
+BASE_URL = os.environ.get('BASE_URL', None)
 
 class dalle3(BaseLLM):
     def __init__(
         self,
         api_key: str,
-        api_url: str = (os.environ.get("API_URL") or "https://api.openai.com/v1/images/generations"),
+        api_url: str = (os.environ.get("BASE_URL") or "https://api.openai.com/v1/images/generations"),
         timeout: float = 20,
     ):
         super().__init__(api_key, api_url=api_url, timeout=timeout)

aient/utils/prompt.py

@@ -90,10 +90,6 @@ chatgpt_system_prompt = (
     "You are ChatGPT, a large language model trained by OpenAI. Use simple characters to represent mathematical symbols. Do not use LaTeX commands. Respond conversationally"
 )
 
-claude_system_prompt = (
-    "You are Claude, a large language model trained by Anthropic. Use simple characters to represent mathematical symbols. Do not use LaTeX commands. Respond conversationally in {}."
-)
-
 search_system_prompt = (
     "You are ChatGPT, a large language model trained by OpenAI. Respond conversationally in {}."
     "You can break down the task into multiple steps and search the web to answer my questions one by one."

aient/utils/scripts.py

@@ -134,14 +134,6 @@ def is_surrounded_by_chinese(text, index):
 def replace_char(string, index, new_char):
     return string[:index] + new_char + string[index+1:]
 
-def claude_replace(text):
-    Punctuation_mapping = {",": "，", ":": "：", "!": "！", "?": "？", ";": "；"}
-    key_list = list(Punctuation_mapping.keys())
-    for i in range(len(text)):
-        if is_surrounded_by_chinese(text, i) and (text[i] in key_list):
-            text = replace_char(text, i, Punctuation_mapping[text[i]])
-    return text
-
 def safe_get(data, *keys, default=None):
     for key in keys:
         try:

{aient-1.2.27.dist-info → aient-1.2.30.dist-info}/METADATA

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

{aient-1.2.27.dist-info → aient-1.2.30.dist-info}/RECORD

@@ -7,23 +7,23 @@ 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=QnDhyrjzcJOEQU2oauMQi_HHMRR5NxdkrX7nn5JMwTc,76675
-aient/core/response.py,sha256=HcyOEfZXZEXeJaUBMCYE4LiLyB79XuUR5o0Gtwdyi-E,36309
-aient/core/utils.py,sha256=sLmPHONYhIPq1zUYcbKOtIOpAVsLFk_5lNwH5-G2c4E,30013
+aient/core/request.py,sha256=-KEBd4jWLVC9QYUhb1ZfgkLf4nKE7HKL0A58iULkY7o,76757
+aient/core/response.py,sha256=Z9geTfh2LkGHKAqjelgeleQtfOAYIyM82t9AVB4xsgE,36407
+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
 aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
 aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhFkw,2755
 aient/models/__init__.py,sha256=ZTiZgbfBPTjIPSKURE7t6hlFBVLRS9lluGbmqc1WjxQ,43
-aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
-aient/models/base.py,sha256=-nnihYnx-vHZMqeVO9ljjt3k4FcD3n-iMk4tT-10nRQ,7232
-aient/models/chatgpt.py,sha256=oIFhSTqmFNG4KYJd1xdEui6l5EbHSaxOne0sSwNP4aM,42920
+aient/models/audio.py,sha256=FNW4lxG1IhxOU7L8mvcbaeC1nXk_lpUZQlg9ijQ0h_Q,1937
+aient/models/base.py,sha256=HWIGfa2A7OTccvHK0wG1-UlHB-yaWRC7hbi4oR1Mu1Y,7228
+aient/models/chatgpt.py,sha256=A8tZl-a00EZxGYKQBOiNh-kG-YjU-zsj0XbeIzcbf6o,42916
 aient/plugins/__init__.py,sha256=p3KO6Aa3Lupos4i2SjzLQw1hzQTigOAfEHngsldrsyk,986
 aient/plugins/arXiv.py,sha256=yHjb6PS3GUWazpOYRMKMzghKJlxnZ5TX8z9F6UtUVow,1461
 aient/plugins/config.py,sha256=TGgZ5SnNKZ8MmdznrZ-TEq7s2ulhAAwTSKH89bci3dA,7079
 aient/plugins/excute_command.py,sha256=b-rxsyFN6_HnZJAhUi9Qsp8iJ6XTf-zU-CIUIxeQO98,10869
 aient/plugins/get_time.py,sha256=Ih5XIW5SDAIhrZ9W4Qe5Hs1k4ieKPUc_LAd6ySNyqZk,654
-aient/plugins/image.py,sha256=ZElCIaZznE06TN9xW3DrSukS7U3A5_cjk1Jge4NzPxw,2072
+aient/plugins/image.py,sha256=JR4iJ--uUk1abICwQjd9tVIk0-Vs8qMxn6z2lJwuQ4U,2075
 aient/plugins/list_directory.py,sha256=V_uKkLx_fQDL5z__bSDC-PqAP-o32KmQW6Pdhx0Fx0s,1433
 aient/plugins/read_file.py,sha256=qHAhdesOr1VMOCDkeHNvI8UV2ZI98HmJl6GhN4Aq9dU,9183
 aient/plugins/read_image.py,sha256=4FbIiMNVFUQpNyiH5ApGSRvOD9ujcXGyuqlGTJMd7ac,4017
@@ -33,10 +33,10 @@ aient/plugins/run_python.py,sha256=MohvdtZUTDLrHBDtJ9L2_Qu1pWAGrkbzsGmmn5tMN20,4
 aient/plugins/websearch.py,sha256=aPsBjUQ3zQ4gzNrbVq7BMh28ENj9h_fSAeJFF2h9TNk,15334
 aient/plugins/write_file.py,sha256=Jt8fOEwqhYiSWpCbwfAr1xoi_BmFnx3076GMhuL06uI,3949
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
-aient/utils/scripts.py,sha256=VqtK4RFEx7KxkmcqG3lFDS1DxoNlFFGErEjopVcc8IE,40974
-aient-1.2.27.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.2.27.dist-info/METADATA,sha256=DpjEPqdiZ_lYC_V0v5Z8tJGjOYKbL1onqcfBVG4Gedc,4842
-aient-1.2.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aient-1.2.27.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.2.27.dist-info/RECORD,,
+aient/utils/prompt.py,sha256=ZvGAt_ImJ_CGbDnWgpsWskfSV5fCkpFKRpNQjYL7M7s,11100
+aient/utils/scripts.py,sha256=Q0tS7E9AmdikO7GeDBd_3Ii5opXHCvKjDGqHsXen6_A,40622
+aient-1.2.30.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.2.30.dist-info/METADATA,sha256=uFCKPmb6M_-Fehq-bpgkcFhK6zu6IqlVnGVKsgZH_8g,4842
+aient-1.2.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aient-1.2.30.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.2.30.dist-info/RECORD,,