MeUtils 2025.4.8.20.33.43__py3-none-any.whl → 2025.4.11.17.25.15__py3-none-any.whl

meutils/apis/jimeng/images.py

@@ -33,7 +33,10 @@ from fake_useragent import UserAgent
 
 ua = UserAgent()
 
+VERSION = "3.1.5"
 
+
+#
 async def create_draft_content(request: ImageRequest, token: str):
     """
     创建草稿内容
@@ -44,7 +47,7 @@ async def create_draft_content(request: ImageRequest, token: str):
 
     request.model = MODELS_MAP.get(request.model, MODELS_MAP["default"])
 
-    height = width = 1360
+    height = width = 1328
     if 'x' in request.size:
         height, width = map(int, request.size.split('x'))
 
@@ -84,7 +87,9 @@ async def create_draft_content(request: ImageRequest, token: str):
                             "type": "",
                             "id": str(uuid.uuid4()),
                             "height": height,
-                            "width": width
+                            "width": width,
+
+                            # "resolution_type": "2k"
                         },
                     },
                     "ability_list": [
@@ -164,7 +169,9 @@ async def create_draft_content(request: ImageRequest, token: str):
                             "type": "",
                             "id": str(uuid.uuid4()),
                             "height": height,
-                            "width": width
+                            "width": width,
+
+                            "resolution_type": "1k"
                         }
                     },
                     "history_option": {
@@ -181,7 +188,7 @@ async def create_draft_content(request: ImageRequest, token: str):
         "min_version": "3.0.2",
         "min_features": [],
         "is_from_tsn": True,
-        "version": "3.0.8",
+        "version": VERSION,
         "main_component_id": main_component_id,
         "component_list": [component]
     }
@@ -191,8 +198,15 @@ async def create_draft_content(request: ImageRequest, token: str):
     return draft_content
 
 
+def key_builder(*args, **kwargs):
+    logger.debug(args)
+    logger.debug(kwargs)
+
+    return args[1].prompt
+
+
 @retrying()
-@rcache(ttl=30 * 24 * 3600, serializer="pickle", key_builder=lambda *args, **kwargs: args[1].prompt)
+@rcache(ttl=30 * 24 * 3600, serializer="pickle", key_builder=lambda *args, **kwargs: f"{args[1].seed} {args[1].prompt}")
 async def create_task(request: ImageRequest, token: Optional[str] = None):  # todo: 图片
     token = token or await get_next_token_for_polling(FEISHU_URL, check_token)
 
@@ -229,7 +243,21 @@ async def create_task(request: ImageRequest, token: Optional[str] = None):  # to
         data = response.json()
         logger.debug(bjson(data))
 
-    if task_id := (data.get("data") or {}).get("aigc_data", {}).get("history_record_id"):  # bug
+    # {
+    #     "ret": "1000",
+    #     "errmsg": "invalid parameter",
+    #     "systime": "1744354538",
+    #     "logid": "20250411145538E30D2FF8347A9A710F49",
+    #     "data": {
+    #         "aigc_data": null,
+    #         "fail_code": "",
+    #         "fail_starling_key": "",
+    #         "fail_starling_message": ""
+    #     }
+    # }
+
+    aigc_data = (data.get("data") or {}).get("aigc_data") or {}
+    if task_id := aigc_data.get("history_record_id"):  # bug
         return TaskResponse(task_id=task_id, system_fingerprint=token)
     else:
 
@@ -280,7 +308,7 @@ async def get_task(task_id, token):
         "status": 50,
         """
 
-        image_data = map(lambda x: x.get("image", {}).get("large_images"), item_list)
+        image_data = map(lambda x: x.get("image", {}).get("large_images", []), item_list)
 
         task_data = sum(image_data, []) | xmap_(lambda x: {"url": x.get("image_url")})
 
@@ -377,7 +405,12 @@ if __name__ == '__main__':
 
     # arun(generate(ImageRequest(prompt="fuck you")))
     prompt = "A plump Chinese beauty wearing a wedding  dress revealing her skirt and underwear is swinging on the swing,Happy smile,cleavage,Exposed thighs,Spread your legs open,Extend your leg,panties,upskirt,Barefoot,sole"
-    request = ImageRequest(prompt=prompt)
+    prompt = "a dog"
+    request = ImageRequest(prompt=prompt, size="1328x1328")
+    # request = ImageRequest(prompt=prompt, size="1024x1024")
+
+    # request = ImageRequest(prompt=prompt, size="2048*2048")
+
     # task = arun(create_task(ImageRequest(**data), token=token))
 
     # arun(get_task(task.task_id, task.system_fingerprint))

meutils/apis/search/metaso.py

@@ -110,7 +110,7 @@ async def create(request: Union[ChatCompletionRequest, CompletionRequest]):
         _, engine_type = request.model.split(':')
 
     model = None
-    if request.model.startswith(("meta", "deepseek")):
+    if request.model.startswith(("deepseek",)):
         model = "ds-r1"
         system_fingerprint = "deepseek-r1"
 
@@ -195,7 +195,7 @@ if __name__ == '__main__':
     request = ChatCompletionRequest(
         # model="deepseek-search",
         # model="deepseek-r1-search",
-        model="meta-deepresearch",
+        model="11meta-deepresearch",
         # model="ai-search",
         # model="ai-search:scholar",
         # model="ai-search-pro:scholar",

meutils/apis/siliconflow/images.py

@@ -25,8 +25,7 @@ from meutils.schemas.image_types import ImageRequest, FluxImageRequest, SDImageR
 FEISHU_URL = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=3aA5dH"
 FEISHU_URL_FREE = "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=xlvlrH"
 
-BASE_URL = os.getenv("SILICONFLOW_BASE_URL")
-# BASE_URL = "https://api.siliconflow.cn/v1"
+BASE_URL = "https://api.siliconflow.cn/v1"
 
 DEFAULT_MODEL = "black-forest-labs/FLUX.1-schnell"
 MODELS = {
@@ -116,6 +115,8 @@ async def generate(request: ImageRequest, api_key: Optional[str] = None):
     response = await client.images.generate(**data)
     response.model = ""
     logger.debug(response)
+
+    response.data[0].url = unquote(response.data[0].url or "")
     if request.response_format == "b64_json":
         b64_json = await to_base64(response.data[0].url)
 
@@ -162,7 +163,8 @@ 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': 'flux-schnell', 'prompt': '画一个2025年电脑如何一键重装系统win10教程详解的封面图', 'n': 1, 'size': '680x400'}
+    data = {'model': 'flux-schnell', 'prompt': '画一个2025年电脑如何一键重装系统win10教程详解的封面图', 'n': 1,
+            'size': '680x400'}
     request = FluxImageRequest(**data)
 
     print(request)

meutils/caches/acache.py

@@ -60,7 +60,7 @@ async def cached_fc(user_id, **kwargs):
 key_builder = lambda *args, **kwargs: args[1].prompt
 
 def key_builder(*args, **kwargs):
-    # print(args)
+    print(args)
     return args[1].prompt
 
 

meutils/common.py

@@ -68,6 +68,7 @@ from queue import Queue
 from pprint import pprint
 from abc import abstractmethod
 from dataclasses import dataclass
+from urllib.parse import unquote, unquote_plus, urlparse, urljoin
 from functools import reduce, lru_cache, partial
 
 from collections import Counter, OrderedDict

meutils/data/VERSION

@@ -1 +1 @@
-2025.04.08.20.33.43
+2025.04.11.17.25.15

meutils/decorators/catch.py

@@ -8,7 +8,6 @@
 # @Software     : PyCharm
 # @Description  :
 from meutils.pipe import *
-from meutils.log_utils import logger4wecom
 
 
 def wecom_hook(title='Task Done', text=None, hook_url=None):
@@ -30,12 +29,6 @@ def wecom_hook(title='Task Done', text=None, hook_url=None):
 
         logger.info(f"{title} done in {mins} m")
 
-        logger4wecom(
-            title=title,
-            text=f"**{wrapped.__name__}:** {r if text is None else text}\n耗时 {mins} m",
-            hook_url=hook_url
-        )
-
         return r
 
     return wrapper
@@ -54,7 +47,6 @@ def wecom_catch(hook_url=None, more_info=True):
             {info.strip()}
             ```
             """.strip()
-            logger4wecom(wrapped.__name__, text, hook_url)
 
     return wrapper
 

meutils/decorators/common.py

@@ -7,19 +7,20 @@
 # @WeChat       : 313303303
 # @Software     : PyCharm
 # @Description  :
-import importlib
 import os
 import sys
 import time
-from functools import wraps
-
+import wrapt
+import asyncio
+import inspect
 import schedule
 import threading
 import traceback
-import wrapt
+import importlib
 
 from loguru import logger
 from tqdm.auto import tqdm
+from functools import wraps
 from concurrent.futures import ThreadPoolExecutor, ProcessPoolExecutor
 from contextlib import contextmanager, asynccontextmanager
 from typing import *
@@ -148,14 +149,6 @@ def do_nothing(func, *args, **kwargs):
     return func(*args, **kwargs)
 
 
-@decorator
-def try_catch(func, is_trace=False, *args, **kwargs):
-    try:
-        return func(*args, **kwargs)
-    except Exception as e:
-        return {'error': traceback.format_exc().strip() if is_trace else e}
-
-
 @decorator
 def timeout(func, seconds=1, *args, **kwargs):
     future = ThreadPoolExecutor(1).submit(func, *args, **kwargs)
@@ -398,12 +391,64 @@ def limit(limit_value: str = '1/second', key_func: Callable[..., str] = None, er
     return inner
 
 
+def try_catch(
+        task: Optional[str] = None,
+        callback: Optional[Callable] = None,
+        is_trace: bool = False,
+):
+    from meutils.notice.feishu import send_message_for_try_catch
+
+    callback = callback or send_message_for_try_catch  # logger.error
+
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            task_name = task or f"{func.__module__}.{func.__name__}"
+
+            data = {
+                "task_name": task_name,
+                # "args": args,
+                # "kwargs": kwargs,
+                # "defined_args": inspect.getfullargspec(func).args,  # .varargs
+            }
+
+            logger.debug(data)
+
+            async def async_wrapper():
+                try:
+                    if asyncio.iscoroutinefunction(func):
+                        return await func(*args, **kwargs)
+                    else:
+                        return func(*args, **kwargs)
+                except Exception as e:
+
+                    if is_trace:
+                        error_msg = f"{task_name}:\n{traceback.format_exc()}"
+                    else:
+                        error_msg = f"{task_name}: {e}"
+
+                    data["error"] = error_msg
+                    callback(data)
+
+                    raise
+
+            if asyncio.iscoroutinefunction(func):
+                return async_wrapper()
+            else:
+                try:
+                    return asyncio.get_event_loop().run_until_complete(async_wrapper())
+                except RuntimeError:
+                    # 如果没有事件循环（例如在同步环境中），则直接运行
+                    return async_wrapper()
+
+        return wrapper
+
+    return decorator
 
 
 if __name__ == '__main__':
     import time
 
-
     # @timeout()
     # def ff():
     #     import time
@@ -476,11 +521,33 @@ if __name__ == '__main__':
     # while 1:
     #     pass
 
-    def f():
-        return 1 / 0
-        # return 1
+    # def f():
+    #     return 1 / 0
+    #     # return 1
+    #
+    #
+    # with tryer('try'):
+    #     a = f()
+    # print(a)
+
+    from meutils.pipe import *
+    from meutils.notice.feishu import send_message_for_try_catch
+
+
+    @try_catch(is_trace=False)
+    async def my_async_function(x=1, y=1):
+        # 您的异步函数代码
+        pass
+        1 / 0
 
 
-    with tryer('try'):
-        a = f()
-    print(a)
+    async def main():
+        await my_async_function(x=111, y=10000)
+
+
+    # @async_try_catch(task="Custom Task Name", fallback=some_fallback_function)
+    # async def another_async_function():
+    #     # 另一个异步函数的代码
+    #     pass
+
+    arun(main())

meutils/decorators/contextmanagers.py

@@ -9,6 +9,7 @@
 # @Description  :
 
 from meutils.pipe import *
+from meutils.notice.feishu import send_message_for_try_catch
 
 from contextlib import contextmanager, asynccontextmanager
 from concurrent.futures import ThreadPoolExecutor, as_completed, TimeoutError
@@ -53,12 +54,13 @@ async def atry_catcher(task="Task", fallback: Callable = None, is_trace: bool =
     except Exception as e:
         error = traceback.format_exc() if is_trace else e
         logger.error(f"{task}: {error}")
+
         if fallback:
             yield await fallback()
 
 
 @contextmanager
-def timeout_task_executor(timeout: float=3, max_workers: int = None):
+def timeout_task_executor(timeout: float = 3, max_workers: int = None):
     """
     一个上下文管理器，用于执行任务并设置超时时间。
     :param timeout: 超时时间（秒）。
@@ -85,6 +87,90 @@ def timeout_task_executor(timeout: float=3, max_workers: int = None):
         executor.shutdown(wait=False)  # 不等待未完成的任务，直接关闭
 
 
+@asynccontextmanager
+async def atry_catcher(task="Task", fallback: Callable = None, is_trace: bool = False):
+    try:
+        yield
+    except Exception as e:
+        error = traceback.format_exc() if is_trace else e
+        logger.error(f"{task}: {error}")
+        if fallback:
+            yield await fallback()
+
+
+@asynccontextmanager
+async def atry_catch(
+        task: Optional[str] = None,
+        callback: Optional[Callable] = None,
+        is_trace: bool = False,
+        **kwargs,
+):
+    callback = callback or send_message_for_try_catch
+
+    task_name = task or "Unnamed TryCatch Task"
+
+    data = {
+        "task_name": task_name,
+    }
+    for k, v in kwargs.items():
+        if isinstance(v, BaseModel):
+            v = v.model_dump(exclude_none=True)
+        data[k] = v
+
+    # logger.debug(data)
+
+    try:
+        yield
+    except Exception as e:
+        if is_trace:
+            error_msg = f"""{traceback.format_exc()}"""
+        else:
+            error_msg = f"{e}"
+
+        data["error"] = error_msg
+
+        callback(data)
+        raise
+
+
+@contextmanager
+def try_catch(
+        task: Optional[str] = None,
+        callback: Optional[Callable] = None,
+        is_trace: bool = False,
+        **kwargs,
+):
+    callback = callback or send_message_for_try_catch
+
+    task_name = task or "Unnamed TryCatch Task"
+
+    data = {
+        "task_name": task_name,
+    }
+    for k, v in kwargs.items():
+        if isinstance(v, BaseModel):
+            v = v.model_dump(exclude_none=True)
+        elif isinstance(v, typing.Mapping):
+            v = dict(v)
+
+        data[k] = v
+
+    logger.debug(data)
+
+    try:
+        yield
+    except Exception as e:
+        if is_trace:
+            error_msg = f"""{traceback.format_exc()}"""
+        else:
+            error_msg = f"{e}"
+
+        data["error"] = error_msg
+
+        callback(data)
+        raise e
+
+
 if __name__ == '__main__':
     # async def f():
     #     return 1/0
@@ -93,16 +179,19 @@ if __name__ == '__main__':
     # with try_catcher("test"):
     #     arun(f())
 
-    def example_task():
-        print("Starting task...")
-        time.sleep(4)  # 模拟耗时任务
-        print("Task completed!")
-        return "Done"
-
-
-    with timeout_task_executor(timeout=3) as execute:
-        try:
-            result = execute(example_task)
-            print(f"Task result: {result}")
-        except TimeoutError:
-            print("Task did not complete in time.")
+    # def example_task():
+    #     print("Starting task...")
+    #     time.sleep(4)  # 模拟耗时任务
+    #     print("Task completed!")
+    #     return "Done"
+    #
+    #
+    # with timeout_task_executor(timeout=3) as execute:
+    #     try:
+    #         result = execute(example_task)
+    #         print(f"Task result: {result}")
+    #     except TimeoutError:
+    #         print("Task did not complete in time.")
+
+    with try_catch("test"):
+        1 / 0

meutils/decorators/demo.py

@@ -7,26 +7,88 @@
 # @WeChat       : 313303303
 # @Software     : PyCharm
 # @Description  : 
+import asyncio
+import traceback
+from typing import Optional, Callable
+from contextlib import asynccontextmanager, contextmanager
 
+from meutils.notice.feishu import send_message_for_try_catch
 
-from meutils.decorators.feishu import *
 
-from meutils.decorators.retry import retrying
-import asyncio
+@asynccontextmanager
+async def atry_catch(
+        task: Optional[str] = None,
+        callback: Optional[Callable] = None,
+        is_trace: bool = False,
+):
+    callback = callback or send_message_for_try_catch
+
+    task_name = task or "Unnamed TryCatch Task"
+
+    data = {
+        "task_name": task_name,
+    }
+
+    # logger.debug(data)
+
+    try:
+        yield
+    except Exception as e:
+        if is_trace:
+            error_msg = f"""{task_name}:\n{traceback.format_exc()}"""
+        else:
+            error_msg = f"{task_name}: {e}"
+
+        data["error"] = error_msg
+
+        callback(data)
+        raise
+
 
-import openai
+@contextmanager
+def try_catch(
+        task: Optional[str] = None,
+        callback: Optional[Callable] = None,
+        is_trace: bool = False,
+):
+    callback = callback or send_message_for_try_catch
 
-@retrying
-async def my_coroutine_function():
-    # 在这里执行协程函数的逻辑
-    # 如果发生异常，tenacity将自动重试
-    await asyncio.sleep(1)
-    raise Exception("Something went wrong")
+    task_name = task or "Unnamed TryCatch Task"
+
+    data = {
+        "task_name": task_name,
+    }
+
+    # logger.debug(data)
 
-async def main():
     try:
-        await my_coroutine_function()
+        yield
     except Exception as e:
-        print(f"Exception: {e}")
+        if is_trace:
+            error_msg = f"""{task_name}:\n{traceback.format_exc()}"""
+        else:
+            error_msg = f"{task_name}: {e}"
+
+        data["error"] = error_msg
+
+        callback(data)
+        raise
+
+
+if __name__ == '__main__':
+    from meutils.pipe import *
+
+
+    async def f():
+        return 1
+
+
+    async def main():
+        # with atry_catch_context(task="test", is_trace=True):
+        #     1 / 0
+        with try_catch(task="test", is_trace=True):
+            logger.debug(await f())
+            1 / 0
+
 
-asyncio.run(main())
+    asyncio.run(main())

meutils/io/files_utils.py

@@ -50,7 +50,6 @@ def base64_to_bytes(base64_image_string):
 
 
 @retrying()
-@rcache(ttl=300, serializer='pickle')  # todo: UploadFile不一定兼容
 async def to_bytes(
         file: Union[UploadFile, str, bytes],
         headers: Optional[dict] = None
@@ -79,12 +78,12 @@ async def to_bytes(
             resp = await cilent.get(file)
             file_bytes = resp.content
 
-    elif isinstance(file, str) and len(file) > 256:  # base64
+    elif isinstance(file, str) and len(file) > 1024:  # base64
         logger.debug(f"FileType: BASE64")
 
         file_bytes = base64_to_bytes(file)
 
-    elif isinstance(file, str) and len(file) < 256 and Path(file).is_file():  # file
+    elif isinstance(file, str) and len(file) < 1024 and Path(file).is_file():  # file
         logger.debug(f"FileType: PATH")
 
         file_bytes = Path(file).read_bytes()

meutils/io/openai_files.py

@@ -50,13 +50,15 @@ async def delete_files(client, threshold: int = 666):
 
 
 @rcache(ttl=7 * 24 * 3600)
-async def _file_extract(file):
+async def file_extract(file):
     """
 
     :param file: url bytes path
     :return:
     """
     # url
+    if isinstance(file, list):
+        return await asyncio.gather(*map(file_extract, file))
 
     filename = Path(file).name if isinstance(file, str) else 'untitled'
     mime_type = guess_mime_type(file)
@@ -108,12 +110,14 @@ async def _file_extract(file):
     return data
 
 
-async def file_extract(files):
-    if isinstance(files, str):
-        return await _file_extract(files)
+# http://admin.ilovechatgpt.top/file/boshihouyanjiurenyuankaitipingshenbiaochugaofanyidocx_88256801.docx
 
-    tasks = [_file_extract(file) for file in files]
-    return await asyncio.gather(*tasks)
+# async def file_extract(files):
+#     if isinstance(files, str):
+#         return await _file_extract(files)
+#
+#     tasks = [_file_extract(file) for file in files]
+#     return await asyncio.gather(*tasks)
 
 
 # FileObject(id='1741136989_8dd96cbee6274251b7e4c9568779bd6a', bytes=82947, created_at=1741136989, filename='kling_watermark.png', object='file',  status=None, status_details=None)
@@ -153,6 +157,7 @@ if __name__ == '__main__':
         file = "http://admin.ilovechatgpt.top/file/yuzhicaizaibutongnianlingquntixiaofeixingweijishichangdiaochawenjuanweishanjianbanpptx_59787479.pptx"
         file = "https://oss.ffire.cc/files/百炼系列手机产品介绍.docx"
         # file = "https://app.yinxiang.com/fx/8b8bba1e-b254-40ff-81e1-fa3427429efe"
+        file = "http://admin.ilovechatgpt.top/file/boshihouyanjiurenyuankaitipingshenbiaochugaofanyidocx_88256801.docx"
 
         print(guess_mime_type(file))