MeUtils 2025.8.16.19.17.25__py3-none-any.whl → 2025.8.20.17.32.39__py3-none-any.whl

meutils/apis/siliconflow/images.py

@@ -9,6 +9,7 @@
 # @Description  :
 
 from openai import AsyncOpenAI
+from openai import APIStatusError
 
 from meutils.pipe import *
 from meutils.io.files_utils import to_base64, to_url
@@ -111,19 +112,30 @@ async def generate(request: ImageRequest, api_key: Optional[str] = None):
     data = to_openai_images_params(request)
     # logger.debug(data)
 
-    # 代理
-    http_client = None
-    if request.user == 'proxy':
-        http_client = httpx.AsyncClient(proxy=await get_one_proxy(), timeout=60)
-
-    client = AsyncOpenAI(base_url=BASE_URL, api_key=api_key, http_client=http_client, timeout=60)
-    response = await client.images.generate(**data)
-    response.model = ""
-    # logger.debug(response)
+    try:
+        client = AsyncOpenAI(base_url=BASE_URL, api_key=api_key)
+        response = await client.images.generate(**data)
+        # logger.debug(response)
+
+    except APIStatusError as e:
+        logger.debug(e)
+        # logger.debug(e.response.json())
+        # logger.debug(e.response.status_code)
+
+        if e.response.status_code > 403 and any(i in BASE_URL for i in {"siliconflow", "modelscope"}):
+            proxy = await get_one_proxy()
+            client = AsyncOpenAI(
+                base_url=BASE_URL,
+                api_key=api_key,
+                http_client=httpx.AsyncClient(proxy=proxy, timeout=100)
+            )
+            response = await client.images.generate(**data)
+        raise e
 
     # response.data[0].url = response.data[0].url.replace(r'\u0026', '&')
-    send_message(f"request: {request.model}\n{request.prompt}\nresponse: {response.data[0].url}",)
+    send_message(f"request: {request.model}\n{request.prompt}\nresponse: {response.data[0].url}", )
 
+    response.model = ""
     response.data[0].url = await to_url(response.data[0].url, content_type="image/png")
     if request.response_format == "b64_json":
         b64_json = await to_base64(response.data[0].url)
@@ -140,10 +152,11 @@ if __name__ == '__main__':
     from meutils.pipe import *
 
     data = {
-        # "model": "flux-schnell",
-        "model": "black-forest-labs/FLUX.1-Krea-dev",
+        "model": "flux-schnell",
+        # "model": "black-forest-labs/FLUX.1-Krea-dev",
 
-        "prompt": "(Chinese dragon soaring through the clouds).(majestic, colorful, mythical, powerful, ancient).(DSLR camera).(wide-angle lens).(dawn)(fantasy photography).(Kodak Ektar 100)",
+        "prompt": "a dog",
+        # "prompt": "(Chinese dragon soaring through the clouds).(majestic, colorful, mythical, powerful, ancient).(DSLR camera).(wide-angle lens).(dawn)(fantasy photography).(Kodak Ektar 100)",
         "negative_prompt": "",
         "n": 1,
         # "response_format": "url",
@@ -173,8 +186,11 @@ if __name__ == '__main__':
     # request = FluxImageRequest(model="flux", prompt="a dog", size="1024x1024", num_inference_steps=1)
     # request = FluxImageRequest(model="flux-pro", prompt="a dog", size="10x10", num_inference_steps=1)
 
-    data = {'model': 'black-forest-labs/FLUX.1-Krea-dev', 'prompt': '画一个2025年电脑如何一键重装系统win10教程详解的封面图', 'n': 1,
-            'size': '680x400'}
+    # data = {
+    #     'model': 'black-forest-labs/FLUX.1-Krea-dev',
+    #     'prompt': '画一个2025年电脑如何一键重装系统win10教程详解的封面图', 'n': 1,
+    #     'size': '1024x1024'
+    # }
     request = FluxImageRequest(**data)
 
     print(request)

meutils/data/VERSION

@@ -1 +1 @@
-2025.08.16.19.17.25
+2025.08.20.17.32.39

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,6 +40,18 @@ 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
+
     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")
@@ -65,7 +78,6 @@ async def chat_for_image(
     return chunks
 
 
-
 async def chat_for_video(
         get_task: Callable,  # response
         taskid: str,
@@ -100,7 +112,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/llm/openai_utils/common.py

@@ -27,7 +27,7 @@ from meutils.schemas.openai_types import chat_completion, chat_completion_chunk,
 
 from meutils.schemas.image_types import ImageRequest, ImageEditRequest
 
-token_encoder = tiktoken.get_encoding('cl100k_base')
+token_encoder = tiktoken.get_encoding('cl100k_base') # o200k_base
 token_encoder_with_cache = lru_cache(maxsize=1024)(token_encoder.encode)
 
 CHAT_COMPLETION_PARAMS = get_function_params()
@@ -320,4 +320,6 @@ if __name__ == '__main__':
     #
     # print(token_encoder.encode('hi'))
 
-    logger.debug(IMAGES_EDIT_PARAMS)
+    # logger.debug(IMAGES_EDIT_PARAMS)
+
+    print(token_encoder_with_cache('hi'))

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/request_utils/crawler.py

@@ -58,7 +58,13 @@ if __name__ == '__main__':
     url  = "https://chat.tune.app/?id=7f268d94-d2d4-4bd4-a732-f196aa20dceb"
     url = "https://app.yinxiang.com/fx/8b8bba1e-b254-40ff-81e1-fa3427429efe"
 
-    print(Crawler(url).xpath('//script//text()'))
+    # print(Crawler(url).xpath('//script//text()'))
+
+
+    url = "https://docs.bigmodel.cn/cn/guide/models/free"
+    print(Crawler(url).xpath('//*[@id="sidebar-group"]/li[8]//text()'))
+
+    # 'GLM-4.5-Flash', 'GLM-4.1V-Thinking-Flash', 'GLM-4-Flash-250414', 'GLM-4V-Flash', 'GLM-Z1-Flash', 'Cogview-3-Flash'
 
     # html_content = httpx.get(url).text
 

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())

meutils/schemas/oneapi/common.py

@@ -107,7 +107,7 @@ FAL_MODELS = {
 MODEL_PRICE = {
     **FAL_MODELS,
 
-    "qwen-image": 0.1,
+    "qwen-image": 0.05,
 
     "wan-ai-wan2.1-t2v-14b": 1,
     "wan-ai-wan2.1-t2v-14b-turbo": 1,
@@ -198,6 +198,7 @@ MODEL_PRICE = {
     "minimax-i2v-01_6s_720p": 1 * MINIMAX_VIDEO,
     "minimax-i2v-01-director_6s_720p": 1 * MINIMAX_VIDEO,
     "minimax-i2v-01-live_6s_720p": 1 * MINIMAX_VIDEO,
+
     "minimax-s2v-01_6s_720p": 1.5 * MINIMAX_VIDEO,
     "minimax-hailuo-02_6s_512p": 0.3 * MINIMAX_VIDEO,
     "minimax-hailuo-02_10s_512p": 0.5 * MINIMAX_VIDEO,