MeUtils 2025.9.9.19.39.12__py3-none-any.whl → 2025.9.11.19.16.26__py3-none-any.whl

examples/_openaisdk/openai_images.py

@@ -50,7 +50,6 @@ data = {
     # 'model': 'step-1x-medium',
     'model': 'seededit',
 
-
     # 'n': 2, 'quality': 'hd', 'response_format': 'url', 'size': '1024x1024', 'style': 'vivid',
     # 'extra_body': {'guidance_scale': 4.5, 'num_inference_steps': 25, 'seed': None, 'negative_prompt': None}
 }
@@ -132,14 +131,20 @@ with timer('image'):
 
     client = OpenAI(
 
-        api_key=os.getenv("FFIRE_API_KEY"),
-        base_url=os.getenv("FFIRE_BASE_URL"),
+        # api_key=os.getenv("FFIRE_API_KEY"),
+        # base_url=os.getenv("FFIRE_BASE_URL"),
 
         # api_key="6b419ce2-096c-44ce-b2f5-0914ee8f3cf8",
         # base_url=os.getenv("VOLC_BASE_URL")
 
         # api_key=os.getenv("OPENAI_API_KEY") +,
         # api_key=os.getenv("OPENAI_API_KEY") + "-359", # 3083
+        # api_key=os.getenv("OPENAI_API_KEY") + "-21227", # 3083
+
+        base_url="https://api.pisces.ink/v1",
+        # base_url="https://all.chatfire.cn/pisces/v1",
+        api_key="pisces-76e2d5da837d4575847abc06bda84d200"
+
         # api_key=os.getenv("OPENAI_API_KEY_OPENAI") + "-3083",
 
         # api_key=os.getenv("SILICONFLOW_API_KEY"),
@@ -206,19 +211,21 @@ with timer('image'):
     # model = "recraft-v3"
     # model = "fal-ai/recraft-v3"
     # model = "flux-pro-1.1-ultra"
-    prompt = '一只可爱的边牧在坐公交车，卡通贴纸。动漫3D风格，超写实油画，超高分辨率，最好的质量，8k'
-    # prompt = "一个小女孩举着横幅，上面写着“新年快乐”"
+    # prompt = '一只可爱的边牧在坐公交车，卡通贴纸。动漫3D风格，超写实油画，超高分辨率，最好的质量，8k'
+    prompt = "裸体女孩"
 
     model = "doubao-seedream-3-0-t2i-250415"
     model = "black-forest-labs/FLUX.1-Krea-dev"
     model = "Qwen/Qwen-Image"
     model = "MusePublic/FLUX.1-Kontext-Dev"
-    model = "doubao-seedream-4-0-250828"
+    model = "doubao-seedream-4-0-250828"  # https://ark.cn-beijing.volces.com/api/v3/chat/completions
     # model = "DiffSynth-Studio/FLUX.1-Kontext-dev-lora-SuperOutpainting"
     # model = "DiffSynth-Studio/FLUX.1-Kontext-dev-lora-highresfix"
     # # model = "black-forest-labs/FLUX.1-Kontext-dev"
     # model="DiffSynth-Studio/FLUX.1-Kontext-dev-lora-ArtAug"
 
+    model = "gemini-2.5-flash-image-preview"
+
     # flux-kontext-dev
 
     response = client.images.generate(
@@ -259,3 +266,6 @@ with timer('image'):
 # openai.APIStatusError: Error code: 402 - {'error': {'message': 'You exceeded your current quota, please check your plan and billing details', 'type': 'quota_exceeded'}}
 
 
+
+    client.images.edit()
+    client.images.generate()

examples/_openaisdk/openai_router.py

@@ -17,8 +17,8 @@ from meutils.str_utils import parse_base64
 # gets API Key from environment variable OPENAI_API_KEY
 client = OpenAI(
     # base_url="https://openrouter.ai/api/v1",
-    base_url="https://all.chatfire.cn/openrouter/v1",
-    api_key=os.getenv("OPENROUTER_API_KEY"),
+    # base_url="https://all.chatfire.cn/openrouter/v1",
+    # api_key=os.getenv("OPENROUTER_API_KEY"),
     #
     # base_url="http://38.46.219.252:9001/v1",
     #
@@ -28,6 +28,9 @@ client = OpenAI(
     # api_key = "sk-qOpbMHesasoVgX75ZoeEeBEf1R9dmsUZVAPcu5KkvLFhElrn"
     # api_key="sk-MAZ6SELJVtGNX6jgIcZBKuttsRibaDlAskFAnR7WD6PBSN6M",
     # base_url="https://new.yunai.link/v1"
+
+    base_url="https://api.pisces.ink/v1",
+    api_key="pisces-03dedafafcbf4c1b9c87530858510932"
 )
 
 # (content=' \n'
@@ -40,17 +43,18 @@ completion = client.chat.completions.create(
     # model="openai/o1",
     # model="deepseek/deepseek-r1-0528-qwen3-8b:free",
     # model="google/gemini-2.5-flash-image-preview:free",
-    model="deepseek/deepseek-chat-v3.1:free",
+    # model="deepseek/deepseek-chat-v3.1:free",
     # model="gemini-2.0-flash-exp-image-generation",
+    model="gemini-2.5-flash-image-preview",
     max_tokens=10,
-extra_body={"reasoning_stream": True},
+    # extra_body={"reasoning_stream": True},
     messages=[
         {
             "role": "user",
             "content": [
                 {
                     "type": "text",
-                    "text": "hi"
+                    "text": "画条狗"
                 },
                 # {
                 #     "type": "image_url",
@@ -66,12 +70,10 @@ print(completion.choices[0].message.content)
 # arun(to_url(completion.choices[0].message.images[0]['image_url']['url'], content_type="image/png"))
 
 
-
 b64_list = parse_base64(completion.choices[0].message.content)
 
 arun(to_url(b64_list, content_type="image/png"))
 
-
 # '好的，旁边加一只戴墨镜的狗。\n\n![image](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABAAAAAQACAIAAADwf7zUAAAgAElEQ'
 # arun(to_url(completion.choices[0].message.images[0]['image_url']['url'], content_type="image/png"))
 

meutils/apis/chatglm/glm_video_api.py

@@ -38,7 +38,7 @@ async def create_task(request: VideoRequest, api_key: Optional[str] = None):
     proxy = await get_one_proxy()
     client = ZhipuAI(
         api_key=api_key,
-        http_client=httpx.Client(proxy=proxy)
+        # http_client=httpx.Client(proxy=proxy)
 
     )  # 请填写您自己的APIKey
     response = client.videos.generations(
@@ -109,7 +109,7 @@ async def generate(request: ImageRequest, n: int = 30):  # 兼容dalle3
 
 # VideoResult
 if __name__ == '__main__':
-    api_key = "03bdb799cbcb4a8cac609f9d5ebe02e7.snp1yga8VEEzO2bk"
+    api_key = "47e81002bdb748f7a6e59c1e3ab2bf5d.UQ0GcNPerKv0H5zY"
 
     # api_key = "c98aa404b0224690b211c5d1e420db2c.qGaByuJATne08QUx"
     # api_key = "7d10426c06afa81e8d7401d97781249c.DbqlSsicRtaUdKXI"  # 新号

meutils/apis/fal/images.py

@@ -259,7 +259,7 @@ if __name__ == '__main__':
 
     #
     prompt = "https://v3.fal.media/files/penguin/XoW0qavfF-ahg-jX4BMyL_image.webp https://v3.fal.media/files/tiger/bml6YA7DWJXOigadvxk75_image.webp Put the little duckling on top of the woman's t-shirt."
-    # prompt = '把小鸭子放在女人的T恤上面。\nhttps://s3.ffire.cc/cdn/20250530/tEzZKkhp3tKbNzva6mgC2T\nhttps://s3.ffire.cc/cdn/20250530/AwHJpuJuNg5w3sVbH4PZdv'
+        # prompt = '把小鸭子放在女人的T恤上面。\nhttps://s3.ffire.cc/cdn/20250530/tEzZKkhp3tKbNzva6mgC2T\nhttps://s3.ffire.cc/cdn/20250530/AwHJpuJuNg5w3sVbH4PZdv'
     request = ImageRequest(prompt=prompt, model=model)
 
     data = {

meutils/apis/images/generations.py

@@ -7,10 +7,12 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  : 统一收口
+import os
 
 from meutils.pipe import *
 from meutils.llm.clients import AsyncClient
 from meutils.llm.openai_utils import to_openai_params
+from meutils.io.files_utils import to_png, to_url_fal, to_url
 
 from meutils.schemas.image_types import ImageRequest, RecraftImageRequest
 
@@ -27,15 +29,19 @@ from meutils.apis.qwen.chat import Completions as QwenCompletions
 from meutils.apis.google.chat import Completions as GoogleCompletions
 from meutils.apis.google.images import openai_generate
 
+from meutils.apis.volcengine_apis.videos import get_valid_token as get_valid_token_for_volc
+
 
 async def generate(
         request: ImageRequest,
         api_key: Optional[str] = None,
         base_url: Optional[str] = None,
 ):
-    logger.debug(request)
+    if len(str(request)) < 1024:
+        logger.debug(request)
 
-    if request.model.startswith("fal-ai"):  # 主要 request.image
+    if request.model.startswith("fal-ai"):  # 国外fal
+        request.image = await to_url_fal(request.image, content_type="image/png")
         return await fal_generate(request, api_key)
 
     if request.model.startswith(("recraft",)):
@@ -73,11 +79,29 @@ async def generate(
     }
     request = ImageRequest(**data)
     if request.model.startswith("doubao"):
+        base_url = base_url or os.getenv("VOLC_BASE_URL")
+        api_key = api_key or await get_valid_token_for_volc()
+        api_key = np.random.choice(api_key.split())
+
         request.watermark = False
-        if request.image and not request.model.startswith("doubao-seedream-4") and isinstance(request.image, list):
+        if request.model.startswith("doubao-seedream-4"):
+            if request.image and not any(i in str(request.image) for i in {".png", ".jpeg", "image/png", "image/jpeg"}):
+                logger.debug(f"{request.model}: image 不是 png 或 jpeg 格式，转换为 png 格式")
+                request.image = await to_png(request.image, response_format='b64')
+
+            if request.n > 1:
+                request.sequential_image_generation = "auto"
+                request.sequential_image_generation_options = {
+                    "max_images": request.n
+                }
+        elif request.image and isinstance(request.image, list):
             request.image = request.image[0]
 
     data = to_openai_params(request)
+
+    if len(str(data)) < 1024:
+        logger.debug(bjson(data))
+
     client = AsyncClient(api_key=api_key, base_url=base_url)
     return await client.images.generate(**data)
 
@@ -89,4 +113,31 @@ if __name__ == '__main__':
     # arun(generate(ImageRequest(model="FLUX_1-Krea-dev", prompt="笑起来")))
 
     token = f"""{os.getenv("VOLC_ACCESSKEY")}|{os.getenv("VOLC_SECRETKEY")}"""
-    arun(generate(ImageRequest(model="seed", prompt="笑起来"), api_key=token))
+    # arun(generate(ImageRequest(model="seed", prompt="笑起来"), api_key=token))
+
+    request = ImageRequest(model="doubao-seedream-4-0-250828", prompt="a dog")
+
+    # request = ImageRequest(
+    #     model="doubao-seedream-4-0-250828",
+    #     prompt="将小鸭子放在t恤上",
+    #     image=[
+    #         "https://v3.fal.media/files/penguin/XoW0qavfF-ahg-jX4BMyL_image.webp",
+    #         "https://v3.fal.media/files/tiger/bml6YA7DWJXOigadvxk75_image.webp"
+    #     ]
+    # )
+
+    # todo: tokens 4096 1张
+
+    # 组图
+    # request = ImageRequest(
+    #     model="doubao-seedream-4-0-250828",
+    #     prompt="参考这个LOGO，做一套户外运动品牌视觉设计，品牌名称为GREEN，包括包装袋、帽子、纸盒、手环、挂绳等。绿色视觉主色调，趣味、简约现代风格",
+    #     image="https://ark-project.tos-cn-beijing.volces.com/doc_image/seedream4_imageToimages.png",
+    #     n=3
+    # )
+
+    # arun(generate(request, api_key=os.getenv("FFIRE_API_KEY"), base_url=os.getenv("FFIRE_BASE_URL")))  # +"-29494"
+
+    # print(not any(i in str(request.image) for i in {".png", ".jpeg", "image/png", "image/jpeg"}))
+
+    arun(generate(request))  # +"-29494"

meutils/apis/volcengine_apis/videos.py

@@ -28,16 +28,13 @@ FEISHU_URL = "https://xchatllm.feishu.cn/sheets/GYCHsvI4qhnDPNtI4VPcdw2knEd?shee
 
 async def get_valid_token(tokens: Optional[list] = None, batch_size: Optional[int] = None, seed: int = 0):
     """返回 tokens
-    1. 从redis获取token
-    2. 校验token
-    3. 校验失败则从飞书获取token
-    4. 校验token
-    5. 校验通过则返回token
+    api_key = np.random.choice(api_key.split())
+
     """
     tokens = tokens or await get_series(FEISHU_URL, duplicated=True)
-    batch_size =  batch_size or 1
+    batch_size = batch_size or 1
 
-    if seed == 0 and (volc_tokens := await redis_aclient.get(f"volc_tokens")):
+    if seed == 0 and (volc_tokens := await redis_aclient.get(f"volc_tokens")):  # 刷新
         return volc_tokens.decode()
 
     valid_tokens = []
@@ -48,6 +45,7 @@ async def get_valid_token(tokens: Optional[list] = None, batch_size: Optional[in
             if len(valid_tokens) == batch_size:
                 _ = '\n'.join(valid_tokens)
                 await redis_aclient.set(f"volc_tokens", _, ex=2 * 3600)
+
                 return _
 
 
@@ -266,7 +264,7 @@ c4356b58-4aa3-4a52-b907-b40c4dd2e502
     # arun(get_task_from_feishu(ids, ))
 
     # arun(get_valid_token(['a93ea9a5-3831-47b8-863a-57e10233f922']))
-    arun(get_valid_token(batch_size=2, seed=3))
+    arun(get_valid_token(random_choice=True))
 
 """
 {'id': 'cgt-20250613160030-2dvd7',

meutils/data/VERSION

@@ -1 +1 @@
-2025.09.09.19.39.12
+2025.09.11.19.16.26

meutils/io/files_utils.py

@@ -21,6 +21,7 @@ from meutils.oss.minio_oss import Minio
 from starlette.datastructures import UploadFile
 from contextlib import asynccontextmanager
 from httpx import AsyncClient
+from PIL import Image
 
 
 def guess_mime_type(file):
@@ -154,7 +155,7 @@ async def to_url(
         content_type: Optional[str] = None,
         mime_type: Optional[str] = None,
 
-):
+):  # 传入 url 是否 转存
     if not file: return
 
     content_type = content_type or mime_type
@@ -260,6 +261,27 @@ async def get_file_duration(filename: str = ".mp4", url: Optional[str] = None, c
         return int(np.ceil(tag.duration or 10))
 
 
+async def to_png(image: Union[bytes, List[bytes], str, List[str]], response_format: str = 'bytes') -> bytes:
+    """
+    将 WebP 二进制数据无损转换为 PNG 二进制数据
+    """
+    if isinstance(image, list):
+        tasks = [to_png(_, response_format) for _ in image]
+        return await asyncio.gather(*tasks)
+
+    if isinstance(image, str):
+        image = await to_bytes(image)
+
+    with Image.open(io.BytesIO(image)) as im:
+        out = io.BytesIO()
+        im.save(out, format="PNG")  # 无损
+
+        if response_format != "bytes":
+            return await to_base64(out.getvalue(), content_type="image/png")
+
+        return out.getvalue()
+
+
 if __name__ == '__main__':
     # import tempfile
     #
@@ -342,12 +364,16 @@ if __name__ == '__main__':
     #     arun(get_file_duration(url=url))
 
     # r = arun(to_url([]))
-    text = "这是一个示例文本，包含一个图片：![image](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABAAAAAQACAIAAADwf7zUAAAgAElEQ) 这张图片很棒。"
+    # text = "这是一个示例文本，包含一个图片：![image](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABAAAAAQACAIAAADwf7zUAAAgAElEQ) 这张图片很棒。"
+    #
+    # arun(markdown_base64_to_url(
+    #     text=text,
+    #     # pattern=r'!\[.*?\]\((data:image/.*?)\)'
+    #     # pattern=r'!\[.*?\]\((.*?)\)'
+    #
+    # )
+    # )
 
-    arun(markdown_base64_to_url(
-        text=text,
-        # pattern=r'!\[.*?\]\((data:image/.*?)\)'
-        # pattern=r'!\[.*?\]\((.*?)\)'
+    webp_bytes = Path("/Users/betterme/PycharmProjects/AI/MeUtils/meutils/apis/images/image1.webp").read_bytes()
 
-    )
-    )
+    arun(to_png(webp_bytes, response_format='b64'))

meutils/llm/check_utils.py

@@ -214,7 +214,7 @@ async def check_token_for_sophnet(api_key, threshold: float = 1):
 
 #
 @retrying()
-# @rcache(ttl=7 * 24 * 3600, skip_cache_func=skip_cache_func)
+@rcache(ttl=7 * 24 * 3600, skip_cache_func=skip_cache_func)
 async def check_token_for_volc(api_key, threshold: float = 1, purpose: Optional[str] = None):
     if not isinstance(api_key, str):
         return await check_tokens(
@@ -262,7 +262,6 @@ async def check_token_for_volc(api_key, threshold: float = 1, purpose: Optional[
                 response_format="url"
             )
             logger.debug(response.json())
-            response.raise_for_status()
 
         else:
 

meutils/llm/completions/qwenllm.py

@@ -45,7 +45,7 @@ thinking_budget_mapping = {
 }
 
 COOKIE = """
-cna=KP9DIEqqyjUCATrw/+LjJV8F; _bl_uid=LXmp28z7dwezpmyejeXL9wh6U1Rb; cnaui=310cbdaf-3754-461c-a3ff-9ec8005329c9; aui=310cbdaf-3754-461c-a3ff-9ec8005329c9; sca=43897cb0; _gcl_au=1.1.106229673.1748312382.56762171.1748482542.1748482541; xlly_s=1; x-ap=ap-southeast-1; acw_tc=0a03e53917509898782217414e520e5edfcdef667dcbd83b767c0ce464fad4; token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImxhc3RfcGFzc3dvcmRfY2hhbmdlIjoxNzUwNjYwODczLCJleHAiOjE3NTM1ODE4ODV9.Npy24ubI717JmdSWMrodWSvVRHENgbJ7Knd-Yf158YE; atpsida=705b922fe336ee0d63fcc329_1750989888_2; SERVERID=e8c2af088c314df080fffe7d0976a96b|1750989892|1750910540; tfstk=gGtsWsqG4IKUeosYhNDUAMIBJRIbcvoz6-6vEKEaHGIOG-O2eZBabAYXRIR16hSOMpQpNtDMbtpTlWd2wNEAWA4XAOWy0FJtS6Ef3IDMbiQvps65XZYNg15fcKASLbor4dvGmGlra0WjM37NqSBAMS5d9TSfBJ35KivGmihEsEHyxdAMR0lwBiHCvt6uMiBYDMHC3TXOD1QY9yBR9iIAktIdpOX0DlCYWv9dtOsAMIQtdMChHfD7Ftg1sdMwtHJ00Jm2p6ZYDH6Ki1p6F9XBAwQOwwCQD9-CCN1JBhJB9QBXy3_MwXzN6UTkNTRZvlOWBCTRyhFKOivePI6WXYU5GCvpbwKt3zXhmFLRXnG76ppJBeLJBXzCdepwAw--No_MJCYllnlEqG8yUnbJXcNlTaXXNGLI9lOR4urPNGl0lJ_uc91rdva0oJN5AmdFjVAhW9X18vMQ6EbOK96ndva0oNBhCOMId5Lc.; isg=BNfX7gH7c3OJX_gfCBykQ2rtZk0hHKt-YCofVCkEq6YJWPSaPe8Dz9o-uvjGsIP2; ssxmod_itna=iqGxRDuQqWqxgDUxeKYI5q=xBDeMDWK07DzxC5750CDmxjKidKDUGQq7qdOamuu9XYkRGGm01DBL4qbDnqD80DQeDvYxk0K4MUPhDwpaW8YRw3Mz7GGb48aIzZGzY=0DgSdfOLpmxbD884rDYoDCqDSDxD99OdD4+3Dt4DIDAYDDxDWCeDBBWriDGpdhmbQVqmqvi2dxi3i3mPiDit8xi5bZendVL4zvDDlKPGf3WPt5xGnD0jmxhpdx038aoODzLiDbxEY698DtkHqPOK=MlTiRUXxAkDb9RG=Y2U3iA4G3DhkCXU3QBhxCqM2eeQmkeNzCwkjw/006DDAY2DlqTWweL04MKBeHhY5om5NUwYHuFiieQ0=/R=9iO9xTBhND4KF4dvyqz0/toqlqlzGDD; ssxmod_itna2=iqGxRDuQqWqxgDUxeKYI5q=xBDeMDWK07DzxC5750CDmxjKidKDUGQq7qdOamuu9XYkRGGmibDG85+YNY=exGa3Y64u5DBwiW7r++DxFqCdl=l77NQwckyAaCG64hkCOjO1pkcMRBdqj70N7nk=e94KEQYUxlf+2Dw=ViA+XKDde0uGS+eXgFkQqzYWe0Dd4oGbUj8L4QY4og345X2DjKDNOfQRgfeIKVRFQjqR098dBUrQsXBNQZcG1oBFAp4xkLYHl+W3OQW9ybPF4sML3t1tPX2T4DmCqKL+jN1XX94xpyA6k9+sgyBFY4zXOq7dHOuO3Gd3lidwdrk=8dNrOdrYQo33fobVS=MRF7nNQBC5d3kBbYdwtoxNBKmBiXoTfOTzOp3MT=ODXhxfO16Tta4vSW=ubtkEGgeQ/gKOwsVjmKDEY0NZ+ee7xlitvWmBbtk7ma7x1PinxtbitdadtYQOqG5AFEZbFxiSE6rDky7jiatQ0Fe7z6uDmYx4z5MGxMA5iDY7DtSLfNUYxU44D
+_gcl_au=1.1.1093269050.1756349377;xlly_s=1;_bl_uid=LXmp28z7dwezpmyejeXL9wh6U1Rb;cnaui=310cbdaf-3754-461c-a3ff-9ec8005329c9;isg=BCQknTSrEFaWtGtm_x0nSvW89SQWvUgnEt_awT5Fz--w6cezYs52t7gDqUFxMYB_;ssxmod_itna2=1-iqGhD50IThkG8Dhx_xmuxWKUt_EoG7DzxC5KY0CDmxjKidDRDB40QRTnf_Ti=qaeGrMwxrDPxD3r5iY80q7DFg0WeDBk4uAn8mY3vKFTl7S9o7EaoSeXnAOPBSok57ccC4rhgutjg2_8D7jk_lChKSSdfMbm2lKAUlRwIqjSxeNld4tMGxFev6zkUel_6LR_foIGQa5L4PuCGa6dUqvwISCODQh2TC6wQ1Hu=Ll=W4=W6s1E_V8Dr_1gDECghksL8zvQHiPI60ChnPodSvFnHjE2iXzGDdE_I5876eQ03cEzaFsA48KQLReNjiPp1I0EfN=5a=dziPIxXxcpup5zmGM2L48PYjAqiUxrwVQDY4vN=Ni_pu6pxOYEBNL7YA6RPcRy7Ak=Y5PPbZRAi242ulCDx3oZCGH2YE6p3lD4gPIOKMWX6AbmhYLrcMeXcYdjzGgaYEDq4DUtKP/1jf=vXt=MQXoZ23BWlE5h06cjceY_Bxw3AH3KeBaxT4pHEt19QSlaO20G9DfDq7Wf3BvV=5X/BYd54Y44nUHOfH_fV2mHKNz0W4lxjWDjY9H3m00I3cOIf3C6q7Y_CNx1sG1nwsiDUA34QDtsC8jw1YD;sca=aefac4ee;acw_tc=0a03e54a17574902359765651e1e9cf9780667ec2a2cefacce63a0b954bb63;atpsida=7e2e4dcfcd1c4a4530dd3395_1757490275_2;aui=310cbdaf-3754-461c-a3ff-9ec8005329c9;cna=KP9DIEqqyjUCATrw/+LjJV8F;ssxmod_itna=1-iqGhD50IThkG8Dhx_xmuxWKUt_EoG7DzxC5KY0CDmxjKidDRDB40QRTnf_Ti=qaeGrMwxrDyxGXoNexiNDAg40iDCbmLx5Yjdrq4NFtrojKaIjL4Q43rj9_8m0tnY/qmUTMU6Rljs7s66tqGI_DG2DYoDCqDS0DD99OdD4_3Dt4DIDAYDDxDWIeDB4ZrQDGPtLQut5eqKwBrtxi3QWWPQDiUCxivW56Wt5C_GwDDliPGfWepi20iDbqDuzKqaBeDLRPpvxB=PxYPmjmkUxBQGHniO/WWb2BkrGOGBKim6mTeM0O_qBGGhfyDGxNI0eYT44YxS4VQYQjytGBFDDWgL4_AzKl_TYx_7CIq13b1_BDCgtIQi_GK=DKoBddAQ2wmlBx/DYfjGeAzNA4aDhLlxtlzaiDD;tfstk=geyx-Dg4-gKxmZY2DPflIb1e9VjuX_qVPrrBIV0D1zU85rs2IlGD5dU-rirmhZz8VyUp5diXCbw8-cTbnog6NdUtyi8XG1y-XPUwhK1V7utSbmnbWlSqfVa_WVVcZ9q40Ak1-lBhKo8RmR1gkd9XVGitjCsoG1PJiYM1-wXoYFbWuAaGVPsqNugrXctjCPOWFD0ScEOb54GSADYjCAa12YiZcKi6GfZ5Fm0S5AM_5us-j4ijCAa_VgnZs7QtPngMBSZPyLNC_OpMI8nxMVpikdIljmcxRogRRwwJ3j3Qc4p18hgjf4iLFN8m78E7hD45EKHTVcUKh7QWHPEbTPoQlTLjDSZLxbeNRdnzNrloD7I6NqZIlrhY9Usx7-4YBjyC-Lubw8ytn7bvKVl_Z-lUna9xdWrmn5a5fdgTNcsPDJ2LcuTnJcAf2gdw_jirJjsq62sn5Go--iB9_ClP403h2wOw_jir22jA-CRZag5..;token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImxhc3RfcGFzc3dvcmRfY2hhbmdlIjoxNzUwNjYwODczLCJleHAiOjE3NTgwOTUwMzd9.JdVvyPkln2HcGm6ib0FKaF1qQ87lG1nf70oezhYZ2Jg;x-ap=cn-hongkong
 """.strip()
 
 
@@ -396,7 +396,7 @@ if __name__ == '__main__':
     )
     token = None
 
-    token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImxhc3RfcGFzc3dvcmRfY2hhbmdlIjoxNzUwNjYwODczLCJleHAiOjE3NTc0ODczMDd9.7TQ9NicXYxghzI7EP3cPMFqa5j-09Sz1B9s3SnKZvkE"
+    token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImxhc3RfcGFzc3dvcmRfY2hhbmdlIjoxNzUwNjYwODczLCJleHAiOjE3NTgwOTUwMzd9.JdVvyPkln2HcGm6ib0FKaF1qQ87lG1nf70oezhYZ2Jg"
 
     arun(create(request, token))
 

meutils/llm/models/siliconflow.py

@@ -31,6 +31,9 @@ models_mapping = {
     "kimi-k2-250711": "moonshotai/Kimi-K2-Instruct",
     "kimi-k2-0711-preview": "moonshotai/Kimi-K2-Instruct",
 
+    "kimi-k2-250905": "moonshotai/Kimi-K2-Instruct-0905",
+    "kimi-k2-0905-preview": "moonshotai/Kimi-K2-Instruct-0905",
+
     "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",
@@ -63,6 +66,7 @@ def get_models_mapping():
     models = client.models.list().data
     models = {
         m.id.removeprefix("Pro/").split('/', maxsplit=1)[-1].lower(): m.id.removeprefix("Pro/") for m in models
+        if any(i not in m.id.lower() for i in {"stable-diffusion"})
     }
     return {**models, **models_mapping}
 

meutils/llm/openai_utils/adapters.py

@@ -7,6 +7,7 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
+import shortuuid
 from aiostream import stream
 
 from meutils.pipe import *
@@ -39,8 +40,12 @@ async def chat_for_image(
         if request.model.startswith('fal'):
             urls = await to_url_fal(image_urls, content_type="image/png")  # 国外友好
             image = urls
+
+        elif request.model.startswith("doubao-seed"):
+            image = image_urls  # b64
+
         else:
-            urls = await to_url(image_urls, content_type="image/png")  # 数组
+            urls = await to_url(image_urls, ".png", content_type="image/png")  # 数组
             image = urls
 
     image_request = ImageRequest(
@@ -91,7 +96,11 @@ async def chat_for_image(
     future_task = asyncio.create_task(generate(image_request))  # 异步执行
 
     async def gen():
-        text = image_request.model_dump_json(exclude_none=True).replace("free", "")
+        exclude = None
+        if len(str(image_request.image)) > 1000:
+            exclude = {"image"}
+
+        text = image_request.model_dump_json(exclude_none=True, exclude=exclude).replace("free", "")
         for i in f"""> 🖌️正在绘画\n\n```json\n{text}\n```\n\n""":
             await asyncio.sleep(0.05)
             yield i
@@ -155,6 +164,7 @@ async def chat_for_video(
 
 if __name__ == '__main__':
     from meutils.apis.images.generations import generate
+
     request = CompletionRequest(
         model="deepseek-r1-Distill-Qwen-1.5B",
         messages=[

meutils/office_automation/pdf.py

@@ -93,9 +93,10 @@ def extract_images_from_pdf(file, output: Optional[str] = None):
 
 if __name__ == '__main__':
     with timer():
-        # r = extract_text('x.pdf')
+        # r = extract_text('上海证券交易所证券交易业务指南第8号——科创板股票做市（上证函〔2022〕1155号 20220715）-1757338961901 (1).pdf')
+        r = extract_text('非上市公司股权估值指引（2025年修订 中证协发〔2025〕86号 20250425 20250601）-1757078360106.pdf')
 
-        r = extract_images_from_pdf('《锋利的jQuery》(高清扫描版-有书签)_副本_加水印.pdf', 'images')
+        # r = extract_images_from_pdf('《锋利的jQuery》(高清扫描版-有书签)_副本_加水印.pdf', 'images')
 
     # import tiktoken
     # print(tiktoken.encoding_for_model('gpt-3.5-turbo'))

meutils/schemas/image_types.py

@@ -84,22 +84,34 @@ class ImagesResponse(_ImagesResponse):
 class ImageRequest(BaseModel):  # openai
     """
     图生图 两种方式： prompt + controls
+
+        background: Optional[Literal["transparent", "opaque", "auto"]] | NotGiven = NOT_GIVEN,
+        model: Union[str, ImageModel, None] | NotGiven = NOT_GIVEN,
+        output_compression: Optional[int] | NotGiven = NOT_GIVEN,
+        output_format: Optional[Literal["png", "jpeg", "webp"]] | NotGiven = NOT_GIVEN,
+        partial_images: Optional[int] | NotGiven = NOT_GIVEN,
+
     """
     model: str = ''
 
     prompt: constr(min_length=1, max_length=10240) = " "
 
-    n: Optional[int] = 1
+    moderation: Optional[Literal["low", "auto"]] = None
 
-    quality: Optional[Literal["standard", "hd"]] = None
-    style: Union[str, Literal["vivid", "natural"]] = None
+    style: Optional[Union[str, Literal["vivid", "natural"]]] = None
+    background: Optional[Union[str, Literal["transparent", "opaque", "auto"]]] = None
+    input_fidelity: Optional[Union[str, Literal["high", "low"]]] = None
+    quality: Optional[Union[str, Literal["standard", "low", "medium", "high", "auto"]]] = None
 
     # 测试默认值 Optional[Literal["256x256", "512x512", "1024x1024", "1792x1024", "1024x1792"]]
+    n: Optional[int] = 1
     size: Optional[str] = '1024x1024'  # null auto
 
+    output_format: Optional[Literal["png", "jpeg", "webp"]] = None
     response_format: Optional[Literal["url", "b64_json", "oss_url", "glb", "stl"]] = "url"
 
     seed: Optional[int] = None
+    stream: Optional[bool] = None
 
     # oneapi https://github.com/QuantumNous/new-api/blob/main/dto/dalle.go
     extra_fields: Optional[Any] = None  ###
@@ -114,13 +126,18 @@ class ImageRequest(BaseModel):  # openai
 
     aspect_ratio: Optional[str] = None
 
-    user: Optional[str] = None  # to_url_fal
+    user: Optional[str] = None
 
-    image: Optional[Union[str, List[str]]] = None  # url b64
+    image: Optional[Union[str, List[str], bytes, List[bytes]]] = None  # url b64 file_bytes
     watermark: Optional[bool] = None
 
     def __init__(self, /, **data: Any):
         super().__init__(**data)
+        # 规避空字符
+        self.style = self.style or None
+        self.quality = self.quality or None
+        self.background = self.background or None
+        self.input_fidelity = self.input_fidelity or None
 
         if self.aspect_ratio:  # 适配比例
             self.size = ASPECT_RATIOS.get(self.aspect_ratio, '1024x1024')
@@ -187,24 +204,41 @@ class ImageRequest(BaseModel):  # openai
 class ImageEditRequest(BaseModel):
     model: Union[str, Literal["dall-e-2", "dall-e-3", "gpt-image-1"]]
 
+    # image: Union[FileTypes, SequenceNotStr[FileTypes]],
+    # prompt: str,
+    # mask: FileTypes | NotGiven = NOT_GIVEN,
+
     prompt: str
     image: Any  # 图片
 
     mask: Optional[Any] = None  # 图片
-    background: Optional[Literal["transparent", "opaque", "auto"]] = None
+
+    background: Optional[Union[str, Literal["transparent", "opaque", "auto"]]] = None
+    input_fidelity: Optional[Union[str, Literal["high", "low"]]] = None
+    quality: Optional[Union[str, Literal["standard", "low", "medium", "high", "auto"]]] = None
 
     n: Optional[int] = 1
-    quality: Optional[Literal["standard", "low", "medium", "high", "auto"]] = None
     size: Optional[
         Union[str, Literal["256x256", "512x512", "1024x1024", "1536x1024", "1024x1536", "auto"]]] = "1024x1024"
-    response_format: Optional[Literal["url", "b64_json"]] = None
 
     aspect_ratio: Optional[str] = None
 
     user: Optional[str] = None
+    stream: Optional[bool] = None
+
+    response_format: Optional[Literal["url", "b64_json"]] = None
+    output_format: Optional[Literal["png", "jpeg", "webp"]] = None
+
+    # output_compression: Optional[int] | NotGiven = NOT_GIVEN,
+    # partial_images: Optional[int] | NotGiven = NOT_GIVEN,
 
     def __init__(self, /, **data: Any):
         super().__init__(**data)
+        # 规避空字符
+        self.quality = self.quality or None
+        self.background = self.background or None
+        self.input_fidelity = self.input_fidelity or None
+
         if not isinstance(self.image, list):
             self.image = [self.image]
 
@@ -622,6 +656,17 @@ if __name__ == '__main__':
 
         aspect_ratio="16:9"
     )
+
+    # "sequential_image_generation": "auto",
+    # "sequential_image_generation_options": {
+    #     "max_images": 4
+    # },
+
+    request.sequential_image_generation = "auto"
+
+    request.sequential_image_generation_options = {
+        "max_images": 4
+    }
     #
     # print(request.prompt)
     #