MeUtils 2025.8.21.9.53.54__py3-none-any.whl → 2025.8.26.9.9.32__py3-none-any.whl

meutils/llm/models/modelscope.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : modelscope
+# @Time         : 2025/8/22 22:47
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+
+models_mapping = {
+    "flux-kontext-dev": "MusePublic/FLUX.1-Kontext-Dev",
+    # "flux-kontext-dev": "black-forest-labs/FLUX.1-Kontext-dev",
+
+    "flux.1-krea-dev": "black-forest-labs/FLUX.1-Krea-dev",
+
+    "moonshotai/kimi-k2-instruct": "moonshotai/Kimi-K2-Instruct",
+    "kimi-k2-0711-preview": "moonshotai/Kimi-K2-Instruct",
+    "majicflus_v1": "MAILAND/majicflus_v1",
+    "deepseek-reasoner": "deepseek-ai/DeepSeek-R1-0528",
+
+    "deepseek-r1": "deepseek-ai/DeepSeek-R1-0528",
+    "deepseek-r1-0528": "deepseek-ai/DeepSeek-R1-0528",
+    "deepseek-r1-250528": "deepseek-ai/DeepSeek-R1-0528",
+    "deepseek-chat": "deepseek-ai/DeepSeek-V3",
+    "deepseek-v3": "deepseek-ai/DeepSeek-V3",
+    "deepseek-v3-0324": "deepseek-ai/DeepSeek-V3",
+    "deepseek-v3-250324": "deepseek-ai/DeepSeek-V3",
+    "deepseek-v3-1-250821": "deepseek-ai/DeepSeek-V3.1",
+
+    "deepseek-r1-distill-qwen-14b": "deepseek-ai/DeepSeek-R1-Distill-Qwen-14B",
+    "deepseek-r1-distill-qwen-32b": "deepseek-ai/DeepSeek-R1-Distill-Qwen-32B",
+    "deepseek-r1-distill-llama-70b": "deepseek-ai/DeepSeek-R1-Distill-Llama-70B",
+    "qwen2.5-coder-32b-instruct": "Qwen/Qwen2.5-Coder-32B-Instruct",
+    "qwen2.5-coder-14b-instruct": "Qwen/Qwen2.5-Coder-14B-Instruct",
+    "qwen2.5-coder-7b-instruct": "Qwen/Qwen2.5-Coder-7B-Instruct",
+    "qwen2.5-72b-instruct": "Qwen/Qwen2.5-72B-Instruct",
+    "qwen2.5-32b-instruct": "Qwen/Qwen2.5-32B-Instruct",
+    "qwen2.5-14b-instruct": "Qwen/Qwen2.5-14B-Instruct",
+    "qwen2.5-7b-instruct": "Qwen/Qwen2.5-7B-Instruct",
+    "qwq-32b-preview": "Qwen/QwQ-32B-Preview",
+    "qvq-72b-preview": "Qwen/QVQ-72B-Preview",
+    "qwen2-vl-7b-instruct": "Qwen/Qwen2-VL-7B-Instruct",
+    "qwen2.5-14b-instruct-1m": "Qwen/Qwen2.5-14B-Instruct-1M",
+    "qwen2.5-7b-instruct-1m": "Qwen/Qwen2.5-7B-Instruct-1M",
+    "qwen2.5-vl-3b-instruct": "Qwen/Qwen2.5-VL-3B-Instruct",
+    "qwen2.5-vl-7b-instruct": "Qwen/Qwen2.5-VL-7B-Instruct",
+    "qwen2.5-vl-72b-instruct": "Qwen/Qwen2.5-VL-72B-Instruct",
+    "qwq-32b": "Qwen/QwQ-32B",
+    "qwen2.5-vl-32b-instruct": "Qwen/Qwen2.5-VL-32B-Instruct",
+    "qwen3-0.6b": "Qwen/Qwen3-0.6B",
+    "qwen3-1.7b": "Qwen/Qwen3-1.7B",
+    "qwen3-4b": "Qwen/Qwen3-4B",
+    "qwen3-14b": "Qwen/Qwen3-14B",
+    "qwen3-30b-a3b": "Qwen/Qwen3-30B-A3B",
+    "qwen3-32b": "Qwen/Qwen3-32B",
+    "qwen3-235b-a22b": "Qwen/Qwen3-235B-A22B",
+    "qwen3-coder-480b-a35b-instruct": "Qwen/Qwen3-Coder-480B-A35B-Instruct",
+    "qwen3-235b-a22b-instruct-2507": "Qwen/Qwen3-235B-A22B-Instruct-2507"
+
+}
+
+if __name__ == '__main__':
+    print(','.join(models))

meutils/llm/models/ppio.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : ppio
+# @Time         : 2025/8/22 11:05
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+
+models = {
+
+    "glm-4.5": "zai-org/glm-4.5",
+
+    "qwen3-235b-a22b-thinking-2507": "qwen/qwen3-235b-a22b-thinking-2507",
+    "qwen3-235b-a22b-instruct-2507": "qwen/qwen3-235b-a22b-instruct-2507",
+    "kimi-k2-0711-preview": "moonshotai/kimi-k2-instruct",
+    "deepseek-v3.1": "deepseek/deepseek-v3.1",
+    "deepseek-v3": "deepseek/deepseek-v3-turbo",
+    "deepseek-v3-0324": "deepseek/deepseek-v3-0324",
+    "deepseek-v3-250324": "deepseek/deepseek-v3-0324",
+
+    # "deepseek/deepseek-v3/community"
+    "deepseek-r1": "deepseek/deepseek-r1-turbo",
+    "deepseek-reasoner": "deepseek/deepseek-r1-turbo",
+
+    "deepseek-r1-250528": "deepseek/deepseek-r1-0528",
+
+}
+
+print(','.join(models))

meutils/llm/models/siliconflow.py

@@ -19,6 +19,10 @@ models_mapping = {
     "deepseek-v3-0324": "deepseek-ai/DeepSeek-V3",
     "deepseek-v3-250324": "deepseek-ai/DeepSeek-V3",
     "deepseek-chat": "deepseek-ai/DeepSeek-V3",
+    "deepseek-v3.1": "deepseek-ai/DeepSeek-V3.1",
+    "deepseek-v3-1-250821": "deepseek-ai/DeepSeek-V3.1",
+
+
     "qwen3-32b": "Qwen/Qwen3-32B",
     "deepseek-r1": "deepseek-ai/DeepSeek-R1",
     "deepseek-r1-250528": "deepseek-ai/DeepSeek-R1",
@@ -38,7 +42,14 @@ models_mapping = {
     "deepseek-r1-distill-qwen-7b": "deepseek-ai/DeepSeek-R1-Distill-Qwen-7B",
     "deepseek-r1:8b": "deepseek-ai/DeepSeek-R1-Distill-Llama-8B",
     "deepseek-r1-distill-llama-8b": "deepseek-ai/DeepSeek-R1-Distill-Llama-8B",
-    "qwen2.5-32b-instruct": "Qwen/Qwen2.5-32B-Instruct"
+    "qwen2.5-32b-instruct": "Qwen/Qwen2.5-32B-Instruct",
+
+    "flux": "black-forest-labs/FLUX.1-schnell",
+    "flux-schnell": "black-forest-labs/FLUX.1-schnell",
+    "flux-pro-max": "black-forest-labs/FLUX.1-dev",
+    "flux-dev": "black-forest-labs/FLUX.1-dev",
+    "flux-pro": "black-forest-labs/FLUX.1-dev",
+    "flux.1.1-pro": "black-forest-labs/FLUX.1-dev",
 }
 
 

meutils/llm/openai_utils/adapters.py

@@ -16,6 +16,7 @@ from meutils.llm.openai_utils import create_chat_completion
 from meutils.schemas.openai_types import CompletionRequest, ChatCompletion
 from meutils.schemas.image_types import ImageRequest
 from meutils.llm.openai_utils import chat_completion, chat_completion_chunk, create_chat_completion_chunk
+from meutils.str_utils import parse_url, parse_command_string
 
 
 async def stream_to_nostream(
@@ -25,11 +26,12 @@ async def stream_to_nostream(
 
 
 async def chat_for_image(
-        generate: Callable,
+        generate: Optional[Callable],
         request: CompletionRequest,
         api_key: Optional[str] = None,
+        base_url: Optional[str] = None,
 ):
-    generate = partial(generate, api_key=api_key)
+    generate = generate and partial(generate, api_key=api_key, base_url=base_url)
 
     if not request.stream or request.last_user_content.startswith(  # 跳过nextchat
             (
@@ -66,7 +68,20 @@ async def chat_for_image(
         prompt=prompt,
         image=image
     )
+    if not request.image:
+        request.image, request.prompt = request.image_and_prompt
 
+    if '--' in request.prompt:
+        prompt_dict = parse_command_string(request.prompt)
+
+        data = {
+            **request.model_dump(exclude_none=True, exclude={"extra_fields", "aspect_ratio"}),
+            **prompt_dict
+        }
+        request = ImageRequest(**data)
+        logger.debug(request)
+
+    if not generate: return
     future_task = asyncio.create_task(generate(request))  # 异步执行
 
     async def gen():
@@ -125,8 +140,8 @@ if __name__ == '__main__':
     request = CompletionRequest(
         model="deepseek-r1-Distill-Qwen-1.5B",
         messages=[
-            {"role": "user", "content": "``hi"}
+            {"role": "user", "content": "``hi --a 1"}
         ],
-        stream=False,
+        stream=True,
     )
     arun(chat_for_image(None, request))

meutils/llm/openai_utils/billing_utils.py

@@ -263,7 +263,10 @@ if __name__ == '__main__':
     model = "Wan-AI/Wan2.1-T2V-14B"
 
     # arun(billing_for_async_task(model, task_id=task_id, n=3))
-    arun(billing_for_async_task(task_id='fal-ai-sync'))
+    # arun(billing_for_async_task(task_id='fal-ai-sync'))
+    arun(billing_for_async_task())
+
+
 
     # data = {
     #     "model": "doubao-seedance-1-0-pro-250528",

meutils/schemas/image_types.py

@@ -9,7 +9,7 @@
 # @Description  : todo: 通用比例适配
 
 from meutils.pipe import *
-from meutils.str_utils import parse_url
+from meutils.str_utils import parse_url, parse_command_string
 from meutils.math_utils import size2aspect_ratio
 
 from pydantic import constr

meutils/schemas/oneapi/common.py

@@ -25,6 +25,9 @@ MINIMAX_VIDEO = 2 * 0.6
 FAL = 3
 FAL_ = 5
 FAL_MODELS = {
+    #
+    "fal-ai/clarity-upscaler": 1,  # Your request will cost $0.03 per upscaled megapixel.
+
     'fal-kling-video-lipsync-audio-to-video': 0.5,
 
     'fal-pixverse-v4.5-effects': 1,
@@ -108,6 +111,7 @@ MODEL_PRICE = {
     **FAL_MODELS,
 
     "qwen-image": 0.05,
+    "qwen-image-edit": 0.05,
 
     "wan-ai-wan2.1-t2v-14b": 1,
     "wan-ai-wan2.1-t2v-14b-turbo": 1,
@@ -222,10 +226,6 @@ MODEL_PRICE = {
     "qwen3-reranker-4b": 0.0011,
     "qwen3-reranker-8b": 0.0011,
 
-    "qwen3-embedding-0.6b": 0.0011,
-    "qwen3-embedding-4b": 0.0011,
-    "qwen3-embedding-8b": 0.0011,
-
     # 视频
     "api-videos-3d": 0.01,
     "api-videos-3d-1.5": 0.01,
@@ -544,8 +544,18 @@ MODEL_RATIO = {
     "elevenlabs/scribe_v1": 3 * 0.03 * 1000 / 60 / 2,  # Your request will cost $0.03 per minute of audio transcribed
     "elevenlabs/eleven_multilingual_v2": 3 * 0.1 * 1000 / 2,
     "elevenlabs/eleven_turbo_v2_5": 3 * 0.05 * 1000 / 2,  # Your request will cost $0.05 per thousand characters.
+    "elevenlabs/eleven_v3": 3 * 0.05 * 1000 / 2,  # Your request will cost $0.05 per thousand characters.
+
+    'elevenlabs/eleven_flash_v2_5': 3 * 0.05 * 1000 / 2,
+    'elevenlabs/eleven_turbo_v2': 3 * 0.05 * 1000 / 2,
+    'elevenlabs/eleven_flash_v2': 3 * 0.05 * 1000 / 2,
+    'elevenlabs/eleven_monolingual_v1': 3 * 0.05 * 1000 / 2,
+    'elevenlabs/eleven_english_sts_v2': 3 * 0.05 * 1000 / 2,
+    'elevenlabs/eleven_multilingual_sts_v2': 3 * 0.05 * 1000 / 2,
+    'elevenlabs/eleven_multilingual_v1': 3 * 0.05 * 1000 / 2,
 
     "fal-elevenlabs-speech-to-text": 3 * 0.03 * 1000 / 60 / 2,
+    "fal-elevenlabs-tts-eleven-v3": 3 * 0.03 * 1000 / 60 / 2,
     'fal-elevenlabs-tts-turbo-v2.5': 3 * 0.05 * 1000 / 2,
     'fal-elevenlabs-tts-multilingual-v2': 3 * 0.1 * 1000 / 2,
 
@@ -593,6 +603,14 @@ MODEL_RATIO = {
     "jina-embeddings-v4": 0.1,
     "jina-reranker-m0": 0.1,
 
+    "qwen3-embedding-0.6b": 0.1,
+    "qwen3-embedding-4b": 0.1,
+    "qwen3-embedding-8b": 0.1,
+
+    "doubao-embedding-vision-250615": 0.9,
+    "doubao-embedding-large-text-250515": 0.25,
+    "doubao-embedding-text-240715": 0.35,
+
     # 百川
     'baichuan4-turbo': 7.5,
     'baichuan4-air': 0.49,
@@ -668,10 +686,10 @@ MODEL_RATIO = {
     "glm-4.1v-thinking-flashx": 1,
 
     "glm-4.5-flash": 0.1,
-    "glm-4.5-air": 0.2,
+    "glm-4.5-air": 0.4,
     "glm-4.5-airx": 1,
-    "glm-4.5": 1,
-    "glm-4.5-x": 2,
+    "glm-4.5": 2,
+    "glm-4.5-x": 6,
     "glm-4.5v": 1,
 
     # 阿里千问 https://dashscope.console.aliyun.com/billing
@@ -712,8 +730,8 @@ MODEL_RATIO = {
     "qwen3-235b-a22b": 1,
     "qwen-math-plus": 2,
     "qwen3-coder-480b-a35b-instruct": 3,
-    "qwen3-235b-a22b-instruct-2507": 1,
-    "qwen3-235b-a22b-thinking-2507": 3,
+    "qwen3-235b-a22b-instruct-2507": 2,
+    "qwen3-235b-a22b-thinking-2507": 2,
 
     "qwen3-coder-plus": 2,
     "qwen3-coder-plus-2025-07-22": 2,
@@ -802,6 +820,9 @@ MODEL_RATIO = {
     "deepseek-v3-8k": 0.5,
     "deepseek-v3-128k": 5,
     "deepseek-chat": 1,
+    "deepseek-v3.1": 2,
+    "deepseek-v3-1-250821": 2,
+    "deepseek-v3-1-think": 2,
 
     "deepseek-chat-8k": 0.5,
     "deepseek-chat-64k": 5,
@@ -858,6 +879,7 @@ MODEL_RATIO = {
     "doubao-seed-1-6-250615": 0.4,
     "doubao-seed-1-6-thinking-250615": 0.4,
     "doubao-seed-1-6-thinking-250715": 0.4,
+    "doubao-seed-1-6-vision-250815": 0.6,
 
     "doubao-1-5-ui-tars-250428": 1.75,
     "ui-tars-72b": 1.75,
@@ -878,6 +900,8 @@ MODEL_RATIO = {
     "doubao-pro-4k": 0.4,
     "doubao-pro-32k": 0.4,
     "doubao-pro-32k-character": 0.4,
+    "doubao-pro-32k-character-241215": 0.4,
+
     "doubao-pro-128k": 2.5,
     "doubao-pro-256k": 2.5,
     "doubao-1.5-pro-32k": 0.4,
@@ -1462,7 +1486,7 @@ COMPLETION_RATIO = {
     "qwen3-235b-a22b": 4,
     "qwenlong-l1-32b": 4,
     "qwen3-235b-a22b-instruct-2507": 4,
-    "qwen3-235b-a22b-thinking-2507": 4,
+    "qwen3-235b-a22b-thinking-2507": 10,
     "qwen3-coder-480b-a35b-instruct": 4,
 
     "qwen3-coder-plus": 4,
@@ -1477,6 +1501,7 @@ COMPLETION_RATIO = {
     "doubao-seed-1-6-250615": 10,
     "doubao-seed-1-6-thinking-250615": 10,
     "doubao-seed-1-6-thinking-250715": 10,
+    "doubao-seed-1-6-vision-250815": 13.33,
 
     "doubao-1-5-ui-tars-250428": 3.43,
     "ui-tars-72b": 4,
@@ -1491,6 +1516,7 @@ COMPLETION_RATIO = {
     "doubao-pro-4k": 3,
     "doubao-pro-32k": 2.5,
     "doubao-pro-32k-character": 3,
+    "doubao-pro-32k-character-241215": 3,
     "doubao-pro-128k": 3,
     "doubao-pro-256k": 1.8,
     "doubao-1.5-pro-32k": 2.5,
@@ -1548,6 +1574,9 @@ COMPLETION_RATIO = {
     "deepseek-v3-250324": 4,
     "deepseek-chat": 4,
     "deepseek-v3-fast": 4,
+    "deepseek-v3.1": 3,
+    "deepseek-v3-1-250821": 3,
+    "deepseek-v3-1-think": 3,
 
     'deepseek-r1': 4,
     "deepseek-r1-160k": 5,
@@ -1588,8 +1617,8 @@ COMPLETION_RATIO = {
     "glm-4.1v-thinking-flashx": 4,
 
     "glm-4.5-flash": 3,
-    "glm-4.5-air": 3,
-    "glm-4.5-airx": 3,
+    "glm-4.5-air": 7.5,
+    "glm-4.5-airx": 4,
     "glm-4.5": 4,
     "glm-4.5-x": 4,
     "glm-4.5v": 3,

meutils/str_utils/__init__.py

@@ -7,14 +7,10 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
-import re
 
-import httpx
 
 from meutils.pipe import *
-# from meutils.str_utils.translater import translater
-from meutils.str_utils.regular_expression import parse_url
-from meutils.caches import cache
+from meutils.str_utils.regular_expression import parse_url, parse_command_string
 from meutils.request_utils.crawler import Crawler
 from urllib.parse import urlencode, parse_qs, parse_qsl, quote_plus, unquote_plus, urljoin
 

meutils/str_utils/regular_expression.py

@@ -114,6 +114,80 @@ def parse_url(text: str, for_image=False, fn: Optional[Callable] = None):
 def parse_url_from_json():
     pass
 
+def parse_command_string(command_str: str) -> dict:
+    """
+    解析一个类似 "prompt --key1 value1 --key2 value2" 格式的字符串。
+
+    Args:
+        command_str: 输入的命令行字符串。
+
+    Returns:
+        一个包含 prompt 和解析后参数的字典。
+        例如: {"prompt": "画条狗", "size": "1:1", "n": 10}
+    """
+    # 初始化结果字典
+    result = {}
+
+    # 使用正则表达式找到第一个参数 '--' 的位置
+    # 这比简单的 split 更健壮，可以处理 prompt 中包含 '--' 的情况（虽然不常见）
+    match = re.search(r'\s--\w', command_str)
+
+    if not match:
+        # 如果没有找到任何参数，整个字符串都是 prompt
+        result['prompt'] = command_str.strip()
+        return result
+
+    first_arg_index = match.start()
+
+    # 提取 prompt 和参数部分
+    prompt = command_str[:first_arg_index].strip()
+    args_str = command_str[first_arg_index:].strip()
+
+    result['prompt'] = prompt
+
+    # 将参数字符串按空格分割成列表
+    # 例如 "--size 1:1 --n 10" -> ['--size', '1:1', '--n', '10']
+    args_list = args_str.split()
+
+    # 遍历参数列表，每次处理一个键值对
+    i = 0
+    while i < len(args_list):
+        arg = args_list[i]
+
+        # 确认当前项是一个参数键（以 '--' 开头）
+        if arg.startswith('--'):
+            key = arg[2:]  # 去掉 '--' 前缀
+
+            # 检查后面是否跟着一个值
+            if i + 1 < len(args_list) and not args_list[i + 1].startswith('--'):
+                value = args_list[i + 1]
+
+                # 尝试将值转换为整数，如果失败则保留为字符串
+                try:
+                    processed_value = int(value)
+                except ValueError:
+                    processed_value = value
+
+                # 布尔型
+                if processed_value in ['true', 'yes', 'on']:
+                    processed_value = True
+                elif processed_value in ['false', 'no', 'off']:
+                    processed_value = False
+
+                result[key] = processed_value
+
+                i += 2  # 跳过键和值，移动到下一个参数
+            else:
+                # 处理没有值的参数，例如 --test，可以设为 True 或忽略
+                result[key] = True  # 或者可以写 pass 直接忽略
+                i += 1
+        else:
+            # 如果某一项不是以 '--' 开头，它可能是格式错误，直接跳过
+            i += 1
+
+    return result
+
+
 
 if __name__ == '__main__':
     # from urllib.parse import urlparse