MeUtils 2025.8.7.20.17.40__py3-none-any.whl → 2025.8.11.16.30.21__py3-none-any.whl

meutils/llm/completions/qwenllm.py

@@ -13,6 +13,7 @@
 AttributeError: 'str' object has no attribute 'choices'
 
 """
+import time
 
 from openai import AsyncOpenAI
 
@@ -31,6 +32,7 @@ from meutils.schemas.openai_types import chat_completion, chat_completion_chunk,
 FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=PP1PGr"
 
 base_url = "https://chat.qwen.ai/api"
+DEFAUL_MODEL = "qwen3-235b-a22b"
 
 from fake_useragent import UserAgent
 
@@ -47,6 +49,28 @@ cna=KP9DIEqqyjUCATrw/+LjJV8F; _bl_uid=LXmp28z7dwezpmyejeXL9wh6U1Rb; cnaui=310cbd
 """.strip()
 
 
+@retrying()
+async def create_new_chat(api_key, cookie: Optional[str] = None):
+    qwen_client = AsyncOpenAI(
+        base_url=base_url,
+        api_key=api_key,
+        default_headers={
+            'User-Agent': ua.random,
+            'Cookie': cookie or COOKIE
+        }
+    )
+    payload = {
+        "title": "新建对话",
+        "models": [DEFAUL_MODEL],
+        "chat_mode": "normal",
+        "chat_type": "t2i",
+        "timestamp": time.time() * 1000 // 1
+    }
+    resp = await qwen_client.post('/v2/chats/new', body=payload, cast_to=object)
+    logger.debug(resp)
+    return resp['data']['id']
+
+
 @retrying()
 async def to_file(file, api_key, cookie: Optional[str] = None):
     qwen_client = AsyncOpenAI(
@@ -65,8 +89,6 @@ async def to_file(file, api_key, cookie: Optional[str] = None):
     logger.debug(file_object)
     return file_object
 
-# todo
-# oss
 
 async def create(request: CompletionRequest, token: Optional[str] = None, cookie: Optional[str] = None):
     cookie = cookie or COOKIE
@@ -78,25 +100,38 @@ async def create(request: CompletionRequest, token: Optional[str] = None, cookie
 
     logger.debug(token)
 
+    default_query = None
+    if 'image' in request.model:
+        chat_id = await create_new_chat(token, cookie)
+        default_query = {'chat_id': chat_id}
+
     client = AsyncOpenAI(
         base_url=base_url,
         api_key=token,
         default_headers={
             'User-Agent': ua.random,
             'Cookie': cookie,
-        }
+        },
+
+        default_query=default_query
     )
     # qwen结构
     model = request.model.lower()
     if any(i in model for i in ("research",)):  # 遇到错误 任意切换
-        request.model = np.random.choice({""})
+        request.model = DEFAUL_MODEL
         request.messages[-1]['chat_type'] = "deep_research"
 
-        # request.messages["extra"] = {
-        #     "meta": {
-        #         "subChatType": "deep_thinking"
-        #     }
-        # }
+    elif any(i in model for i in ("image",)):
+        request.model = DEFAUL_MODEL
+        request.chat_id = default_query['chat_id']
+        request.size = "1:1"
+
+        request.messages[-1]['chat_type'] = "t2i"
+        request.messages[-1]['feature_config'] = {
+            "thinking_enabled": False,
+            "output_schema": "phase"
+        }
+
 
     elif any(i in model for i in ("search",)):
         request.model = "qwen-max-latest"
@@ -105,7 +140,7 @@ async def create(request: CompletionRequest, token: Optional[str] = None, cookie
     # 混合推理
     if (request.reasoning_effort
             or request.last_user_content.startswith("/think")
-            or hasattr(request, "enable_thinking")
+            or request.enable_thinking
             or hasattr(request, "thinking_budget")
     ):
         feature_config = {"thinking_enabled": True, "output_schema": "phase"}
@@ -168,6 +203,8 @@ async def create(request: CompletionRequest, token: Optional[str] = None, cookie
     request.incremental_output = True  # 增量输出
     data = to_openai_params(request)
 
+    logger.debug(data)
+
     # 流式转非流
     data['stream'] = True
     chunks = await client.chat.completions.create(**data)
@@ -226,7 +263,7 @@ if __name__ == '__main__':
     user_content = [
         {
             "type": "text",
-            "text": "一句话总结"
+            "text": "主体文字'诸事皆顺'，超粗笔画、流畅飘逸、有飞白效果的狂野奔放草书字体，鎏金质感且有熔金流动感和泼溅金箔效果，黑色带细微噪点肌理背景，英文'GOOD LUCK'浅金色或灰白色，有淡淡的道家符文点缀,书法字体海报场景，传统书法与现代设计融合风格,特写,神秘奢华充满能量,焦点清晰，对比强烈"
         },
         # {
         #     "type": "image_url",
@@ -236,7 +273,15 @@ if __name__ == '__main__':
         # }
     ]
 
-    user_content = "1+1"
+    user_content = "主体文字'诸事皆顺'，超粗笔画、流畅飘逸、有飞白效果的狂野奔放草书字体，鎏金质感且有熔金流动感和泼溅金箔效果，黑色带细微噪点肌理背景，英文'GOOD LUCK'浅金色或灰白色，有淡淡的道家符文点缀,书法字体海报场景，传统书法与现代设计融合风格,特写,神秘奢华充满能量,焦点清晰，对比强烈"
+    # {
+    #     "type": "image_url",
+    #     "image_url": {
+    #         "url": "https://fyb-pc-static.cdn.bcebos.com/static/asset/homepage@2x_daaf4f0f6cf971ed6d9329b30afdf438.png"
+    #     }
+    # }
+
+    # user_content = "1+1"
     # user_content = "/think 1+1"
 
     # user_content = [
@@ -270,11 +315,13 @@ if __name__ == '__main__':
     # ]
 
     request = CompletionRequest(
+        # model="qwen3-235b-a22b",
         # model="qwen-turbo-2024-11-01",
         # model="qwen-max-latest",
         # model="qvq-max-2025-03-25",
         # model="qvq-72b-preview-0310",
-        model="qwen2.5-omni-7b",
+        # model="qwen2.5-omni-7b",
+        model="qwen-image",
         # model="qwen-plus",
 
         # model="qwen-max-latest-search",
@@ -361,15 +408,17 @@ if __name__ == '__main__':
         # stream=True,
 
         # reasoning_effort="low",
-        enable_thinking=True,
-        thinking_budget=1024,
+        # enable_thinking=True,
+        # thinking_budget=1024,
         # stream_options={"include_usage": True},
 
     )
     token = None
 
-    # token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImV4cCI6MTc0ODQ3OTE0M30.oAIE1K0XA0YYqlxB8Su-u0UJbY_BBZa4_tvZpFJKxGY"
+    token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImxhc3RfcGFzc3dvcmRfY2hhbmdlIjoxNzUwNjYwODczLCJleHAiOjE3NTc0ODczMDd9.7TQ9NicXYxghzI7EP3cPMFqa5j-09Sz1B9s3SnKZvkE"
 
     arun(create(request, token))
 
     # arun(to_file("https://help-static-aliyun-doc.aliyuncs.com/file-manage-files/zh-CN/20250211/tixcef/cherry.wav", token))
+
+    # arun(create_new_chat(token))

meutils/llm/openai_utils/billing_utils.py

@@ -21,6 +21,8 @@ from contextlib import asynccontextmanager
 from meutils.pipe import *
 from meutils.llm.clients import AsyncOpenAI
 from meutils.apis.utils import make_request
+from meutils.apis.oneapi.user import get_user_money
+from fastapi import status, HTTPException
 
 base_url = "https://api.chatfire.cn/flux/v1"
 
@@ -200,15 +202,27 @@ async def billing_flow_for_async_task(
         n: float = 1,
         api_key: Optional[str] = None
 ):
-    if n:  # 计费
-        await billing_for_async_task(model, task_id=task_id, n=n, api_key=api_key)
+    if n and (user_money := await get_user_money(api_key)):  # 计费
+
+        # 判断
+        if user_money < 1:
+            raise HTTPException(status_code=status.HTTP_402_PAYMENT_REQUIRED, detail="余额不足或API-KEY限额")
+
+        # 执行
         yield
 
+        # 计费
+        await billing_for_async_task(model, task_id=task_id, n=n, api_key=api_key)
+
     else:  # 不计费
         a = yield
         logger.debug(a)
 
 
+# # 检查余额
+# if user_money := await get_user_money(api_key):
+#     if user_money < 1:
+#         raise HTTPException(status_code=status.HTTP_402_PAYMENT_REQUIRED, detail="余额不足或API-KEY限额")
 @asynccontextmanager
 async def billing_flow_for_tokens(
         model: str = "usage-chat",

meutils/schemas/oneapi/common.py

@@ -81,6 +81,7 @@ FAL_MODELS = {
 
     # veo
     "fal-ai/veo3/fast": 3.2 * FAL_,  # 2 3.2
+    "fal-ai/veo3/fast/image-to-video": 3.2 * FAL_,
 
     # seedance
     "fal-ai/bytedance/seedance/v1/lite/text-to-video": 1,
@@ -141,7 +142,7 @@ MODEL_PRICE = {
     "gemini-2.5-pro-video": 0.1,
 
     # rix
-    "kling_image": 0.05,
+    "kling_image": 0.025,
     "kling_image_expand": 0.3,
     "kling_virtual_try_on": 1,
     "kling_effects": 1,
@@ -167,6 +168,7 @@ MODEL_PRICE = {
     # 火山
     "jimeng-video-3.0": 0.5,
     "doubao-seedream-3-0-t2i-250415": 0.1,
+    "doubao-seededit-3-0-i2i-250628": 0.1,
 
     "doubao-seedance-1-0-pro-250528": 0.5,  # 480 1080
     "api-doubao-seedance-1-0-pro-250528-1080p": 2,  # 480 1080
@@ -410,6 +412,7 @@ MODEL_PRICE = {
     "gpt-4o-image": 0.05,
     "sora-image": 0.1,
     "gpt-image-1": 0.1,
+    "gpt-5-thinking": 0.05,
 
     "gpt-4-gizmo-*": 0.1,
     "advanced-voice": 1,
@@ -965,6 +968,7 @@ MODEL_RATIO = {
     "claude-sonnet-4-20250514-thinking": 1.5,
     "claude-opus-4-20250514": 7.5,
     "claude-opus-4-20250514-thinking": 7.5,
+    "claude-opus-4.1": 7.5,
 
     "deepclaude": 1.5,
     "deep-claude": 1.5,
@@ -1059,8 +1063,6 @@ MODEL_RATIO = {
     "gpt-4-1106-vision-preview": 5,
     "gpt-4-32k": 30,
     "gpt-4-32k-0613": 30,
-    "gpt-4-all": 15,
-    "gpt-4-gizmo-*": 15,
     "gpt-4-turbo": 5,
     "gpt-4-turbo-2024-04-09": 5,
     "gpt-4-turbo-preview": 5,
@@ -1094,6 +1096,14 @@ MODEL_RATIO = {
     "gpt-oss-20b": 0.025,
     "gpt-oss-120b": 0.05,
 
+    "gpt-5": 0.625,
+    "gpt-5-2025-08-07": 0.625,
+    "gpt-5-chat-latest": 0.625,
+    "gpt-5-mini": 0.125,
+    "gpt-5-mini-2025-08-07": 0.125,
+    "gpt-5-nano": 0.025,
+    "gpt-5-nano-2025-08-07": 0.025,
+
     "o1": 7.5,
     "o1-2024-12-17": 7.5,
 
@@ -1217,9 +1227,6 @@ COMPLETION_RATIO = {
     "grok-3-mini-fast-beta": 4 / 0.6,
     "grok-4": 5,
 
-    "gpt-4-all": 4,
-    "gpt-4-gizmo-*": 4,
-    "gpt-4o-all": 4,
     "gpt-4.5-preview-2025-02-27": 2,
 
     "o1-mini": 4,
@@ -1254,6 +1261,14 @@ COMPLETION_RATIO = {
     "gpt-oss-20b": 4,
     "gpt-oss-120b": 4,
 
+    "gpt-5": 8,
+    "gpt-5-2025-08-07": 8,
+    "gpt-5-chat-latest": 8,
+    "gpt-5-mini": 8,
+    "gpt-5-mini-2025-08-07": 8,
+    "gpt-5-nano": 4,
+    "gpt-5-nano-2025-08-07": 4,
+
     # claude
     "claude-3-5-haiku-20241022": 5,
     "anthropic/claude-3-5-haiku-20241022:beta": 5,
@@ -1273,6 +1288,7 @@ COMPLETION_RATIO = {
     "claude-sonnet-4-20250514-thinking": 5,
     "claude-opus-4-20250514": 5,
     "claude-opus-4-20250514-thinking": 5,
+    "claude-opus-4.1": 5,
 
     "llama-3.1-70b-instruct": 2,
     "meta-llama/Meta-Llama-3.1-70B-Instruct": 2,
@@ -1778,3 +1794,6 @@ if __name__ == '__main__':
 
     print("FAL按次")
     print(','.join(FAL_MODELS))  # fal 按次
+
+    print('\n\n')
+    print([k for k in MODEL_RATIO if k.startswith(('gpt-5'))] | xjoin(","))