MeUtils 2024.11.29.19.50.1__py3-none-any.whl → 2024.11.29.20.29.0__py3-none-any.whl

{MeUtils-2024.11.29.19.50.1.dist-info → MeUtils-2024.11.29.20.29.0.dist-info}/METADATA

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

{MeUtils-2024.11.29.19.50.1.dist-info → MeUtils-2024.11.29.20.29.0.dist-info}/RECORD

@@ -350,7 +350,7 @@ meutils/apis/jiema/yezi.py,sha256=26vhnA3lC5049Rqx-CHO-wyGKbdZAfvjEOG90W38cr0,36
 meutils/apis/kling/__init__.py,sha256=pKz40SEjui1dhHBD-icyNTJOYhzLvxLxJCwszuH4vio,271
 meutils/apis/kling/api.py,sha256=AuVQ9URmrbTlz7dEv_kIyhA9fMTZPL9rF3Td6KxTIMA,2183
 meutils/apis/kling/images.py,sha256=FcCkvA4x1Po3SuugfQa8klT0Lrj7fq4N8kbzx6luUxI,5095
-meutils/apis/kling/kolors_virtual_try_on.py,sha256=pxXdnchm7lEVHqwL8piomuXh3UxprxvRWPv1PQH-w0s,2820
+meutils/apis/kling/kolors_virtual_try_on.py,sha256=xn9zwUjdqRZAuCQ7vxFrTK01b6ScyhF4aMxEkm8-CG4,2818
 meutils/apis/kling/videos.py,sha256=6z3w0gQHPe3BQNid4ZO2DfYSqvry44EMehG9U0qSB3E,2115
 meutils/apis/kling/鉴权.py,sha256=1kR67Mb0PxEo4ZxLVJZys4Iru9BUnS_Qqo2cbpLZNCU,842
 meutils/apis/kuaishou/__init__.py,sha256=fDzJvVQl_CxHyiL3bCPH9x7gOLYfK6QuW2iQ33eez7c,243
@@ -418,14 +418,14 @@ meutils/apis/voice_clone/fish_api.py,sha256=pDpE-B8HFiGIOV3NVd1HmFrCC2GQc3wH-81o
 meutils/async_task/__init__.py,sha256=45cUr-GWvQ1JFYGOYPOIkHLyTR3JbfP_PEYrmktpMLo,367
 meutils/async_task/celery_config.py,sha256=-p8-uGQq0HFFifZWZY6duCxEDcPJpWA4A_Rnz-WNysU,3430
 meutils/async_task/common.py,sha256=ZJ4e0CsEJf1ppPmGSwPCwhZBAkUL5xsi_t1ny-bJuko,845
-meutils/async_task/demo_create_tasks.py,sha256=DBUxi8lp4iJZrubn6XztRHB4DuZDEXpohSxCH6NMKuc,2219
-meutils/async_task/utils.py,sha256=FRyQAsMw4mWxOm9TseorJ4gBMd3RjNS3SSxDv4f2jPA,3613
+meutils/async_task/demo_create_tasks.py,sha256=4tDxmM--e5CUhFQaDySd4CQigiEXcwc55hBI-g1-Qd0,2483
+meutils/async_task/utils.py,sha256=IAcGmXUn-L7oJ-i66p-KJCtpNFMQY7lBXGe2ausNljg,3957
 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=DwOUHyNDBpM1olCpow_cVct8iPpg2PEqY180wpTt07o,904
+meutils/async_task/tasks/kling.py,sha256=4n898Xxv_TgohxqCbsfKt0Jkm6VL3nWY_QkHLckXEx8,925
 meutils/async_task/tasks/replicateai.py,sha256=wbxx6kB7GQZPnKRE6J6r1mEv3wO8X7XaGaNMC5rBVoE,716
-meutils/async_task/tasks/test.py,sha256=f-QY-k81ixe4x-rRO7yqStZ1w8MdVoq-ooq9bDzXOeI,2148
+meutils/async_task/tasks/test.py,sha256=lihvD94rlIkIvt2YaVulT9R88KkX-I1lueP-BfecaOw,2331
 meutils/async_task/tasks/vidu.py,sha256=obBG4_bf1oPIlLxeca1s1dGOnlyam2xYRy-8TrH3ZTk,620
 meutils/async_utils/__init__.py,sha256=IiJLRm258jkM4xAjUKOD7tVwHIemj7_1CuzXCu3TuQU,284
 meutils/async_utils/asyncer_.py,sha256=S1Sp5WZx_uKM7kJyRVYU8QhmbjOh61JmfN2IN_PJNX4,736
@@ -460,7 +460,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=mR6Qrl-yDOywYfTLDBOiRw8Fq1J7X3zGSiB5mleXchM,19
+meutils/data/VERSION,sha256=PIcyeEQw2kEviUX63KO8XDOkraOYUcVf5toineW3v6U,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -793,9 +793,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.11.29.19.50.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.11.29.19.50.1.dist-info/METADATA,sha256=KSzeOgv_j546q543J1Dm00DXFdeDnIYRS9HeFKDFbuo,6143
-MeUtils-2024.11.29.19.50.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.11.29.19.50.1.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.11.29.19.50.1.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.11.29.19.50.1.dist-info/RECORD,,
+MeUtils-2024.11.29.20.29.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.11.29.20.29.0.dist-info/METADATA,sha256=6UfRQ8qWeu_Z1Qrkak3CLMrgniw3UMJ16o8SiQ0_mgc,6143
+MeUtils-2024.11.29.20.29.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.11.29.20.29.0.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.11.29.20.29.0.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.11.29.20.29.0.dist-info/RECORD,,

meutils/apis/kling/kolors_virtual_try_on.py

@@ -66,7 +66,7 @@ async def get_task(task_id, token):
 
 if __name__ == '__main__':
     request = TryOnRequest()
-    # arun(create_task(request))
+    arun(create_task(request))
     # {
     #     "code": 0,
     #     "message": "SUCCEED",

meutils/async_task/demo_create_tasks.py

@@ -50,9 +50,9 @@ if __name__ == '__main__':
 
     # test.do_pydantic_task.apply_async(kwargs={'request': test.Request()})
 
-    test.do_pydantic_task.apply_async(kwargs={"request": {"method": "POST", "url": "测试"}})
+    # test.do_pydantic_task.apply_async(kwargs={"request": {"method": "POST", "url": "测试"}})
 
-    print(type(test.do_pydantic_task))
+    # print(type(test.do_pydantic_task))
 
 
     # test.do_pydantic_task.apply_async(kwargs={"request": {"method": "POST", "url": "测试"}})
@@ -63,3 +63,9 @@ if __name__ == '__main__':
     # test.do_task_retrying.apply_async(kwargs={'name': "###do_task_retrying"})
     # test.do_task_retry.apply_async(kwargs={'name': "###do_task_retry"})
     # test.do_task_retry_backoff.apply_async(kwargs={'name': "###do_task_retry_backoff"})
+    # test.ado_pydantic_task.apply_async(kwargs={'name': "###do_task_retry_backoff"})
+
+    test.Request()
+    test.ado_pydantic_task.apply_async(kwargs={"request": None})
+
+    test.ado_pydantic_task.apply_async(kwargs={"request": test.Request().model_dump()})

meutils/async_task/tasks/kling.py

@@ -29,4 +29,4 @@ async def create_task(request: kolors_virtual_try_on.TryOnRequest, **kwargs):
 if __name__ == '__main__':
     pass
     # create_task.apply_async()
-    # kling.create_task.apply_async(kwargs={"request": request.model_dump()})
+    create_task.apply_async(kwargs={"request": kolors_virtual_try_on.TryOnRequest().model_dump()})

meutils/async_task/tasks/test.py

@@ -14,6 +14,14 @@ from meutils.async_utils import async_to_sync_pro
 from meutils.async_task import worker, shared_task
 
 
+class Request(BaseModel):
+    method: str = "GET"
+    url: str = "https://api.chatfire.cn/"
+
+    class Config:
+        frozen = True
+
+
 @shared_task
 def do_sync_task(sleep=10, **kwargs):
     logger.debug("同步任务")
@@ -25,18 +33,20 @@ def do_sync_task(sleep=10, **kwargs):
 # AttributeError: 'AsyncToSync' object has no attribute '__name__'. Did you mean: '__ne__'?
 
 
-# @shared_task(name='meutils.async_task.tasks.test.proxy_task')
-@shared_task
-@async_to_sync_pro
-async def ado_sync_task(**kwargs):
-    logger.debug("同步任务+协程")
+@alru_cache()
+async def create_task(request: Request, **kwargs):
+    logger.debug(request)
     await asyncio.sleep(10)
-    return kwargs
+    return request
 
 
-class Request(BaseModel):
-    method: str = "GET"
-    url: str = "https://api.chatfire.cn/"
+@shared_task(pydantic=True)
+@async_to_sync_pro
+async def ado_pydantic_task(request: Request):
+    logger.debug("同步任务+协程+结构体+缓存")
+    logger.debug(request)
+
+    return await create_task(request)
 
 
 @shared_task(pydantic=True)
@@ -50,6 +60,7 @@ def do_task_retry(*args, **kwargs):
 
     return 1 / 0
 
+
 @shared_task(
     default_retry_delay=3,
     retry_backoff=True,
@@ -59,6 +70,8 @@ def do_task_retry_backoff_noautoretry(*args, **kwargs):
     logger.debug("do_task_retry_backoff")
 
     return 1 / 0
+
+
 @shared_task(
     autoretry_for=(Exception,),
     default_retry_delay=3,

meutils/async_task/utils.py

@@ -23,7 +23,20 @@ async def create_task(async_task, request: Union[BaseModel, dict]):
 
     result = async_task.apply_async(kwargs={"request": request})
     task_id = result.id
-    return TaskResponse(task_id=task_id)
+    return TaskResponse(task_id=task_id, request_id=task_id)
+
+
+# {
+#   "code": 0,
+#   "message": "SUCCEED",
+#   "request_id": "CjMkWmdJhuIAAAAAAAS0mA",
+#   "data": {
+#     "task_id": "CjMkWmdJhuIAAAAAAAS0mA",
+#     "task_status": "submitted",
+#     "created_at": 1732881630997,
+#     "updated_at": 1732881630997
+#   }
+# }
 
 
 async def get_task(
@@ -63,7 +76,8 @@ async def get_task(
             )
 
             if remote_get_task:  # 获取远程任务
-                response: TaskResponse = await remote_get_task(task_id, token)  # todo: 缓存一份，todo： user_id、platform/action
+                response: TaskResponse = await remote_get_task(task_id,
+                                                               token)  # todo: 缓存一份，todo： user_id、platform/action
 
                 if not isinstance(data, dict):
                     data = data.model_dump()

meutils/data/VERSION

@@ -1 +1 @@
-2024.11.29.19.50.01
+2024.11.29.20.29.00