MeUtils 2025.2.20.17.30.7__py3-none-any.whl → 2025.2.25.19.14.31__py3-none-any.whl

meutils/schemas/oneapi/common.py

@@ -101,8 +101,9 @@ MODEL_PRICE = {
     "api-tripo3d": 0.1,
 
     # 图片 音频 视频
-    "recraftv3": 0.04,
-    "chat-recraftv3": 0.04,
+    "recraftv3": 0.1,  # 官方的
+    "recraft-api": 0.1,
+    "chat-recraftv3": 0.1,
 
     "api-asr": 0.01,
     "api-stt": 0.01,
@@ -277,6 +278,7 @@ MODEL_PRICE = {
 
     'deepseek-search': 0.01,
     'deepseek-r1-search': 0.01,
+    "deepseek-r1-search-pro": 0.02,
     'deepseek-reasoner-search': 0.01,
 
     'deepseek-r1-metasearch': 0.03,
@@ -334,6 +336,9 @@ MODEL_RATIO = {
     # 智能体
     "gpt-4-plus": 2.5,
     "gpt-4o-plus": 2.5,
+    "jina-deepsearch": 2,
+    "deepresearch": 2,
+    "deepsearch": 2,
 
     # embedding & rerank
     "rerank-multilingual-v2.0": 0.1,
@@ -364,9 +369,13 @@ MODEL_RATIO = {
     "claude-3-5-haiku-20241022": 0.5,
     "anthropic/claude-3-5-haiku-20241022:beta": 0.5,
 
+    # grok
     "grok-2": 1,
     "grok-2-1212": 1,
     "grok-2-vision-1212": 1,
+    "grok-3": 2,
+    "grok-3-deepsearch": 2,
+    "grok-3-reasoner": 2,
 
     # 定制
     "lingxi-all": 1,
@@ -594,6 +603,10 @@ MODEL_RATIO = {
     "anthropic/claude-3.5-sonnet": 1.5,
     "anthropic/claude-3.5-sonnet:beta": 4,  # 1022
 
+    "claude-3-7-sonnet-thinking": 1.5,
+    "claude-3-7-sonnet-latest": 1.5,
+    "claude-3-7-sonnet-20250219": 1.5,
+
     "command": 0.5 * 2,
     "command-light": 0.5 * 2,
     "command-light-nightly": 0.5 * 2,
@@ -743,11 +756,18 @@ COMPLETION_RATIO = {
     # 智能体
     "gpt-4-plus": 5,
     "gpt-4o-plus": 5,
+    "jina-deepsearch": 4,
+    "deepresearch": 4,
+    "deepsearch": 4,
 
     "grok-2": 5,
     "grok-2-1212": 5,
     "grok-2-vision-1212": 5,
 
+    "grok-3": 5,
+    "grok-3-deepsearch": 5,
+    "grok-3-reasoner": 5,
+
     "claude-3-5-haiku-20241022": 5,
     "anthropic/claude-3-5-haiku-20241022:beta": 5,
 
@@ -772,6 +792,10 @@ COMPLETION_RATIO = {
     "anthropic/claude-3.5-sonnet": 5,
     "anthropic/claude-3.5-sonnet:beta": 5,
 
+    "claude-3-7-sonnet-think": 5,
+    "claude-3-7-sonnet-latest": 5,
+    "claude-3-7-sonnet-20250219": 5,
+
     "llama-3.1-70b-instruct": 2,
     "meta-llama/Meta-Llama-3.1-70B-Instruct": 2,
 

meutils/schemas/openai_types.py

@@ -87,6 +87,62 @@ chat_completion_chunk_stop = ChatCompletionChunk(
 # chat_completion.choices[0].message.content = "*"
 # chat_completion_chunk.choices[0].delta.content = "*"
 
+class CompletionRequest(BaseModel):
+    """
+    prompt_filter_result.content_filter_results
+    choice.content_filter_results
+
+    todo: ['messages', 'model', 'frequency_penalty', 'function_call', 'functions', 'logit_bias', 'logprobs', 'max_tokens', 'n', 'presence_penalty', 'response_format', 'seed', 'stop', 'stream', 'temperature', 'tool_choice', 'tools', 'top_logprobs', 'top_p', 'user']
+    """
+    model: str = ''  # "gpt-3.5-turbo-file-id"
+
+    # [{'role': 'user', 'content': 'hi'}]
+    # [{'role': 'user', 'content':  [{"type": "text", "text": ""}]]
+    # [{'role': 'user', 'content': [{"type": "image_url", "image_url": ""}]}] # 也兼容文件
+    # [{'role': 'user', 'content': [{"type": "image_url", "image_url": {"url": ""}}]}] # 也兼容文件
+    # [{'role': 'user', 'content':  [{"type": "file", "file_url": ""}]]
+    messages: Optional[List[Dict[str, Any]]] = None  # 标准化
+
+    stream: Optional[bool] = False
+    stream_options: Optional[dict] = None
+
+    top_p: Optional[float] = 0.7
+    temperature: Optional[float] = 0.7
+
+    n: Optional[int] = 1
+    max_tokens: Optional[int] = None
+    stop: Optional[Union[str, List[str]]] = None
+
+    frequency_penalty: Optional[float] = None
+    user: Optional[str] = None
+
+    # 拓展字段
+    last_message: Optional[Dict[str, Any]] = None
+
+    user_content: Optional[Any] = None  # str dict
+
+    system_messages: Optional[list] = None
+    last_content: Optional[Any] = None
+    urls: List[str] = []
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        last_message = self.messages[-1]  # role content
+        if last_message.get("role") == "user":
+            user_content = last_message.get("content")
+            if isinstance(user_content, list):  # todo: 多模态 'image_url','video_url' and 'video' 'file' audio
+                for i, c in enumerate(user_content):
+                    if c.get("type") == "image_url":
+                        user_content[i]["type"] = "image_url"
+                        user_content[i]["image_url"] = user_content[i].get("image_url", {}).get("url", "")
+
+        self.messages = self.messages or [{'role': 'user', 'content': 'hi'}]
+        self.system_messages = [m for m in self.messages if m.get("role") == "system"]
+
+    class Config:
+        extra = "allow"
+
 
 class ChatCompletionRequest(BaseModel):
     """
@@ -170,8 +226,10 @@ class ChatCompletionRequest(BaseModel):
         if self.max_tokens:
             self.max_tokens = min(self.max_tokens, 4096)
 
-    model_config = {
-        "json_schema_extra": {
+    class Config:
+        extra = "allow"
+
+        json_schema_extra = {
             "examples": [
                 {
                     "model": "gpt-3.5-turbo",
@@ -222,7 +280,6 @@ class ChatCompletionRequest(BaseModel):
 
             ]
         }
-    }
 
 
 class ImageRequest(BaseModel):

meutils/schemas/suno_types.py

@@ -77,7 +77,7 @@ class SunoAIRequest(BaseModel):  # 原始请求体
 
     make_instrumental: bool = False
 
-    mv: str = "chirp-v3-5"  # chirp-v3-5-tau
+    mv: str = "chirp-v4"  # chirp-v3-5-tau
     generation_type: str = "TEXT"
 
     task: Optional[str] = None  # "cover"

meutils/schemas/task_types.py

@@ -105,6 +105,7 @@ class TaskType(str, Enum):
     file_extract = "file-extract"
     moonshot_fileparser = "moonshot-fileparser"
     textin_fileparser = "textin-fileparser"
+    qwen = "qwen"
 
     watermark_remove = "watermark-remove"
 

meutils/schemas/vidu_types.py

@@ -92,7 +92,8 @@ class VideoRequest(BaseModel):
 
 class ViduRequest(BaseModel):
     """quality 倍率2"""
-    model: Union[str, Literal['vidu-2.0', 'vidu-1.5', 'vidu-high-performance', 'vidu-high-quality']] = "vidu-high-performance"
+    model: Union[
+        str, Literal['vidu-2.0', 'vidu-1.5', 'vidu-high-performance', 'vidu-high-quality']] = "vidu-high-performance"
 
     prompt: Optional[str] = None
 
@@ -156,13 +157,12 @@ class ViduRequest(BaseModel):
                 }
             )
 
-
-        if self.model in ("vidu-1.5", "vidu-2.0"):
+        if self.model in ("vidu-2.0",):
             self.payload = {
                 "input": input,
                 "type": self.type or type,
                 "settings": {
-                    "model_version": "2.0", #######
+                    "model_version": "2.0",  #######
                     "style": "general",
                     "duration": self.duration,
 

meutils/serving/fastapi/dependencies/auth.py

@@ -14,6 +14,8 @@ from typing import Optional, Union
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 from fastapi import Depends, HTTPException, status
 
+from meutils.config_utils.lark_utils import get_series, get_next_token
+
 http_bearer = HTTPBearer()
 
 
@@ -32,9 +34,13 @@ async def get_bearer_token(
 
     token = auth.credentials
     if token.startswith('redis:'):  # 初始化吧，太长？
-        pass
-        if ',' in token:  # 初始化redis
+        if "feishu.cn" in token:
+            feishu_url = token.removeprefix("redis:")
+            token = await get_next_token(feishu_url)  # 初始化redis
+
+        elif ',' in token:  # todo: 初始化redis
             pass
+
     elif ',' in token:  # 分隔符
         token = np.random.choice(token.split(','))
 

meutils/serving/fastapi/dependencies/headers.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : headers
+# @Time         : 2025/2/23 00:20
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+
+from fastapi import FastAPI, Request, Depends, HTTPException
+from typing import Dict, Optional
+
+
+# 定义一个依赖函数来获取所有请求头
+# def get_headers(request: Request) -> Dict[str, str]:
+#     return dict(request.headers)
+
+def get_headers(request: Request):
+    return request.headers
+
+# lambda request: dict(request.headers)
+# @app.get("/headers/")
+# async def read_headers(headers: Dict[str, str] = Depends(get_headers)):
+#     # 在这里你可以使用 headers 字典
+#     if "upstream_api_key" not in headers:
+#         raise HTTPException(status_code=400, detail="API key is required")
+#
+#     # 返回所有请求头
+#     return {"headers": headers}