aient 1.2.27__tar.gz → 1.2.30__tar.gz

{aient-1.2.27 → aient-1.2.30}/PKG-INFO

@@ -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 → aient-1.2.30}/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-1.2.27 → aient-1.2.30}/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-1.2.27 → aient-1.2.30}/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-1.2.27 → aient-1.2.30}/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-1.2.27 → aient-1.2.30}/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-1.2.27 → aient-1.2.30}/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-1.2.27 → aient-1.2.30}/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-1.2.27 → aient-1.2.30}/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-1.2.27 → aient-1.2.30}/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 → aient-1.2.30}/aient.egg-info/PKG-INFO

@@ -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 → aient-1.2.30}/aient.egg-info/SOURCES.txt

@@ -48,7 +48,5 @@ test/test_ddg_search.py
 test/test_google_search.py
 test/test_ollama.py
 test/test_plugin.py
-test/test_search.py
 test/test_url.py
-test/test_whisper.py
-test/test_yjh.py
+test/test_whisper.py

{aient-1.2.27 → aient-1.2.30}/pyproject.toml

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

{aient-1.2.27 → aient-1.2.30}/test/test_whisper.py

@@ -10,5 +10,5 @@ files = {
     'model': (None, 'whisper-1')
 }
 
-response = requests.post(os.environ.get('API_URL', None), headers=headers, files=files)
+response = requests.post(os.environ.get('BASE_URL', None), headers=headers, files=files)
 print(response.text)

aient-1.2.27/test/test_search.py

@@ -1,18 +0,0 @@
-import os
-from aient.models import chatgpt
-
-API = os.environ.get('API', None)
-API_URL = os.environ.get('API_URL', None)
-GPT_ENGINE = os.environ.get('GPT_ENGINE', 'gpt-4o')
-
-systemprompt = (
-    "You are ChatGPT, a large language model trained by OpenAI. Respond conversationally"
-)
-bot = chatgpt(api_key=API, api_url=API_URL, engine=GPT_ENGINE, system_prompt=systemprompt, print_log=True)
-for text in bot.ask_stream("搜索上海的天气"):
-# for text in bot.ask_stream("我在广州市，想周一去香港，周四早上回来，是去游玩，请你帮我规划整个行程。包括细节，如交通，住宿，餐饮，价格，等等，最好细节到每天各个部分的时间，花费，等等，尽量具体，用户一看就能直接执行的那种"):
-# for text in bot.ask_stream("上海有哪些好玩的地方？"):
-# for text in bot.ask_stream("just say test"):
-# for text in bot.ask_stream("我在上海想去重庆旅游，我只有2000元预算，我想在重庆玩一周，你能帮我规划一下吗？"):
-# for text in bot.ask_stream("我在上海想去重庆旅游，我有一天的时间。你能帮我规划一下吗？"):
-    print(text, end="")

aient-1.2.27/test/test_yjh.py

@@ -1,21 +0,0 @@
-import os
-from datetime import datetime
-
-from aient.models import chatgpt
-from aient.utils import prompt
-
-API = os.environ.get('API', None)
-API_URL = os.environ.get('API_URL', None)
-GPT_ENGINE = os.environ.get('GPT_ENGINE', 'gpt-4o')
-LANGUAGE = os.environ.get('LANGUAGE', 'Simplified Chinese')
-
-current_date = datetime.now()
-Current_Date = current_date.strftime("%Y-%m-%d")
-
-systemprompt = os.environ.get('SYSTEMPROMPT', prompt.system_prompt.format(LANGUAGE, Current_Date))
-
-bot = chatgpt(api_key=API, api_url=API_URL, engine=GPT_ENGINE, system_prompt=systemprompt)
-for text in bot.ask_stream("arXiv:2210.10716 这篇文章讲了啥"):
-# for text in bot.ask_stream("今天的微博热搜有哪些？"):
-# for text in bot.ask_stream("你现在是什么版本？"):
-    print(text, end="")