MeUtils 2024.12.2.11.1.18__tar.gz → 2024.12.2.11.50.27__tar.gz

{meutils-2024.12.2.11.1.18 → meutils-2024.12.2.11.50.27/MeUtils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.2.11.1.18
+Version: 2024.12.2.11.50.27
 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: pymilvus; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
 Requires-Dist: reportlab; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: schedule; 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: streamlit; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: fastapi; extra == "all"
 Requires-Dist: pymupd; extra == "all"
-Requires-Dist: jinja2; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
 Requires-Dist: pymongo; extra == "all"
+Requires-Dist: schedule; extra == "all"
 Requires-Dist: polars; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
 Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: jmespath; extra == "all"
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: streamlit; extra == "all"
-Requires-Dist: fastapi; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
 Requires-Dist: pandas-profiling[notebook]; 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: langchain; extra == "all"
-Requires-Dist: simplejson; extra == "all"
 Requires-Dist: seaborn; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: thefuck; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: jieba; extra == "all"
 Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: pymysql; 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: openai; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: simplejson; extra == "all"
+Requires-Dist: fastapi[all]; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.12.2.11.1.18/MeUtils.egg-info → meutils-2024.12.2.11.50.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MeUtils
-Version: 2024.12.2.11.1.18
+Version: 2024.12.2.11.50.27
 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: pymilvus; extra == "all"
-Requires-Dist: pretty_errors; extra == "all"
-Requires-Dist: filetype; extra == "all"
-Requires-Dist: fastapi[all]; extra == "all"
 Requires-Dist: reportlab; extra == "all"
-Requires-Dist: dataframe_image; extra == "all"
-Requires-Dist: schedule; 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: streamlit; extra == "all"
+Requires-Dist: thefuck; extra == "all"
+Requires-Dist: fastapi; extra == "all"
 Requires-Dist: pymupd; extra == "all"
-Requires-Dist: jinja2; extra == "all"
-Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: sqlalchemy; extra == "all"
 Requires-Dist: pymongo; extra == "all"
+Requires-Dist: schedule; extra == "all"
 Requires-Dist: polars; extra == "all"
-Requires-Dist: openai; extra == "all"
-Requires-Dist: iteration_utilities; extra == "all"
-Requires-Dist: redis-py-cluster; extra == "all"
-Requires-Dist: geopy; extra == "all"
-Requires-Dist: pandas_summary; extra == "all"
 Requires-Dist: thriftpy2; extra == "all"
-Requires-Dist: jmespath; extra == "all"
-Requires-Dist: jieba; extra == "all"
-Requires-Dist: streamlit; extra == "all"
-Requires-Dist: fastapi; extra == "all"
+Requires-Dist: pymilvus; extra == "all"
 Requires-Dist: pandas-profiling[notebook]; 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: langchain; extra == "all"
-Requires-Dist: simplejson; extra == "all"
 Requires-Dist: seaborn; extra == "all"
-Requires-Dist: gunicorn; extra == "all"
-Requires-Dist: sqlalchemy; extra == "all"
-Requires-Dist: thefuck; extra == "all"
+Requires-Dist: faiss-cpu; extra == "all"
+Requires-Dist: jieba; extra == "all"
 Requires-Dist: asyncmy; extra == "all"
-Requires-Dist: sse_starlette; extra == "all"
-Requires-Dist: pyarrow; extra == "all"
-Requires-Dist: pymysql; 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: openai; extra == "all"
+Requires-Dist: pyarrow; extra == "all"
+Requires-Dist: filetype; extra == "all"
+Requires-Dist: iteration_utilities; extra == "all"
+Requires-Dist: dataframe_image; extra == "all"
+Requires-Dist: simplejson; extra == "all"
+Requires-Dist: fastapi[all]; extra == "all"
 
 [![Downloads](http://pepy.tech/badge/meutils)](http://pepy.tech/project/meutils)
 

{meutils-2024.12.2.11.1.18 → meutils-2024.12.2.11.50.27}/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-2024.12.2.11.1.18 → meutils-2024.12.2.11.50.27}/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(f"celery-task-meta-{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-2024.12.2.11.50.27/meutils/data/VERSION

@@ -0,0 +1 @@
+2024.12.02.11.50.27

{meutils-2024.12.2.11.1.18 → meutils-2024.12.2.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())

meutils-2024.12.2.11.1.18/meutils/data/VERSION

@@ -1 +0,0 @@
-2024.12.02.11.01.18

{meutils-2024.12.2.11.1.18 → meutils-2024.12.2.11.50.27}/MeUtils.egg-info/requires.txt

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