MeUtils 2025.4.9.10.39.6__py3-none-any.whl → 2025.4.11.17.37.3__py3-none-any.whl

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

meutils/llm/check_utils.py

@@ -130,6 +130,25 @@ async def check_token_for_moonshot(api_key, threshold: float = 0):
         return False
 
 
+@retrying()
+async def check_token_for_gemini(api_key):
+    if not isinstance(api_key, str):
+        return await check_tokens(api_key, check_token_for_gemini)
+    try:
+        client = AsyncOpenAI(
+            api_key=api_key,
+            base_url=os.getenv("GOOGLE_BASE_URL"),
+        )
+        await client.models.list()
+        return True
+    except TimeoutException as e:
+        raise
+
+    except Exception as e:
+        logger.error(f"Error: {e}\n{api_key}")
+        return False
+
+
 if __name__ == '__main__':
     from meutils.config_utils.lark_utils import get_next_token_for_polling
 
@@ -149,4 +168,4 @@ if __name__ == '__main__':
     arun(check_token_for_siliconflow("sk-vpeietyomqjvizlzfuztzthggcqvutowgbmhjggsmwuhsomg"))
     "https://xchatllm.feishu.cn/sheets/Bmjtst2f6hfMqFttbhLcdfRJnNf?sheet=79272d"
 
-    # arun(check_token_for_moonshot("sk-Qnr87vtf2Q6MEfc2mVNkVZ4qaoZg3smH9527I25QgcFe7HrT"))
+    # arun(check_token_for_moonshot("sk-Qnr87vtf2Q6MEfc2mVNkVZ4qaoZg3smH9527I25QgcFe7HrT"))

meutils/llm/openai_polling/__init__.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : __init__.py
+# @Time         : 2025/4/9 11:23
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+from meutils.pipe import *

meutils/llm/openai_polling/chat.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : chat
+# @Time         : 2025/4/10 16:06
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  :
+
+from meutils.pipe import *
+from meutils.llm.clients import AsyncOpenAI
+from meutils.llm.openai_utils import to_openai_params
+
+from meutils.schemas.openai_types import CompletionRequest
+
+
+class Completions(object):
+
+    def __init__(self, base_url: Optional[str] = None, api_key: Optional[str] = None):
+        self.client = AsyncOpenAI(base_url=base_url, api_key=api_key)
+
+    async def create(self, request: CompletionRequest):
+        data = to_openai_params(request)
+        if 'gemini' in request.model:
+            data.pop("seed", None)
+            data.pop("presence_penalty", None)
+            data.pop("frequency_penalty", None)
+            data.pop("extra_body", None)
+
+        return await self.client.chat.completions.create(**data)
+
+
+if __name__ == '__main__':
+    # 测试
+
+    request = CompletionRequest(
+        model="gpt-4o-mini",
+        messages=[
+            {"role": "system", "content": "你是一个助手"},
+            {"role": "user", "content": "你好"}
+        ],
+        stream=False
+    )
+    arun(Completions().create(request))

meutils/{apis/google_apis → llm/openai_polling}/images.py

@@ -2,10 +2,12 @@
 # -*- coding: utf-8 -*-
 # @Project      : AI.  @by PyCharm
 # @File         : images
-# @Time         : 2025/4/7 13:07
+# @Time         : 2025/4/10 16:07
 # @Author       : betterme
 # @WeChat       : meutils
 # @Software     : PyCharm
-# @Description  : D3
+# @Description  : 
 
 from meutils.pipe import *
+
+

meutils/llm/openai_utils/common.py

@@ -193,7 +193,7 @@ async def create_chat_completion_chunk(
             Iterator[Union[str, ChatCompletionChunk]],
             AsyncIterator[Union[str, ChatCompletionChunk]]
         ],
-        redirect_model: str = ' ',
+        redirect_model: str = ' ',  # todo: response_model
         chat_id: Optional[str] = None
 ):
     """ todo： 替换 前缀

meutils/notice/feishu.py

@@ -108,8 +108,11 @@ def catch(
 send_message_for_images = partial(send_message, url=IMAGES)
 send_message_for_kling = partial(send_message, url=KLING)
 
-httpexception_feishu_url = "https://open.feishu.cn/open-apis/bot/v2/hook/d1c7b67d-b0f8-4067-a2f5-109f20eeb696"
-send_message_for_httpexception = partial(send_message, url=httpexception_feishu_url)
+http_feishu_url = "https://open.feishu.cn/open-apis/bot/v2/hook/d1c7b67d-b0f8-4067-a2f5-109f20eeb696"
+send_message_for_http = partial(send_message, url=http_feishu_url)
+
+try_catch_feishu_url = "https://open.feishu.cn/open-apis/bot/v2/hook/887fe4d3-8bcd-4cfb-bac9-62f776091ca2"
+send_message_for_try_catch = partial(send_message, url=try_catch_feishu_url)
 
 if __name__ == '__main__':
     # send_message("xxx", title=None)

meutils/schemas/image_types.py

@@ -9,6 +9,7 @@
 # @Description  : todo: 通用比例适配
 
 from meutils.pipe import *
+from meutils.str_utils.regular_expression import parse_url
 
 from pydantic import constr
 from openai.types import ImagesResponse as _ImagesResponse, Image
@@ -43,7 +44,7 @@ ASPECT_RATIOS = {
 class ImagesResponse(_ImagesResponse):
     created: int = Field(default_factory=lambda: int(time.time()))
 
-    data: Optional[List[Union[Image, dict]]] = None
+    data: Optional[List[Union[Image, dict]]] = []
 
     image: Optional[Union[str, List[str]]] = None
 
@@ -99,6 +100,20 @@ class ImageRequest(BaseModel):  # openai
         if self.size:
             self.size = self.size if 'x' in self.size else '512x512'
 
+    @cached_property
+    def image_and_prompt(self):  # image prompt 目前是单图
+        if self.prompt.startswith('http') and (prompts := self.prompt.split(maxsplit=1)):
+            if len(prompts) == 2:
+                return prompts
+            else:
+                return prompts + [' ']
+
+        elif "http" in self.prompt and (images := parse_url(self.prompt)):
+            return images[0], self.prompt.replace(images[0], "")
+
+        else:
+            return None, self.prompt
+
     class Config:
         extra = "allow"
 
@@ -502,5 +517,13 @@ if __name__ == '__main__':
 
     # print(ImagesResponse(data=[{'url': 1}]))
 
-    print(RecraftImageRequest(prompt="").model_dump_json())
-    print(RecraftImageRequest(prompt=""))
+    # print(RecraftImageRequest(prompt="").model_dump_json())
+    # print(RecraftImageRequest(prompt=""))
+
+    prompt = "https://oss.ffire.cc/files/kling_watermark.png 带个眼镜"
+    # prompt = "带个眼镜 https://oss.ffire.cc/files/kling_watermark.png"
+    prompt = "https://oss.ffire.cc/files/kling_watermark.png"
+    prompt = "画条狗"
+
+    request = ImageRequest(prompt=prompt)
+    print(request.image_and_prompt)