MeUtils 2025.7.1.18.54.57__py3-none-any.whl → 2025.7.4.19.37.16__py3-none-any.whl

meutils/llm/openai_utils/billing_utils.py

@@ -130,7 +130,7 @@ def get_billing_n(request: Union[BaseModel, dict], duration: float = 6, resoluti
     :param duration:
     :return:
     """
-    resolution = resolution or "500"  # resolution.lower().removesuffix('p')
+    resolution = (resolution or "500").lower().removesuffix('p')
 
     if isinstance(request, BaseModel):
         request = request.model_dump()
@@ -139,7 +139,7 @@ def get_billing_n(request: Union[BaseModel, dict], duration: float = 6, resoluti
     num = request.get("n") or request.get("num_images") or 1
 
     # 时长
-    dur = np.ceil(request.get("duration", duration) / duration)  # 默认 6s
+    dur = np.ceil(int(request.get("duration", duration)) / duration)  # 默认 6s
     durs = {"--duration 10", "--dur 10"}
     if any(i in str(request) for i in durs):
         dur = max(dur, 2)
@@ -153,6 +153,39 @@ def get_billing_n(request: Union[BaseModel, dict], duration: float = 6, resoluti
     return num * dur * rs or 1
 
 
+def get_billing_model(
+        request: Union[BaseModel, dict],
+
+        default_model: Optional[str] = None,
+        default_duration: Optional[int] = None,
+        default_resolution: Optional[str] = None
+):
+    """继续拓展其兼容性
+    什么时候走这个逻辑？
+    """
+    if isinstance(request, BaseModel):
+        request = request.model_dump()
+
+    model = (request.get("model") or request.get("model_name") or default_model or "undefined model").lower()
+
+    # 某些模型不需要匹配，单模型计费
+    if model.startswith(("veo", "jimeng", "cogvideo")):  # todo 后续再拓展
+        return model
+
+    duration = request.get("duration", default_duration or "5")
+    resolution = request.get("resolution", default_resolution or "720p")
+
+    # 火山
+    if any(i in str(request).lower() for i in {"--duration 10", "--dur 10"}):
+        duration = 10
+
+    for rs in {"480p", "720p", "1080p"}:
+        if any(i in str(request).lower() for i in {f"--resolution {rs}", f"--rs {rs}"}):
+            resolution = rs
+
+    return f"{model}_{duration}s_{resolution}"
+
+
 @asynccontextmanager
 async def billing_flow_for_async_task(
         model: str = "usage-async",
@@ -238,8 +271,11 @@ if __name__ == '__main__':
     # }
 
     data = {
-        "model": "cogvideox-flash",
-        "prompt": "比得兔开小汽车，游走在马路上，脸上的表情充满开心喜悦。",
-        "resolution": "720p"
+        "model": "veo3",
+        "prompt": "女人飞上天了",
+        "images": [
+            "https://oss.ffire.cc/files/kling_watermark.png"
+        ],
+        "enhance_prompt": True
     }
-    print(get_billing_n(data))
+    print(get_billing_model(data, default_resolution=""))

meutils/schemas/oneapi/common.py

@@ -22,10 +22,38 @@ MJ_FAST = 1.5
 STEP = 2
 MINIMAX_VIDEO = 3
 
-"""
+FAL = {
+    'fal-elevenlabs-tts-turbo-v2.5': 0.3,
+    'fal-kling-video-lipsync-audio-to-video': 0.5,
+
+    'fal-pixverse-v4.5-effects': 1,
+    'fal-pixverse-v4.5-text-to-video': 0.9,
+    'fal-pixverse-v4.5-text-to-video-fast': 1.8,
+    'fal-pixverse-v4.5-image-to-video': 0.9,
+    'fal-pixverse-v4.5-image-to-video-fast': 1.8,
+
+    # flux
+    'fal-flux-1-schnell': 0.003 * 4,
+    'fal-flux-1-schnell-redux': 0.025 * 4,
+    'fal-flux-1-dev': 0.025 * 3,
+    'fal-flux-1-dev-image-to-image': 0.03 * 3,
+    'fal-flux-1-dev-redux': 0.025 * 3,
+
+    'fal-flux-pro-kontext': 0.04 * 3,
+    'fal-flux-pro-kontext-text-to-image': 0.1,
+    'fal-flux-pro-kontext-multi': 0.04 * 3,
+
+    'fal-flux-pro-kontext-max': 0.08 * 3,
+    'fal-flux-pro-kontext-max-text-to-image': 0.08 * 3,
+    'fal-flux-pro-kontext-max-multi': 0.08 * 3,
+}
+
+FAL = {model.replace("fal-ai", "fal").replace("{{BASE_URL}}/", "").replace("/", "-").lower(): v for model, v in
+       FAL.items()}
 
-"""
 MODEL_PRICE = {
+    **FAL,
+
     "chatfire-claude": 0.02,
     "o1:free": FREE,
     # "claude-3-7-sonnet-code:free": "claude-3-7-sonnet-code"
@@ -72,28 +100,23 @@ MODEL_PRICE = {
     "minimax_video-01-live2d": MINIMAX_VIDEO,
 
     # 火山
+    "jimeng-video-3.0": 0.5,
     "doubao-seedream-3-0-t2i-250415": 0.1,
-    "api-volcengine-high_aes_general_v30l_zt2i": 0.05,
-    "api-volcengine-byteedit_v2.0": 0.05,
 
-    "doubao-seedance-1-0-pro-250528": 0.5, # 480 1080
+    "doubao-seedance-1-0-pro-250528": 0.5,  # 480 1080
+    "api-doubao-seedance-1-0-pro-250528-1080p": 2,  # 480 1080
+    "api-doubao-seedance-1-0-pro-250528-480p": 0.5,  # 480 1080
 
-    "doubao-seedance-1-0-lite-t2v-250428": 0.5,
-    "doubao-seedance-1-0-lite-i2v-250428": 0.5,
+    "doubao-seedance-1-0-lite-t2v-250428": 0.4,
+    "doubao-seedance-1-0-lite-i2v-250428": 0.4,
 
-    # videos
-    "api-videos-wan-ai/wan2.1-t2v-14b": 1.2,
-    "api-videos-wan-ai/wan2.1-t2v-14b-turbo": 1.2,
-    "api-videos-wan-ai/wan2.1-i2v-14b-720p": 1.2,
-    "api-videos-wan-ai/wan2.1-i2v-14b-720p-turbo": 1.2,
+    "api-volcengine-high_aes_general_v30l_zt2i": 0.05,
+    "api-volcengine-byteedit_v2.0": 0.05,
 
     # veo
     "veo3": 2,
     "veo3-pro": 8,
     "veo3-pro-frames": 8,
-    "api-veo3": 2,
-    "api-veo3-pro": 8,
-    "api-veo3-pro-frames": 8,
 
     # hailuo
     "minimax-hailuo-02": 1,
@@ -103,8 +126,6 @@ MODEL_PRICE = {
     "api-minimax-hailuo-02-6s-1080p": 2,
 
     # chatfire
-    "ppu-0001": 0.0001,
-    "ppu-001": 0.001,
     "ppu-01": 0.01,
     "ppu-1": 0.1,
     "api-oss": 0.01,
@@ -1587,3 +1608,5 @@ if __name__ == '__main__':
     print([k for k in MODEL_RATIO if k.startswith('qwen3')] | xjoin(","))
 
     print([k for k in MODEL_RATIO if k.startswith(('deepseek', 'doubao', 'moon'))] | xjoin(","))
+
+    print(','.join(FAL))