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

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

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

{MeUtils-2024.12.5.17.36.18.dist-info → MeUtils-2024.12.5.18.31.40.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=6j0aBxhgpFfduGI13Rw9Lmd3d7a631XqopA9eDrNDX8,4867
+meutils/apis/textin.py,sha256=yPdqoeGZwCJ5gqAWy6HA4GDUQhDlwPKSyiO8wpX1Os4,4957
 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=5y93jzU2B4O3JUE1nWBSuhUJCY8zLeiT0BLGdwpYaCo,2550
+meutils/apis/hunyuan/image_tools.py,sha256=Hq-XH8bx0TaciDXKTJeKWe62wylYe_TU7lvdRYtPmNU,2585
 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=h8fEMh2gMBwxWG4H4NJxSMgC5u83FZ9NORoJX3KasgA,19
+meutils/data/VERSION,sha256=8NvfYO5RXuzs5y3E33eEW2mZgDyPZboEZlfz2RYuOBo,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -531,7 +531,7 @@ meutils/init/__init__.py,sha256=J_ApVNdTQAHsIfSLrMRZhwJ8rdgiOfeyiXGSymvZSng,242
 meutils/init/evn.py,sha256=z-2SGOL2SzDUdaQMEFpazXNjkyV1CLYGML-rNEZZ5a0,1588
 meutils/init/oo.py,sha256=jXWaCWWFYVPGgTIas47Z3J7sIq-CD7DyK6fKDBsq8GA,12884
 meutils/io/__init__.py,sha256=uW43ZfdWu7adRvwvcTzUGtn4CseRmbzEJdlZV-oqHEA,2107
-meutils/io/files_utils.py,sha256=mIjjrTwG4xmwecY-c79_b6Jl-nTKjd5TN8WDnfofnuk,6098
+meutils/io/files_utils.py,sha256=Y1Y16QEMslqfqqt5zeEQPIwlwaiMgyGiy30qYq7bphA,6119
 meutils/io/image.py,sha256=lY8vhmf7_5hW5UPh1QjDfeZZOyvSGKDGpJo9k8-s5N4,6136
 meutils/io/minio_utils.py,sha256=i1YuxwDJzLse0smMXuPqnD1wirBBb8psmB_kd1oPoVU,1274
 meutils/io/tf_io.py,sha256=vEZZS4pCf4Dt3A-FtIVMfhC3FJUUpQCK2OoEvXrBWos,8605
@@ -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.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-2024.12.5.18.31.40.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.5.18.31.40.dist-info/METADATA,sha256=ALmKzPExt04RO70p0fB1oh5CPgR98AwVCKQQRusm5wg,6143
+MeUtils-2024.12.5.18.31.40.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.5.18.31.40.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.5.18.31.40.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.5.18.31.40.dist-info/RECORD,,

meutils/apis/hunyuan/image_tools.py

@@ -45,8 +45,8 @@ async def image_process(request: HunyuanImageProcessRequest, token: Optional[str
         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)
+        elif isinstance(data, list) or any(i in response.text for i in {"当前图片没有检测到水印"}):  # 跳过重试并返回原始错误
+            raise IgnoredRetryException(response.text)
 
         data = {
             "data": [

meutils/apis/textin.py

@@ -92,6 +92,8 @@ async def document_process(data: bytes,
             send_message(_, title=__name__)
 
         # _ => {'msg': '今日请求超过限制次数', 'code': 431}
+        logger.debug(bjson(_))
+        # logger.debug(list(_['data']['result']['image']))
 
         url = await to_url(_['data']['result']['image'])
         _ = {"data": [{"url": url}]}

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.05.17.36.18
+2024.12.05.18.31.40

meutils/io/files_utils.py

@@ -98,7 +98,7 @@ async def to_url(
     from meutils.oss.minio_oss import Minio
     uploads = [partial(Minio().put_object_for_openai, filename=filename)]
 
-    if isinstance(file, str) or filename:  # 不指定就自行判断 url
+    if len(file) < 1024 and isinstance(file, str) or filename:  # 不指定就自行判断 url
         content_type = mimetypes.guess_type(filename)[0] or mimetypes.guess_type(file)[0] or content_type
 
     if content_type and content_type.startswith("image"):