MeUtils 2024.12.5.19.34.53__tar.gz → 2024.12.6.10.16.26__tar.gz

{meutils-2024.12.5.19.34.53 → meutils-2024.12.6.10.16.26/MeUtils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.5.19.34.53
+Version: 2024.12.6.10.16.26
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -106,42 +106,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 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: pretty_errors; extra == "all"
+Requires-Dist: streamlit; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: langchain; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: filetype; extra == "all"
 Requires-Dist: polars; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: geopy; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
+Requires-Dist: jinja2; extra == "all"
+Requires-Dist: schedule; extra == "all"
 Requires-Dist: fastapi[all]; extra == "all"
+Requires-Dist: pyarrow; 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: simplejson; 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: pandas_summary; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: jieba; 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: pymysql; extra == "all"
 Requires-Dist: openai; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: pymupd; extra == "all"
 Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: jinja2; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: schedule; extra == "all"
+Requires-Dist: jmespath; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
 Requires-Dist: faiss-cpu; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
-Requires-Dist: streamlit; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.12.5.19.34.53 → meutils-2024.12.6.10.16.26}/MeUtils.egg-info/SOURCES.txt

@@ -226,6 +226,7 @@ meutils/async_task/utils.py
 meutils/async_task/通用设计.py
 meutils/async_task/tasks/__init__.py
 meutils/async_task/tasks/_all.py
+meutils/async_task/tasks/hailuo.py
 meutils/async_task/tasks/kling.py
 meutils/async_task/tasks/replicateai.py
 meutils/async_task/tasks/test.py

{meutils-2024.12.5.19.34.53/MeUtils.egg-info → meutils-2024.12.6.10.16.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.5.19.34.53
+Version: 2024.12.6.10.16.26
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -106,42 +106,42 @@ Requires-Dist: pandas-profiling[notebook]; extra == "pd"
 Requires-Dist: pandas_summary; extra == "pd"
 Requires-Dist: polars; extra == "pd"
 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: pretty_errors; extra == "all"
+Requires-Dist: streamlit; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: seaborn; extra == "all"
+Requires-Dist: sse_starlette; extra == "all"
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: thriftpy2; extra == "all"
+Requires-Dist: langchain; extra == "all"
+Requires-Dist: cachetools; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: filetype; extra == "all"
 Requires-Dist: polars; extra == "all"
+Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: geopy; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
+Requires-Dist: jinja2; extra == "all"
+Requires-Dist: schedule; extra == "all"
 Requires-Dist: fastapi[all]; extra == "all"
+Requires-Dist: pyarrow; 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: simplejson; 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: pandas_summary; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: jieba; 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: pymysql; extra == "all"
 Requires-Dist: openai; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
+Requires-Dist: pymupd; extra == "all"
 Requires-Dist: pandas-profiling[notebook]; extra == "all"
-Requires-Dist: fastapi; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: jinja2; extra == "all"
-Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: schedule; extra == "all"
+Requires-Dist: jmespath; extra == "all"
+Requires-Dist: asyncmy; extra == "all"
 Requires-Dist: faiss-cpu; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
-Requires-Dist: pymilvus; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: simplejson; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
-Requires-Dist: streamlit; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.12.5.19.34.53 → meutils-2024.12.6.10.16.26}/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-2024.12.6.10.16.26/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, 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 create_task(request)
+    return response.model_dump()
+
+
+# celery_task
+
+
+if __name__ == '__main__':
+    pass
+    # create_task.apply_async()
+    create_task.apply_async(kwargs={"request": VideoRequest().model_dump()})

{meutils-2024.12.5.19.34.53 → meutils-2024.12.6.10.16.26}/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-2024.12.6.10.16.26/meutils/data/VERSION

@@ -0,0 +1 @@
+2024.12.06.10.16.26

{meutils-2024.12.5.19.34.53 → meutils-2024.12.6.10.16.26}/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

meutils-2024.12.5.19.34.53/meutils/data/VERSION

@@ -1 +0,0 @@
-2024.12.05.19.34.53

{meutils-2024.12.5.19.34.53 → meutils-2024.12.6.10.16.26}/MeUtils.egg-info/requires.txt

@@ -43,42 +43,42 @@ openai
 langchain
 
 [all]
-langchain
-dataframe_image
 missingno
-asyncmy
+pretty_errors
+streamlit
+iteration_utilities
+seaborn
+sse_starlette
+fastapi
+thriftpy2
+langchain
+cachetools
+thefuck
+filetype
 polars
+gunicorn
+dataframe_image
+geopy
+pymilvus
+jinja2
+schedule
 fastapi[all]
+pyarrow
 pymongo
-seaborn
-jieba
-iteration_utilities
+simplejson
 redis-py-cluster
-pymysql
 sqlalchemy
-jmespath
-filetype
-pymupd
+pandas_summary
+uvicorn
+jieba
 reportlab
-thefuck
-cachetools
-sse_starlette
+pymysql
 openai
-gunicorn
+pymupd
 pandas-profiling[notebook]
-fastapi
-pretty_errors
-jinja2
-thriftpy2
-pyarrow
-schedule
+jmespath
+asyncmy
 faiss-cpu
-pandas_summary
-pymilvus
-geopy
-simplejson
-uvicorn
-streamlit
 
 [ann]
 pymilvus