MeUtils 2025.6.20.18.7.13__py3-none-any.whl → 2025.6.24.14.6.6__py3-none-any.whl

meutils/llm/openai_utils/usage_utils.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : usage_utils
+# @Time         : 2025/6/24 08:53
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+"""
+1. 同步任务（流 非流）
+    - 按次
+    - 按量
+2. 异步任务
+    - 按次
+    - 按量
+"""
+
+from meutils.pipe import *
+from meutils.llm.clients import AsyncOpenAI
+from meutils.apis.utils import make_request
+
+base_url = "https://api.chatfire.cn"
+
+
+async def create_usage_for_async_task(model: str = "usage-async"):
+    # 计费
+    _ = await make_request(
+        base_url=base_url,
+        path=f"/flux/v1/{model}",
+        payload={
+            "id": "123456",
+            "completion_tokens": 100,
+            "total_tokens": 200
+        }
+        # "/flux/v1/get_result",
+    )
+
+    return _
+
+
+async def get_async_task(id: str = "123456", status: str = "FAILURE"):
+    # 计费
+    _ = await make_request(
+        base_url=base_url,
+        path=f"/flux/v1/get_result?id={id}&status={status}",
+
+        method="GET"
+    )
+
+    return _
+
+
+async def create_usage_for_tokens(model: str = "usage-chat", mode: Literal['chat', 'image'] = 'chat'):
+    client = AsyncOpenAI()  # 外部任务
+    if mode == "image":  # todo: 参数进不去 要不通过 prompt
+        _ = await client.images.generate(
+            model=model,
+            prompt="ChatfireAPI",
+            n=10,
+            size="1024x1024",
+            extra_body={
+                "extra_fields": {
+                    "input_tokens": 1,
+                    "input_tokens_details": {
+                        "image_tokens": 0,
+                        "text_tokens": 1
+                    },
+                    "output_tokens": 1,
+                    "total_tokens": 2
+                }
+            }
+        )
+    else:
+        _ = await client.chat.completions.create(
+            model=model,
+            messages=[
+                {"role": "user", "content": "ChatfireAPI"}
+            ],
+            metadata={
+                "prompt_tokens": 100,
+                "completion_tokens": 100,
+                "total_tokens": 200
+            }
+        )
+    return _
+
+
+if __name__ == '__main__':
+    # arun(create_usage_for_tokens())
+    arun(create_usage_for_tokens(mode='image'))
+
+    # arun(create_usage_for_async_task())
+
+    # arun(get_async_task('xx'))

meutils/llm/utils.py

@@ -17,59 +17,6 @@ from meutils.notice.feishu import send_message
 from meutils.apis.oneapi.utils import get_user_quota
 
 
-async def ppu(
-        model: str = 'ppu',
-        api_key: Optional[str] = None,
-        base_url: Optional[str] = None,
-):
-    if model not in MODEL_PRICE:
-        send_message(f"模型未找到{model}，ppu-1默认", title=__name__)
-        model = "ppu-1"
-
-    client = AsyncOpenAI(api_key=api_key, base_url=base_url)
-    r = await client.chat.completions.create(messages=[{'role': 'user', 'content': 'hi'}], model=model)
-
-
-@asynccontextmanager
-async def ppu_flow(
-        api_key: str,
-        base_url: Optional[str] = None,
-
-        model: str = "ppu-1",  # 后计费
-
-        n: float = 1,  # 计费次数
-
-        **kwargs
-):
-    """
-    查余额
-    失败，先扣费
-    成功，充足，后扣费
-    成功，不足，报错
-    """
-    n = int(np.ceil(n))  # 0 不计费
-
-    if n:  # 计费
-        try:
-            money = await get_user_quota(api_key)
-            logger.debug(f"PREPAY: USER 余额 {money}")
-        except Exception as e:
-            logger.error(e)
-            money = None
-
-        if money and money > MODEL_PRICE.get(model, 0.1):
-            yield  # 先执行
-
-        # 执行计费逻辑
-        await asyncio.gather(*[ppu(model, api_key=api_key, base_url=base_url) for _ in range(n)])
-
-        if money is None:
-            yield  # 后执行
-
-    else:  # 不计费
-        yield
-
-
 def oneturn2multiturn(messages, template: Optional[str] = None, ignore_system: bool = True):
     """todo: https://github.com/hiyouga/LLaMA-Factory/blob/e898fabbe3efcd8b44d0e119e7afaed4542a9f39/src/llmtuner/data/template.py#L423-L427
 
@@ -162,4 +109,4 @@ if __name__ == '__main__':
 
     ]
 
-    print(oneturn2multiturn(messages,ignore_system=False))
+    print(oneturn2multiturn(messages, ignore_system=False))

meutils/schemas/image_types.py

@@ -91,7 +91,7 @@ class ImageRequest(BaseModel):  # openai
     """
     model: str = ''
 
-    prompt: constr(min_length=1, max_length=4096) = ""
+    prompt: constr(min_length=1, max_length=10240) = ""
 
     n: Optional[int] = 1
 
@@ -105,7 +105,8 @@ class ImageRequest(BaseModel):  # openai
 
     seed: Optional[int] = None
 
-    # oneapi
+    # oneapi https://github.com/QuantumNous/new-api/blob/main/dto/dalle.go
+    extra_fields: Optional[str] = None
     negative_prompt: Optional[str] = None
     guidance: Optional[float] = None
     steps: Optional[int] = None

meutils/schemas/oneapi/common.py

@@ -95,6 +95,8 @@ MODEL_PRICE = {
 
     # veo
     "veo3": 2,
+    "veo3-pro": 8,
+    "veo3-pro-frames": 8,
     "api-veo3": 2,
     "api-veo3-pro": 8,
     "api-veo3-pro-frames": 8,
@@ -102,7 +104,7 @@ MODEL_PRICE = {
     # hailuo
     "api-minimax-hailuo-01-6s": 0.5,
     "api-minimax-hailuo-02-6s-768p": 1,
-    "api-minimax-hailuo-02-10s-768p": 1,
+    "api-minimax-hailuo-02-10s-768p": 2,
     "api-minimax-hailuo-02-6s-1080p": 2,
 
     # chatfire
@@ -136,8 +138,7 @@ MODEL_PRICE = {
     "ppt-islide": 0.1,
 
     # grok
-    "grok-3": 0.01,
-    "grok-3-image": 0.02,
+    "grok-3-image": 0.1,
 
     # 虚拟换衣fish
     "api-kolors-virtual-try-on": 0.1,
@@ -478,10 +479,10 @@ MODEL_RATIO = {
     "grok-2": 1,
     "grok-2-1212": 1,
     "grok-2-vision-1212": 1,
-    "grok-3": 2,
-    "grok-3-deepsearch": 2,
-    "grok-3-reasoner": 2,
-    "grok-3-deepersearch": 2,
+    "grok-3": 1.5,
+    "grok-3-deepsearch": 1.5,
+    "grok-3-reasoner": 1.5,
+    "grok-3-deepersearch": 1.5,
 
     "grok-3-beta": 1.5,
     "grok-3-fast-beta": 2.5,

meutils/schemas/openai_types.py

@@ -102,6 +102,7 @@ class CompletionRequest(BaseModel):
     # [{'role': 'user', 'content': [{"type": "image_url", "image_url": {"url": ""}}]}] # 也兼容文件
     # [{'role': 'user', 'content':  [{"type": "file", "file_url": ""}]]
     messages: Optional[List[Dict[str, Any]]] = None  # 标准化
+    metadata: Optional[Dict[str, str]] = None
 
     stream: Optional[bool] = False
     stream_options: Optional[dict] = None
@@ -628,4 +629,4 @@ if __name__ == '__main__':
     #
     # print(chat_completion_chunk)
 
-    print(ImageRequest(prompt='xx'))
+    print(ImageRequest(prompt='xx'))

meutils/serving/fastapi/dependencies/headers.py

@@ -13,19 +13,23 @@ 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 dict(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}
+    dic = dict(request.headers)
+    _dic = {k.replace('-', '_'): v for k, v in dic.items()}
+
+    return {**dic, **_dic}
+
+
+if __name__ == '__main__':
+    def get_headers():
+        d = {"upstream-base-url": 'xx'}
+        d = {}
+        dic = {}
+        # upstream_base_url = headers.get('upstream-base-url')
+        if d:
+            dic = {k.replace('-', '_'): v for k, v in d.items()}
+
+        return {**d, **dic}
+
+
+    print(get_headers())