MeUtils 2024.12.2.10.19.51__py3-none-any.whl → 2024.12.2.10.54.20__py3-none-any.whl

{MeUtils-2024.12.2.10.19.51.dist-info → MeUtils-2024.12.2.10.54.20.dist-info}/METADATA

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

{MeUtils-2024.12.2.10.19.51.dist-info → MeUtils-2024.12.2.10.54.20.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=-p8-uGQq0HFFifZWZY6duCxEDcPJpWA4A_Rnz-WNysU,3430
+meutils/async_task/celery_config.py,sha256=KqMLvbOCAvjx-egRfR1tuzdw5k6CoeCkgjp4sVoCIOc,3429
 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=5UGFmTUvlaYNMP9dCkYAyRBJN8zOSzpiF7e-k9PN4Bw,5125
+meutils/async_task/utils.py,sha256=VdQYG59bn8YnFGP6QX4FOMJp3a_EkmcIaQ3ucEwofSU,5345
 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=v0LDzt-y0RRm3UYDoOS7jzUit_p_slZFseifSKBN2qg,19
+meutils/data/VERSION,sha256=ChE79KR0VZxIsXHXB596hz4y1Pi-4kH3T_f66eMbJbI,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=vBe-Yj2JxZS8-G7bmMB4oxxMrV1xUwy22kGaETMb0DE,2085
+meutils/db/redis_db.py,sha256=fsNqUPVt-qiAk_rBQU_9XYZUz7zQyOogUzjQXnVmJow,2433
 meutils/decorators/__ai.py,sha256=QAz005-Wa-sp0YUUoelaR1pMbt6hPSBML5j0My6TbEI,1681
 meutils/decorators/__init__.py,sha256=hgpHo40pfFWYXEnrW74o8W7SIfCD0GHr3gnujBw1hIQ,3284
 meutils/decorators/cache.py,sha256=-sqhCuiSYZK1UtsRw7bBog19G65O9N27DVTAp_nlBk4,2972
@@ -664,7 +664,7 @@ meutils/schemas/vidu_types.py,sha256=Wa947mT5pL9yR4utM-A9oQvNvgaJorr9YRccryHnHH4
 meutils/schemas/wechat_types.py,sha256=XtIJpMNBzkqBcU68Qno8bnUfHzDOXwFNCIL-6VYQKOA,9260
 meutils/schemas/yuanbao_types.py,sha256=ZmB-7_eAuTU3QDonNgy0vcVP4YQNwA5yJ8G4mvfOmUE,11966
 meutils/schemas/db/__init__.py,sha256=m1maURVoM6dIW0yt6ELZrZTzULtkHybVOSXtHNJRVIU,272
-meutils/schemas/db/oneapi_types.py,sha256=hQiWXiF9jcXELosrYkLaai5ZjmbhUSrKfm07OlJgegM,2860
+meutils/schemas/db/oneapi_types.py,sha256=Jtt1hXRS5C3DHf_wrkjklVcdPllsAFrzvLq9JLuTdtc,2858
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
 meutils/schemas/oneapi/common.py,sha256=DPo8jsY0ytKFTILKi3-Apz6VK6cM_lBJ1xKqDNRjT88,22573
@@ -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.19.51.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.12.2.10.19.51.dist-info/METADATA,sha256=BByTxbpKRQMkWAfRvrEAZ-13NSRJOOwJ6v9ISPjPPsI,6143
-MeUtils-2024.12.2.10.19.51.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.12.2.10.19.51.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.12.2.10.19.51.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.12.2.10.19.51.dist-info/RECORD,,
+MeUtils-2024.12.2.10.54.20.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.12.2.10.54.20.dist-info/METADATA,sha256=TNCnXJiePYeGlFeHXcMkKxttFsa-0wYm5LU8Gmo8NHk,6143
+MeUtils-2024.12.2.10.54.20.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.12.2.10.54.20.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.12.2.10.54.20.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.12.2.10.54.20.dist-info/RECORD,,

meutils/async_task/celery_config.py

@@ -17,7 +17,7 @@ broker_url = 'redis://localhost:6379/0'  # 消息代理（推荐使用Redis）
 broker_url = os.getenv('REDIS_URL', broker_url)
 
 # result_backend = f"redis://localhost:6379/1"  # 结果存储
-result_backend = f"{broker_url.replace('/0', '/')}/1"  # 结果存储
+result_backend = f"{broker_url.replace('/0', '')}/1"  # 结果存储
 
 # 添加以下配置增加可靠性
 broker_connection_retry = True

meutils/async_task/utils.py

@@ -16,10 +16,9 @@ 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
+from meutils.db.redis_db import redis_aclient
 
-background_tasks = BackgroundTasks()
+from fastapi import APIRouter, File, UploadFile, Query, Form, Depends, Request, HTTPException, status, BackgroundTasks
 
 
 async def create_task(async_task, request: Union[BaseModel, dict]):
@@ -64,6 +63,10 @@ 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
 

meutils/data/VERSION

@@ -1 +1 @@
-2024.12.02.10.19.51
+2024.12.02.10.54.20

meutils/db/redis_db.py

@@ -7,7 +7,7 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  :
-# from meutils.pipe import *
+from meutils.pipe import *
 
 import os
 from redis import Redis, ConnectionPool
@@ -26,6 +26,8 @@ if REDIS_URL := os.getenv("REDIS_URL"):
     redis_aclient = AsyncRedis.from_pool(async_pool)
     # redis_client = Redis.from_url(REDIS_URL, **kwargs)
     # redis_aclient = AsyncRedis.from_url(REDIS_URL, **kwargs)
+
+
 else:
     redis_client = Redis(**kwargs)  # decode_responses=True
     redis_aclient = AsyncRedis(**kwargs)
@@ -64,4 +66,16 @@ if __name__ == '__main__':
     # _ = redis_client.lrange(feishu, 0, -1)
     # print(len(eval(_)))
 
-    arun(redis_aclient.get('a'))
+    task_id = "celery-task-meta-72d59447-1f88-4727-8067-8244c2268faa"
+
+
+    # arun(redis_aclient.get('celery-task-meta-72d59447-1f88-4727-8067-8244c2268faa'))
+    #
+    # arun(redis_aclient.select(1))
+
+    async def main():
+        r = await redis_aclient.select(1)
+        print(await redis_aclient.get('celery-task-meta-72d59447-1f88-4727-8067-8244c2268faa'))
+
+
+    arun(main())

meutils/schemas/db/oneapi_types.py

@@ -54,7 +54,7 @@ class OneapiTask(SQLModel, table=True):
     TaskStatusSuccess               = "SUCCESS"
     TaskStatusUnknown               = "UNKNOWN
     """
-    status: Optional[str] = Field(default="IN_PROGRESS", max_length=20)
+    status: Optional[str] = Field(default="SUBMITTED", max_length=20)
 
     progress: str = Field(default="0%", max_length=20)
     fail_reason: Optional[str] = Field(default=None)