MeUtils 2025.2.18.19.56.22__py3-none-any.whl → 2025.2.25.18.30.35__py3-none-any.whl

meutils/llm/completions/qwenllm.py

@@ -7,6 +7,12 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
+"""
+ File "/usr/local/lib/python3.10/site-packages/meutils/llm/completions/qwenllm.py", line 47, in create
+    yield response.choices[0].message.content
+AttributeError: 'str' object has no attribute 'choices'
+
+"""
 
 from openai import AsyncOpenAI
 
@@ -32,6 +38,16 @@ async def create(request: ChatCompletionRequest):
         base_url=base_url, api_key=token,
         default_headers={'User-Agent': ua.random}
     )
+
+    # qwen结构
+    if any(i in request.model.lower() for i in ("search",)):
+        request.model = "qwen-plus-latest"
+        request.messages[-1]['chat_type'] = "search"
+
+    if any(i in request.model.lower() for i in ("qwq", "think")):
+        request.model = "qwen-plus-latest"
+        request.messages[-1]['feature_config'] = {"thinking_enabled": True}
+
     data = to_openai_params(request)
 
     if request.stream:
@@ -43,8 +59,10 @@ async def create(request: ChatCompletionRequest):
 
     else:
         response = await client.chat.completions.create(**data)
-        # logger.info(response)
-        yield response.choices[0].message.content
+        if isinstance(response, str):
+            logger.error(response)
+        else:
+            yield response.choices[0].message.content
 
 
 if __name__ == '__main__':
@@ -60,16 +78,38 @@ if __name__ == '__main__':
     # ]
     request = ChatCompletionRequest(
         # model="qwen-turbo-2024-11-01",
-        model="qwen-max-latest",
+        # model="qwen-max-latest",
+        model="qwen-max-latest-search",
+
         # model="qwen-plus-latest",
 
         messages=[
             {
                 'role': 'user',
-                'content': 'hi'
+                # 'content': '今天南京天气',
+                # 'content': '总结下',
+
+                # "chat_type": "search",
+
+                "content": [
+                    {
+                        "type": "text",
+                        "text": "总结下",
+                        "chat_type": "t2t",
+                        "feature_config": {
+                            "thinking_enabled": False
+                        }
+                    },
+                    {
+                        "type": "file",
+                        "file": "2d677df1-45b2-4f30-829f-0d42b2b07136"
+                    }
+                ]
+
             },
 
         ],
-        stream=False,
+        stream=True,
+
     )
     arun(create(request))

meutils/llm/prompts/search_prompts.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : search_prompt
+# @Time         : 2025/2/19 10:37
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 提示词模板
+
+from meutils.pipe import *
+
+current_date = datetime.datetime.now().strftime("%Y-%m-%d")
+
+system_prompt = f"""你是一个具备网络访问能力的智能助手，在适当情况下，优先使用网络信息（参考信息）来回答，
+以确保用户得到最新、准确的帮助。当前日期是 {current_date}。"""
+
+# deepseek_prompt

meutils/schemas/image_types.py

@@ -83,7 +83,7 @@ class ImageRequest(BaseModel):  # openai
 
     # oneapi
     negative_prompt: Optional[str] = None
-    guidance: Optional[int] = None
+    guidance: Optional[float] = None
     steps: Optional[int] = None
 
     controls: Optional[dict] = {}  # 额外参数
@@ -479,6 +479,9 @@ class ImageProcess(BaseModel):
 
     response_format: Literal["url", "b64_json"] = "url"
 
+    # class Config:
+    #     extra = "allow"
+
 
 if __name__ == '__main__':
     # print(ASPECT_RATIOS.items())

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,
@@ -412,7 +421,7 @@ MODEL_RATIO = {
     "qwen2.5-coder-7b-instruct": 0.05,
     "qwen2.5-7b-instruct": 0.05,
     "qwen2.5-14b-instruct": 0.25,
-    "qwen2.5-32b-instruct": 0.5,
+    "qwen2.5-32b-instruct": 1,
     "qwen2.5-72b-instruct": 2,
     "qwen2.5-math-72b-instruct": 2,
     "qwen2.5-coder-32b-instruct": 0.5,
@@ -568,7 +577,7 @@ MODEL_RATIO = {
     "ERNIE-3.5-128K": 4,
 
     "ERNIE-4.0-Turbo-8K": 15,
-    "ERNIE-4.0-8K": 20,
+    "ERNIE-4.0-8K": 10,
 
     "text-ada-001": 0.2,
     "text-babbage-001": 0.25,
@@ -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,
@@ -622,9 +635,9 @@ 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.075,
-    "gemini-2.0-flash-001": 0.075,
-    "gemini-2.0-flash-lite-preview-02-05": 0.075,
+    "gemini-2.0-flash": 0.0625,
+    "gemini-2.0-flash-001": 0.0625,
+    "gemini-2.0-flash-lite-preview-02-05": 0.0625,
 
     "gemini-2.0-pro": 1.25,
     "gemini-2.0-pro-exp-02-05": 1.25,
@@ -735,17 +748,26 @@ MODEL_RATIO = {
     "ep-20240515073409-dlpqp": 5,
     "microsoft/phi-4": 0.035 * 5,
 
+    "meta-llama/Llama-3.2-11B-Vision-Instruct": 0.1,
+
 }
 
 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,
 
@@ -770,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,
 
@@ -915,6 +941,8 @@ COMPLETION_RATIO = {
     "step-1.5v-mini": 5,
     "step-1o-vision-32k": 5,
 
+    "meta-llama/Llama-3.2-11B-Vision-Instruct": 4
+
 }
 
 REDIRECT_MODEL = {

meutils/schemas/openai_types.py

@@ -170,8 +170,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 +224,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,10 +92,14 @@ class VideoRequest(BaseModel):
 
 class ViduRequest(BaseModel):
     """quality 倍率2"""
-    model: Union[str, Literal['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
+
     url: Optional[str] = None  # ssupload:?id=
+    tail_image_url: Optional[str] = None
+
     style: str = "general"  # anime
     aspect_ratio: str = "16:9"
     duration: int = 4
@@ -103,7 +107,7 @@ class ViduRequest(BaseModel):
     type: Optional[str] = None  # text2video img2video character2video headtailimg2video
 
     """vidu-1.5"""
-    resolution: Literal['512', '720p', 'vidu-high-quality'] = "512"
+    resolution: Union[str, Literal['512', '720p', '1080p']] = "512"
     movement_amplitude: Optional[str] = "auto"  # small medium high
 
     sample_count: int = 1
@@ -143,12 +147,22 @@ class ViduRequest(BaseModel):
                 }
             )
 
-        if self.model in ("vidu-1.5", "vidu-2.0"):
+        if self.tail_image_url:
+            type = "headtailimg2video"
+            input['prompts'].append(
+                {
+                    "type": "image",
+                    "content": self.tail_image_url,
+                    "src_imgs": [self.tail_image_url, ]
+                }
+            )
+
+        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}

meutils/str_utils/json_utils.py

@@ -52,6 +52,7 @@ def json_loads(s):
 
 
 def json_path(obj, expr):  # todo: 缓存
+    """$..["keywords","query","search_result"]"""
     if isinstance(obj, dict):
         pass
     elif isinstance(obj, str):

meutils/str_utils/regular_expression.py

@@ -145,9 +145,14 @@ if __name__ == '__main__':
     print(parse_url(text, for_image=False))
 
     d = {"url": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\n\n总结下"}
-    print(parse_url(str(d)))
+    # print(parse_url(str(d)))
 
-    print('https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\\n\\n'.strip(r"\n"))
+
+    text = "https://sc-maas.oss-cn-shanghai.aliyuncs.com/outputs/bb305b60-d258-4542-8b07-5ced549e9896_0.png?OSSAccessKeyId=LTAI5tQnPSzwAnR8NmMzoQq4&Expires=1739948468&Signature=NAswPSXj4AGghDuoNX5rVFIidcs%3D 笑起来"
+
+    print(parse_url(text))
+
+    # print('https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\\n\\n'.strip(r"\n"))
 
     # print(parse_url("http://154.3.0.117:39666/docs#/default/get_content_preview_spider_playwright_get"))