MeUtils 2025.2.6.20.41.23__py3-none-any.whl → 2025.2.13.20.50.5__py3-none-any.whl

meutils/schemas/oneapi/common.py

@@ -18,6 +18,11 @@ MJ_RELAX = 1
 STEP = 2
 
 MODEL_PRICE = {
+    "o1:free": FREE,
+
+    "black-forest-labs/FLUX.1-dev": 0.0001,
+    "black-forest-labs/FLUX.1-pro": 0.0001,
+
     "images": FREE,
     # rix
     "kling_image": 0.025,
@@ -34,6 +39,11 @@ MODEL_PRICE = {
     "minimax_i2v-01-live": 1.2,
     "minimax_s2v-01": 1.2,
 
+    # free
+    "google/gemini-2.0-flash-thinking-exp:free": 0.00001,
+    "google/gemini-2.0-flash-lite-preview-02-05:free": 0.00001,
+    "google/gemini-2.0-pro-exp-02-05:free": 0.00001,
+
     # chatfire
     "ppu-0001": 0.0001,
     "ppu-001": 0.001,
@@ -45,6 +55,7 @@ MODEL_PRICE = {
     "chatfire-law": 0.01,
 
     "sora-1:1-480p-5s": 1.2,
+    "dall-e-3": 0.03,
 
     # 虚拟换衣fish
     "api-kolors-virtual-try-on": 0.1,
@@ -199,6 +210,12 @@ MODEL_PRICE = {
     "api-cogvideox": 0.1,
     "api-cogvideox-vip": 0.4,
 
+    #
+    "runway_video": 0.6,
+    "runway_video2video": 0.6,
+    "runway_act_one": 1,
+    "runwayml_image_to_video": 0.8,
+
     "api-runwayml-gen3": 0.1,
 
     "api-translator": 0.0001,
@@ -212,7 +229,7 @@ MODEL_PRICE = {
 
     # all
     "o1-plus": 0.2,
-    "o1-pro": 0.6,
+    "o1-pro": 1.2,
 
     "o1-mini-all": 0.2,
     "o1-preview-all": 0.6,
@@ -261,6 +278,13 @@ MODEL_PRICE = {
     "ai-search-pro": 0.1,
     "ai-search-pro:scholar": 0.1,
 
+    'deepseek-search': 0.01,
+    'deepseek-r1-search': 0.01,
+    'deepseek-reasoner-search': 0.01,
+
+    'deepseek-r1-metasearch': 0.03,
+    'deepseek-reasoner-metasearch': 0.03,
+
     # MJ
     "mj-chat": 0.3,
 
@@ -379,7 +403,7 @@ MODEL_RATIO = {
     "qwen-long": 0.25,
     "qwen-turbo": 0.05,
     "qwen-plus": 2,
-    "qwen-max": 10,
+    "qwen-max": 1.2,
     "qwen-max-longcontext": 20,
     "qwen-turbo-2024-11-01": 0.15,
     "qwen-max-latest": 1.2,
@@ -399,6 +423,7 @@ MODEL_RATIO = {
     "Qwen/QwQ-32B-Preview": 1,
     "qwq-32b-preview": 1,
     "qvq-72b-preview": 2,
+    "qwen2.5-vl-72b-instruct": 1.25,
 
     "qwen1.5-7b-chat": 0.05,  # 特价
     "qwen1.5-14b-chat": 0.7,
@@ -461,29 +486,42 @@ MODEL_RATIO = {
     "abab5.5s-chat": 2.5,
 
     # deepseek
-    "deepseek-chat": 0.5,
+    "deepseek-v3": 1,
+    "deepseek-v3-128k": 5,
+    "deepseek-chat": 1,
+    "deepseek-chat-64k": 5,
+    "deepseek-chat-164k": 5,
+    "deepseek-chat:function": 4,
     "deepseek-vl2": 0.5,
-
     "deepseek-ai/deepseek-vl2": 0.5,
-    "deepseek-llm-67b-chat": 0.5,
-
-    "deepseek-chat:function": 4,
-
-    "deepseek-v3": 0.5,
-    "deepseek/deepseek-chat": 0.5,
-    "deepseek-ai/DeepSeek-V3": 0.5,
-    "accounts/fireworks/models/deepseek-v3": 0.5,
 
+    # deepseek-r1:1.5b,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:1.5b": 0.1,
+    'deepseek-r1-lite': 0.1,  # think
+    "deepseek-r1-distill-qwen-1.5b": 0.1,
     "deepseek-r1:7b": 0.2,
+    "deepseek-r1-distill-qwen-7b": 0.2,
+    "deepseek-r1:8b": 0.3,
+    "deepseek-r1-distill-llama-8b": 0.3,
+
     "deepseek-r1:14b": 0.5,
+    "deepseek-r1-distill-qwen-14b": 0.5,
+
     "deepseek-r1:32b": 1,
+    "deepseek-r1-distill-qwen-32b": 1,
+
+    "deepseek-r1:70b": 1.5,
+    "deepseek-r1-distill-llama-70b": 1.5,
+
     'deepseek-r1': 2,
     'deepseek-reasoner': 2,
-    'deepseek-think': 0.5,
-    "deepseek-search": 0.5,
-    "deepseek-chat-64k": 5,
-    "deepseek-v3-128k": 5,
+
+    'deepseek-r1-think': 1.5,
+    'deepseek-reasoner-think': 1.5,
+
+    "deepseek-search": 1,
+    'deepseek-r1-search': 2,
+    'deepseek-reasoner-search': 2,
 
     # 豆包
     "doubao-lite-128k": 0.4,
@@ -573,6 +611,7 @@ MODEL_RATIO = {
     "gemini-1.0-pro-vision-latest": 1,
     "gemini-exp-1206": 1,
 
+    "gemini-1.5-flash": 0.1,
     "gemini-1.5-flash-002": 0.3,  # 重定向到openrouter
     "google/gemini-flash-1.5-8b": 0.3,  # openrouter  $0.0375 $0.15
 
@@ -581,8 +620,12 @@ MODEL_RATIO = {
     "google/gemini-flash-1.5-exp": 0.1,  # openrouter免费
     "google/gemini-flash-1.5-8b-exp": 0.1,  # openrouter免费
 
-    "gemini-2.0-flash": 0.75,
-    "gemini-2.0-flash-001": 0.75,
+    "gemini-2.0-flash": 0.075,
+    "gemini-2.0-flash-001": 0.075,
+    "gemini-2.0-flash-lite-preview-02-05": 0.075,
+
+    "gemini-2.0-pro": 1.25,
+    "gemini-2.0-pro-exp-02-05": 1.25,
 
     "gemini-2.0-flash-exp": 0.5,
     "gemini-2.0-flash-thinking-exp": 1,
@@ -633,6 +676,8 @@ MODEL_RATIO = {
     "gpt-4o-2024-11-20": 1.25,
 
     "o1": 7.5,
+    "o1-2024-12-17": 7.5,
+
     "o1-mini": 1.5,
     "o1-preview": 7.5,
     "o1-mini-2024-09-12": 1.5,
@@ -685,7 +730,8 @@ MODEL_RATIO = {
     "Qwen/Qwen2-VL-72B-Instruct": 2,
 
     # 临时
-    "ep-20240515073409-dlpqp": 5
+    "ep-20240515073409-dlpqp": 5,
+    "microsoft/phi-4": 0.035 * 5,
 
 }
 
@@ -751,6 +797,7 @@ COMPLETION_RATIO = {
 
     "gemini-1.5-pro-001": 4,
     "gemini-1.5-pro-002": 4,
+    "gemini-1.5-flash": 4,
     "gemini-1.5-flash-002": 4,
 
     "gemini-exp-1206": 5,
@@ -763,6 +810,11 @@ COMPLETION_RATIO = {
     "gemini-2.0-flash-thinking-exp-1219": 5,
     "gemini-2.0-flash-thinking-exp-01-21": 5,
 
+    "gemini-2.0-flash-lite-preview-02-05": 4,
+
+    "gemini-2.0-pro": 4,
+    "gemini-2.0-pro-exp-02-05": 4,
+
     "hunyuan-a52b-instruct": 5,
     "qwen2.5-coder-32b-instruct": 3,
 
@@ -773,7 +825,7 @@ COMPLETION_RATIO = {
     "qvq-72b-preview": 3,
 
     "qwen-long": 4,
-    "qwen-max": 3,
+    "qwen-max": 4,
     "qwen-vl-max-latest": 3,
     "qwen-vl-plus-latest": 3,
     "qwen2-vl-7b-instruct": 5,
@@ -786,6 +838,7 @@ COMPLETION_RATIO = {
     "qwen2.5-32b-instruct": 4,
     "qwen2.5-72b-instruct": 4,
     "qwen2.5-math-72b-instruct": 4,
+    "qwen2.5-vl-72b-instruct": 3,
 
     "deepseek-vl2": 4,
     "deepseek-ai/deepseek-vl2": 4,
@@ -809,17 +862,39 @@ COMPLETION_RATIO = {
     "doubao-vision-lite-32k": 3,
     "doubao-vision-pro-32k": 3,
 
+    "deepseek-r1:1.5b": 4,
+    "deepseek-r1-distill-qwen-1.5b": 4,
+    "deepseek-r1:7b": 4,
+    "deepseek-r1-distill-qwen-7b": 4,
+    "deepseek-r1:8b": 4,
+    "deepseek-r1-distill-llama-8b": 4,
+    "deepseek-r1:14b": 4,
+    "deepseek-r1-distill-qwen-14b": 4,
+    "deepseek-r1:32b": 4,
+    "deepseek-r1-distill-qwen-32b": 4,
+    "deepseek-r1:70b": 4,
+    "deepseek-r1-distill-llama-70b": 4,
+
     "deepseek-v3": 4,
-    "deepseek-search": 1,
+    "deepseek-chat": 4,
     'deepseek-r1': 4,
     'deepseek-reasoner': 4,
-    "deepseek/deepseek-chat": 1,
-    "deepseek-ai/DeepSeek-V3": 1,
-    "accounts/fireworks/models/deepseek-v3": 1,
+    "deepseek-reasoner-164k": 8,
+
     "deepseek-chat:function": 4,
+
+    "deepseek-chat-8k": 5,
     "deepseek-chat-64k": 5,
+    "deepseek-chat-164k": 5,
+
     "deepseek-v3-128k": 5,
+
     "deepseek-llm-67b-chat": 4,
+    'deepseek-r1-think': 4,
+    'deepseek-reasoner-think': 4,
+    "deepseek-search": 5,
+    'deepseek-r1-search': 5,
+    'deepseek-reasoner-search': 5,
 
     "glm-zero": 5,
     "glm-zero-preview": 5,
@@ -992,7 +1067,9 @@ REDIRECT_MODEL = {
     # "qwen-2.5-72b": "qwen/qwen-2.5-72b",
     "tune-blob": "kaushikaakash04/tune-blob",
     "tune-mythomax-l2-13b": "rohan/tune-mythomax-l2-13b",
-    "tune-wizardlm-2-8x22b": "rohan/tune-wizardlm-2-8x22b"
+    "tune-wizardlm-2-8x22b": "rohan/tune-wizardlm-2-8x22b",
+
+    "microsoft/phi-4": 2,
 
 }
 

meutils/schemas/openai_types.py

@@ -74,13 +74,13 @@ class ChatCompletionChunk(_ChatCompletionChunk):
 
 
 chat_completion = ChatCompletion(
-    choices=[Choice(message=ChatCompletionMessage(content=""))]
+    choices=[Choice(message=ChatCompletionMessage(reasoning_content="", content=""))]
 )
 chat_completion_chunk = ChatCompletionChunk(
-    choices=[ChunkChoice(delta=ChoiceDelta(content=""))]
+    choices=[ChunkChoice(delta=ChoiceDelta(reasoning_content="", content=""))]
 )
 chat_completion_chunk_stop = ChatCompletionChunk(
-    choices=[ChunkChoice(delta=ChoiceDelta(content=""), finish_reason="stop")]
+    choices=[ChunkChoice(delta=ChoiceDelta(reasoning_content="", content=""), finish_reason="stop")]
 )
 
 
@@ -352,15 +352,19 @@ if __name__ == '__main__':
     #
     #
     # print(A(n=11))
-    messages = [
-        {
-            "role": "user",
-            "content": [{'role': 'user', 'content': [{"type": "image_url", "image_url": "这是个图片链接"}]}]
-        },
-
-        # {'role': 'user', 'content': [{"type": "image_url", "image_url": {"url": "这是个图片链接"}}]},
-    ]
-
-    r = ChatCompletionRequest(model="gpt-3.5-turbo", messages=messages)
-    r.messages[-1]['content'] = [{"type": "image_url", "image_url": {"url": r.urls[-1]}}]
-    print(r)
+    # messages = [
+    #     {
+    #         "role": "user",
+    #         "content": [{'role': 'user', 'content': [{"type": "image_url", "image_url": "这是个图片链接"}]}]
+    #     },
+    #
+    #     # {'role': 'user', 'content': [{"type": "image_url", "image_url": {"url": "这是个图片链接"}}]},
+    # ]
+    #
+    # r = ChatCompletionRequest(model="gpt-3.5-turbo", messages=messages)
+    # r.messages[-1]['content'] = [{"type": "image_url", "image_url": {"url": r.urls[-1]}}]
+    # print(r)
+
+    print(chat_completion_chunk)
+    print(chat_completion)
+    print(chat_completion_chunk_stop)

meutils/schemas/vidu_types.py

@@ -10,7 +10,8 @@
 
 from meutils.pipe import *
 
-BASE_URL = "https://api.vidu.studio/vidu/v1"
+# BASE_URL = "https://api.vidu.studio/vidu/v1"
+BASE_URL = "https://service.vidu.com/vidu/v1"
 UPLOAD_BASE_URL = "https://api.vidu.studio/tools/v1"  # /files/uploads
 
 EXAMPLES = [

meutils/schemas/yuanbao_types.py

@@ -220,12 +220,17 @@ class SSEData(BaseModel):
     # data: [DONE]
 
     content: str = ""
+    reasoning_content: str = ""
+
     image: Optional[str] = None
 
     chunk: str = ""
 
     def __init__(self, **data):
         super().__init__(**data)
+
+        logger.debug(self.chunk)
+
         chunk = self.chunk.lstrip("data:")
 
         if '"type":"progress"' in chunk:
@@ -248,6 +253,9 @@ class SSEData(BaseModel):
         # df['title'] = "[" + df['title'] + "](" + df['url'] + ")"
         # df['image'] = "![](" + df['image'] + ")"
 
+        elif '{"type":"think"' in chunk: # 思考中...
+            content = self.reasoning_content = json.loads(chunk).get("content", "")
+
         else:
             content = ""
             # chunk.strip() or logger.debug(chunk)  # debug

meutils/serving/fastapi/exceptions/http_error.py

@@ -42,6 +42,7 @@ async def general_exception_handler(request: Request, exc: Exception):
 
 
 async def chatfire_api_exception_handler(request: Request, exc: Exception):
+
     content = {
         "error":
             {
@@ -54,7 +55,6 @@ async def chatfire_api_exception_handler(request: Request, exc: Exception):
 
     # 默认值
     reps = None
-    request_json = {"body": await request.body()}
     if isinstance(exc, (HTTPStatusError, APIStatusError)):
         status_code = exc.response.status_code or 500
 
@@ -71,7 +71,7 @@ async def chatfire_api_exception_handler(request: Request, exc: Exception):
     if any(code in content_detail for code in {'451', }):
         content_detail = ""
 
-    send_message([request_json, content, content_detail])
+    send_message([content, content_detail])
 
     return reps or JSONResponse(
         content=content,