MeUtils 2024.12.2.10.56.44__py3-none-any.whl → 2024.12.2.11.50.27__py3-none-any.whl

{MeUtils-2024.12.2.10.56.44.dist-info → MeUtils-2024.12.2.11.50.27.dist-info}/METADATA

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

{MeUtils-2024.12.2.10.56.44.dist-info → MeUtils-2024.12.2.11.50.27.dist-info}/RECORD

@@ -416,10 +416,10 @@ meutils/apis/voice_clone/__init__.py,sha256=y7Rpn90LocHhA0ywrDP_fT4QAK7sr4JsIX5w
 meutils/apis/voice_clone/fish.py,sha256=6m8zcS2KEqmalKy2ArnOaNovyxsQp_sw4d_O1kVZR2s,7146
 meutils/apis/voice_clone/fish_api.py,sha256=pDpE-B8HFiGIOV3NVd1HmFrCC2GQc3wH-81oNbTS0mY,307
 meutils/async_task/__init__.py,sha256=45cUr-GWvQ1JFYGOYPOIkHLyTR3JbfP_PEYrmktpMLo,367
-meutils/async_task/celery_config.py,sha256=KqMLvbOCAvjx-egRfR1tuzdw5k6CoeCkgjp4sVoCIOc,3429
+meutils/async_task/celery_config.py,sha256=BX1h3jY34aO6UmUFakdBUwOdsEiOxCGuUtYDUKFtafc,3461
 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=VdQYG59bn8YnFGP6QX4FOMJp3a_EkmcIaQ3ucEwofSU,5345
+meutils/async_task/utils.py,sha256=MbG3f6d3PYWySp4P74rw3DCKgWyinyEBjMJBKBPmLlE,5563
 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=ADC-ZisW9dgSw6YPcepVV6cplQ_Mt8AvmzvrzKSVWT4,19
+meutils/data/VERSION,sha256=oGyFhh775J26HbWxepBbFfL0hO3q7_7RvPBFa2cnntU,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -473,7 +473,7 @@ meutils/db/__init__.py,sha256=HR99rqxoFTWXUHDhLVl33tzIn8M86gigHLmEzOKH1Ec,7637
 meutils/db/mongo.py,sha256=B-B_t939rxtnNGt0PxhivjIUwinmHPzLUpXsjUIaTkQ,2337
 meutils/db/neo4j.py,sha256=eYd3jP3COWlOFBaF20UXphW67-HwlZ1t0Q34Cp-j6o0,2168
 meutils/db/orm.py,sha256=dyV8tlVDUw_8tS6uiz_nyPzpNg8UX-ob7zarLVfvvqE,4060
-meutils/db/redis_db.py,sha256=fsNqUPVt-qiAk_rBQU_9XYZUz7zQyOogUzjQXnVmJow,2433
+meutils/db/redis_db.py,sha256=Br2AAB8S2lkvLP1ppp7feaFvWGn_MSdw_CDW2lcoIno,2385
 meutils/decorators/__ai.py,sha256=QAz005-Wa-sp0YUUoelaR1pMbt6hPSBML5j0My6TbEI,1681
 meutils/decorators/__init__.py,sha256=hgpHo40pfFWYXEnrW74o8W7SIfCD0GHr3gnujBw1hIQ,3284
 meutils/decorators/cache.py,sha256=-sqhCuiSYZK1UtsRw7bBog19G65O9N27DVTAp_nlBk4,2972
@@ -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.12.2.10.56.44.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.2.10.56.44.dist-info/METADATA,sha256=hvIieIB5io0eoJGPvhJNDxsaYrImlpcCCgnMmH-AgkI,6143
-MeUtils-2024.12.2.10.56.44.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.2.10.56.44.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.2.10.56.44.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.2.10.56.44.dist-info/RECORD,,
+MeUtils-2024.12.2.11.50.27.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.2.11.50.27.dist-info/METADATA,sha256=RtWelX_xSuEYF8775NX0U2C_AA6j8XbkuX6NOfi64O4,6143
+MeUtils-2024.12.2.11.50.27.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.2.11.50.27.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.2.11.50.27.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.2.11.50.27.dist-info/RECORD,,

meutils/async_task/celery_config.py

@@ -19,6 +19,8 @@ broker_url = os.getenv('REDIS_URL', broker_url)
 # result_backend = f"redis://localhost:6379/1"  # 结果存储
 result_backend = f"{broker_url.replace('/0', '')}/1"  # 结果存储
 
+# logger.debug(result_backend)
+
 # 添加以下配置增加可靠性
 broker_connection_retry = True
 broker_connection_max_retries = 5

meutils/async_task/utils.py

@@ -63,23 +63,26 @@ async def get_task(
         }
     :return:
     """
-    await redis_aclient.select(1)  # 切到 celery
-    if not await redis_aclient.get(task_id):
-        raise HTTPException(status_code=404, detail="TaskID not found")
-
     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()))
+    logger.debug(bjson(result._get_task_meta()))
+    # logger.debug(bjson(result.get(timeout=30)))
+    logger.debug(result)
+    logger.debug(result.ready())
+    logger.debug(result.state)
 
-    data = result.get().copy()  # 创建任务时：remote task的返回结果 ####### copy避免丢失字段
-    logger.debug(bjson(data))
-    token = data.pop("system_fingerprint", None)  # 远程任务 token/apikey
+    # if result.status=="PENDING": # worker可能还未启动，会阻塞
+    # if await redis_aclient.select(1) and not await redis_aclient.exists(f"celery-task-meta-{task_id}"):
+    #     raise HTTPException(status_code=404, detail="TaskID not found")
 
     if result.ready():
         if result.successful():
+            data = result.get(timeout=30).copy()  # 创建任务时：remote task的返回结果 ####### copy避免丢失字段
+            logger.debug(bjson(data))
+            token = data.pop("system_fingerprint", None)  # 远程任务 token/apikey
+
             remote_task_id = (
                     data.get("task_id")  # 提前写
                     or data.get("data", {}).get("task_id")
@@ -164,7 +167,7 @@ if __name__ == '__main__':
 
     from meutils.apis.kling import kolors_virtual_try_on
 
-    task_id = "d91e39a9-eff9-4e98-8412-a5c40371479e"
+    task_id = "03f8990f-a196-4af3-88cb-727750e462d21"
     # filter_kwargs = {
     #     "task_id": task_id,  #########理论上只需这个
     #     "user_id": 1,

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.02.10.56.44
+2024.12.02.11.50.27

meutils/db/redis_db.py

@@ -66,7 +66,7 @@ if __name__ == '__main__':
     # _ = redis_client.lrange(feishu, 0, -1)
     # print(len(eval(_)))
 
-    task_id = "celery-task-meta-72d59447-1f88-4727-8067-8244c2268faa"
+    task_id = "celery-task-meta-ca94c602-a2cc-4db5-afe4-763f30df8a18"
 
 
     # arun(redis_aclient.get('celery-task-meta-72d59447-1f88-4727-8067-8244c2268faa'))
@@ -75,7 +75,7 @@ if __name__ == '__main__':
 
     async def main():
         r = await redis_aclient.select(1)
-        print(await redis_aclient.get('celery-task-meta-72d59447-1f88-4727-8067-8244c2268faa'))
+        return await redis_aclient.get(task_id)
 
 
     arun(main())