MeUtils 2024.11.29.22.4.24__py3-none-any.whl → 2024.12.2.8.52.40__py3-none-any.whl

{MeUtils-2024.11.29.22.4.24.dist-info → MeUtils-2024.12.2.8.52.40.dist-info}/METADATA

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

{MeUtils-2024.11.29.22.4.24.dist-info → MeUtils-2024.12.2.8.52.40.dist-info}/RECORD

@@ -419,7 +419,7 @@ 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=Eu4XjNxRROmMJ0oKfbEhrfLTaOUgedbAhmFyQx5nOQc,2699
-meutils/async_task/utils.py,sha256=2ImDpIVfo8hMBGYRGF3UG8D7T4iQSg5cnff449CAIQc,5039
+meutils/async_task/utils.py,sha256=jqJArlsv8C559fuN9Qz1q777dRuw44DtctKzKFQwJbA,5190
 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
@@ -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=lutwKDTq2yFt2y19_RtkZBcm4ftMY5MUEew8u9M74mM,19
+meutils/data/VERSION,sha256=9M1foIAwkqkrZoMedtaqp9mmEE8XG8DGG09VdEn8Iqs,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.22.4.24.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.11.29.22.4.24.dist-info/METADATA,sha256=nJ4igJPKRQXmhEKQmkvyDs4VVxk-0l34P4pVcs8hEB4,6143
-MeUtils-2024.11.29.22.4.24.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.11.29.22.4.24.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.11.29.22.4.24.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.11.29.22.4.24.dist-info/RECORD,,
+MeUtils-2024.12.2.8.52.40.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.2.8.52.40.dist-info/METADATA,sha256=PEy8UrM2rrZyTUNtwP_lHGRqRbSNYHzqhKWS7bp-LUI,6142
+MeUtils-2024.12.2.8.52.40.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.2.8.52.40.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.2.8.52.40.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.2.8.52.40.dist-info/RECORD,,

meutils/async_task/utils.py

@@ -48,7 +48,8 @@ async def create_task(async_task, request: Union[BaseModel, dict]):
 async def get_task(
         task_id: str,
         remote_get_task: Optional[Callable] = None,
-        filter_kwargs: Optional[dict] = None
+        filter_kwargs: Optional[dict] = None,
+        background_tasks: Optional[BackgroundTasks] = None,
 ):
     """
 
@@ -63,6 +64,9 @@ async def get_task(
         }
     :return:
     """
+    filter_kwargs = filter_kwargs or {}
+    filter_kwargs["task_id"] = task_id
+
     result = AsyncResult(id=task_id)
     # logger.debug(bjson(result._get_task_meta()))
     # logger.debug(bjson(result.get()))
@@ -116,8 +120,10 @@ async def get_task(
 
     # 更新到数据库：异步任务
     update_fn = partial(update_oneapi_from_response, task_response=response)
-    background_tasks.add_task(update_or_insert, OneapiTask, filter_kwargs, update_fn)  # fastapi 服务里会运行
-    # await background_tasks.__call__() # 调试
+    if background_tasks:
+        background_tasks.add_task(update_or_insert, OneapiTask, filter_kwargs, update_fn)
+    else:
+        await update_or_insert(OneapiTask, filter_kwargs, update_fn)
 
     return response
 
@@ -138,7 +144,7 @@ async def update_oneapi_from_response(task: OneapiTask, task_response: TaskRespo
     """
     if task.status in {"SUCCESS", "FAILURE"}: return False  # 跳出轮询，不再更新
 
-    task.data = task_response.model_dump(exclude_none=True, exclude={"system_fingerprint"})
+    task.data = task_response.model_dump(exclude={"system_fingerprint"})
     task.status = task_response.status
     task.progress = time.time() // 10 % 100
 

meutils/data/VERSION

@@ -1 +1 @@
-2024.11.29.22.04.24
+2024.12.02.08.52.40