MeUtils 2025.8.19.22.3.25__py3-none-any.whl → 2025.8.20.18.38.45__py3-none-any.whl

examples/_openaisdk/openai_ffire.py

@@ -14,39 +14,41 @@ from openai import OpenAI
 from openai import OpenAI, APIStatusError
 
 client = OpenAI(
-    base_url=os.getenv("FFIRE_BASE_URL"),
-    api_key=os.getenv("FFIRE_API_KEY") #+"-29463"
-)
-#
-# for i in range(1):
-#     try:
-#         completion = client.chat.completions.create(
-#             # model="kimi-k2-0711-preview",
-#             # model="deepseek-reasoner",
-#             # model="qwen3-235b-a22b-thinking-2507",
-#             model="qwen3-235b-a22b-instruct-2507",
-#
-#             messages=[
-#                 {"role": "user", "content": '你是谁'}
-#             ],
-#             # top_p=0.7,
-#             top_p=None,
-#             temperature=None,
-#             # stream=True,
-#             max_tokens=1000,
-#             extra_body={"xx": "xxxxxxxx"}
-#         )
-#         print(completion)
-#     except Exception as e:
-#         print(e)
+    # base_url=os.getenv("FFIRE_BASE_URL"),
+    # api_key=os.getenv("FFIRE_API_KEY") #+"-29463"
 
-model = "doubao-embedding-text-240715"
+    base_url="http://127.0.0.1:8000/v1",
 
-
-r = client.embeddings.create(
-    input='hi',
-    model=model
+    api_key="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImxhc3RfcGFzc3dvcmRfY2hhbmdlIjoxNzUwNjYwODczLCJleHAiOjE3NTgxNTc1Njh9.eihH3NVrzJCg9bdWb9mim9rGKTLKn1a66kW2Cqc0uPM"
 )
-print(r)
+#
+for i in range(1):
+    try:
+        completion = client.chat.completions.create(
+            # model="kimi-k2-0711-preview",
+            # model="deepseek-reasoner",
+            # model="qwen3-235b-a22b-thinking-2507",
+            # model="qwen3-235b-a22b-instruct-2507",
+            model="qwen-image",
 
+            messages=[
+                {"role": "user", "content": 'a cat'}
+            ],
+            # top_p=0.7,
+            top_p=None,
+            temperature=None,
+            # stream=True,
+            max_tokens=1000,
+            extra_body={"xx": "xxxxxxxx"}
+        )
+        print(completion)
+    except Exception as e:
+        print(e)
 
+# model = "doubao-embedding-text-240715"
+#
+# r = client.embeddings.create(
+#     input='hi',
+#     model=model
+# )
+# print(r)

examples/_openaisdk/openai_images.py

@@ -152,7 +152,9 @@ with timer('image'):
         # base_url="https://oneapi.chatfire.cn/v1",
 
         base_url=os.getenv("MODELSCOPE_BASE_URL"),
-        api_key=os.getenv("MODELSCOPE_API_KEY")
+        api_key=os.getenv("MODELSCOPE_API_KEY"),
+
+        # default_query=
 
     )
 
@@ -209,7 +211,7 @@ with timer('image'):
     response = client.images.generate(
         model=model,
         prompt=prompt,
-        # response_format="b64_json",
+        response_format="url",
         # extra_body={
         #     "Style": "True",
         #     "controls": {}, ######### 这个看起来更通用些
@@ -222,6 +224,10 @@ with timer('image'):
 
         # size="1700x1275",
 
+        extra_headers={"X-ModelScope-Async-Mode": "false"},
+
+
+
         extra_body={
             "extra_fields": {
 

meutils/apis/chatglm/glm_video_api.py

@@ -7,11 +7,13 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
+import httpx
 
 from meutils.pipe import *
 from meutils.decorators.retry import retrying
 from meutils.notice.feishu import send_message as _send_message
 from meutils.config_utils.lark_utils import get_next_token_for_polling
+from meutils.apis.proxy.kdlapi import get_one_proxy
 
 from meutils.schemas.video_types import VideoRequest
 from meutils.schemas.image_types import ImageRequest, ImagesResponse
@@ -33,7 +35,12 @@ FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?shee
 async def create_task(request: VideoRequest, api_key: Optional[str] = None):
     api_key = api_key or await get_next_token_for_polling(FEISHU_URL, from_redis=False)
 
-    client = ZhipuAI(api_key=api_key)  # 请填写您自己的APIKey
+    proxy = await get_one_proxy()
+    client = ZhipuAI(
+        api_key=api_key,
+        http_client=httpx.Client(proxy=proxy)
+
+    )  # 请填写您自己的APIKey
     response = client.videos.generations(
         model=request.model,
         prompt=request.prompt,
@@ -102,15 +109,15 @@ async def generate(request: ImageRequest, n: int = 30):  # 兼容dalle3
 
 # VideoResult
 if __name__ == '__main__':
-    api_key = "a7eb02770d1a41be95ba0b82f651e761.gHEXdCbRLadIwKtI"
+    api_key = "f0a6177640364388a6d5d82428ee93b7.2woWPO0QdF3aWbVZ"
 
-    ""
+    # api_key = "c98aa404b0224690b211c5d1e420db2c.qGaByuJATne08QUx"
     # api_key = "7d10426c06afa81e8d7401d97781249c.DbqlSsicRtaUdKXI"  # 新号
     # api_key = "e21bd630f681c4d90b390cd609720483.WSFVgA3Kk1wNCX0mN"
 
     request = VideoRequest(
         # model='cogvideox-flash',
-        model='cogvideox'
+        model='cogvideox-3'
 
     )
     r = arun(create_task(request, api_key=api_key))
@@ -119,4 +126,3 @@ if __name__ == '__main__':
     # request = ImageRequest(prompt="https://oss.ffire.cc/files/kling_watermark.png 让这个女人笑起来")
     #
     # arun(generate(request, n=30))
-

meutils/apis/images/generations.py

@@ -18,6 +18,7 @@ from meutils.apis.fal.images import generate as fal_generate
 
 from meutils.apis.gitee.image_to_3d import generate as image_to_3d_generate
 from meutils.apis.gitee.openai_images import generate as gitee_images_generate
+from meutils.apis.qwen.chat import Completions as QwenCompletions
 
 
 async def generate(
@@ -38,6 +39,11 @@ async def generate(
     if request.model in {"Qwen-Image", "FLUX_1-Krea-dev"}:
         return await gitee_images_generate(request, api_key)
 
+    if request.model.startswith("qwen-image"):
+        return await QwenCompletions(api_key=api_key).generate(request)
+
+
+
 
 # "flux.1-krea-dev"
 

meutils/apis/models.py

@@ -38,10 +38,15 @@ def make_billing_model(model: str, request: dict):
 
     elif _model.startswith(("minimax")):
         # MiniMax-Hailuo-02 T2V-01-Director I2V-01-Director S2V-01 I2V-01-live I2V-01 T2V-01
+
         duration = request.get("duration", 6)
         resolution = request.get("resolution", "720P")
         model = request.get("model", "").lower()
 
+        if "01" in model:
+            duration = 6
+            resolution = "720P"
+
         if model.startswith("minimax"):  # 02
             resolution = request.get("resolution", "768P")
 

meutils/apis/proxy/kdlapi.py

@@ -62,6 +62,6 @@ if __name__ == '__main__':
         loop.run_until_complete(asyncio.wait(tasks))
 
 
-    run()
+    # run()
 
-    # arun(get_one_proxy())
+    arun(get_one_proxy())

meutils/apis/qwen/chat.py

@@ -13,15 +13,16 @@ from openai import AsyncOpenAI, OpenAI, AsyncStream
 
 from meutils.pipe import *
 from meutils.decorators.retry import retrying
-# from meutils.oss.ali_oss import qwenai_upload
-from meutils.io.files_utils import to_bytes, guess_mime_type
+from meutils.oss.ali_oss import qwenai_upload
+from meutils.io.files_utils import to_bytes, guess_mime_type, to_url
 from meutils.caches import rcache
 
 from meutils.llm.openai_utils import to_openai_params, create_chat_completion_chunk, token_encoder
 
 from meutils.config_utils.lark_utils import get_next_token_for_polling
 from meutils.schemas.openai_types import chat_completion, chat_completion_chunk, CompletionRequest, CompletionUsage, \
-    ChatCompletion
+    ChatCompletion, Choice, ChatCompletionMessage
+from meutils.schemas.image_types import ImageRequest, ImagesResponse
 
 FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=PP1PGr"
 
@@ -46,8 +47,43 @@ class Completions(object):
     def __init__(self, api_key: Optional[str] = None):
         self.api_key = api_key
 
-    async def create(self, request: CompletionRequest, api_key: Optional[str] = None, cookie: Optional[str] = None):
-        api_key = api_key or await get_next_token_for_polling(FEISHU_URL)
+    async def generate(self, request: ImageRequest, **kwargs):
+
+        if request.image and not request.image.startswith("http"):
+            request.image = await to_url(request.image, content_type="image/png")
+
+        _ = CompletionRequest(
+            model="qwen-image",
+            stream=True,
+            messages=[
+                {
+                    "role": "user",
+                    "content": [
+                        {"type": "text", "text": request.prompt},
+
+                        {
+                            "type": "image_url",
+                            "image_url": {
+                                "url": request.image
+                            }
+                        }
+
+                    ],
+
+                }
+            ],
+            size=request.aspect_ratio
+        )
+
+        async for chunk in await self.create(_):
+            logger.debug(chunk)
+            if chunk.choices and (url := chunk.choices[0].delta.content):
+                return ImagesResponse(data=[{"url": url}])
+
+        raise Exception("qwen-image 生成失败, 请重试")
+
+    async def create(self, request: CompletionRequest, cookie: Optional[str] = None):
+        api_key = self.api_key or await get_next_token_for_polling(FEISHU_URL)
 
         self.client = AsyncOpenAI(
             base_url=base_url,
@@ -60,33 +96,28 @@ class Completions(object):
 
         chat_id = await self.create_new_chat()
 
+        # request.last_user_content
+        # request.last_urls.get("image_url", [])
 
         payload = {
             "chat_id": chat_id,
+            "stream": request.stream,
             "incremental_output": True,
             "chat_mode": "normal",
             "model": "qwen3-235b-a22b",
             "messages": [
                 {
                     "role": "user",
-                    "content": "这只熊拿着五彩画板和画笔，站在画板前画画。",
+                    "content": request.last_user_content,
 
-                    "user_action": "recommendation",
-                    "files": [
-                        {
-                            "type": "image",
-                            "name": "example.png",
-                            "file_type": "image",
-                            "showType": "image",
-                            "file_class": "vision",
-                            "url": "https://img.alicdn.com/imgextra/i2/O1CN0137EBmZ276dnmyY0kx_!!6000000007748-2-tps-1024-1024.png"
-                        }
-                    ],
+                    "user_action": "chat",
+                    "files": [],
                     "models": [
                         "qwen3-235b-a22b"
                     ],
-                    # "chat_type": "t2t",
-                    "chat_type": "image_edit",
+                    "chat_type": "t2t",
+                    # "chat_type": "t2i",
+                    # "chat_type": "image_edit",
 
                     "feature_config": {
                         "thinking_enabled": request.enable_thinking or False,
@@ -98,20 +129,45 @@ class Completions(object):
                         }
                     }
                 }
-            ]
+            ],
+            "size": request.size if hasattr(request, "size") else "1:1"
         }
 
-        payload = {**request.model_dump(), **payload}
+        if request.model.startswith("qwen-image"):
+            payload["messages"][0]["chat_type"] = "t2i"
+            if image_urls := request.last_urls.get("image_url"):
+                payload["messages"][0]["chat_type"] = "image_edit"
+                payload["messages"][0]["files"] = [
+                    {
+                        "type": "image",
+                        "name": "example.png",
+                        "file_type": "image",
+                        "showType": "image",
+                        "file_class": "vision",
+                        "url": image_urls[-1]  # todo 阿里对象存储
+                    }
+                ]
 
         data = to_openai_params(payload)
+        logger.debug(bjson(data))
         response = await self.client.chat.completions.create(**data, extra_query={"chat_id": chat_id})
         # response = self.do_response(response)
 
-        if isinstance(response, AsyncStream):
-            async for i in response:
-                print(i)
+        if isinstance(response, AsyncStream):  # image
+            # async def gen():
+            #     async for chunk in response:
+            #         if url := chunk.choices[0].delta.content:
+            #             yield f"[]{url}"
+
+            return response
 
         else:
+            logger.debug(response)
+
+            if hasattr(response, "data") and (choices := response.data.get("choices")):
+                response = response.model_construct(choices=choices)
+                logger.debug(response)
+
             prompt_tokens = len(token_encoder.encode(str(request.messages)))
             completion_tokens = len(token_encoder.encode(str(response.choices[0].message.content)))
             usage = {
@@ -120,12 +176,9 @@ class Completions(object):
                 "total_tokens": prompt_tokens + completion_tokens
             }
             response.usage = usage
-            print(response)
-
-        # return response
+            return response
 
     async def create_new_chat(self):
-
         payload = {
             "title": "新建对话",
             "models": [DEFAUL_MODEL],
@@ -141,20 +194,40 @@ class Completions(object):
 if __name__ == '__main__':
     token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjMxMGNiZGFmLTM3NTQtNDYxYy1hM2ZmLTllYzgwMDUzMjljOSIsImxhc3RfcGFzc3dvcmRfY2hhbmdlIjoxNzUwNjYwODczLCJleHAiOjE3NTgxNTc1Njh9.eihH3NVrzJCg9bdWb9mim9rGKTLKn1a66kW2Cqc0uPM"
     request = CompletionRequest(
-        model="qwen3-235b-a22b",
+        # model="qwen3-235b-a22b",
+        model="qwen-image",
+
         messages=[
 
             {
                 "role": "user",
-                # "content": [{"type": "text", "text": "周杰伦"}],
-                "content": "这只熊拿着五彩画板和画笔，站在画板前画画。",
+                "content": [
+                    {"type": "text", "text": "带个墨镜"},
+
+                    {
+                        "type": "image_url",
+                        "image_url": {
+                            "url": "https://oss.ffire.cc/files/kling_watermark.png"
+                        }
+                    }
+
+                ],
 
             }
         ],
         stream=True,
 
-        enable_thinking=True
+        enable_thinking=True,
+
+        size="16:9"
 
     )
 
-    arun(Completions().create(request, token))
+    # arun(Completions(api_key=token).create(request))
+
+    request = ImageRequest(
+        model="qwen-image",
+        prompt="带个墨镜",
+        image = "https://oss.ffire.cc/files/kling_watermark.png"
+    )
+    arun(Completions(api_key=token).generate(request))

meutils/data/VERSION

@@ -1 +1 @@
-2025.08.19.22.03.25
+2025.08.20.18.38.45

meutils/llm/check_utils.py

@@ -286,7 +286,7 @@ async def check_token_for_zhipu(api_key, threshold: float = 1, resource_package_
     try:
         client = AsyncOpenAI(base_url="https://bigmodel.cn/api/biz/tokenAccounts/list", api_key=api_key)
         data = await client.get("", cast_to=object)
-        logger.debug(bjson(data))
+        # logger.debug(bjson(data))
 
         if resource_package_name:
             # print(str(data))
@@ -298,8 +298,8 @@ async def check_token_for_zhipu(api_key, threshold: float = 1, resource_package_
             # "resourcePackageName": "【新用户专享】200万GLM-Z1-Air推理资源包",
             # "resourcePackageName": "【新用户专享】30次Vidu系列视频生成次包",
             for d in data["rows"]:
-                if resource_package_name.lower() in d["resourcePackageName"].lower():
-                    # logger.debug(bjson(d))
+                if resource_package_name.lower() in d["resourcePackageName"].lower() and d['status'] != "EXPIRED":
+                    logger.debug(bjson(d))
                     return d["tokenBalance"] >= threshold
         else:
             logger.debug(bjson(data))

meutils/llm/openai_utils/adapters.py

@@ -7,12 +7,13 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
-import json
+from aiostream import stream
 
 from meutils.pipe import *
 from meutils.io.files_utils import to_url, to_url_fal
 from meutils.str_utils.json_utils import json_path
-from meutils.schemas.openai_types import CompletionRequest
+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.llm.openai_utils import chat_completion, chat_completion_chunk, create_chat_completion_chunk
 
@@ -39,14 +40,31 @@ async def chat_for_image(
         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 request.last_urls:  # image_url
-        urls = await to_url_fal(request.last_urls["image_url"], content_type="image/png")
-        prompt = "\n".join(urls + [prompt])
+        if request.model.startswith('fal'):
+            urls = await to_url_fal(request.last_urls["image_url"], content_type="image/png")  # 国外友好
+            prompt = "\n".join(urls + [prompt])
+        else:
+            urls = await to_url(request.last_urls["image_url"], content_type="image/png")
+            image = urls[-1]
 
     request = ImageRequest(
         model=request.model,
         prompt=prompt,
+        image=image
     )
 
     future_task = asyncio.create_task(generate(request))  # 异步执行
@@ -65,7 +83,6 @@ async def chat_for_image(
     return chunks
 
 
-
 async def chat_for_video(
         get_task: Callable,  # response
         taskid: str,
@@ -100,7 +117,7 @@ async def chat_for_video(
             else:
                 yield "🚀"
 
-    chunks = create_chat_completion_chunk(gen())
+    chunks = create_chat_completion_chunk(gen(), chat_id=taskid)
     return chunks
 
 

meutils/math_utils/common.py

@@ -36,6 +36,8 @@ def calculate_min_resolution(w, h):
 
 
 def size2aspect_ratio(size):
+    if not size: return "1:1"
+
     if 'x' in size:
         w, h = size.split('x')
         w, h = calculate_min_resolution(w, h)
@@ -49,3 +51,4 @@ if __name__ == '__main__':
     print(size2aspect_ratio("1920x1080"))
     print(size2aspect_ratio("1920:1080"))
     print(size2aspect_ratio("1024x1024"))
+    print(size2aspect_ratio("16:9"))

meutils/oss/ali_oss.py

@@ -11,6 +11,7 @@
 import oss2
 
 from meutils.pipe import *
+from meutils.caches import rcache
 from meutils.io.files_utils import guess_mime_type
 from meutils.config_utils.lark_utils import get_next_token_for_polling
 
@@ -32,11 +33,10 @@ url = "https://chat.qwen.ai/api/v1/files/getstsToken"
 
 
 async def get_sts_token(filename, filetype: Optional[str] = None, token: Optional[str] = None):
-    token = token or await get_next_token_for_polling(feishu_url=FEISHU_URL, from_redis=True)
+    token = token or await get_next_token_for_polling(feishu_url=FEISHU_URL)
 
     filetype = filetype or guess_mime_type(filename).split('/')[0]
 
-
     payload = {
         "filename": filename,
         "filetype": filetype,  # file video audio
@@ -52,8 +52,8 @@ async def get_sts_token(filename, filetype: Optional[str] = None, token: Optiona
     return response.json()
 
 
-async def qwenai_upload(file, filetype: Optional[str] = None):  # todo: 自动猜测类型
-    params = await get_sts_token(file_name, filetype)
+async def qwenai_upload(file, filetype: Optional[str] = None, token: Optional[str] = None):  # todo: 自动猜测类型
+    params = await get_sts_token(file_name, filetype, token)
 
     access_key_id = params['access_key_id']
     access_key_secret = params['access_key_secret']
@@ -87,4 +87,3 @@ if __name__ == '__main__':
 
     # arun(get_sts_token(file_name))
     file_url = arun(qwenai_upload(file_name))
-

meutils/schemas/image_types.py

@@ -108,7 +108,7 @@ class ImageRequest(BaseModel):  # openai
     guidance: Optional[float] = None
     steps: Optional[int] = None
 
-    controls: Optional[dict] = None # 额外参数
+    controls: Optional[dict] = None  # 额外参数
 
     safety_tolerance: Optional[int] = None
 
@@ -116,6 +116,9 @@ class ImageRequest(BaseModel):  # openai
 
     user: Optional[str] = None  # to_url_fal
 
+    image: Optional[str] = None  # url b64
+    watermark: Optional[bool] = None
+
     def __init__(self, /, **data: Any):
         super().__init__(**data)
 
@@ -618,4 +621,4 @@ if __name__ == '__main__':
 
     r = ImageRequest(**data)
 
-    print(ImagesResponse())
+    # print(ImagesResponse())