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

meutils/io/files_utils.py

@@ -58,23 +58,29 @@ async def to_bytes(
     """
     # assert file
 
-    logger.debug(type(file))
-
-    if isinstance(file, bytes): return file
+    if isinstance(file, bytes):
+        logger.debug(f"FileType: BYTES")
+        return file
 
     file_bytes = None
     if isinstance(file, UploadFile):
         file_bytes = await file.read()
 
     elif isinstance(file, str) and file.startswith('http'):  # url
+        logger.debug(f"FileType: HTTP")
+
         async with AsyncClient(headers=headers or {}, timeout=60) as cilent:
             resp = await cilent.get(file)
             file_bytes = resp.content
 
     elif isinstance(file, str) and len(file) > 256:  # base64
+        logger.debug(f"FileType: BASE64")
+
         file_bytes = base64_to_bytes(file)
 
     elif isinstance(file, str) and len(file) < 256 and Path(file).is_file():  # file
+        logger.debug(f"FileType: PATH")
+
         file_bytes = Path(file).read_bytes()
 
     return file_bytes

meutils/llm/completions/agents/file.py

@@ -13,6 +13,7 @@ api形式
 - /agents/v1
 - /v1 前缀区分 agents-{model}【底层调用 /agents/v1】
 
+todo: 记录上下文日志
 """
 
 from meutils.pipe import *
@@ -88,16 +89,18 @@ if __name__ == '__main__':
 
             {
                 'role': 'user',
-                'content': {
-                    "type": "file_url",
-                    "file_url": {"url": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf", "detai": "auto"}
-                },
+                # 'content': {
+                #     "type": "file_url",
+                #     "file_url": {"url": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf", "detai": "auto"}
+                # },
                 # 'content': "https://oss.ffire.cc/files/%E6%8B%9B%E6%A0%87%E6%96%87%E4%BB%B6%E5%A4%87%E6%A1%88%E8%A1%A8%EF%BC%88%E7%AC%AC%E4%BA%8C%E6%AC%A1%EF%BC%89.pdf 这个文件讲了什么？",
                 # 'content': "https://translate.google.com/?sl=zh-CN&tl=en&text=%E6%8F%90%E4%BE%9B%E6%96%B9&op=tr1anslate 这个文件讲了什么？",
 
                 # "content": "总结下 https://oss.ffire.cc/files/百炼系列手机产品介绍.docx"
                 # "content": "https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\n\n总结下"
 
+                "content": "https://admin.ilovechatgpt.top/file/lunIMYAIzhinengzhushouduishenghuodocx_14905733.docx 总结"
+
             },
 
             # {'role': 'assistant', 'content': "好的"},

meutils/schemas/hailuo_types.py

@@ -33,7 +33,7 @@ status_mapper = {
 
 
 class VideoRequest(BaseModel):
-    """
+    """https://platform.minimaxi.com/document/video_generation?key=66d1439376e52fcee2853049
     23000 文生视频
     "T2V-01": "23000"
     "I2V-01": "23001"
@@ -61,6 +61,11 @@ class VideoRequest(BaseModel):
     传入图片需要满足以下条件：格式为JPG/JPEG/PNG；长宽比大于2:5、小于5:2；短边像素大于300px；体积不大于20MB。"""
     first_frame_image: Optional[str] = None
 
+    """本参数仅当model选择为S2V-01时可用。模型将依据此参数中上传的主体来生成视频。目前仅支持单主体参考（数组长度为 1）。"""
+    # subject_reference: list = [{"type": "character", "image": ""}]
+
+    callback_url: Optional[str] = None
+
     "n"
     n: int = 1
 
@@ -133,13 +138,14 @@ class VideoResponse(BaseModel):
     base_resp: BaseResponse  # response.statusInfo
 
     """
+    SUBMITTED-已提交
     Preparing-准备中
     Queueing-队列中
     Processing-生成中
     Success-成功
     Failed-失败
     """
-    status: str = "Queueing"
+    status: str = "SUBMITTED"
     file_id: Optional[str] = None  # 通过file_id 可以获取视频地址download_url
 
     videos: Optional[List[Video]] = None  # response.data.videos

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
@@ -459,7 +464,7 @@ class ImageProcess(BaseModel):
     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,
 
@@ -127,7 +133,8 @@ MODEL_PRICE = {
     "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 +153,12 @@ MODEL_PRICE = {
 
     # aitools
     "api-aitools": 0.007,
+    "api-images-edits-remove-watermark": 0.01,  # mask
+    "api-images-edits-remove-textin": 0.02,  # remove-watermark
+
+    "api-images-edits-clarity": 0.01,
+    "api-images-edits-expand": 0.01,
+    "api-images-edits-rmbg-2.0": 0.01,
 
     # 文档智能
     "api-textin": 0.02,
@@ -179,10 +192,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 +246,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 +402,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 +452,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 +545,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
@@ -584,11 +647,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,6 +719,8 @@ 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,
@@ -674,15 +739,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 +775,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 +967,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/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,7 +54,17 @@ 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",]] = 'latentsync'
+
     video_url: Optional[str] = None
     audio_url: Optional[str] = None
     image_url: Optional[str] = None

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'))