MeUtils 2025.6.3.9.35.1__py3-none-any.whl → 2025.6.4.17.6.12__py3-none-any.whl

meutils/llm/openai_utils/common.py

@@ -121,8 +121,11 @@ async def appu(
         model='ppu',
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
+
+        dynamic: bool = False,  # 动态路由模型
+
 ):
-    if model not in MODEL_PRICE:
+    if not dynamic and model not in MODEL_PRICE:
         _ = f"模型未找到「{model}」，默认ppu-1"
 
         logger.warning(_)
@@ -142,6 +145,9 @@ async def ppu_flow(
         post: str = "ppu-1",  # 后计费
 
         pre: str = "ppu-0001",  # 前置判断，废弃
+
+        dynamic: bool = False,
+
         **kwargs
 ):
     """
@@ -164,7 +170,7 @@ async def ppu_flow(
 
         # 计费逻辑
         n = int(np.round(n)) or 1  # np.ceil(n)
-        await asyncio.gather(*[appu(post, api_key=api_key, base_url=base_url) for _ in range(n)])
+        await asyncio.gather(*[appu(post, api_key=api_key, base_url=base_url, dynamic=dynamic) for _ in range(n)])
 
         if money is None:  # 先扣费
             yield
@@ -239,6 +245,19 @@ async def create_chat_completion_chunk(
     yield "[DONE]"  # 兼容标准格式
 
 
+def get_payment_times(request: Union[BaseModel, dict], duration: float = 5):
+    if isinstance(request, BaseModel):
+        request = request.model_dump()
+
+    # 数量
+    N = request.get("n") or request.get("num_images") or 1
+
+    # 时长
+    N += request.get("duration", 0) // duration
+
+    return N
+
+
 if __name__ == '__main__':
     # print(ppu())
     # print(appu())

meutils/llm/utils.py

@@ -70,7 +70,7 @@ async def ppu_flow(
         yield
 
 
-def oneturn2multiturn(messages, template: Optional[str] = None):
+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
 
     _register_template(
@@ -99,36 +99,67 @@ def oneturn2multiturn(messages, template: Optional[str] = None):
     #     context += f"<|im_start|>{role}\n{content}<|im_end|>\n"
     # context += "<|im_start|>assistant\n"
     if len(messages) == 1:
-        return messages[0].get("content")
+        content = messages[0].get("content")
+        if isinstance(content, list):
+            content = content[-1].get('text', '')
+        return content
 
     context = "\n"
     for message in messages:
         role = message.get("role")
         content = message.get("content")
+
         if isinstance(content, list):  # content: {'type': 'text', 'text': ''}
             content = content[-1].get('text', '')
 
+        if role == "system" and ignore_system:
+            continue
+
         context += f"{role}:\n{content}\n\n"
-    context += "assistant:\n"
-    return context
 
+    return context
 
 
 if __name__ == '__main__':
-    async def main():
-        with timer():
-            try:
-                async with ppu_flow(
-                        api_key="sk-OYK4YxtTlWauT2TdGR5FTAJpkRmSnDwPly4cve0cAvMcrBkZ",
-                        model="api-oss",
-                        n=1):
-                    logger.debug("消费了哦")
-
-            except Exception as e:
-                pass
-                logger.error(e)
-                # logger.debug(e.response.status_code)
-                # logger.debug(e.response.text)
-
-
-    arun(main())
+    messages = [
+        {
+            "role": "system",
+            "content": [
+                {
+                    "type": "text",
+                    "text": "你是数学家"
+                }
+            ]
+        },
+        {
+            "role": "user",
+            "content": [
+                {
+                    "type": "text",
+                    "text": "1+1"
+                }
+            ]
+        },
+        {
+            "role": "assistant",
+            "content": [
+                {
+                    "type": "text",
+                    "text": "2"
+                }
+            ]
+        },
+
+        {
+            "role": "user",
+            "content": [
+                {
+                    "type": "text",
+                    "text": "1+2"
+                }
+            ]
+        },
+
+    ]
+
+    print(oneturn2multiturn(messages,ignore_system=False))

meutils/schemas/image_types.py

@@ -93,7 +93,7 @@ class ImageRequest(BaseModel):  # openai
 
     aspect_ratio: Optional[str] = None
 
-    user: Optional[str] = None
+    user: Optional[str] = None # to_url_fal
 
     def __init__(self, /, **data: Any):
         super().__init__(**data)

meutils/schemas/oneapi/common.py

@@ -149,9 +149,9 @@ MODEL_PRICE = {
     "ideogram-ai/ideogram-v2": 0.2,
     "ideogram-ai/ideogram-v2-turbo": 0.1,
 
-    "imagen4": 0.05 * 2,
-    "flux-kontext-pro": 0.04 * 2,
-    "flux-kontext-max": 0.08 * 2,
+    "imagen4": 0.05 * 3,
+    "flux-kontext-pro": 0.04 * 3,
+    "flux-kontext-max": 0.08 * 3,
 
     "api-asr": 0.01,
     "api-stt": 0.01,
@@ -626,6 +626,7 @@ MODEL_RATIO = {
     "deepseek-r1-0528": 2,
     "deepseek-r1-250528": 2,
     "deepseek-r1-250528-qwen3-8b": 0.3,
+    "deepseek-r1-250528-think": 2,
 
     "deepseek-search": 1,
     'deepseek-r1-search': 2,
@@ -657,11 +658,14 @@ MODEL_RATIO = {
     "hunyuan-t1": 1,
     "hunyuan-t1-search": 1,
 
+    "hunyuan-r1-search": 2,
+
     "deepseek-r1-metasearch": 2,
     "meta-deepresearch": 2,
 
     # 豆包
     "doubao-1-5-ui-tars-250428": 1.75,
+    "ui-tars-72b": 1.75,
     "doubao-1-5-pro-32k": 0.4,
     "doubao-1-5-pro-32k-250115": 0.4,
     "doubao-1-5-pro-256k": 2.5,
@@ -679,9 +683,9 @@ MODEL_RATIO = {
     "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 / 2,
-    "doubao-1.5-pro-256k": 5 / 2,
+    "doubao-pro-256k": 2.5,
+    "doubao-1.5-pro-32k": 0.4,
+    "doubao-1.5-pro-256k": 2.5,
 
     "doubao-1.5-vision-pro-32k": 1.5,
     "doubao-1.5-vision-pro-250328": 1.5,
@@ -901,6 +905,9 @@ MODEL_RATIO = {
     "o4-mini": 0.55,
     "gpt-image-1": 2.5,
 
+    "o3": 5,
+    "o3-2025-04-16": 5,
+
     # 硅基
     "llama-3.1-8b-instruct": 0.01,
     "meta-llama/Meta-Llama-3.1-8B-Instruct": 0.01,
@@ -1010,6 +1017,9 @@ COMPLETION_RATIO = {
     "o3-mini": 4,
     "o4-mini": 4,
 
+    "o3": 4,
+    "o3-2025-04-16": 4,
+
     "gpt-4o-realtime-preview": 4,
     "gpt-4o-realtime-preview-2024-10-01": 4,
     "gpt-4o-2024-11-20": 4,
@@ -1178,22 +1188,22 @@ COMPLETION_RATIO = {
     "deepseek-ai/deepseek-vl2": 4,
 
     # 豆包
-    "doubao-1-5-ui-tars-250428": 4,
+    "doubao-1-5-ui-tars-250428": 3.43,
+    "ui-tars-72b": 4,
 
     "doubao-lite-128k": 3,
-    "doubao-lite-32k": 3,
+    "doubao-lite-32k": 2,
     "doubao-lite-32k-character": 3,
     "doubao-lite-4k": 3,
     "doubao-1.5-lite-32k": 2,
 
     "doubao-pro-4k": 3,
-    "doubao-pro-32k": 3,
-    "doubao-pro-32k-241215": 3,
+    "doubao-pro-32k": 2.5,
     "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-pro-256k": 1.8,
+    "doubao-1.5-pro-32k": 2.5,
+    "doubao-1.5-pro-256k": 1.8,
 
     "doubao-1.5-vision-pro-32k": 3,
     "doubao-1.5-vision-pro-250328": 3,
@@ -1205,7 +1215,7 @@ COMPLETION_RATIO = {
     "doubao-vision-pro-32k": 3,
 
     "doubao-1-5-pro-32k": 1.25,
-    "doubao-1-5-pro-32k-250115": 1.25,
+    "doubao-1-5-pro-32k-250115": 2.5,
     "doubao-1-5-pro-256k": 1.8,
     "doubao-1-5-pro-256k-250115": 1.8,
 
@@ -1236,6 +1246,7 @@ COMPLETION_RATIO = {
 
     "hunyuan-t1": 4,
     "hunyuan-t1-search": 4,
+    "hunyuan-r1-search": 4,
 
     "deepseek-r1-metasearch": 4,
     "meta-deepresearch": 4,
@@ -1252,6 +1263,7 @@ COMPLETION_RATIO = {
     "deepseek-r1-250120": 4,
     "deepseek-r1-0528": 4,
     "deepseek-r1-250528": 4,
+    "deepseek-r1-250528-think": 4,
 
     "deepseek-r1-250528-qwen3-8b": 4,
 

meutils/str_utils/regular_expression.py

@@ -26,7 +26,6 @@ def has_chinese(text):
     return bool(pattern.search(text))
 
 
-
 @lru_cache()
 def remove_date_suffix(filename):
     """
@@ -147,6 +146,7 @@ if __name__ == '__main__':
         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 这个文件讲了什么？
 
     """
+
     # 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 正则匹配会卡死
     # from urllib3.util import parse_url
     # text = "@firebot /换衣 https://oss.ffire.cc/files/try-on.png"
@@ -163,10 +163,14 @@ if __name__ == '__main__':
 
     print(parse_url(text))
 
-    print(parse_url("[](https://oss.ffire.cc/cdn/2025-03-20/YbHhMbrXV82XGn4msunAJw)"))
+    # print(parse_url("[](https://oss.ffire.cc/cdn/2025-03-20/YbHhMbrXV82XGn4msunAJw)"))
 
     # print('https://mj101-1317487292.cos.ap-shanghai.myqcloud.com/ai/test.pdf\\n\\n'.strip(r"\n"))
 
     # print(parse_url("http://154.3.0.117:39666/docs#/default/get_content_preview_spider_playwright_get"))
 
     # print(parse_url(text, True))
+    text = """
+    https://p3-bot-workflow-sign.byteimg.com/tos-cn-i-mdko3gqilj/1fe07cca46224208bfbed8c0f3c50ed8.png~tplv-mdko3gqilj-image.image?rk3s=81d4c505&x-expires=1780112531&x-signature=e7q1NOMjqCHvMz%2FC3dVAEVisAh4%3D&x-wf-file_name=9748f6214970f744fe7fd7a3699cfa2.png \nA young woman holding a lipstick tube with a black body and gold decorative rings, featuring a nude or light brown lipstick bullet. The lipstick product faces the camera, positioned slightly below her face. In the background, a close-up of lips coated with the same nude or light brown shade, creating a natural and soft effect.
+    """
+    print(parse_url(text, for_image=True))