MeUtils 2024.12.5.19.7.59__py3-none-any.whl → 2024.12.5.19.29.0__py3-none-any.whl

{MeUtils-2024.12.5.19.7.59.dist-info → MeUtils-2024.12.5.19.29.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.5.19.7.59
+Version: 2024.12.5.19.29.0
 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: simplejson ; extra == 'all'
-Requires-Dist: faiss-cpu ; extra == 'all'
-Requires-Dist: sse-starlette ; extra == 'all'
-Requires-Dist: fastapi[all] ; extra == 'all'
-Requires-Dist: missingno ; extra == 'all'
-Requires-Dist: jmespath ; extra == 'all'
-Requires-Dist: pymupd ; extra == 'all'
-Requires-Dist: asyncmy ; extra == 'all'
-Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: iteration-utilities ; extra == 'all'
-Requires-Dist: reportlab ; extra == 'all'
-Requires-Dist: thefuck ; extra == 'all'
 Requires-Dist: streamlit ; extra == 'all'
-Requires-Dist: pyarrow ; extra == 'all'
-Requires-Dist: schedule ; extra == 'all'
+Requires-Dist: dataframe-image ; extra == 'all'
 Requires-Dist: seaborn ; extra == 'all'
-Requires-Dist: geopy ; extra == 'all'
+Requires-Dist: polars ; extra == 'all'
+Requires-Dist: sqlalchemy ; extra == 'all'
 Requires-Dist: pymysql ; extra == 'all'
-Requires-Dist: openai ; extra == 'all'
+Requires-Dist: iteration-utilities ; extra == 'all'
+Requires-Dist: fastapi ; extra == 'all'
+Requires-Dist: missingno ; extra == 'all'
 Requires-Dist: pymongo ; extra == 'all'
-Requires-Dist: pretty-errors ; extra == 'all'
-Requires-Dist: dataframe-image ; extra == 'all'
+Requires-Dist: redis-py-cluster ; extra == 'all'
 Requires-Dist: uvicorn ; extra == 'all'
-Requires-Dist: gunicorn ; extra == 'all'
+Requires-Dist: asyncmy ; extra == 'all'
+Requires-Dist: schedule ; extra == 'all'
+Requires-Dist: pandas-summary ; extra == 'all'
 Requires-Dist: filetype ; extra == 'all'
+Requires-Dist: jmespath ; extra == 'all'
+Requires-Dist: thefuck ; extra == 'all'
+Requires-Dist: pymilvus ; extra == 'all'
+Requires-Dist: cachetools ; extra == 'all'
+Requires-Dist: openai ; extra == 'all'
+Requires-Dist: pymupd ; extra == 'all'
 Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
-Requires-Dist: jinja2 ; extra == 'all'
-Requires-Dist: polars ; extra == 'all'
-Requires-Dist: pandas-summary ; extra == 'all'
-Requires-Dist: redis-py-cluster ; extra == 'all'
+Requires-Dist: sse-starlette ; extra == 'all'
 Requires-Dist: jieba ; extra == 'all'
-Requires-Dist: pymilvus ; extra == 'all'
+Requires-Dist: langchain ; extra == 'all'
+Requires-Dist: jinja2 ; extra == 'all'
+Requires-Dist: geopy ; extra == 'all'
+Requires-Dist: gunicorn ; extra == 'all'
+Requires-Dist: fastapi[all] ; extra == 'all'
+Requires-Dist: pretty-errors ; extra == 'all'
+Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: simplejson ; extra == 'all'
 Requires-Dist: thriftpy2 ; extra == 'all'
-Requires-Dist: fastapi ; extra == 'all'
-Requires-Dist: cachetools ; extra == 'all'
-Requires-Dist: sqlalchemy ; extra == 'all'
+Requires-Dist: pyarrow ; extra == 'all'
+Requires-Dist: reportlab ; extra == 'all'
 Provides-Extra: ann
 Requires-Dist: pymilvus ; extra == 'ann'
 Requires-Dist: faiss-cpu ; extra == 'ann'

{MeUtils-2024.12.5.19.7.59.dist-info → MeUtils-2024.12.5.19.29.0.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=yPdqoeGZwCJ5gqAWy6HA4GDUQhDlwPKSyiO8wpX1Os4,4957
+meutils/apis/textin.py,sha256=vkl3VI3ox-m-0UA-DBTOCZURAlD9lA7nA-057gJLMoc,4880
 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=AeweHZIFyKvY7GucYoMvpChamOlnNz2QaRnQApzw-zw,2889
+meutils/apis/hunyuan/image_tools.py,sha256=TB1DWS_xrAn0rAZJ55C22TcsP2NZacXJeD12JtQTmlU,3001
 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
@@ -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=P7gsQvmnZehc3SWU9LXrVYWgKt5blQvoRse7IDJBww8,19
+meutils/data/VERSION,sha256=8MH5r7NFudBhM6lJNQ8vm8efAPX3c5h-OY8IjIDAlcA,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -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.19.7.59.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.5.19.7.59.dist-info/METADATA,sha256=dcxz5V2MxwRV30abCcUbJmfsl69pFMHfebwGGiQPumU,6142
-MeUtils-2024.12.5.19.7.59.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.5.19.7.59.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.5.19.7.59.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.5.19.7.59.dist-info/RECORD,,
+MeUtils-2024.12.5.19.29.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.5.19.29.0.dist-info/METADATA,sha256=avqttVH4Ts22UL5NAmL6aCl1ygRCUGA21M-__n7fzBc,6142
+MeUtils-2024.12.5.19.29.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.5.19.29.0.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.5.19.29.0.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.5.19.29.0.dist-info/RECORD,,

meutils/apis/hunyuan/image_tools.py

@@ -50,7 +50,7 @@ async def image_process(request: HunyuanImageProcessRequest, token: Optional[str
         if isinstance(data, dict) and any(data["code"] == code for code in {"429"}):
             Exception(f"重试: {response.text}")
 
-        elif isinstance(data, list) or any(i in response.text for i in {"当前图片没有检测到水印"}):  # 跳过重试并返回原始错误
+        elif isinstance(data, list) or any(i in response.text for i in {"当前图片没有检测到水印", "429"}):  # 跳过重试并返回原始错误
             raise IgnoredRetryException(f"忽略重试: \n{response.text}")
 
         data = {
@@ -73,6 +73,7 @@ if __name__ == '__main__':
         image = "https://sfile.chatglm.cn/chatglm4/3dcb1cc2-22ad-420b-9d16-dc71dffc02b2.png"
         image = "https://oss.ffire.cc/files/kling_watermark.png"
         image = "https://cdn.meimeiqushuiyin.cn/2024-12-05/ori/tmp_0511a4cb2066ffc309fa6f7a733ac1e93236709bf46c9430.jpg"
+        image = "https://cdn.meimeiqushuiyin.cn/2024-12-05/ori/tmp_de5e186878b079a87d22c561f17e6853.jpg"
         request = HunyuanImageProcessRequest(image=image, task='removewatermark')
 
         arun(image_process(request))

meutils/apis/textin.py

@@ -69,21 +69,19 @@ async def document_process(data: bytes,
 
                 _ = 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 = {
-                # "proxy": await get_one_proxy(),
-                "proxy": proxy,
+                "proxy": await get_one_proxy(),
+                # "proxy": proxy,
 
             }
 

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.05.19.07.59
+2024.12.05.19.29.00