MeUtils 2024.11.29.20.47.50__py3-none-any.whl → 2024.11.29.21.20.15__py3-none-any.whl

{MeUtils-2024.11.29.20.47.50.dist-info → MeUtils-2024.11.29.21.20.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.11.29.20.47.50
+Version: 2024.11.29.21.20.15
 Summary: description
 Home-page: https://github.com/yuanjie-ai/MeUtils
 Author: yuanjie
@@ -62,41 +62,41 @@ Requires-Dist: openai ; extra == 'ai'
 Requires-Dist: langchain ; extra == 'ai'
 Provides-Extra: all
 Requires-Dist: pandas-summary ; extra == 'all'
-Requires-Dist: streamlit ; extra == 'all'
-Requires-Dist: pymongo ; extra == 'all'
-Requires-Dist: langchain ; extra == 'all'
-Requires-Dist: pymupd ; extra == 'all'
-Requires-Dist: jinja2 ; extra == 'all'
 Requires-Dist: fastapi[all] ; extra == 'all'
-Requires-Dist: schedule ; extra == 'all'
 Requires-Dist: polars ; extra == 'all'
-Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
-Requires-Dist: sse-starlette ; extra == 'all'
-Requires-Dist: iteration-utilities ; extra == 'all'
-Requires-Dist: pyarrow ; extra == 'all'
-Requires-Dist: thriftpy2 ; extra == 'all'
-Requires-Dist: faiss-cpu ; extra == 'all'
-Requires-Dist: asyncmy ; extra == 'all'
+Requires-Dist: schedule ; extra == 'all'
+Requires-Dist: langchain ; extra == 'all'
+Requires-Dist: pretty-errors ; extra == 'all'
 Requires-Dist: pymilvus ; extra == 'all'
-Requires-Dist: geopy ; extra == 'all'
-Requires-Dist: filetype ; extra == 'all'
 Requires-Dist: redis-py-cluster ; extra == 'all'
-Requires-Dist: sqlalchemy ; extra == 'all'
-Requires-Dist: thefuck ; extra == 'all'
-Requires-Dist: uvicorn ; extra == 'all'
-Requires-Dist: pymysql ; extra == 'all'
-Requires-Dist: dataframe-image ; extra == 'all'
-Requires-Dist: cachetools ; extra == 'all'
-Requires-Dist: fastapi ; extra == 'all'
-Requires-Dist: pretty-errors ; extra == 'all'
-Requires-Dist: openai ; extra == 'all'
+Requires-Dist: pymongo ; extra == 'all'
+Requires-Dist: jinja2 ; extra == 'all'
 Requires-Dist: missingno ; extra == 'all'
-Requires-Dist: gunicorn ; extra == 'all'
 Requires-Dist: seaborn ; extra == 'all'
+Requires-Dist: iteration-utilities ; extra == 'all'
 Requires-Dist: reportlab ; extra == 'all'
+Requires-Dist: fastapi ; extra == 'all'
+Requires-Dist: uvicorn ; extra == 'all'
+Requires-Dist: asyncmy ; extra == 'all'
+Requires-Dist: pymysql ; extra == 'all'
 Requires-Dist: simplejson ; extra == 'all'
-Requires-Dist: jmespath ; extra == 'all'
+Requires-Dist: geopy ; extra == 'all'
+Requires-Dist: thefuck ; extra == 'all'
+Requires-Dist: openai ; extra == 'all'
+Requires-Dist: cachetools ; extra == 'all'
+Requires-Dist: gunicorn ; extra == 'all'
+Requires-Dist: thriftpy2 ; extra == 'all'
 Requires-Dist: jieba ; extra == 'all'
+Requires-Dist: filetype ; extra == 'all'
+Requires-Dist: streamlit ; extra == 'all'
+Requires-Dist: sqlalchemy ; extra == 'all'
+Requires-Dist: sse-starlette ; extra == 'all'
+Requires-Dist: pandas-profiling[notebook] ; extra == 'all'
+Requires-Dist: faiss-cpu ; extra == 'all'
+Requires-Dist: pyarrow ; extra == 'all'
+Requires-Dist: pymupd ; extra == 'all'
+Requires-Dist: dataframe-image ; extra == 'all'
+Requires-Dist: jmespath ; extra == 'all'
 Provides-Extra: ann
 Requires-Dist: pymilvus ; extra == 'ann'
 Requires-Dist: faiss-cpu ; extra == 'ann'

{MeUtils-2024.11.29.20.47.50.dist-info → MeUtils-2024.11.29.21.20.15.dist-info}/RECORD

@@ -419,11 +419,11 @@ meutils/async_task/__init__.py,sha256=45cUr-GWvQ1JFYGOYPOIkHLyTR3JbfP_PEYrmktpML
 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=p2CntKKd9tSrlfyx63uGu57SHQlu2x6XBi1u7y6LTYo,2577
-meutils/async_task/utils.py,sha256=IAcGmXUn-L7oJ-i66p-KJCtpNFMQY7lBXGe2ausNljg,3957
+meutils/async_task/utils.py,sha256=pUatJfzU9Ir-QnMljeeOLAb52bil1siHy_k6rXjU53M,4506
 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=4n898Xxv_TgohxqCbsfKt0Jkm6VL3nWY_QkHLckXEx8,925
+meutils/async_task/tasks/kling.py,sha256=mqGQ4qtvQOyg7kmhk4AyZBfnFOQOoAFSuzYX5F6MyHo,1037
 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
@@ -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=aGC8mRV_oQWAoVWDqKoUJuo88h6T4MIMY59L-wrgihQ,19
+meutils/data/VERSION,sha256=XKBonRtYezOE5KKAm-3wYxpPlf9vfguPCRly42EHiQc,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.20.47.50.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.11.29.20.47.50.dist-info/METADATA,sha256=kyZ8oVHhqv8yLAkY6_av_OSCXRm_GTP9KLPyZ8N11YE,6144
-MeUtils-2024.11.29.20.47.50.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.11.29.20.47.50.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.11.29.20.47.50.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.11.29.20.47.50.dist-info/RECORD,,
+MeUtils-2024.11.29.21.20.15.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.11.29.21.20.15.dist-info/METADATA,sha256=cgTfiiDYrdOixNxGiZ0Hy4Cn-IiTqRU1q8_q8u2hNK8,6144
+MeUtils-2024.11.29.21.20.15.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.11.29.21.20.15.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.11.29.21.20.15.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.11.29.21.20.15.dist-info/RECORD,,

meutils/async_task/tasks/kling.py

@@ -19,8 +19,11 @@ from meutils.apis.kling import kolors_virtual_try_on
 @shared_task(pydantic=True, retry_kwargs={'max_retries': 5, 'countdown': 10})
 @async_to_sync_pro
 async def create_task(request: kolors_virtual_try_on.TryOnRequest, **kwargs):
+    if isinstance(request, dict):
+        request = kolors_virtual_try_on.TryOnRequest(**request)
+
     response = await kolors_virtual_try_on.create_task(request)
-    return response
+    return response.model_dump()
 
 
 # celery_task

meutils/async_task/utils.py

@@ -16,6 +16,11 @@ from meutils.schemas.task_types import TaskResponse
 from meutils.db.orm import update_or_insert
 from meutils.schemas.db.oneapi_types import OneapiTask
 
+# 或者方案2：使用 BackgroundTasks
+from fastapi import BackgroundTasks
+
+background_tasks = BackgroundTasks()
+
 
 async def create_task(async_task, request: Union[BaseModel, dict]):
     if not isinstance(request, dict):
@@ -23,6 +28,7 @@ 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, request_id=task_id)
 
 
@@ -61,11 +67,17 @@ async def get_task(
 
     if result.ready():
         if result.successful():
-            data = result.get()  # TaskResponse
-            token = data.pop("system_fingerprint", None)  # 远程任务 token/apikey
+            data = result.get()  # 创建任务时：remote task的返回结果
+
+            remote_task_id = (
+                    data.get("task_id")  # 远程任务 写在最外层
+                    or data.get("id")
+                    or data.get("request_id")
+                    or data.get("data", {}).get("id")
+                    or data.get("data", {}).get("task_id")
+            )
 
-            # data.get('platform')
-            # data.get('action')
+            token = data.pop("system_fingerprint", None)  # 远程任务 token/apikey
 
             response = TaskResponse(
                 task_id=task_id,
@@ -75,13 +87,13 @@ async def get_task(
                 data=data
             )
 
-            if remote_get_task:  # 获取远程任务
-                response: TaskResponse = await remote_get_task(task_id,
-                                                               token)  # todo: 缓存一份，todo： user_id、platform/action
+            if remote_get_task:  # 获取远程任务, todo: 判断函数类型
+                # todo: 缓存一份，todo： user_id、platform/action
+                remote_task_response = await remote_get_task(remote_task_id, token)
+                if not isinstance(remote_task_response, dict):
+                    remote_task_response = remote_task_response.model_dump()
 
-                if not isinstance(data, dict):
-                    data = data.model_dump()
-                response.__dict__.update(data)
+                response.__dict__.update(remote_task_response)  # 更新 response
 
         else:
             response = TaskResponse(
@@ -103,6 +115,8 @@ async def get_task(
     update_fn = partial(update_oneapi_from_response, task_response=response)
     asyncio.create_task(update_or_insert(OneapiTask, filter_kwargs, update_fn))  # 测试是否会执行
 
+    background_tasks.add_task(update_or_insert, OneapiTask, filter_kwargs, update_fn)
+
     return response
 
 

meutils/data/VERSION

@@ -1 +1 @@
-2024.11.29.20.47.50
+2024.11.29.21.20.15