MeUtils 2024.12.5.19.34.53__py3-none-any.whl → 2024.12.6.10.34.3__py3-none-any.whl

{MeUtils-2024.12.5.19.34.53.dist-info → MeUtils-2024.12.6.10.34.3.dist-info}/METADATA

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

{MeUtils-2024.12.5.19.34.53.dist-info → MeUtils-2024.12.6.10.34.3.dist-info}/RECORD

@@ -225,7 +225,7 @@ meutils/np_utils.py,sha256=JzernZr0aj93l-hS49W1Wt07Sjuw_6_u9ytNiLt-wO4,3726
 meutils/path_utils.py,sha256=krhUCuqZozmXhgI6xOJd9Lt_e6enbhHuz3oJRhjZmeQ,2846
 meutils/pay.py,sha256=J7XeZ2vW7Q6xzt5GLLm2cmDY38sb2ym2Hqg3iu6SpUM,928
 meutils/pd_utils.py,sha256=UyOnRAH3HXhNd8VjoXxzchxP-9iddWsnYSoK8QzI7lI,6084
-meutils/pipe.py,sha256=jWRadwrzRD_bCWEeCyVduNdcFCiMa-tBfWzK9hSMslU,10141
+meutils/pipe.py,sha256=VBSCwNNQRnHBZyb_CHessmjgnBWJ40ZQ-sDRJFM3aIw,12303
 meutils/sftp.py,sha256=SEkTI4z2fSL6p3shAvUilKC0Wfbi1AkTQZ-9unemKtw,956
 meutils/sk_utils.py,sha256=uvdbc51cGjznOK9OII2X23wK8oWSffrEKxcczy0au8I,796
 meutils/smooth_utils.py,sha256=pLCJMLGHgOMfWmwFuJGOVh2vGKFmJ8ZsQfppF7ZGzGQ,1506
@@ -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=Rkc96xIt31FjpaPNhE9leSAw_scbZwzmqx-VMfDYpxs,2994
+meutils/apis/hunyuan/image_tools.py,sha256=o_Q8_-kp4F11bmZ-VA4_wmI_S5xdH8Dw6VIDbbYjNJY,3232
 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
@@ -428,7 +428,8 @@ meutils/async_task/utils.py,sha256=6M0YRIPhakpH3Geywkl-NPy_O2pQvnsDcQPyyTrA7Mc,5
 meutils/async_task/通用设计.py,sha256=kGdrJHJu9VoOkyGHREn0KUtBTibAaLIcG0O6hEJNhLA,3232
 meutils/async_task/tasks/__init__.py,sha256=flHRXJMdts_9az9T9V1c5l3Y-gaDD88COWrARr4WAKU,246
 meutils/async_task/tasks/_all.py,sha256=Vz63k9yvgj-IBGjekm0u2t571TTT0nMRMqcPvPqJAbY,533
-meutils/async_task/tasks/kling.py,sha256=mqGQ4qtvQOyg7kmhk4AyZBfnFOQOoAFSuzYX5F6MyHo,1037
+meutils/async_task/tasks/hailuo.py,sha256=BEosSKvUyqdosSpfjJBNrvIBpV0bm85E9uPweIBAeS0,918
+meutils/async_task/tasks/kling.py,sha256=QVn5VvPdcH-BFOx8ABtVyqWiUNjI_vvwJtLeJpGNYac,948
 meutils/async_task/tasks/replicateai.py,sha256=wbxx6kB7GQZPnKRE6J6r1mEv3wO8X7XaGaNMC5rBVoE,716
 meutils/async_task/tasks/test.py,sha256=-nCQhwEP6hQEnmk3ucDbjbnxbeyOHrg0HXCJmWL0KBU,2675
 meutils/async_task/tasks/vidu.py,sha256=obBG4_bf1oPIlLxeca1s1dGOnlyam2xYRy-8TrH3ZTk,620
@@ -466,7 +467,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=YI2cB1pv7Pa7VPfaxvdlH_NPOIBSdAck4MZovkj8uKI,19
+meutils/data/VERSION,sha256=SviVnPVoj9OAFqBRqc_c90AN9Mc5zC95QOYkgbXhs6o,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 +802,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.34.53.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.5.19.34.53.dist-info/METADATA,sha256=bu8PFFDshcyJdnKxRQ-oIAhC9yf6z6N5x75_bMfdgzQ,6143
-MeUtils-2024.12.5.19.34.53.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.5.19.34.53.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.5.19.34.53.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.5.19.34.53.dist-info/RECORD,,
+MeUtils-2024.12.6.10.34.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.6.10.34.3.dist-info/METADATA,sha256=UA6VOYW4vZJ1UYbPIDEXBtJU82IN3MT1Zc7k8ap_suo,6142
+MeUtils-2024.12.6.10.34.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.6.10.34.3.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.6.10.34.3.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.6.10.34.3.dist-info/RECORD,,

meutils/apis/hunyuan/image_tools.py

@@ -16,6 +16,7 @@ from meutils.schemas.image_types import HunyuanImageProcessRequest
 
 from meutils.config_utils.lark_utils import get_next_token_for_polling
 from meutils.io.files_utils import to_url
+from meutils.notice.feishu import send_message
 
 
 @retrying(min=3, ignored_exception_types=(IgnoredRetryException,))
@@ -40,10 +41,14 @@ async def image_process(request: HunyuanImageProcessRequest, token: Optional[str
         logger.debug(response.text)
 
         # 新版本的位置可能不一样 注意
-        data = json_repair.repair_json(
-            response.text.replace(r'\u0026', '&').rsplit("data: [TRACEID", 1)[0],
-            return_objects=True
-        )[-1]
+        # data = json_repair.repair_json(
+        #     response.text.replace(r'\u0026', '&').rsplit("data: [TRACEID", 1)[0],
+        #     return_objects=True
+        # )[-1]
+
+        skip_strings = ['DONE', 'TRACEID']
+        data = response.text.replace(r'\u0026', '&').splitlines() | xsse_parser(skip_strings=skip_strings)
+        data = data and data[-1]
         logger.debug(data)
 
         # todo: 错误处理
@@ -77,4 +82,3 @@ if __name__ == '__main__':
         request = HunyuanImageProcessRequest(image=image, task='removewatermark')
 
         arun(image_process(request))
-

meutils/async_task/tasks/hailuo.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : hailuo
+# @Time         : 2024/12/6 09:05
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 
+
+
+from meutils.async_utils import async_to_sync_pro
+from meutils.async_task import worker, shared_task
+from meutils.apis.hailuoai.videos import VideoRequest, create_task as remote_create_task, get_task
+
+
+@shared_task(pydantic=True, retry_kwargs={'max_retries': 10, 'countdown': 10})
+@async_to_sync_pro
+async def create_task(request, **kwargs):
+    if isinstance(request, dict):
+        request = VideoRequest(**request)
+
+    response = await remote_create_task(request)
+    return response.model_dump()
+
+
+# celery_task
+
+
+if __name__ == '__main__':
+    pass
+    # create_task.apply_async()
+    create_task.apply_async(kwargs={"request": VideoRequest(prompt='a dog').model_dump()})

meutils/async_task/tasks/kling.py

@@ -8,9 +8,7 @@
 # @Software     : PyCharm
 # @Description  : 注册任务
 
-from meutils.pipe import *
 from meutils.async_utils import async_to_sync_pro
-from meutils.decorators.retry import retrying
 from meutils.async_task import worker, shared_task
 
 from meutils.apis.kling import kolors_virtual_try_on
@@ -26,9 +24,6 @@ async def create_task(request: kolors_virtual_try_on.TryOnRequest, **kwargs):
     return response.model_dump()
 
 
-# celery_task
-
-
 if __name__ == '__main__':
     pass
     # create_task.apply_async()

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.05.19.34.53
+2024.12.06.10.34.03

meutils/pipe.py

@@ -6,7 +6,8 @@
 # @Author       : yuanjie
 # @Email        : meutils@qq.com
 # @Software     : PyCharm
-# @Description  : 
+# @Description  :
+import json
 
 from meutils.common import *
 from meutils.async_utils.common import arun, aclose, alru_cache, async2sync_generator, close_event_loop, achain
@@ -303,6 +304,22 @@ def xAsyncio(tasks, return_exceptions=False):
     return loop.run_until_complete(_)
 
 
+@Pipe
+def xsse_parser(iterable, prefix: str = 'data:', skip_strings: Optional[list] = None):
+    l = []
+    skip_strings = skip_strings or []
+    for line in iterable:
+        if (line := line.lstrip()) and line.startswith(prefix):
+            if any(s in line for s in skip_strings):
+                continue
+            try:
+                _ = json.loads(line[len(prefix):])
+                l.append(_)
+            except Exception as e:
+                logger.debug(f'error: {e}\nline: {line}')
+    return l
+
+
 if __name__ == '__main__':
     # @Pipe
     # def xfunc1(x):
@@ -356,5 +373,21 @@ if __name__ == '__main__':
     # print(range(10) | xThreadPoolExecutor(print, 1) | xlist)
     # print(range(10) | xThreadPoolExecutor(print, 2) | xlist)
 
-    print(range(10) | xProcessPoolExecutor(print, 1) | xlist)
-    print(range(10) | xProcessPoolExecutor(print, 2) | xlist)
+    # print(range(10) | xProcessPoolExecutor(print, 1) | xlist)
+    # print(range(10) | xProcessPoolExecutor(print, 2) | xlist)
+
+    sse = """
+    data: {"type":"step","msg":"努力生成中...","code":200}
+data: {"type":"progress","value":0.08333333333333333,"code":200}
+data: {"type":"progress","value":0.16666666666666666,"code":200}
+data: {"type":"progress","value":0.25,"code":200}
+data: {"type":"progress","value":0.3333333333333333,"code":200}
+data: {"type":"progress","value":0.4166666666666667,"code":200}
+data: {"type":"progress","value":0.5,"code":200}
+data: {"type":"removewatermark","id":"c0d1e312-b374-11ef-a22c-6a452a83f9ec","imageUrl":"https://hunyuan-prod-1258344703.cos.ap-guangzhou.myqcloud.com/removewatermark/f55df3ef029c13eba0832a11f77d03ad/20241206095236h0_d589b0620869d87ad340b4b4ed68b4ec.png?q-sign-algorithm=sha1\u0026q-ak=AKID0qSq0xJRL7h3A4nIYJFrFOJ1VlnbIm26\u0026q-sign-time=1733449957;1764985957\u0026q-key-time=1733449957;1764985957\u0026q-header-list=host\u0026q-url-param-list=\u0026q-signature=7bbec24fe87917896f662f65b80320a4a3fb8569","source":"inspiration","code":200,"thumbnailUrl":"https://hunyuan-prod-1258344703.cos.ap-guangzhou.myqcloud.com/removewatermark/f55df3ef029c13eba0832a11f77d03ad/20241206095236h0_d589b0620869d87ad340b4b4ed68b4ec.png?q-sign-algorithm=sha1\u0026q-ak=AKID0qSq0xJRL7h3A4nIYJFrFOJ1VlnbIm26\u0026q-sign-time=1733449957;1764985957\u0026q-key-time=1733449957;1764985957\u0026q-header-list=host\u0026q-url-param-list=\u0026q-signature=7bbec24fe87917896f662f65b80320a4a3fb8569\u0026imageMogr2/strip/format/jpg/size-limit/500k!/ignore-error/1"}
+data: [TRACEID:8a50e3687e26e03097e507c076fe7145]
+data: [DONE]"""
+
+    # print()
+
+    sse.splitlines() | xsse_parser(skip_strings=['DONE', 'TRACEID']) | xprint