MeUtils 2025.9.3.23.13.47__py3-none-any.whl → 2025.9.7.0.7.25__py3-none-any.whl

meutils/llm/openai_utils/adapters.py

@@ -33,26 +33,6 @@ async def chat_for_image(
 ):
     generate = generate and partial(generate, api_key=api_key, base_url=base_url)
 
-    if not request.stream or request.last_user_content.startswith(  # 跳过nextchat
-            (
-                    "hi",
-                    "使用四到五个字直接返回这句话的简要主题",
-                    "简要总结一下对话内容，用作后续的上下文提示 prompt，控制在 200 字以内"
-            )):
-        chat_completion.choices[0].message.content = "请设置`stream=True`"
-        return chat_completion
-
-        # request.stream = True  # 流转非流
-        # response = await chat_for_image(generate, request, api_key)
-        # chunks = await stream.list(response)
-        #
-        # logger.debug(chunks)
-        #
-        # if chunks and isinstance(chunks[0], ChatCompletion):
-        #     response = chunks[0]
-        # else:
-        #     response = create_chat_completion(chunks)
-        # return response
     image = None
     prompt = request.last_user_content
     if image_urls := request.last_urls.get("image_url"):  # image_url
@@ -63,32 +43,55 @@ async def chat_for_image(
             urls = await to_url(image_urls, content_type="image/png")  # 数组
             image = urls
 
-    request = ImageRequest(
+    image_request = ImageRequest(
         model=request.model,
         prompt=prompt,
         image=image
     )
-    if not request.image:
-        request.image, request.prompt = request.image_and_prompt
+    if not image_request.image:
+        image_request.image, image_request.prompt = image_request.image_and_prompt
 
-    if '--' in request.prompt:
-        prompt_dict = parse_command_string(request.prompt)
+    if '--' in image_request.prompt:
+        prompt_dict = parse_command_string(image_request.prompt)
         # 缩写补充
         prompt_dict['aspect_ratio'] = prompt_dict.get('aspect_ratio') or prompt_dict.get('ar')
 
         data = {
-            **request.model_dump(exclude_none=True, exclude={"extra_fields", "aspect_ratio"}),
+            **image_request.model_dump(exclude_none=True, exclude={"extra_fields", "aspect_ratio"}),
             **prompt_dict
         }
-        request = ImageRequest(**data)
-        logger.debug(request)
+        image_request = ImageRequest(**data)
+        logger.debug(image_request)
 
+    # 非流式
+    if not request.stream or request.last_user_content.startswith(  # 跳过nextchat
+            (
+                    "hi",
+                    "使用四到五个字直接返回这句话的简要主题",
+                    "简要总结一下对话内容，用作后续的上下文提示 prompt，控制在 200 字以内"
+            )):
+        # chat_completion.choices[0].message.content = "请设置`stream=True`"
+        # return chat_completion
+
+        response = await generate(image_request)
+
+        if not isinstance(response, dict):
+            response = response.model_dump()
+
+        content = ""
+        for image in response['data']:
+            content += f"""![{image.get("revised_prompt")}]({image['url']})\n\n"""
+
+        chat_completion.choices[0].message.content = content
+        return chat_completion
+
+    # 流式
     if not generate: return
 
-    future_task = asyncio.create_task(generate(request))  # 异步执行
+    future_task = asyncio.create_task(generate(image_request))  # 异步执行
 
     async def gen():
-        text = request.model_dump_json(exclude_none=True).replace("free", "")
+        text = image_request.model_dump_json(exclude_none=True).replace("free", "")
         for i in f"""> 🖌️正在绘画\n\n```json\n{text}\n```\n\n""":
             await asyncio.sleep(0.05)
             yield i
@@ -151,6 +154,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=[
@@ -159,3 +163,14 @@ if __name__ == '__main__':
         stream=True,
     )
     arun(chat_for_image(None, request))
+
+    request = CompletionRequest(
+        model="gemini-2.5-flash-image-preview",
+        messages=[
+            {"role": "user", "content": "画条狗"}
+        ],
+        # stream=True,
+    )
+    api_key = "sk-MAZ6SELJVtGNX6jgIcZBKuttsRibaDlAskFAnR7WD6PBSN6M-openai"
+    base_url = "https://new.yunai.link/v1"
+    arun(chat_for_image(generate, request, api_key, base_url))

meutils/schemas/oneapi/_types.py

@@ -52,7 +52,7 @@ class ChannelInfo(BaseModel):
     access_token: str = ''
     openai_organization: str = ''
     test_model: str = ''
-    status: int = 1
+    status: int = 1  # 开启
     weight: int = 0
     created_time: int = Field(default_factory=lambda: int(time.time()))
     test_time: int = 0
@@ -85,11 +85,15 @@ class ChannelInfo(BaseModel):
 
     """参数覆盖"""
     param_override: Union[str, dict] = ''  # json
+    header_override: Union[str, dict] = ''  # json
     is_tools: bool = False
 
     # new
     max_input_tokens: int = 0
-    multi_key_mode: str = "random"
+
+    mode:Optional[Literal["multi_to_single"]] = None
+    multi_key_mode: Literal['random', 'polling'] = "polling"
+    key_mode: Optional[Literal['append', 'replace']] = None
 
     def __init__(self, /, **data: Any):
         super().__init__(**data)
@@ -113,6 +117,9 @@ class ChannelInfo(BaseModel):
         if isinstance(self.param_override, dict):
             self.param_override = json.dumps(self.param_override)
 
+        if isinstance(self.header_override, dict):
+            self.header_override = json.dumps(self.header_override)
+
         if isinstance(self.setting, dict):
             self.setting = json.dumps(self.setting)
 

meutils/schemas/oneapi/common.py

@@ -666,6 +666,9 @@ MODEL_RATIO = {
     "moonshotai/kimi-k2-instruct": 2,
     "kimi-k2-0711-preview": 2,
     "kimi-k2-turbo-preview": 2,
+    "kimi-k2-250711": 2,
+    "kimi-k2-250905": 2,
+    "kimi-k2-0905-preview": 2,
 
     # 智谱 https://www.bigmodel.cn/pricing
     'glm-4-9b-chat': 0.1,
@@ -710,6 +713,8 @@ MODEL_RATIO = {
     "qwen-max-latest": 1.2 * 1,
     "qwen2.5-max": 1.2 * 1,
     "qwen-max-2025-01-25": 1.2 * 1,
+    "qwen3-max": 3,
+    "qwen3-max-preview": 3,
 
     "qwen-vl-max-latest": 1.5,
     "qwen-vl-plus-latest": 0.75,
@@ -1256,6 +1261,9 @@ COMPLETION_RATIO = {
     "moonshotai/kimi-k2-instruct": 4,
     "kimi-k2-0711-preview": 4,
     "kimi-k2-turbo-preview": 4,
+    "kimi-k2-250711": 4,
+    "kimi-k2-250905": 4,
+    "kimi-k2-0905-preview": 4,
 
     "moonshot-v1-8k": 5,
     "moonshot-v1-32k": 4,
@@ -1452,6 +1460,9 @@ COMPLETION_RATIO = {
 
     "qwen-long": 4,
     "qwen-max": 4,
+    "qwen3-max": 4,
+    "qwen3-max-preview": 4,
+
     "qwen-vl-max-latest": 3,
     "qwen-vl-plus-latest": 3,
 

meutils/str_utils/__init__.py

@@ -10,7 +10,7 @@
 
 
 from meutils.pipe import *
-from meutils.str_utils.regular_expression import parse_url, parse_command_string
+from meutils.str_utils.regular_expression import parse_url, parse_command_string, parse_base64
 from meutils.request_utils.crawler import Crawler
 from urllib.parse import urlencode, parse_qs, parse_qsl, quote_plus, unquote_plus, urljoin
 

meutils/str_utils/regular_expression.py

@@ -114,6 +114,7 @@ def parse_url(text: str, for_image=False, fn: Optional[Callable] = None):
 def parse_url_from_json():
     pass
 
+
 def parse_command_string(command_str: str) -> dict:
     """
     解析一个类似 "prompt --key1 value1 --key2 value2" 格式的字符串。
@@ -188,6 +189,16 @@ def parse_command_string(command_str: str) -> dict:
     return result
 
 
+def parse_base64(text, pattern=r'!\[.*?\]\((.*?)\)'):
+    """
+    :param text:
+    :param pattern:
+        pattern=r'!\[.*?\]\((data:image/.*?)\)'
+    :return:
+    """
+    base64_strings = re.findall(pattern, text)
+    return base64_strings
+
 
 if __name__ == '__main__':
     # from urllib.parse import urlparse
@@ -258,7 +269,6 @@ https://i.miji.bid/2025/06/10/d018000aed9b872c7b248dccf14c4450.pngA
     """
     print(parse_url(text, for_image=True))
 
-
     # print(parse_url(text, for_image=False))
 
     # text = """https://photog.art/api/oss/R2yh8N Convert this portrait into a straight-on,front-facing ID-style headshot."""
@@ -266,4 +276,9 @@ https://i.miji.bid/2025/06/10/d018000aed9b872c7b248dccf14c4450.pngA
     #
     # valid_urls = parse_url(text, for_image=True)
 
-    print(mimetypes.guess_type("xx.ico"))
+    print(mimetypes.guess_type("xx.ico"))
+
+    text = "这是一个示例文本，包含一个图片：![image](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABAAAAAQACAIAAADwf7zUAAAgAElEQ) 这张图片很棒。"
+    # text = "这是一个示例文本，。"
+
+    print(parse_base64(text * 2))