MeUtils 2025.3.23.13.35.22__py3-none-any.whl → 2025.3.31.19.40.39__py3-none-any.whl

meutils/schemas/oneapi/common.py

@@ -20,13 +20,15 @@ MINIMAX_VIDEO = 3
 
 MODEL_PRICE = {
     "o1:free": FREE,
+    # "claude-3-7-sonnet-code:free": "claude-3-7-sonnet-code"
+    "claude-3-7-sonnet-code:free": 0.0001,
 
     "black-forest-labs/FLUX.1-dev": 0.0001,
     "black-forest-labs/FLUX.1-pro": 0.0001,
 
     "images": FREE,
     # rix
-    "kling_image": 0.025,
+    "kling_image": 0.05,
     "kling_virtual_try_on": 1,
     "kling_effects": 1,
 
@@ -66,6 +68,10 @@ MODEL_PRICE = {
     "sora-1:1-480p-5s": 1.2,
     "dall-e-3": 0.03,
 
+    # 智能体
+    "ppt": 0.1,
+    "ppt-islide": 0.1,
+
     # 虚拟换衣fish
     "api-kolors-virtual-try-on": 0.1,
     "official-api-kolors-virtual-try-on": 0.8,
@@ -242,6 +248,7 @@ MODEL_PRICE = {
 
     "gpt-4-all": 0.1,
     "gpt-4o-all": 0.1,
+    "gpt-4o-image": 0.06,
 
     "gpt-4-gizmo-*": 0.1,
     "advanced-voice": 1,
@@ -377,6 +384,7 @@ MODEL_RATIO = {
     "grok-3": 2,
     "grok-3-deepsearch": 2,
     "grok-3-reasoner": 2,
+    "grok-3-deepersearch": 2,
 
     # 定制
     "lingxi-all": 1,
@@ -420,6 +428,10 @@ MODEL_RATIO = {
     "qwen-vl-max-latest": 1.5,
     "qwen-vl-plus-latest": 0.75,
 
+    "qwen2.5-vl-7b-instruct": 0.15,
+    "qwen2.5-vl-32b-instruct": 0.5,
+    "qwen2.5-vl-72b-instruct": 1.5,
+
     "qwen2.5-coder-7b-instruct": 0.05,
     "qwen2.5-7b-instruct": 0.05,
     "qwen2.5-14b-instruct": 0.25,
@@ -429,12 +441,13 @@ MODEL_RATIO = {
     "qwen2.5-coder-32b-instruct": 0.5,
 
     "qwq-32b": 1,
-    "qwq-max": 2,
+    "qwq-plus": 0.8,
+    "qwq-max": 0.8,
     "qwq-max-search": 2,
     "qwen-max-search": 2,
 
     "qvq-72b-preview": 2,
-    "qwen2.5-vl-72b-instruct": 8,
+    "qvq-max-2025-03-25": 4,
 
     "qwen1.5-7b-chat": 0.05,  # 特价
     "qwen1.5-14b-chat": 0.7,
@@ -498,9 +511,11 @@ MODEL_RATIO = {
 
     # deepseek
     "deepseek-v3": 1,
+    "deepseek-v3-0324": 1,
     "deepseek-v3-8k": 0.5,
     "deepseek-v3-128k": 5,
     "deepseek-chat": 1,
+
     "deepseek-chat-8k": 0.5,
     "deepseek-chat-64k": 5,
     "deepseek-chat-164k": 5,
@@ -517,8 +532,10 @@ MODEL_RATIO = {
     'deepseek-r1-search': 2,
     'deepseek-reasoner-search': 2,
 
-    'deepseek-r1-think': 1.5,
-    'deepseek-reasoner-think': 1.5,
+    'deepseek-r1-think': 2,
+    'deepseek-reasoner-think': 2,
+
+    "deepseek-r1-plus": 2,
 
     # 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,
@@ -594,8 +611,9 @@ MODEL_RATIO = {
     "text-babbage-001": 0.25,
     "text-davinci-edit-001": 10,
 
+    "omni-moderation-latest": 0.1,
     "text-moderation-latest": 0.1,
-    "text-moderation-stable": 0.1,
+
     "tts-1": 7.5,
     "tts-1-1106": 7.5,
     "tts-1-hd": 15,
@@ -618,6 +636,12 @@ MODEL_RATIO = {
     "claude-3-7-sonnet-latest": 1.5,
     "claude-3-7-sonnet-20250219": 1.5,
 
+    "deepclaude": 1.5,
+    "deep-claude": 1.5,
+
+    "deep-gemini": 1.5,
+    "deep-grok": 1.5,
+
     "command": 0.5 * 2,
     "command-light": 0.5 * 2,
     "command-light-nightly": 0.5 * 2,
@@ -655,6 +679,7 @@ MODEL_RATIO = {
 
     "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.0-flash-thinking-exp": 1,
     "gemini-2.0-flash-thinking-exp-1219": 1,
@@ -783,6 +808,7 @@ COMPLETION_RATIO = {
     "grok-3": 5,
     "grok-3-deepsearch": 5,
     "grok-3-reasoner": 5,
+    "grok-3-deepersearch": 5,
 
     "claude-3-5-haiku-20241022": 5,
     "anthropic/claude-3-5-haiku-20241022:beta": 5,
@@ -863,6 +889,7 @@ COMPLETION_RATIO = {
 
     "gemini-2.0-pro": 5,
     "gemini-2.0-pro-exp-02-05": 5,
+    "gemini-2.5-pro-exp-03-25": 5,
 
     "gemma2-9b-it": 4,
     "gemma2-27b-it": 4,
@@ -883,6 +910,11 @@ COMPLETION_RATIO = {
     "qwen-max": 4,
     "qwen-vl-max-latest": 3,
     "qwen-vl-plus-latest": 3,
+
+    "qwen2.5-vl-7b-instruct": 4,
+    "qwen2.5-vl-32b-instruct": 4,
+    "qwen2.5-vl-72b-instruct": 4,
+
     "qwen2-vl-7b-instruct": 5,
     "qwen2-vl-72b-instruct": 5,
     "qwen-max-latest": 4,
@@ -891,16 +923,17 @@ COMPLETION_RATIO = {
 
     "qwen-plus": 2.5,
 
-    "qwq-max": 4,
+    "qwq-plus": 2.5,
+    "qwq-max": 2.5,
     "qwq-max-search": 4,
     "qwen-max-search": 4,
+    "qvq-max-2025-03-25": 4,
 
     "qwen2.5-7b-instruct": 4,
     "qwen2.5-14b-instruct": 4,
     "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,
@@ -944,7 +977,9 @@ COMPLETION_RATIO = {
     "meta-deepresearch": 4,
 
     "deepseek-v3": 4,
+    "deepseek-v3-0324": 4,
     "deepseek-chat": 4,
+
     'deepseek-r1': 4,
     'deepseek-reasoner': 4,
     "deepseek-reasoner-164k": 8,
@@ -964,6 +999,12 @@ COMPLETION_RATIO = {
     'deepseek-r1-search': 5,
     'deepseek-reasoner-search': 5,
 
+    "deepseek-r1-plus": 4,
+    "deepclaude": 4,
+    "deep-claude": 4,
+    "deep-gemini": 4,
+    "deep-grok": 4,
+
     "glm-zero": 5,
     "glm-zero-preview": 5,
     "glm-4v-flash": 5,

meutils/schemas/siliconflow_types.py

@@ -11,6 +11,9 @@
 
 from meutils.pipe import *
 
+FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=3aA5dH"
+FEISHU_URL_FREE = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=xlvlrH"
+
 BASE_URL = "https://api.siliconflow.cn/v1"
 
 EXAMPLES = [
@@ -72,9 +75,28 @@ class RerankRequest(BaseModel):
 
 class VideoRequest(BaseModel):
     model: str
+
     prompt: str
-    image: Optional[str] = None
+    negative_prompt: Optional[str] = None
+
+    image: Optional[str] = None  # 图生视频
+
     seed: Optional[int] = None
 
+    # response_format: Optional[str] = None # "mp4" fal
+
     class Config:
-        frozen = True
+        extra = "allow"
+
+        # frozen = True
+        # populate_by_name = True
+
+        json_schema_extra = {
+            "examples": [
+                {
+                    "model": "Wan-AI/Wan2.1-I2V-14B-720P-Turbo",
+                    "prompt": "画条狗",
+                    "image": "https://oss.ffire.cc/files/kling_watermark.png"
+                },
+            ]
+        }

meutils/serving/fastapi/exceptions/http_error.py

@@ -10,13 +10,7 @@ from starlette.responses import JSONResponse
 
 from fastapi.exceptions import RequestValidationError, HTTPException
 
-from meutils.notice.feishu import send_message as _send_message
-
-send_message = partial(
-    _send_message,
-    title=__name__,
-    url="https://open.feishu.cn/open-apis/bot/v2/hook/d1c7b67d-b0f8-4067-a2f5-109f20eeb696"
-)
+from meutils.notice.feishu import send_message_for_httpexception as send_message
 
 
 async def http_error_handler(_: Request, exc: HTTPException) -> JSONResponse:
@@ -42,7 +36,6 @@ async def general_exception_handler(request: Request, exc: Exception):
 
 
 async def chatfire_api_exception_handler(request: Request, exc: Exception):
-
     content = {
         "error":
             {
@@ -68,10 +61,37 @@ async def chatfire_api_exception_handler(request: Request, exc: Exception):
 
     # send_message
     content_detail = f"{traceback.format_exc()}"
+    #
+    # from meutils.pipe import logger
+    # logger.debug(content_detail)
+
     if any(code in content_detail for code in {'451', }):
         content_detail = ""
 
-    send_message([content, content_detail])
+    send_message([content, content_detail], title=__name__)
+
+    # from meutils.pipe import logger
+    #
+    # try:
+    #
+    #     logger.debug(request.headers)
+    #     logger.debug(request.url)
+    #     logger.debug(request.method)
+    #     logger.debug(request.query_params._dict)
+    #
+    #     logger.debug(request.client)
+    #     logger.debug(request.cookies)
+    #
+    #     payload  = await request.body()
+    #
+    #     # send_message(payload, title=__name__)
+    #
+    #     logger.debug(payload)
+    #     logger.debug(payload)
+    #
+    #
+    # except Exception as e:
+    #     logger.debug(e)
 
     return reps or JSONResponse(
         content=content,