MeUtils 2025.1.17.19.49.29__py3-none-any.whl → 2025.1.27.15.5.31__py3-none-any.whl

meutils/schemas/image_types.py

@@ -62,10 +62,14 @@ class ImagesResponse(_ImagesResponse):
     # class Config:
     #     extra = "allow"
 
+
 class ImageRequest(BaseModel):  # openai
+    """
+    图生图 两种方式： prompt + controls
+    """
     model: str = ""
 
-    prompt: constr(min_length=1, max_length=2000) = ""
+    prompt: constr(min_length=1, max_length=3000) = ""
 
     n: Optional[int] = 1
 
@@ -78,11 +82,12 @@ class ImageRequest(BaseModel):  # openai
     seed: Optional[int] = None
 
     # oneapi
-    controls: dict = {}  # 额外参数
-
     negative_prompt: Optional[str] = None
     guidance: Optional[int] = None
     steps: Optional[int] = None
+
+    controls: dict = {}  # 额外参数
+
     safety_tolerance: Optional[int] = None
 
     aspect_ratio: Optional[str] = None
@@ -454,12 +459,21 @@ class TextinImageProcessRequest(ImageProcessRequest):
 
 
 class ImageProcess(BaseModel):
-    model: Literal["remove-watermark", "clarity", "expand", "rmbg-2.0"]
+    model: Literal[
+        "remove-watermark",
+        "clarity",
+
+        "hunyuan-remove-watermark",
+        "hunyuan-clarity",
+
+        "expand",
+        "rmbg-2.0"
+    ]
     image: str
     mask: Optional[str] = None
 
     style: Optional[str] = None
-    aspect_ratio: Union[str, Literal["1:1", "4:3", "3:4"]] = "1:1" # 扩图
+    aspect_ratio: Union[str, Literal["1:1", "4:3", "3:4"]] = "1:1"  # 扩图
 
     response_format: Literal["url", "b64_json"] = "url"
 

meutils/schemas/oneapi/common.py

@@ -14,7 +14,8 @@ from meutils.data.oneapi import NOTICE, FOOTER
 BASE_URL = "https://api.chatfire.cn"
 # BASE_URL = "https://api-dev.chatfire.cn"
 FREE = 0.001
-MJ = 1.5
+MJ_RELAX = 1
+STEP = 2
 
 MODEL_PRICE = {
     "images": FREE,
@@ -22,9 +23,16 @@ MODEL_PRICE = {
     "kling_image": 0.025,
     "kling_virtual_try_on": 1,
 
-    "kling_video": 1,
-    "kling_extend": 1,
-    "kling_lip_sync": 1,
+    "kling_video": 1.2,
+    "kling_extend": 1.2,
+    "kling_lip_sync": 1.2,
+
+    "minimax_video-01": 1.2,
+
+    "minimax_t2v-01": 1.2,
+    "minimax_i2v-01": 1.2,
+    "minimax_i2v-01-live": 1.2,
+    "minimax_s2v-01": 1.2,
 
     # chatfire
     "ppu-0001": 0.0001,
@@ -92,8 +100,6 @@ MODEL_PRICE = {
     "api-stt": 0.01,
     "api-tts": 0.01,
 
-    "step-1x-medium": 0.1,
-
     "kolors": 0.02,
     "kling": 0.02,
 
@@ -116,6 +122,14 @@ MODEL_PRICE = {
     "api-replicate-stable-diffusion-3.5-large-turbo": 0.040,
     "api-replicate-stable-diffusion-3.5-medium": 0.035,
 
+    # sd
+    "stable-diffusion-xl-base-1.0": 0.01,
+    "stable-diffusion-2-1": 0.01,
+    "stable-diffusion": 0.01,
+    "stable-diffusion-3-medium": 0.02,
+    "stable-diffusion-3-5-large": 0.05,
+    "chat-stable-diffusion-3-5-large": 0.05,
+
     "flux": 0.01,
     "flux-schnell": 0.01,
     "flux-dev": 0.03,
@@ -124,10 +138,8 @@ MODEL_PRICE = {
     "flux.1.1-pro": 0.1,
     "black-forest-labs/flux.1.1-pro": 0.1,
 
-    "stable-diffusion-3-5-large": 0.0001,
-    "chat-stable-diffusion-3-5-large": 0.1,
-
-    "chat-step-1x-medium": 0.1 / 4,
+    "step-1x-medium": 0.2,
+    "chat-step-1x-medium": 0.2,
 
     "chat-flux-schnell": 0.01,
     "chat-flux-dev": 0.03,
@@ -146,6 +158,17 @@ MODEL_PRICE = {
 
     # aitools
     "api-aitools": 0.007,
+    "api-images-edits-remove-watermark": 0.01,  # mask
+    "api-images-edits-remove-watermark-hunyuan": 0.01,
+
+    "api-images-edits-remove-watermark-textin": 0.02,  # remove-watermark
+
+    "api-images-edits-clarity": 0.01,
+    "api-images-edits-clarity-hunyuan": 0.01,
+    "api-images-edits-clarity-baidu": 0.01,  # 官方api
+
+    "api-images-edits-expand": 0.01,
+    "api-images-edits-rmbg-2.0": 0.01,
 
     # 文档智能
     "api-textin": 0.02,
@@ -169,7 +192,7 @@ MODEL_PRICE = {
     "api-kling-v1.6-pro-10s": 2 * 0.8 * 1.75,
 
     "api-vidu": 0.09,
-    "api-vidu-vip": 0.3,
+    "api-vidu-vip": 0.6,
 
     "api-cogvideox": 0.1,
     "api-cogvideox-vip": 0.4,
@@ -179,10 +202,11 @@ MODEL_PRICE = {
     "api-translator": 0.0001,
     "api-voice-clone": 0.01,
 
-    "suno_music": 0.5,
+    "suno_music": 0.25,
     "suno_lyrics": 0.01,
-
-    "api-reranker": 0.01,
+    "suno_uploads": 0.01,
+    "suno_upload": 0.01,
+    "suno_concat": 0.01,
 
     # all
     "o1-plus": 0.2,
@@ -232,22 +256,51 @@ MODEL_PRICE = {
     "ai-search-pro": 0.1,
     "ai-search-pro:scholar": 0.1,
 
-    "mj_imagine": 0.1 * MJ,
-    "mj_variation": 0.1 * MJ,
-    "mj_high_variation": 0.1 * MJ,
-    "mj_low_variation": 0.1 * MJ,
-    "mj_pan": 0.1 * MJ,
-    "mj_blend": 0.1 * MJ,
-    "mj_inpaint": 0,
-    "mj_reroll": 0.1 * MJ,
-
-    "mj_upscale": 0.05 * MJ,
-    "mj_custom_zoom": 0,
-    "mj_describe": 0.05 * MJ,
-    "mj_modal": 0.1 * MJ,
-    "mj_shorten": 0.1 * MJ,
-    "mj_zoom": 0.1 * MJ,
-    "swap_face": 0.05 * MJ,
+    # MJ
+    "mj-chat": 0.3,
+
+    "mj_fast_blend": 0.08,
+    "mj_fast_custom_oom": 0,
+    "mj_fast_describe": 0.04,
+    "mj_fast_high_variation": 0.08,
+    "mj_fast_imagine": 0.08,
+    "mj_fast_inpaint": 0,
+    "mj_fast_low_variation": 0.08,
+    "mj_fast_modal": 0.08,
+    "mj_fast_pan": 0.08,
+    "mj_fast_pic_reader": 0,
+    "mj_fast_prompt_analyzer": 0,
+    "mj_fast_prompt_analyzer_extended": 0,
+    "mj_fast_reroll": 0.08,
+    "mj_fast_shorten": 0.08,
+    "mj_fast_upload": 0.01,
+    "mj_fast_upscale": 0.04,
+    "mj_fast_upscale_creative": 0.08,
+    "mj_fast_upscale_subtle": 0.08,
+    "mj_fast_variation": 0.08,
+    "mj_fast_zoom": 0.08,
+
+    "mj_relax_imagine": 0.08 * 0.5,
+
+    "mj_relax_blend": 0.08,
+    "mj_relax_custom_oom": 0,
+    "mj_relax_describe": 0.04 * MJ_RELAX,
+    "mj_relax_high_variation": 0.08 * MJ_RELAX,
+    "mj_relax_inpaint": 0,
+    "mj_relax_low_variation": 0.08 * MJ_RELAX,
+    "mj_relax_modal": 0.08 * MJ_RELAX,
+    "mj_relax_pan": 0.08 * MJ_RELAX,
+    "mj_relax_pic_reader": 0,
+    "mj_relax_prompt_analyzer": 0,
+    "mj_relax_prompt_analyzer_extended": 0,
+    "mj_relax_reroll": 0.08 * MJ_RELAX,
+    "mj_relax_shorten": 0.08 * MJ_RELAX,
+    "mj_relax_upload": 0.01 * MJ_RELAX,
+    "mj_relax_upscale": 0.04 * 1,
+    "mj_relax_upscale_creative": 0.08 * 1,
+    "mj_relax_upscale_subtle": 0.08 * 1,
+    "mj_relax_variation": 0.08 * 1,
+    "mj_relax_zoom": 0.08 * MJ_RELAX,
 
 }
 
@@ -359,10 +412,20 @@ MODEL_RATIO = {
     'spark-ultra': 50,
 
     # 阶跃星辰 https://platform.stepfun.com/docs/pricing/details
-    "step-1-8k": 2.5,
-    "step-1-32k": 7.5,
-    "step-1v-8k": 2.5,
-    "step-1v-32k": 7.5,
+    "step-1-flash": 0.5 * STEP,
+
+    "step-1-8k": 2.5 * STEP,
+    "step-1-32k": 7.5 * STEP,
+    "step-1-256k": 47.5 * STEP,
+
+    "step-2-16k": 19 * STEP,
+    "step-2-mini": 0.5 * STEP,
+    "step-2-16k-exp": 19 * STEP,
+
+    "step-1v-8k": 2.5 * STEP,
+    "step-1.5v-mini": 4 * STEP,
+    "step-1v-32k": 7.5 * STEP,
+    "step-1o-vision-32k": 7.5 * STEP,
 
     # 零一万物 https://platform.lingyiwanwu.com/docs#%E8%AE%A1%E8%B4%B9%E5%8D%95%E5%85%83
     "yi-spark": 0.05,  # 特价
@@ -399,20 +462,29 @@ MODEL_RATIO = {
     "deepseek-ai/DeepSeek-V3": 0.5,
     "accounts/fireworks/models/deepseek-v3": 0.5,
 
-    'deepseek-r1': 0.5,
+    "deepseek-r1:1.5b": 0.1,
+    "deepseek-r1:7b": 0.2,
+    'deepseek-r1': 2,
+    'deepseek-reasoner': 2,
     'deepseek-think': 0.5,
     "deepseek-search": 0.5,
 
     # 豆包
     "doubao-lite-128k": 0.4,
     "doubao-lite-32k": 0.15,
+    "doubao-lite-32k-character": 0.15,
     "doubao-lite-4k": 0.15,
+    "doubao-1.5-lite-32k": 0.3,
 
+    "doubao-pro-4k": 0.4,
+    "doubao-pro-32k": 0.4,
+    "doubao-pro-32k-character": 0.4,
+    "doubao-pro-128k": 2.5,
     "doubao-pro-256k": 5,
+    "doubao-1.5-pro-32k": 0.8,
+    "doubao-1.5-pro-256k": 5,
 
-    "doubao-pro-128k": 2.5,
-    "doubao-pro-32k": 0.4,
-    "doubao-pro-4k": 0.4,
+    "doubao-1.5-vision-pro-32k": 3,
     "doubao-vision-lite-32k": 0.75,
     "doubao-vision-pro-32k": 1.5,
 
@@ -483,6 +555,7 @@ MODEL_RATIO = {
     "gemini-1.0-pro-latest": 1,
     "gemini-1.0-pro-vision-001": 1,
     "gemini-1.0-pro-vision-latest": 1,
+    "gemini-exp-1206": 1,
 
     "gemini-1.5-flash-002": 0.3,  # 重定向到openrouter
     "google/gemini-flash-1.5-8b": 0.3,  # openrouter  $0.0375 $0.15
@@ -495,6 +568,7 @@ MODEL_RATIO = {
     "gemini-2.0-flash-exp": 0.5,
     "gemini-2.0-flash-thinking-exp": 1,
     "gemini-2.0-flash-thinking-exp-1219": 1,
+    "gemini-2.0-flash-thinking-exp-01-21": 1,
 
     "gemini-1.5-pro-001": 1,
     "gemini-1.5-pro-002": 1,
@@ -584,11 +658,11 @@ MODEL_RATIO = {
 
     "internvl2-8b": 0.35 / 2,
     "internvl2-26b": 1 / 2,
-    "internvl2-llama3-76b": 4.13 / 2,
+    "internvl2-llama3-76b": 2,
 
-    "qwen2-vl-7b-instruct": 0.35 / 2,
-    "qwen2-vl-72b-instruct": 4.13 / 2,
-    "Qwen/Qwen2-VL-72B-Instruct": 4.13 / 2,
+    "qwen2-vl-7b-instruct": 0.5,
+    "qwen2-vl-72b-instruct": 2,
+    "Qwen/Qwen2-VL-72B-Instruct": 2,
 
     # 临时
     "ep-20240515073409-dlpqp": 5
@@ -656,10 +730,13 @@ COMPLETION_RATIO = {
     "gemini-1.5-pro-002": 4,
     "gemini-1.5-flash-002": 4,
 
+    "gemini-exp-1206": 5,
+
     "gemini-2.0-flash": 5,
     "gemini-2.0-flash-exp": 5,
     "gemini-2.0-flash-thinking-exp": 5,
     "gemini-2.0-flash-thinking-exp-1219": 5,
+    "gemini-2.0-flash-thinking-exp-01-21": 5,
 
     "hunyuan-a52b-instruct": 5,
     "qwen2.5-coder-32b-instruct": 3,
@@ -674,15 +751,34 @@ COMPLETION_RATIO = {
     "qwen-max": 3,
     "qwen-vl-max-latest": 3,
     "qwen-vl-plus-latest": 3,
+    "qwen2-vl-7b-instruct": 5,
+    "qwen2-vl-72b-instruct": 5,
 
     "deepseek-ai/deepseek-vl2": 3,
+
+    # 豆包
+    "doubao-lite-128k": 3,
+    "doubao-lite-32k": 3,
+    "doubao-lite-32k-character": 3,
+    "doubao-lite-4k": 3,
+    "doubao-1.5-lite-32k": 3,
+
+    "doubao-pro-4k": 3,
+    "doubao-pro-32k": 3,
+    "doubao-pro-32k-character": 3,
+    "doubao-pro-128k": 3,
+    "doubao-pro-256k": 3,
+    "doubao-1.5-pro-32k": 3,
+    "doubao-1.5-pro-256k": 3,
+
+    "doubao-1.5-vision-pro-32k": 3,
     "doubao-vision-lite-32k": 3,
     "doubao-vision-pro-32k": 3,
 
     "deepseek-v3": 1,
-    'deepseek-r1': 1,
-    'deepseek-think': 1,
     "deepseek-search": 1,
+    'deepseek-r1': 4,
+    'deepseek-reasoner': 4,
     "deepseek/deepseek-chat": 1,
     "deepseek-ai/DeepSeek-V3": 1,
     "accounts/fireworks/models/deepseek-v3": 1,
@@ -691,6 +787,18 @@ COMPLETION_RATIO = {
     "glm-zero-preview": 5,
     "glm-4v-flash": 5,
 
+    "step-1-flash": 5,
+    "step-1-8k": 5,
+    "step-1-32k": 5,
+    "step-1-256k": 5,
+    "step-2-16k": 5,
+    "step-2-mini": 5,
+    "step-2-16k-exp": 5,
+    "step-1v-8k": 5,
+    "step-1v-32k": 5,
+    "step-1.5v-mini": 5,
+    "step-1o-vision-32k": 5,
+
 }
 
 REDIRECT_MODEL = {
@@ -871,7 +979,6 @@ GROUP_RATIO = {
 
 }
 
-
 # https://oss.ffire.cc/images/qw.jpeg?x-oss-process=image/format,jpg/resize,w_512
 if __name__ == '__main__':
     # print(','.join(REDIRECT_MODEL.keys()))

meutils/schemas/oneapi/models.py

@@ -17,7 +17,7 @@ BAICHUAN = {
     'baichuan4': 50,
     'baichuan3-turbo': 6,
     'baichuan3-turbo-128k': 12,
-    'baichuan2-turbo': 4
+    'baichuan2-turbo': 4,
 }
 
 if __name__ == '__main__':

meutils/schemas/openai_types.py

@@ -115,7 +115,7 @@ class ChatCompletionRequest(BaseModel):
     stop: Optional[Union[str, List[str]]] = None
 
     presence_penalty: Optional[float] = 0.0
-    frequency_penalty: Optional[float] = 0.0
+    frequency_penalty: Optional[float] = None
     user: Optional[str] = None
 
     # tools

meutils/schemas/task_types.py

@@ -24,6 +24,7 @@ STATUSES = {
     "started": "QUEUED",
     "pending": "QUEUED",
     "PENDING": "QUEUED",
+    "Queueing": "QUEUED",
 
     "processing": "IN_PROGRESS",
     "in_progress": "IN_PROGRESS",
@@ -34,6 +35,7 @@ STATUSES = {
     "success": "SUCCESS",
     "succeeded": "SUCCESS",
 
+    "fail": "FAILURE",
     "failed": "FAILURE",
     "canceled": "FAILURE",
     "FAILURE": "FAILURE",

meutils/schemas/video_types.py

@@ -54,9 +54,27 @@ class VideoRequest(BaseModel):
 
 
 class FalVideoRequest(BaseModel):
-    model: Union[str, Literal["latentsync", "sync-lipsync", ]] = 'latentsync'
+    model: Union[str, Literal["latentsync", "sync-lipsync",]] = 'latentsync'
     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 LipsyncVideoRquest(BaseModel):
+    model: Union[str, Literal[
+        "latentsync", "sync-lipsync",
+        "lip_sync_avatar_std", "lip_sync_avatar_lively"
+    ]
+    ] = 'latentsync'
+
+    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"
+
+
+if __name__ == '__main__':
+    print(LipsyncVideoRquest())

meutils/str_utils/json_utils.py

@@ -7,6 +7,10 @@
 # @WeChat       : 313303303
 # @Software     : PyCharm
 # @Description  : pd.io.json.json_normalize
+
+# https://mangiucugna.github.io/json_repair/
+# https://jsonpath.com/
+
 import jsonpath
 
 # json https://blog.csdn.net/freeking101/article/details/103048514
@@ -20,6 +24,7 @@ import jsonpath
 # https://blog.csdn.net/weixin_44799217/article/details/127590589
 
 from meutils.pipe import *
+from json_repair import repair_json
 
 
 def json2class(dic, class_name='Test'):
@@ -46,5 +51,28 @@ def json_loads(s):
         return eval(s)
 
 
+def json_path(obj, expr):  # todo: 缓存
+    if isinstance(obj, dict):
+        pass
+    elif isinstance(obj, str):
+        obj = json_repair.loads(obj)
+    elif isinstance(obj, bytes):
+        obj = json_repair.loads(obj.decode())
+    elif isinstance(obj, BaseModel):
+        obj = obj.dict()
+
+    return jsonpath.jsonpath(obj, expr=expr)
+
+
 if __name__ == '__main__':
-    print(jsonpath.jsonpath({"a": 1}, expr='$.a'))
+    print(json_path({"a": 1}, expr='$.a'))
+    print(json_path("""{"a": 1}""", expr='$.a'))
+
+    json_string = """{"a": 1}"""
+
+
+    class A(BaseModel):
+        a: int = 1
+
+
+    print(json_path(A(), '$.a'))

meutils/request_utils/jwt_utils/common.py

@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Project      : AI.  @by PyCharm
-# @File         : common
-# @Time         : 2024/10/28 20:57
-# @Author       : betterme
-# @WeChat       : meutils
-# @Software     : PyCharm
-# @Description  : 
-
-from meutils.pipe import *
-
-import jwt
-import time
-import datetime
-
-# Header and payload
-header = {
-    "alg": "HS256",
-    "typ": "JWT"
-}
-
-payload = {
-    "exp": int(time.time()) + 3600,  # 1 hour from now
-    "user": {
-        "id": "302833867771949058",
-        "name": "me better",
-        "avatar": "https://lh3.googleusercontent.com/a/ACg8ocIgSSChs1D4sTj1STk7PsTm7y53JDX99o8BxpZcV6560AJbRg=s96-c",
-        "deviceID": ""
-    }
-}
-
-# Your secret key
-secret = ""
-
-
-# Create the JWT
-token = jwt.encode(payload, secret, algorithm="HS256", headers=header)
-
-print(token)
-
-jwt.decode(token, secret, algorithms=["HS256"])