MeUtils 2025.4.15.13.18.47__py3-none-any.whl → 2025.4.18.13.49.52__py3-none-any.whl

meutils/decorators/contextmanagers.py

@@ -112,23 +112,20 @@ async def atry_catch(
     data = {
         "task_name": task_name,
     }
-    for k, v in kwargs.items():
-        if isinstance(v, BaseModel):
-            v = v.model_dump(exclude_none=True)
-        data[k] = v
-
-    # logger.debug(data)
 
     try:
         yield
     except Exception as e:
-        if is_trace:
-            error_msg = f"""{traceback.format_exc()}"""
-        else:
-            error_msg = f"{e}"
-
+        error_msg = f"""{traceback.format_exc()}""" if is_trace else f"{e}"
         data["error"] = error_msg
 
+        for k, v in kwargs.items():
+            if isinstance(v, BaseModel):
+                v = v.model_dump(exclude_none=True)
+            data[k] = v
+
+        # logger.debug(data)
+
         callback(data)
         raise
 
@@ -192,6 +189,9 @@ if __name__ == '__main__':
     #         print(f"Task result: {result}")
     #     except TimeoutError:
     #         print("Task did not complete in time.")
+    async def main():
+        async with atry_catch("test"):
+            1 / 0
+
 
-    with try_catch("test"):
-        1 / 0
+    arun(main())

meutils/io/files_utils.py

@@ -147,14 +147,15 @@ async def to_url(
         content_type: Optional[str] = None,
         mime_type: Optional[str] = None
 ):
+    content_type = content_type or mime_type
+
     if isinstance(file, list):
-        tasks = [to_url(_, f"{shortuuid.random()}_{filename}", headers) for _ in file]
+        tasks = [to_url(_, f"{shortuuid.random()}_{filename}", headers, content_type=content_type) for _ in file]
         urls = await asyncio.gather(*tasks)
         return urls
 
     if not file: return
 
-    content_type = content_type or mime_type
     file = await to_bytes(file, headers=headers)
     file_url = await Minio().upload(file, filename, content_type=content_type)
     return file_url

meutils/llm/check_utils.py

@@ -165,7 +165,9 @@ if __name__ == '__main__':
 
     # arun(check_token_for_jina(["jina_c8da77fed9704d558c8def39837960edplTLkNYrsPTJHBF1HcYg_RkRVh0X"]*10))
 
-    arun(check_token_for_siliconflow("sk-kxjxieomafksgguzsjbudwbrsqbmaauospunspvhtcynfryx"))
+    # arun(check_token_for_siliconflow("sk-jcsgbsqkdctaxunqljmghdahokavyliamkcgbhosfsoyaeln"))
     "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=79272d"
+    arun(check_token_for_moonshot("sk-iabLMgfFvuahlh5u3oM7kk84pjIciRzqCbNTDt15PVxQM78K"))
+    # sk-kk7ALp38EG63yPzJtmind5sEPiHipCcI2NbqW97QlWcvJfiW
 
     # arun(check_token_for_moonshot("sk-Qnr87vtf2Q6MEfc2mVNkVZ4qaoZg3smH9527I25QgcFe7HrT"))

meutils/llm/openai_polling/images.py

@@ -10,4 +10,25 @@
 
 from meutils.pipe import *
 
+from meutils.llm.clients import AsyncOpenAI
+from meutils.llm.openai_utils import to_openai_params
+from meutils.schemas.image_types import ImageRequest, ImagesResponse
 
+
+class Images(object):
+    def __init__(
+            self,
+            base_url: Optional[str] = None,
+            api_key: Optional[str] = None,
+            http_client: Optional[httpx.AsyncClient] = None
+    ):
+        self.base_url = base_url
+        self.api_key = api_key
+
+        self.client = AsyncOpenAI(base_url=self.base_url, api_key=self.api_key, http_client=http_client)
+
+    async def generate(self, request: ImageRequest):
+        data = to_openai_params(request)
+        response = await self.client.images.generate(**data)  # todo: 兼容 response_format="b64_json"
+
+        return response

meutils/schemas/db/oneapi_types.py

@@ -90,6 +90,7 @@ class OneapiUser(SQLModel, table=True):
     request_count: Optional[int] = Field(default=None)
 
     access_token: Optional[str] = Field(default=None)
+    password: Optional[str] = Field(default="")
 
     class Config:
         arbitrary_types_allowed = True

meutils/schemas/image_types.py

@@ -54,7 +54,7 @@ class ImagesResponse(_ImagesResponse):
 
     def __init__(self, /, **data: Any):
         super().__init__(**data)
-        if self.data is None and self.image is not None:
+        if not self.data and self.image is not None:
             if isinstance(self.image, str):
                 self.image = [self.image]
 
@@ -78,7 +78,7 @@ class ImageRequest(BaseModel):  # openai
     style: Union[str, Literal["vivid", "natural"]] = None
     size: str = '1024x1024'  # 测试默认值 Optional[Literal["256x256", "512x512", "1024x1024", "1792x1024", "1024x1792"]]
 
-    response_format: Optional[Literal["url", "b64_json"]] = "url"
+    response_format: Optional[Literal["oss_url", "url", "b64_json"]] = "url"
 
     seed: Optional[int] = 21
 

meutils/schemas/oneapi/common.py

@@ -96,7 +96,9 @@ MODEL_PRICE = {
     "api-images-cogview-3": 0.01,
     "api-images-stable-diffusion": 0.01,
 
+    "api-images-recraftv3": 0.1,
     "api-images-seededit": 0.1,
+
     "seededit": 0.1,
     "chat-seededit": 0.1,
 
@@ -397,23 +399,29 @@ MODEL_RATIO = {
     "kimi": 5,
     "kimi-128k": 5,
 
-    # 智谱
-    'glm-4-9b-chat': 0.05,  # 特价
-    "glm-3-turbo": 0.05,  # 特价
-    "glm-4-flash": 0.05,  # 特价
-    "glm-4-air": 0.05,  # 特价
+    # 智谱 https://www.bigmodel.cn/pricing
+    'glm-4-9b-chat': 0.1,
+    "glm-3-turbo": 0.1,
+    "glm-4-flash": 0.1,  # "glm-z1-flash": "glm-z1-flash==THUDM/GLM-4-9B-0414"
+
+    "glm-4-air": 0.25,  # THUDM/GLM-4-32B-0414
+    "glm-4-airx": 0.05,
 
     "glm-4": 2.5,
     "glm-4-0520": 2.5,
-    "glm-4-airx": 10,
+    "glm-4-plus": 2.5,
+
+    "glm-4v-flash": 0.1,
     "glm-4v": 2.5,
     "glm-4v-plus": 2,
-    "glm-4v-flash": 0.1,
-    "glm-4-plus": 25,
 
     "glm-zero": 5,
     "glm-zero-preview": 5,
 
+    "glm-z1-flash": 0.1,  # "glm-z1-flash": "glm-z1-flash==THUDM/GLM-Z1-9B-0414"
+    "glm-z1-air": 0.25,  # "glm-z1-air": "glm-z1-air==THUDM/GLM-Z1-32B-0414"
+    "glm-z1-airx": 2.5,  # "glm-z1-airx": "glm-z1-airx==THUDM/GLM-Z1-Rumination-32B-0414"
+
     # 月之暗面 https://platform.moonshot.cn/docs/price/chat#%E4%BA%A7%E5%93%81%E5%AE%9A%E4%BB%B7
     "kimi-latest-8k	": 1,
     "kimi-latest-32k": 2.5,
@@ -543,6 +551,7 @@ MODEL_RATIO = {
     'deepseek-r1-8k': 1,
     'deepseek-reasoner': 2,
     'deepseek-reasoner-8k': 1,
+    "deepseek-r1-250120": 2,
 
     "deepseek-search": 1,
     'deepseek-r1-search': 2,
@@ -603,6 +612,11 @@ MODEL_RATIO = {
     "doubao-vision-lite-32k": 0.75,
     "doubao-vision-pro-32k": 1.5,
 
+    "doubao-1-5-thinking-pro": 2,
+    "doubao-1-5-thinking-pro-250415": 2,
+    "doubao-1-5-thinking-pro-vision": 2,
+    "doubao-1-5-thinking-pro-vision-250415": 2,
+
     # 商汤 https://platform.sensenova.cn/pricing
     # https://platform.sensenova.cn/doc?path=/pricingdoc/pricing.md
     "SenseChat-Turbo": 1 / 5,  # 特价
@@ -698,16 +712,18 @@ MODEL_RATIO = {
     "gemini-2.0-flash-001": 0.0625,
     "gemini-2.0-flash-lite-preview-02-05": 0.0625,
     "gemini-2.0-flash-exp": 0.0625,
-
-    "gemini-2.0-pro": 1.25,
-    "gemini-2.0-pro-exp-02-05": 1.25,
-    "gemini-2.5-pro-exp-03-25": 1.5,
-    "gemini-2.5-pro-preview-03-25": 0.625,
-
     "gemini-2.0-flash-thinking-exp": 1,
     "gemini-2.0-flash-thinking-exp-1219": 1,
     "gemini-2.0-flash-thinking-exp-01-21": 1,
 
+    "gemini-2.5-flash-preview-04-17": 0.15,
+
+    "gemini-2.0-pro": 0.625,
+    "gemini-2.0-pro-exp": 0.625,
+    "gemini-2.0-pro-exp-02-05": 0.625,
+    "gemini-2.5-pro-exp-03-25": 0.625,
+    "gemini-2.5-pro-preview-03-25": 0.625,
+
     "gemini-1.5-pro-001": 1,
     "gemini-1.5-pro-002": 1,
     "gemini-1.5-pro-latest": 1.75,
@@ -774,6 +790,7 @@ MODEL_RATIO = {
     "o1-preview": 7.5,
     "o1-preview-2024-09-12": 7.5,
     "o3-mini": 0.55,
+    "o4-mini": 0.55,
 
     # 硅基
     "llama-3.1-8b-instruct": 0.01,
@@ -878,6 +895,7 @@ COMPLETION_RATIO = {
     "o1-mini-2024-09-12": 4,
     "o1-preview-2024-09-12": 4,
     "o3-mini": 4,
+    "o4-mini": 4,
 
     "gpt-4o-realtime-preview": 4,
     "gpt-4o-realtime-preview-2024-10-01": 4,
@@ -956,10 +974,12 @@ COMPLETION_RATIO = {
     "gemini-2.0-flash-thinking-exp-01-21": 5,
 
     "gemini-2.0-flash-lite-preview-02-05": 4,
+    "gemini-2.5-flash-preview-04-17": 4,
 
     "gemini-2.0-pro": 5,
+    "gemini-2.0-pro-exp": 5,
     "gemini-2.0-pro-exp-02-05": 5,
-    "gemini-2.5-pro-exp-03-25": 5,
+    "gemini-2.5-pro-exp-03-25": 8,
     "gemini-2.5-pro-preview-03-25": 8,
 
     "gemma2-9b-it": 4,
@@ -1034,6 +1054,11 @@ COMPLETION_RATIO = {
     "doubao-1-5-pro-256k": 1.8,
     "doubao-1-5-pro-256k-250115": 1.8,
 
+    "doubao-1-5-thinking-pro": 4,
+    "doubao-1-5-thinking-pro-250415": 4,
+    "doubao-1-5-thinking-pro-vision": 4,
+    "doubao-1-5-thinking-pro-vision-250415": 4,
+
     "deepseek-r1:1.5b": 4,
     "deepseek-r1-distill-qwen-1.5b": 4,
     "deepseek-r1:7b": 4,
@@ -1061,6 +1086,7 @@ COMPLETION_RATIO = {
     'deepseek-r1': 4,
     'deepseek-reasoner': 4,
     "deepseek-reasoner-164k": 8,
+    "deepseek-r1-250120": 4,
 
     "deepseek-chat:function": 4,
 
@@ -1294,3 +1320,4 @@ if __name__ == '__main__':
     # arun(channel.edit_channel(MODEL_PRICE))
 
     print(bjson({k: v * 6 for k, v in MODEL_RATIO.items() if k.startswith('claude')}))
+    print([k for k in MODEL_RATIO if k.startswith('gpt-4.1')] | xjoin(","))