MeUtils 2025.4.30.17.40.5__py3-none-any.whl → 2025.5.7.18.34.50__py3-none-any.whl

meutils/apis/oneapi/channel.py

@@ -158,3 +158,46 @@ if __name__ == '__main__':
     arun(create_or_update_channel(tokens, base_url))
     # arun(create_or_update_channel(tokens))
     # # arun(delete_channel(range(10000, 20000)))
+
+
+"""
+API_KEY=6c255307-7b4d-4be8-984b-5440a3e867eb
+curl --location --request POST 'https://api.ffire.cc/api/channel/' \
+--header 'new-api-user: 1' \
+--header 'Authorization: Bearer 20ff7099a62f441287f47c86431a7f12' \
+--header 'User-Agent: Apifox/1.0.0 (https://apifox.com)' \
+--header 'content-type: application/json' \
+--data-raw '{
+    "type": 8,
+    "key": "${API_KEY}",
+    "openai_organization": "",
+    "test_model": "",
+    "status": 1,
+    "name": "火山-超刷",
+    "weight": 0,
+    "created_time": 1746166915,
+    "test_time": 1746156171,
+    "response_time": 878,
+    "base_url": "https://ark.cn-beijing.volces.com/api/v3/chat/completions",
+    "other": "",
+    "balance": 0,
+    "balance_updated_time": 0,
+    "models": "doubao-1.5-vision-pro-250328,deepseek-v3,deepseek-v3-0324,deepseek-v3-250324,deepseek-v3-8k,deepseek-v3-128k,deepseek-chat,deepseek-chat-8k,deepseek-chat-64k,deepseek-chat-164k,deepseek-chat:function,deepseek-vl2,deepseek-ai/deepseek-vl2,deepseek-r1,deepseek-r1-8k,deepseek-reasoner,deepseek-reasoner-8k,deepseek-r1-250120,deepseek-search,deepseek-r1-search,deepseek-reasoner-search,deepseek-r1-think,deepseek-reasoner-think,deepseek-r1-plus,deepseek-r1:1.5b,deepseek-r1-lite,deepseek-r1-distill-qwen-1.5b,deepseek-r1:7b,deepseek-r1-distill-qwen-7b,deepseek-r1:8b,deepseek-r1-distill-llama-8b,deepseek-r1:14b,deepseek-r1-distill-qwen-14b,deepseek-r1:32b,deepseek-r1-distill-qwen-32b,deepseek-r1:70b,deepseek-r1-distill-llama-70b,deepseek-r1-metasearch,doubao-1-5-pro-32k,doubao-1-5-pro-32k-250115,doubao-1-5-pro-256k,doubao-1-5-pro-256k-250115,doubao-1-5-vision-pro-32k,doubao-1-5-vision-pro-32k-250115,doubao-lite-128k,doubao-lite-32k,doubao-lite-32k-character,doubao-lite-4k,doubao-1.5-lite-32k,doubao-pro-4k,doubao-pro-32k,doubao-pro-32k-character,doubao-pro-128k,doubao-pro-256k,doubao-1.5-pro-32k,doubao-1.5-pro-256k,doubao-1.5-vision-pro-32k,doubao-vision-lite-32k,doubao-vision-pro-32k,doubao-1-5-pro-thinking,doubao-1-5-vision-thinking,doubao-1-5-thinking-pro-250415,doubao-1-5-thinking-pro-vision,doubao-1-5-thinking-pro-vision-250415,doubao-1-5-thinking-pro-m-250415,moonshot-v1-8k,moonshot-v1-32k,moonshot-v1-128k",
+    "group": "default,deepseek,volcengine",
+    "used_quota": 0,
+    "model_mapping": "{\n  \"deepseek-r1\": \"deepseek-r1-250120\",\n  \"deepseek-reasoner\": \"deepseek-r1-250120\",\n  \"deepseek-v3-0324\": \"deepseek-v3-250324\",\n  \"deepseek-v3\": \"deepseek-v3-250324\",\n  \"deepseek-chat\": \"deepseek-v3-250324\",\n  \"doubao-1-5-vision-pro-32k\": \"doubao-1-5-vision-pro-32k-250115\",\n  \"doubao-1.5-vision-pro-32k\": \"doubao-1-5-vision-pro-32k-250115\",\n  \"doubao-pro-32k\": \"doubao-1-5-pro-32k-250115\",\n  \"doubao-pro-256k\": \"doubao-1-5-pro-256k-250115\",\n  \"doubao-1.5-lite-32k\": \"doubao-1-5-lite-32k-250115\",\n  \"doubao-lite-4k\": \"doubao-1-5-lite-32k-250115\",\n  \"doubao-lite-32k\": \"doubao-1-5-lite-32k-250115\",\n  \"doubao-lite-128k\": \"doubao-lite-128k-240828\",\n  \"doubao-pro-128k\": \"doubao-1-5-pro-256k-250115\",\n  \"doubao-1.5-lite\": \"doubao-1-5-lite-32k-250115\",\n  \"doubao-vision-lite-32k\": \"doubao-vision-lite-32k-241015\",\n  \"doubao-vision-pro-32k\": \"doubao-1-5-vision-pro-32k-250115\",\n  \"doubao-1.5-pro-32k\": \"doubao-1-5-pro-32k-250115\",\n  \"doubao-1.5-pro-256k\": \"doubao-1-5-pro-256k-250115\",\n  \"doubao-1-5-thinking-pro\": \"doubao-1-5-thinking-pro-250415\",\n  \"doubao-1-5-thinking-pro-vision\": \"doubao-1-5-thinking-pro-vision-250415\"\n}",
+    "status_code_mapping": "",
+    "priority": 999,
+    "auto_ban": 1,
+    "other_info": "",
+    "settings": "",
+    "tag": "火山",
+    "setting": null,
+    "param_override": null,
+    "groups": [
+        "default",
+        "deepseek",
+        "volcengine"
+    ]
+}'
+"""

meutils/apis/oneapi/system.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : system
+# @Time         : 2025/4/30 18:06
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+
+# curl 'https://usa.chatfire.cn/api/option/' \
+#   -X 'PUT' \
+#   -H 'New-API-User: 1' \
+#   -H 'sec-ch-ua-platform: "macOS"' \
+#   -H 'Cache-Control: no-store' \
+#   -H 'Referer: https://usa.chatfire.cn/setting?tab=operation' \
+#   -H 'sec-ch-ua: "Google Chrome";v="135", "Not-A.Brand";v="8", "Chromium";v="135"' \
+#   -H 'sec-ch-ua-mobile: ?0' \
+#   -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36' \
+#   -H 'Accept: application/json, text/plain, */*' \
+#   -H 'Content-Type: application/json' \
+#   --data-raw '{"key":"LogConsumeEnabled","value":"false"}'

meutils/apis/volcengine_apis/images.py

@@ -15,12 +15,15 @@ https://www.volcengine.com/docs/6791/1384311
 import os
 
 from meutils.pipe import *
+from meutils.decorators.retry import retrying
+
 from meutils.io.files_utils import to_url
 from meutils.schemas.image_types import ImageRequest, ImagesResponse
 
 from volcengine.visual.VisualService import VisualService
 
 
+@retrying(min=3, max=5)
 async def generate(request: ImageRequest, token: Optional[str] = None):
     """
 

meutils/data/VERSION

@@ -1 +1 @@
-2025.04.30.17.40.05
+2025.05.07.18.34.50

meutils/llm/completions/chat_spark.py

@@ -12,6 +12,7 @@
 from meutils.pipe import *
 from meutils.io.openai_files import file_extract, guess_mime_type
 from meutils.str_utils.json_utils import json_path
+from meutils.str_utils.regular_expression import parse_url
 
 from meutils.llm.clients import AsyncOpenAI, zhipuai_client
 from meutils.llm.openai_utils import to_openai_params
@@ -26,26 +27,12 @@ class Completions(object):
 
     async def create(self, request: CompletionRequest):
         logger.debug(request.last_user_content)
+        logger.debug(parse_url(request.last_assistant_content))
 
         if request.last_user_content.startswith("http"):  # 文件问答-单轮
             file_url, *texts = request.last_user_content.split(maxsplit=1) + ["总结下"]
             text = texts[0]
 
-            # # 图片：走4v
-            # if guess_mime_type(file_url).startswith("image"):
-            #     request.model = "glm-4v-flash"
-            #     request.messages = [
-            #         {
-            #             'role': 'user',
-            #             'content': [{"type": "image_url", "image_url": {"url": file_url}}]
-            #         }
-            #     ]
-            # {
-            #     "type": "image_url",
-            #     "image_url": {
-            #         "url": {
-            #             "url":
-
             file_content = await file_extract(file_url)
 
             request.messages = [
@@ -59,7 +46,7 @@ class Completions(object):
 
             if guess_mime_type(url).startswith("image"):  # 图片问答
 
-                request.model = "glm-4v-flash"  # 6月过期
+                request.model = "glm-4v-flash" if "image" not in request.model else request.model
                 for i, message in enumerate(request.messages):
                     if message.get("role") == "user":
                         user_contents = message.get("content")
@@ -91,6 +78,13 @@ class Completions(object):
                             request.messages = request.messages[-i:]
                             break  # 截断：从最新的文件开始
 
+        elif image_urls := parse_url(request.last_assistant_content):
+            image_url = image_urls[-1]
+            request.messages[-1]["content"] = [
+                {"type": "text", "text": request.last_user_content},
+                {"type": "image_url", "image_url": {"url": image_url}}
+            ]
+
         logger.debug(request.model_dump_json(indent=4))
 
         data = to_openai_params(request)

meutils/llm/openai_polling/chat.py

@@ -85,12 +85,9 @@ class Completions(object):
             if not request.reasoning_effort:  # 默认关闭思考
                 data['reasoning_effort'] = "none"
 
-                if "gemini-2.5-pro" in request.model:  ####### 关闭失效
-                    data['reasoning_effort'] = "low"
-
             if "thinking" in request.model:
                 data['model'] = data['model'].removesuffix("-thinking")  # 开启思考
-                data['reasoning_effort'] = None
+                data['reasoning_effort'] = 'low'
 
         logger.debug(data)
         return await self.client.chat.completions.create(**data)

meutils/schemas/oneapi/common.py

@@ -569,6 +569,7 @@ MODEL_RATIO = {
     "abab5.5s-chat": 2.5,
 
     # deepseek
+    "deepseek-prover-v2-671b": 2,
     "deepseek-v3": 1,
     "deepseek-v3-0324": 1,
     "deepseek-v3-250324": 1,
@@ -646,6 +647,8 @@ MODEL_RATIO = {
     "doubao-1.5-pro-256k": 5 / 2,
 
     "doubao-1.5-vision-pro-32k": 1.5,
+    "doubao-1.5-vision-pro-250328": 1.5,
+
     "doubao-vision-lite-32k": 0.75,
     "doubao-vision-pro-32k": 1.5,
 
@@ -765,6 +768,7 @@ MODEL_RATIO = {
     "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-2.5-pro-preview-05-06": 0.625,
 
     "gemini-1.5-pro-001": 1.25,
     "gemini-1.5-pro-002": 1.25,
@@ -887,8 +891,9 @@ MODEL_RATIO = {
     "Qwen/Qwen2-VL-72B-Instruct": 2,
 
     # 临时
-    "ep-20240515073409-dlpqp": 5,
-    "microsoft/phi-4": 0.035 * 5,
+    "microsoft/phi-4": 0.035,
+    "microsoft/phi-4-reasoning": 0.035,
+    "microsoft/phi-4-reasoning-plus": 0.035 * 2,
     "mistral-small-3.1-24b-instruct": 0.1,
     "mistral-small-24b-instruct-2501": 0.1,
 
@@ -1032,6 +1037,7 @@ COMPLETION_RATIO = {
     "gemini-2.0-pro-exp-02-05": 5,
     "gemini-2.5-pro-exp-03-25": 8,
     "gemini-2.5-pro-preview-03-25": 8,
+    "gemini-2.5-pro-preview-05-06": 8,
 
     "gemma2-9b-it": 4,
     "gemma2-27b-it": 4,
@@ -1113,6 +1119,8 @@ COMPLETION_RATIO = {
     "doubao-1.5-pro-256k": 3,
 
     "doubao-1.5-vision-pro-32k": 3,
+    "doubao-1.5-vision-pro-250328": 3,
+
     "doubao-1-5-vision-pro-32k": 3,
     "doubao-1-5-vision-pro-32k-250115": 3,
 
@@ -1132,6 +1140,7 @@ COMPLETION_RATIO = {
     "doubao-1-5-thinking-pro-vision-250415": 4,
     "doubao-1-5-thinking-pro-m-250415": 4,
 
+    "deepseek-prover-v2-671b": 4,
     "deepseek-r1:1.5b": 4,
     "deepseek-r1-distill-qwen-1.5b": 4,
     "deepseek-r1:7b": 4,
@@ -1360,7 +1369,9 @@ REDIRECT_MODEL = {
     "tune-mythomax-l2-13b": "rohan/tune-mythomax-l2-13b",
     "tune-wizardlm-2-8x22b": "rohan/tune-wizardlm-2-8x22b",
 
-    "microsoft/phi-4": 2,
+    "microsoft/phi-4": 5,
+    "microsoft/phi-4-reasoning": 5,
+    "microsoft/phi-4-reasoning-plus": 5,
 
 }
 
@@ -1398,3 +1409,5 @@ if __name__ == '__main__':
     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(","))
     print([k for k in MODEL_RATIO if k.startswith('qwen3')] | xjoin(","))
+
+    print([k for k in MODEL_RATIO if k.startswith(('deepseek', 'doubao', 'moon'))] | xjoin(","))

meutils/schemas/video_types.py

@@ -12,15 +12,17 @@ from meutils.pipe import *
 
 
 class VideoRequest(BaseModel):
-    model: Literal["cogvideox-flash", "cogvideox"] = "cogvideox-flash"
+    model: Union[str, Literal["cogvideox-flash", "cogvideox"]] = "cogvideox-flash"
 
     prompt: str = "比得兔开小汽车，游走在马路上，脸上的表情充满开心喜悦。"
+    negative_prompt: Optional[str] = None
 
     """
     提供基于其生成内容的图像。如果传入此参数，系统将以该图像为基础进行操作。支持通过URL或Base64编码传入图片。
     图片要求如下：图片支持.png、jpeg、.jpg 格式、图片大小：不超过5M。image_url和prompt二选一或者同时传入。
     """
     image_url: Optional[str] = None
+    tail_image_url: Optional[str] = None
 
     """
     输出模式，默认为 "quality"。 "quality"：质量优先，生成质量高。 "speed"：速度优先，生成时间更快，质量相对降低。 
@@ -31,10 +33,14 @@ class VideoRequest(BaseModel):
     """是否生成 AI 音效。默认值: False（不生成音效）。"""
     with_audio: bool = True
 
+    cfg_scale: Optional[float] = None
+
     """
     默认值: 若不指定，默认生成视频的短边为 1080，长边根据原图片比例缩放。最高支持 4K 分辨率。
     分辨率选项：720x480、1024x1024、1280x960、960x1280、1920x1080、1080x1920、2048x1080、3840x2160
     """
+    aspect_ratio: Union[str, Literal["1:1", "21:9", "16:9", "9:16", "4:3", "3:4"]] = "16:9"
+
     size: Literal[
         '720x480',
         '1024x1024',
@@ -62,7 +68,20 @@ class FalVideoRequest(BaseModel):
     sync_mode: Union[str, Literal["cut_off", "loop", "bounce"]] = "cut_off"
 
 
-class LipsyncVideoRquest(BaseModel):
+class FalKlingVideoRequest(BaseModel):
+    model: Union[
+        str, Literal["fal-ai/kling-video/v1/standard/text-to-video",]] = 'fal-ai/kling-video/v1/standard/text-to-video'
+
+    prompt: Optional[str] = None
+    duration: Optional[float] = 5.0
+    video_url: Optional[str] = None
+    audio_url: Optional[str] = None
+    image_url: Optional[str] = None
+
+    sync_mode: Union[str, Literal["cut_off", "loop", "bounce"]] = "cut_off"
+
+
+class LipsyncVideoRequest(BaseModel):
     model: Union[str, Literal[
         "latentsync", "sync-lipsync",
         "lip_sync_avatar_std", "lip_sync_avatar_lively"
@@ -77,4 +96,4 @@ class LipsyncVideoRquest(BaseModel):
 
 
 if __name__ == '__main__':
-    print(LipsyncVideoRquest())
+    print(LipsyncVideoRequest())