MeUtils 2024.12.5.15.58.45__py3-none-any.whl → 2024.12.5.17.36.18__py3-none-any.whl

{MeUtils-2024.12.5.15.58.45.dist-info → MeUtils-2024.12.5.17.36.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.5.15.58.45
+Version: 2024.12.5.17.36.18
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -61,42 +61,42 @@ Requires-Dist: sse-starlette ; extra == 'ai'
 Requires-Dist: openai ; extra == 'ai'
 Requires-Dist: langchain ; extra == 'ai'
 Provides-Extra: all
-Requires-Dist: pretty-errors ; extra == 'all'
-Requires-Dist: streamlit ; extra == 'all'
-Requires-Dist: pymupd ; extra == 'all'
-Requires-Dist: jieba ; extra == 'all'
-Requires-Dist: jinja2 ; extra == 'all'
+Requires-Dist: openai ; extra == 'all'
 Requires-Dist: geopy ; extra == 'all'
-Requires-Dist: sqlalchemy ; extra == 'all'
-Requires-Dist: seaborn ; extra == 'all'
+Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
 Requires-Dist: pymilvus ; extra == 'all'
-Requires-Dist: pandas-summary ; extra == 'all'
-Requires-Dist: polars ; extra == 'all'
-Requires-Dist: simplejson ; extra == 'all'
-Requires-Dist: thriftpy2 ; extra == 'all'
-Requires-Dist: gunicorn ; extra == 'all'
-Requires-Dist: redis-py-cluster ; extra == 'all'
-Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: iteration-utilities ; extra == 'all'
+Requires-Dist: pymupd ; extra == 'all'
+Requires-Dist: thefuck ; extra == 'all'
 Requires-Dist: uvicorn ; extra == 'all'
-Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
+Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: jmespath ; extra == 'all'
 Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: fastapi ; extra == 'all'
-Requires-Dist: iteration-utilities ; extra == 'all'
-Requires-Dist: openai ; extra == 'all'
-Requires-Dist: fastapi[all] ; extra == 'all'
-Requires-Dist: cachetools ; extra == 'all'
-Requires-Dist: filetype ; extra == 'all'
-Requires-Dist: sse-starlette ; extra == 'all'
-Requires-Dist: pymysql ; extra == 'all'
+Requires-Dist: sqlalchemy ; extra == 'all'
 Requires-Dist: missingno ; extra == 'all'
+Requires-Dist: gunicorn ; extra == 'all'
+Requires-Dist: polars ; extra == 'all'
+Requires-Dist: jieba ; extra == 'all'
+Requires-Dist: fastapi[all] ; extra == 'all'
+Requires-Dist: asyncmy ; extra == 'all'
+Requires-Dist: pyarrow ; extra == 'all'
+Requires-Dist: streamlit ; extra == 'all'
 Requires-Dist: reportlab ; extra == 'all'
+Requires-Dist: fastapi ; extra == 'all'
 Requires-Dist: dataframe-image ; extra == 'all'
+Requires-Dist: pandas-summary ; extra == 'all'
+Requires-Dist: pymysql ; extra == 'all'
+Requires-Dist: simplejson ; extra == 'all'
+Requires-Dist: seaborn ; extra == 'all'
+Requires-Dist: thriftpy2 ; extra == 'all'
+Requires-Dist: redis-py-cluster ; extra == 'all'
 Requires-Dist: pymongo ; extra == 'all'
+Requires-Dist: pretty-errors ; extra == 'all'
+Requires-Dist: sse-starlette ; extra == 'all'
+Requires-Dist: jinja2 ; extra == 'all'
+Requires-Dist: cachetools ; extra == 'all'
+Requires-Dist: filetype ; extra == 'all'
 Requires-Dist: schedule ; extra == 'all'
-Requires-Dist: pyarrow ; extra == 'all'
-Requires-Dist: asyncmy ; extra == 'all'
-Requires-Dist: jmespath ; extra == 'all'
-Requires-Dist: thefuck ; extra == 'all'
 Provides-Extra: ann
 Requires-Dist: pymilvus ; extra == 'ann'
 Requires-Dist: faiss-cpu ; extra == 'ann'

{MeUtils-2024.12.5.15.58.45.dist-info → MeUtils-2024.12.5.17.36.18.dist-info}/RECORD

@@ -295,7 +295,7 @@ meutils/apis/kuaidi.py,sha256=4KrtOkbGlsLpyvbY80UMSo03iFqFiBHnE0CiqAWWQ4Y,998
 meutils/apis/llm_qa.py,sha256=XM1VMkOTb4xKzgVk56dPC1e8lg7SbnfobBVgfLXiX9A,1207
 meutils/apis/niutrans.py,sha256=weWjn-tUTEaAUe5RGbzcjQqPkJxGDrPwMB6CnaiZSsg,1682
 meutils/apis/search_music.py,sha256=HBLtdterztrccnLAPZrWBlrYSx4WCRflCqz-V30fOA8,972
-meutils/apis/textin.py,sha256=jJC84Ca17bYF8VZU7IXkd7754EWgPJK-tgl1V59BraU,4811
+meutils/apis/textin.py,sha256=6j0aBxhgpFfduGI13Rw9Lmd3d7a631XqopA9eDrNDX8,4867
 meutils/apis/ts.py,sha256=Q13EOS9Q-Y2-KwOG_cFMVmGj9RUmDtxk5A3E27dxbN0,1511
 meutils/apis/web_search.py,sha256=6gS3leIB2iyeLtqhB0IbpL_mKzDgArRTqnR7odTWT3E,1035
 meutils/apis/yezi.py,sha256=26vhnA3lC5049Rqx-CHO-wyGKbdZAfvjEOG90W38cr0,3675
@@ -328,7 +328,7 @@ meutils/apis/hf/r.py,sha256=jvD0WBM5dEZGG4rfdGZnUIh2W9sv-fqTFo-8ouLea60,1272
 meutils/apis/hf/x.py,sha256=QYLiTlTZk1b0wczGHeJMjQABQUQmI_Wk45gbCcCAdIc,862
 meutils/apis/hf/证件照.py,sha256=NVfFp-wO1YCpvf7ClInK-jVJO9atZuk9VN93GrPohoc,1262
 meutils/apis/hunyuan/__init__.py,sha256=vJg28p4USaiGt3vAPKurjuxTPtk_LdmThw3cNc48vpI,272
-meutils/apis/hunyuan/image_tools.py,sha256=LZdhmFzV4i9bhJ-4Lu02mEG3QtZryC4HwW9fgStzVGs,2177
+meutils/apis/hunyuan/image_tools.py,sha256=5y93jzU2B4O3JUE1nWBSuhUJCY8zLeiT0BLGdwpYaCo,2550
 meutils/apis/images/__init__.py,sha256=hs7HUJZvw_3DAtoapPnbZsEb4ng1p0a6fJGFFWwUcUk,272
 meutils/apis/images/deepinfra.py,sha256=N7IDJ9dubojOY--R30uQlzSBbuuy4OXkCkRB1ey0kcQ,3241
 meutils/apis/images/demo.py,sha256=Cjk-EKMKbp44czykW_44qR0TzElX8nNCALqXBBw5sJA,4405
@@ -376,7 +376,7 @@ meutils/apis/oneapi/user.py,sha256=Q4FhUwuUZlOpe9qh8P4ioTnGX3cEtBae39bSMciWDA8,3
 meutils/apis/pixverse/__init__.py,sha256=WiboEUfJ_3Hs2WI3OymEspx8_ZSTgMglxTJd97Qk7qo,271
 meutils/apis/pixverse/pixverse.py,sha256=dvnyYVUXCEY_cLnmX9lvq9TesvplCMCuJmmP7ShchQk,5534
 meutils/apis/proxy/__init__.py,sha256=by7_6GT3xeDjAWLLqbw8uvGaZ3RdprEW-zJ2DFLOdwA,271
-meutils/apis/proxy/ips.py,sha256=6ck3GYuJgujyk5lckTbsOE_d3ia1aXA9t2KCPIibwTo,5250
+meutils/apis/proxy/ips.py,sha256=gdnzX7BUuraU4Vpr8l0t1liw9Z6Ow3ZAe7D6wkWk01c,5339
 meutils/apis/remini/__init__.py,sha256=8TbAnbI_bDfH8g0Y9EHXHBum7C0rZt9MzgAAz_MbAeI,271
 meutils/apis/remini/remini.py,sha256=bJjvtqrCNlAu7No4gYGjoWAM0ch6dCsofYSy2jPZrXg,4239
 meutils/apis/replicateai/__init__.py,sha256=PK7e7-xhn5aj5WOyGHLzpsHQvpeM5uTOiMylvj40ZmU,272
@@ -466,7 +466,7 @@ meutils/config_utils/lark_utils/demo.py,sha256=3g0Fs7oLaeW75T60gYWMLgyNg1OnfOjfH
 meutils/config_utils/lark_utils/x.py,sha256=MlMQGhehP9xMEgetxVCX68XFaosfKoW1JA5cZ3JqN2w,1857
 meutils/crawlers/__init__.py,sha256=TBU4xA-IOsHV-0yIkW7YXxn_QT7TT8NncqxO7IykEfs,271
 meutils/data/SimHei.ttf,sha256=-XEnekS5yHP_URkT4XBI2w22ylV-KxudhkeIYFbrILA,10062565
-meutils/data/VERSION,sha256=ejsUN1se0NIgZaYpaanFbbntU-As4bHY0gLJqOyLlBM,19
+meutils/data/VERSION,sha256=h8fEMh2gMBwxWG4H4NJxSMgC5u83FZ9NORoJX3KasgA,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -491,7 +491,7 @@ meutils/decorators/decorator_demo.py,sha256=JLCulTW04uYHzLg6jRxVseaAdU-YeyL8Z2p-
 meutils/decorators/demo.py,sha256=EZ9uYz5zGdAqUxa9l2C8gTZqdjY5Uw2uZsAUa9tZXq0,710
 meutils/decorators/fastapi_decorator.py,sha256=TH5XtzALxDOFVJsK9XMx9xwV9_n9u7cGa9pwHUR218Q,3428
 meutils/decorators/feishu.py,sha256=0mJSJXIQSc2qYafZzeDPb6XhH6fL8u0pUI9bhOljn1M,3634
-meutils/decorators/retry.py,sha256=ar0e9_rwxEDpc2pV3H88NZjBKOyUaB85MDMpd8I7rdo,5249
+meutils/decorators/retry.py,sha256=PV42YxBzzf5r8MKjzfkSyV3r6JiH9R_OBIo_1W2tPqg,6242
 meutils/decorators/scheduler.py,sha256=NHeUXABx8YpHbxASqAJWEKa3i1AcyvIGcUW461glYKY,1678
 meutils/decorators/schedulers.py,sha256=pZrqMVXl7levZdUgUYHfjwA8oJIPJvbVcQw5CwhuiWU,2664
 meutils/easy_search/__init__.py,sha256=ZWP75-HhKeyckGGR7M_dOXPjuY9PjWDl_bLhZOes0g0,242
@@ -801,9 +801,9 @@ meutils/tools/seize.py,sha256=nOKAS63w-Lbi48I0m2MPhdsokUTwxco0laPxYVmW4Mw,1064
 meutils/tools/service_monitor.py,sha256=ibsLtBN2g2DL7ZnLJ8vhiZOiOcqTAyx711djDdBK-3M,1255
 meutils/tools/sys_monitor.py,sha256=6MoyzrItqDUOSjfHcMJmMofQkEPTW36CT_aKui0rg84,429
 meutils/tools/token_monitor.py,sha256=Np-YK-R4P4IPAXyZvMxwvXI4sFmNJQAQK1lSegNaYpA,997
-MeUtils-2024.12.5.15.58.45.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.5.15.58.45.dist-info/METADATA,sha256=pX7J_TAl9dKT6WkF8EL9fmlWdJtamv5VqD7LigZOXrc,6143
-MeUtils-2024.12.5.15.58.45.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.5.15.58.45.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.5.15.58.45.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.5.15.58.45.dist-info/RECORD,,
+MeUtils-2024.12.5.17.36.18.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.5.17.36.18.dist-info/METADATA,sha256=5DREhdZbj1QqcUYBeCanVPJ0wydI6PbCMjmZpiMhgnQ,6143
+MeUtils-2024.12.5.17.36.18.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.5.17.36.18.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.5.17.36.18.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.5.17.36.18.dist-info/RECORD,,

meutils/apis/hunyuan/image_tools.py

@@ -10,7 +10,7 @@
 import json_repair
 
 from meutils.pipe import *
-from meutils.decorators.retry import retrying
+from meutils.decorators.retry import retrying, IgnoredRetryException
 from meutils.schemas.yuanbao_types import FEISHU_URL, YUANBAO_BASE_URL
 from meutils.schemas.image_types import HunyuanImageProcessRequest
 
@@ -18,7 +18,7 @@ from meutils.config_utils.lark_utils import get_next_token_for_polling
 from meutils.io.files_utils import to_url
 
 
-@retrying(min=3)
+@retrying(min=3, ignored_exception_types=(IgnoredRetryException,))
 async def image_process(request: HunyuanImageProcessRequest, token: Optional[str] = None):
     token = token or await get_next_token_for_polling(FEISHU_URL)
 
@@ -39,10 +39,15 @@ async def image_process(request: HunyuanImageProcessRequest, token: Optional[str
         response.raise_for_status()
         logger.debug(response.text)
 
-        data: dict = json_repair.repair_json(response.text.replace(r'\u0026', '&'), return_objects=True)[-2]
-        if any(data["code"] == code for code in {"429"}):
+        data = json_repair.repair_json(response.text.replace(r'\u0026', '&'), return_objects=True)[-2]
+
+        # todo: 错误处理
+        if isinstance(data, dict) and any(data["code"] == code for code in {"429"}):
             Exception("重试")
 
+        elif any(i in response.text for i in {"当前图片没有检测到水印"}):  # 跳过重试并返回原始错误
+            raise IgnoredRetryException(data)
+
         data = {
             "data": [
                 {
@@ -61,6 +66,7 @@ if __name__ == '__main__':
 
     with timer():
         image = "https://sfile.chatglm.cn/chatglm4/3dcb1cc2-22ad-420b-9d16-dc71dffc02b2.png"
-        request = ImageProcessRequest(image=image, task='clarity')
+        image = "https://oss.ffire.cc/files/kling_watermark.png"
+        request = HunyuanImageProcessRequest(image=image, task='removewatermark')
 
         arun(image_process(request))

meutils/apis/proxy/ips.py

@@ -36,12 +36,15 @@ async def get_one_proxy(token: Optional[str] = None, feishu_url: str = "", from_
     else:
         # 随机获取ip: 如果从redis就是循环队列 check_proxy
         ip = await get_next_token_for_polling(feishu_url, from_redis=from_redis)
+    # https://github.com/encode/httpx/pull/2879
+    # proxies = {
+    #     "http://": f"http://{ip}",  # 自建 38443
+    #     "https://": f"http://{ip}",
+    # }
 
-    proxies = {
-        "http://": f"http://{ip}",  # 自建 38443
-        "https://": f"http://{ip}",
-    }
-    return proxies
+    proxy = f"http://{ip}"
+
+    return proxy
 
 
 def checkip():  # 获取本地ip
@@ -154,12 +157,11 @@ if __name__ == '__main__':
     #
     # logger.debug(resp.text)
     ip = "http://proxy.chatfire.cn"
-    ip="http://chatfire:chatfire@110.42.51.201:38443"
-    ip="http://154.9.253.9:38443"
+    ip = "http://chatfire:chatfire@110.42.51.201:38443"
+    ip = "http://154.9.253.9:38443"
     ip = "http://154.9.252.28:38443"
-    ip="http://110.42.51.223:38443"
-    ip="http://154.40.54.76:38443"
-
+    ip = "http://110.42.51.223:38443"
+    ip = "http://154.40.54.76:38443"
 
     proxies = {'http://': ip, 'https://': ip}
 

meutils/apis/textin.py

@@ -9,6 +9,8 @@
 # @Description  : todo: 重构 https://tools.textin.com/
 # https://www.textin.com/console/recognition/robot_enhance?service=watermark-remove
 
+# proxies 取消了 https://github.com/encode/httpx/pull/2879
+
 from meutils.pipe import *
 from meutils.decorators.retry import retrying
 from meutils.notice.feishu import send_message
@@ -21,14 +23,7 @@ ua = UserAgent()
 
 BASE_URL = "https://api.textin.com/home"
 
-ip = "110.42.51.201"
-ip = "http://proxy.chatfire.cn/"
-proxies = {
-    "http://": ip,  # 自建 8443
-    "https://": ip,
-}
-
-
+proxy = "http://110.42.51.201:38443"
 
 
 @alru_cache(ttl=3600 * 24)
@@ -72,27 +67,32 @@ async def document_process(data: bytes,
                 logger.debug(response.status_code)
                 # logger.info(response.json())  # {'msg': '今日请求超过限制次数', 'code': 431}
 
-                if response.is_success:
-                    _ = response.json()
+                _ = response.json()
+
+                raise Exception("更新请求头或者加代理")
+
+                # if '今日请求超过限制次数' in str(_):
+                #     # logger.info(response.json())
+                #     raise Exception("更新请求头或者加代理")
+                # else:
+                #     break
 
-                    if '今日请求超过限制次数' in str(_):
-                        # logger.info(response.json())
-                        raise Exception("更新请求头或者加代理")
-                    else:
-                        break
 
         except Exception as e:  # 加代理
             logger.error(e)
 
             request_kwargs = {
-                "proxies": await get_one_proxy(),
-                # "proxies": proxies,
+                # "proxy": await get_one_proxy(),
+                "proxy": proxy,
+
             }
 
     if response_format == "url" and service in {"watermark-remove", "crop_enhance_image"}:
         if "data" not in _:
             send_message(_, title=__name__)
 
+        # _ => {'msg': '今日请求超过限制次数', 'code': 431}
+
         url = await to_url(_['data']['result']['image'])
         _ = {"data": [{"url": url}]}
 
@@ -119,11 +119,11 @@ if __name__ == '__main__':
 
     service = Purpose.watermark_remove.value
 
-
     # service = "pdf_to_markdown"
 
     service = 'bill_recognize_v2'
 
+
     async def main(n=1):
         for i in tqdm(range(n)):
             try:

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.05.15.58.45
+2024.12.05.17.36.18

meutils/decorators/retry.py

@@ -11,12 +11,17 @@
 from meutils.pipe import *
 from tenacity import retry, stop_after_attempt, before_sleep_log
 from tenacity import wait_fixed, wait_exponential, wait_incrementing, wait_exponential_jitter  # Wait strategy
-from tenacity import retry_if_result, retry_if_exception, retry_if_exception_type, RetryCallState  # 重试策略
+from tenacity import retry_if_result, RetryCallState  # 重试策略
+from tenacity import retry_if_exception, retry_if_exception_type, retry_if_not_exception_type
 
 # 不兼容异步
 from meutils.notice.feishu import send_message
 
 
+class IgnoredRetryException(Exception):
+    pass
+
+
 def default_retry_error_callback(retry_state: RetryCallState, title: Optional[str] = None):
     """return the result of the last call attempt"""
     # logger.debug(f"最后一次重试仍然失败调用的函数: {retry_state.outcome}")
@@ -50,7 +55,11 @@ def retrying(
         max: int = 100000,
         retry_error_callback: Optional[Callable[[RetryCallState], Any]] = None,
         predicate: Callable[[Any], bool] = lambda r: False,
-        title: Optional[str] = None
+        title: Optional[str] = None,
+        ignored_exception_types: Optional[typing.Union[
+            typing.Type[BaseException],
+            typing.Tuple[typing.Type[BaseException], ...],
+        ]] = None,  # 该错误类型不重试
 ):
     import logging
 
@@ -65,8 +74,9 @@ def retrying(
                     & retry_if_exception(not_in_status_codes)
             )
             | retry_if_result(predicate)
-
     )
+    if ignored_exception_types:
+        retry_reasons = retry_reasons & retry_if_not_exception_type(ignored_exception_types)
 
     _retry_decorator = retry(
         reraise=True,
@@ -166,13 +176,12 @@ if __name__ == '__main__':
     #     # print(wait_incrementing(100, -10)(retry_state))
     #     print(wait_exponential(1, exp_base=2)(retry_state))
 
-    @retrying(3)
-    async def f():
-        logger.debug("retry")
-        pass
-        # 1 / 0
-        raise Exception('xx')
-
+    # @retrying(3)
+    # async def f():
+    #     logger.debug("retry")
+    #     pass
+    #     # 1 / 0
+    #     raise Exception('xx')
 
     # try:
     #     f()
@@ -181,17 +190,43 @@ if __name__ == '__main__':
     #     print(e)
     #     print(type(e))
 
-    @retrying(3)
-    def f():
-    # async def f():
-        logger.debug("retry")
-        for i in range(10):
-            yield ""
-            if i == 8:
-                raise Exception('xx')
+    # @retrying(3)
+    # def f():
+    #     # async def f():
+    #     logger.debug("retry")
+    #     for i in range(10):
+    #         yield ""
+    #         if i == 8:
+    #             raise Exception('xx')
 
+    # arun(f())
 
+    # f()
+
+    # 示例使用
+    class CustomError1(Exception):
+        pass
+
+
+    class CustomError2(Exception):
+        pass
+
+
+    @retrying(
+        max_retries=3,
+        ignored_exception_types=(CustomError1, IgnoredRetryException)
+    )
+    def my_function():
+        logger.debug(1)
+        # 模拟抛出异常
+        raise IgnoredRetryException("This is a custom error")
+
+
+    def main():
+        try:
+            my_function()
+        except Exception as e:
+            print(f"Operation failed after all retries: {e}")
 
-    # arun(f())
 
-    f()
+    main()