MeUtils 2025.8.27.12.16.3__py3-none-any.whl → 2025.8.29.15.13.52__py3-none-any.whl

meutils/io/files_utils.py

@@ -152,8 +152,11 @@ async def to_url(
         headers: Optional[dict] = None,
 
         content_type: Optional[str] = None,
-        mime_type: Optional[str] = None
+        mime_type: Optional[str] = None,
+
 ):
+    if not file: return
+
     content_type = content_type or mime_type
 
     if isinstance(file, list):
@@ -161,13 +164,29 @@ async def to_url(
         urls = await asyncio.gather(*tasks)
         return urls
 
-    if not file: return
-
     file = await to_bytes(file, headers=headers)
     file_url = await Minio().upload(file, filename, content_type=content_type)
     return file_url
 
 
+"""
+    request = ImageProcess(
+        # model="hunyuan-remove-watermark",
+
+        # model="remove-watermark",
+        model="clarity",
+        # model="expand",
+        # model="rmbg-2.0",
+
+        image=url,
+        # mask=url,
+
+        # response_format="b64_json"
+    )
+    arun(edit_image(request))
+"""
+
+
 async def to_base64(file: Union[UploadFile, str, bytes, list], content_type: Optional[str] = None):
     if isinstance(file, list):
         tasks = [to_base64(_, content_type) for _ in file]
@@ -327,9 +346,11 @@ if __name__ == '__main__':
     # url = "https://lmdbk.com/5.mp4"
     # url = "https://v3.fal.media/files/kangaroo/y5-1YTGpun17eSeggZMzX_video-1733468228.mp4"
     # content = requests.get(url).content
+    #
+    # url = "https://fal.media/files/koala/8teUPbRRMtAUTORDvqy0l.mp4"
+    #
+    # with timer():
+    #     # arun(get_file_duration(content=content))
+    #     arun(get_file_duration(url=url))
 
-    url = "https://fal.media/files/koala/8teUPbRRMtAUTORDvqy0l.mp4"
-
-    with timer():
-        # arun(get_file_duration(content=content))
-        arun(get_file_duration(url=url))
+    r = arun(to_url([]))

meutils/llm/check_utils.py

@@ -316,7 +316,7 @@ async def check_token_for_zhipu(api_key, threshold: float = 1, resource_package_
 
 
 @retrying()
-@rcache(ttl=1 * 24 * 3600, skip_cache_func=skip_cache_func)
+# @rcache(ttl=1 * 24 * 3600, skip_cache_func=skip_cache_func)
 async def check_token_for_fal(token, threshold: float = 0):
     try:
         # data = await AsyncClient(key=token).upload(b'', '', '')

meutils/llm/models/openrouter.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : openrouter
+# @Time         : 2025/8/28 08:59
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *
+
+from meutils.llm.clients import OpenAI
+
+models_mapping = {
+    "glm-4.5": "zai-org/GLM-4.5",
+    "glm-4.5v": "zai-org/GLM-4.5V",
+
+    "deepseek-v3": "deepseek-ai/DeepSeek-V3",
+    "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",
+    "deepseek-reasoner": "deepseek-ai/DeepSeek-R1",
+    "qwen2.5-72b-instruct": "Qwen/Qwen2.5-72B-Instruct-128K",
+    "kimi-k2-0711-preview": "moonshotai/Kimi-K2-Instruct",
+    "moonshotai/kimi-k2-instruct": "moonshotai/Kimi-K2-Instruct",
+    "qwen2.5-vl-32b-instruct": "Qwen/Qwen2.5-VL-32B-Instruct",
+    "qwen2.5-vl-72b-instruct": "Qwen/Qwen2.5-VL-72B-Instruct",
+    "qwen2.5-vl-7b-instruct": "Qwen/Qwen2.5-VL-7B-Instruct",
+    "minimax-m1-80k": "MiniMaxAI/MiniMax-M1-80k",
+    "qvq-72b-preview": "Qwen/QVQ-72B-Preview",
+    "qwen2.5-7b-instruct": "Qwen/Qwen2.5-7B-Instruct",
+    "deepseek-r1:1.5b": "deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B",
+    "deepseek-r1-distill-qwen-1.5b": "deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B",
+    "deepseek-r1:7b": "deepseek-ai/DeepSeek-R1-Distill-Qwen-7B",
+    "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"
+
+}
+
+
+def get_models_mapping():
+    client = OpenAI(
+        api_key=os.getenv("OPENROUTER_API_KEY"),
+        base_url=os.getenv("OPENROUTER_BASE_URL"),
+    )
+
+    models = client.models.list().data
+    models = {
+        m.id.lower().split('/', maxsplit=1)[-1].removesuffix(":free"): m.id
+        for m in models
+        if m.id.lower().endswith(':free')
+    }
+    return {**models, **models_mapping}
+
+
+if __name__ == '__main__':
+    data = get_models_mapping()
+    print(bjson(data))
+    print(','.join(data))

meutils/llm/openai_utils/adapters.py

@@ -14,7 +14,7 @@ from meutils.io.files_utils import to_url, to_url_fal
 from meutils.str_utils.json_utils import json_path
 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.schemas.image_types import ImageRequest, ImagesResponse
 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
 
@@ -60,8 +60,8 @@ async def chat_for_image(
             urls = await to_url_fal(image_urls, content_type="image/png")  # 国外友好
             image = urls
         else:
-            urls = await to_url(image_urls, content_type="image/png") # 数组
-            image = urls[-1]
+            urls = await to_url(image_urls, content_type="image/png")  # 数组
+            image = urls
 
     request = ImageRequest(
         model=request.model,
@@ -82,6 +82,7 @@ async def chat_for_image(
         logger.debug(request)
 
     if not generate: return
+
     future_task = asyncio.create_task(generate(request))  # 异步执行
 
     async def gen():
@@ -89,10 +90,20 @@ async def chat_for_image(
             await asyncio.sleep(0.05)
             yield i
 
-        response = await future_task
+        try:
+            response = await future_task
+            # response = await response  # 注意
+
+            if not isinstance(response, dict):
+                response = response.model_dump()
+
+            for image in response['data']:
+                yield f"""![{image.get("revised_prompt")}]({image['url']})\n\n"""
+
 
-        for image in response.data:
-            yield f"![{image.revised_prompt}]({image.url})\n\n"
+        except Exception as e:
+            # yield f"```error\n{e}\n```\n"
+            raise e
 
     chunks = create_chat_completion_chunk(gen(), redirect_model=request.model)
     return chunks

meutils/schemas/image_types.py

@@ -134,24 +134,31 @@ class ImageRequest(BaseModel):  # openai
             self.size = self.size if 'x' in self.size else '512x512'
 
     @cached_property
-    def image_urls(self):
+    def image_urls(self) -> List[str]:
         if self.image:
             if isinstance(self.image, str):
                 return [self.image]
             else:
                 return self.image
+        else:
+            image, _ = self.image_and_prompt
+            if image:
+                return [image]
+
         return []
 
     @cached_property
     def image_and_prompt(self):  # image prompt 目前是单图
         if self.prompt.startswith('http') and (prompts := self.prompt.split(maxsplit=1)):
             if len(prompts) == 2:
+                self.prompt = prompts[-1]
                 return prompts
             else:
                 return prompts + [' ']  # 只有 单url
 
         elif "http" in self.prompt and (images := parse_url(self.prompt)):
-            return images[0], self.prompt.replace(images[0], "")
+            self.prompt = self.prompt.replace(images[0], "")
+            return images[0], self.prompt
 
         else:
             return None, self.prompt
@@ -605,29 +612,34 @@ if __name__ == '__main__':
 
     prompt = "https://oss.ffire.cc/files/kling_watermark.png 带个眼镜"
     # prompt = "带个眼镜 https://oss.ffire.cc/files/kling_watermark.png"
-    prompt = "https://oss.ffire.cc/files/kling_watermark.png"
-    prompt = "画条狗"
+    # prompt = "https://oss.ffire.cc/files/kling_watermark.png"
+    # prompt = "画条狗"
 
     request = ImageRequest(prompt=prompt)
-    print(request.image_and_prompt)
-
-    data = {"image[]": "xxx"}
-    r = ImageRequest(**data)
 
-    data = {
-        "model": "flux-kontext-pro",
-        "prompt": "a cat and a dog",
-        "size": "512x1024",
-        # "aspect_ratio": "16:9"
-    }
+    print(request.prompt)
 
-    dd = {
-        "model": "flux-kontext-pro",
-        "prompt": "a cat and a dog",
-        "size": "5121x1024",
-        # "aspect_ratio": "16:9"
-    }
+    print(request.image_urls)
+    print(request.image_and_prompt)
+    print(request.prompt)
 
-    r = ImageRequest(**data)
+    # data = {"image[]": "xxx"}
+    # r = ImageRequest(**data)
+    #
+    # data = {
+    #     "model": "flux-kontext-pro",
+    #     "prompt": "a cat and a dog",
+    #     "size": "512x1024",
+    #     # "aspect_ratio": "16:9"
+    # }
+    #
+    # dd = {
+    #     "model": "flux-kontext-pro",
+    #     "prompt": "a cat and a dog",
+    #     "size": "5121x1024",
+    #     # "aspect_ratio": "16:9"
+    # }
+    #
+    # r = ImageRequest(**data)
 
     # print(ImagesResponse())

meutils/schemas/oneapi/common.py

@@ -110,11 +110,17 @@ FAL_MODELS = {
 MODEL_PRICE = {
     **FAL_MODELS,
 
+    "nano-banana": 0.04 * 3,
+    "gemini-2.5-flash-image": 0.04 * 3,
+    "gemini-2.5-flash-image-preview": 0.06,
+
     "qwen-image": 0.05,
     "qwen-image-edit": 0.05,
 
     "wan-ai-wan2.1-t2v-14b": 1,
     "wan-ai-wan2.1-t2v-14b-turbo": 1,
+    "wan2-1-14b-i2v-250225": 1,
+    "wan2-1-14b-t2v-250225": 1,
 
     "async-task": 0.0001,
     "chatfire-claude": 0.02,
@@ -174,9 +180,8 @@ MODEL_PRICE = {
     "doubao-seedream-3-0-t2i-250415": 0.1,
     "doubao-seededit-3-0-i2i-250628": 0.1,
 
+    "doubao-seedance-1-0-pro": 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.4,
     "doubao-seedance-1-0-lite-i2v-250428": 0.4,
@@ -1065,6 +1070,7 @@ MODEL_RATIO = {
     "gemini-2.5-pro-preview-05-06": 0.625,
     "gemini-2.5-pro-preview-06-05": 0.625,
     "gemini-2.5-pro": 0.625,
+    "gemini-2.5-pro-nothinking": 0.625,
 
     "gemini-1.5-pro-001": 1.25,
     "gemini-1.5-pro-002": 1.25,
@@ -1409,6 +1415,12 @@ COMPLETION_RATIO = {
     "gemini-2.5-pro-preview-03-25": 8,
     "gemini-2.5-pro-preview-05-06": 8,
     "gemini-2.5-pro-preview-06-05": 8,
+    "gemini-2.5-pro-think": 8,
+
+    "gemini-2.5-pro-thinking": 8,
+    "gemini-2.5-pro-exp-03-25-thinking":8,
+    "gemini-2.5-pro-preview-03-25-thinking": 8,
+    "gemini-2.5-pro-nothinking": 8,
 
     "gemma2-9b-it": 4,
     "gemma2-27b-it": 4,
@@ -1420,11 +1432,7 @@ COMPLETION_RATIO = {
     "gemini-2.5-flash-preview-05-20-thinking": 23,
     "gemini-2.5-flash-preview-05-20": 8.4,
     "gemini-2.5-flash-preview-05-20-nothinking": 8.4,
-    "gemini-2.5-pro-think": 4,
 
-    "gemini-2.5-pro-thinking": 4,
-    "gemini-2.5-pro-exp-03-25-thinking": 4,
-    "gemini-2.5-pro-preview-03-25-thinking": 4,
 
     "hunyuan-a52b-instruct": 5,
     "qwen2.5-coder-32b-instruct": 3,