MeUtils 2024.11.29.11.8.36__py3-none-any.whl → 2024.11.29.18.21.1__py3-none-any.whl

{MeUtils-2024.11.29.11.8.36.dist-info → MeUtils-2024.11.29.18.21.1.dist-info}/METADATA

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

{MeUtils-2024.11.29.11.8.36.dist-info → MeUtils-2024.11.29.18.21.1.dist-info}/RECORD

@@ -105,7 +105,7 @@ examples/_openaisdk/openai_search.py,sha256=HKRTU6y9j_nUfZgrJt2eZ84d7TVT39WN-dcA
 examples/_openaisdk/openai_sensenova.py,sha256=TnJpHcD1tG5w_x5DsgFgBRWrU8XUkww0uCebgNFfZDM,3216
 examples/_openaisdk/openai_siliconflow.py,sha256=SuOwW7XmoBpKtLRbi7MFovjfeI2sFWhgOYh11O0vBR4,1349
 examples/_openaisdk/openai_step.py,sha256=KSSnBwJZbjpPuevqBXGiEBHQidHedePsr4Jfj6ruVO0,943
-examples/_openaisdk/openai_tune.py,sha256=SwwRZg571nAcQ5ossfJIvLw-hiEPxwonOPv57oCc6tM,1232
+examples/_openaisdk/openai_tune.py,sha256=rDmX_EMsAhD0gKJPQ8P0-icZQAjV6OMkMLX67uwJtvU,674
 examples/_openaisdk/openai_zhipu.py,sha256=K13ogb2IZO0-_ItLqHIAFWaN6FH2vd72PdieIXMZNx8,1626
 examples/_openaisdk/ppu.py,sha256=jPBufoYt2ZrqNKjgbHr49YZI5vBM-32eBYbhbYduhnY,602
 examples/_openaisdk/rag.py,sha256=NwNHhfi5FZ2XKCmsScjmM5cxCSfJuqx2jV-69ZXh244,1372
@@ -415,15 +415,16 @@ meutils/apis/vidu/x.py,sha256=UD1QlAQTtLgFiDfWYVxM-1ppfrX_LaVYASk2yNviMuk,322
 meutils/apis/voice_clone/__init__.py,sha256=y7Rpn90LocHhA0ywrDP_fT4QAK7sr4JsIX5wLJgkNHA,241
 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=QpkvoT6u-IBAlVgIevDkvEe_kVfW96UkS7i3NQHG63Y,303
+meutils/async_task/__init__.py,sha256=45cUr-GWvQ1JFYGOYPOIkHLyTR3JbfP_PEYrmktpMLo,367
 meutils/async_task/celery_config.py,sha256=Mv8YjLQlHsWbVHw3wkauMw2H1g46KNnJa4EPehFj6dw,3308
-meutils/async_task/common.py,sha256=LDoHKK8ouiN06NrwRn5vtmIyfGGH76iodtiS8Qjz-rM,1218
-meutils/async_task/demo_create_tasks.py,sha256=emeDUNtZAlZ6kNwt3_6ta0ART0Bj6T2DhivZDzOMx-o,1762
+meutils/async_task/common.py,sha256=ZJ4e0CsEJf1ppPmGSwPCwhZBAkUL5xsi_t1ny-bJuko,845
+meutils/async_task/demo_create_tasks.py,sha256=DBUxi8lp4iJZrubn6XztRHB4DuZDEXpohSxCH6NMKuc,2219
+meutils/async_task/utils.py,sha256=IgGcKkD6yut_CagnRanRPY180kM6FpYO0dFyJKJ50zQ,2933
 meutils/async_task/通用设计.py,sha256=kGdrJHJu9VoOkyGHREn0KUtBTibAaLIcG0O6hEJNhLA,3232
-meutils/async_task/tasks/__init__.py,sha256=2ilRdLq7JNpFU_xFc54r5JGOuNhx5r-zoyXqxC4WWIg,244
+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=xfD_Ec9ZMPJsK9KkwOU5lnsfeq9tjtt1AWSMLAgH_ss,608
-meutils/async_task/tasks/test.py,sha256=U61SWjQoHjbdNWY7QUhOVsMjLa-FLoBIxoXqTD0Q_0U,1797
+meutils/async_task/tasks/kling.py,sha256=DwOUHyNDBpM1olCpow_cVct8iPpg2PEqY180wpTt07o,904
+meutils/async_task/tasks/test.py,sha256=f-QY-k81ixe4x-rRO7yqStZ1w8MdVoq-ooq9bDzXOeI,2148
 meutils/async_task/tasks/vidu.py,sha256=obBG4_bf1oPIlLxeca1s1dGOnlyam2xYRy-8TrH3ZTk,620
 meutils/async_utils/__init__.py,sha256=IiJLRm258jkM4xAjUKOD7tVwHIemj7_1CuzXCu3TuQU,284
 meutils/async_utils/asyncer_.py,sha256=S1Sp5WZx_uKM7kJyRVYU8QhmbjOh61JmfN2IN_PJNX4,736
@@ -458,7 +459,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=D5JpDI561ARAq5jBz_Efv6kW8jnEwhy-74urB5xD0MI,19
+meutils/data/VERSION,sha256=DLrVpDq7LFcQTu5Bosj924g93X879qfc52nPn1RrbTo,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -470,7 +471,7 @@ meutils/data/oneapi/__init__.py,sha256=cm2Kq2RDXPfdVMWcoBB77bu00zJpTDd21Rgc6bTlh
 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=PTFQCYzQB33knBK3kn4WdQCs-RA0XDA0CNeI_nq4kHM,4005
+meutils/db/orm.py,sha256=dyV8tlVDUw_8tS6uiz_nyPzpNg8UX-ob7zarLVfvvqE,4060
 meutils/db/redis_db.py,sha256=vBe-Yj2JxZS8-G7bmMB4oxxMrV1xUwy22kGaETMb0DE,2085
 meutils/decorators/__ai.py,sha256=QAz005-Wa-sp0YUUoelaR1pMbt6hPSBML5j0My6TbEI,1681
 meutils/decorators/__init__.py,sha256=hgpHo40pfFWYXEnrW74o8W7SIfCD0GHr3gnujBw1hIQ,3284
@@ -653,7 +654,7 @@ meutils/schemas/runwayml_types.py,sha256=q6g00kg1PYCDjpw-notgbcUGwRAlIa8kAmU52Zu
 meutils/schemas/siliconflow_types.py,sha256=amOygjMqbSss4021sCNX1p5d-k1wa2tNLr0gnke1Vrc,8429
 meutils/schemas/step_types.py,sha256=nGTPXZ7RwOF2RTsPBQguLLcIaBxHs4bsZkYa_LalcJ0,648
 meutils/schemas/suno_types.py,sha256=KTdcwaJNDUFiY8izVJSZdGZgEMb0OhdiRR_dJVN-Cz0,14967
-meutils/schemas/task_types.py,sha256=s6-pN8SEazi7yCkH47pxxmpH9SI90ePNoi6hZVcR7Uw,2834
+meutils/schemas/task_types.py,sha256=G2qzqdNfYKzeJwps_QNiqV4_Qo0MSdxwqqITD8dtajo,4317
 meutils/schemas/translator_types.py,sha256=xufNQeyim7RhkzAK_J5_JchZfqaUBDXFwMtrPUu1xzI,627
 meutils/schemas/tripo3d_types.py,sha256=mQF65HwHYmczRgAIuXK5hGxWDWNYDq-Xu9pja7Dwy4o,1452
 meutils/schemas/tryblend_types.py,sha256=glZ0diRJvZmfQotcCWYBA832inihy8TvVWxWZ64CzWA,27793
@@ -662,10 +663,10 @@ 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=yQEpaoOY-YWl9PP4INqapX9TENUVqfY7rjGFgBGKIT8,3459
+meutils/schemas/db/oneapi_types.py,sha256=1QEcIkT5dp1SnjEj2cwiZXPjjh6StGf0_gpGFDbGrNI,2806
 meutils/schemas/oneapi/__init__.py,sha256=uevbi3QAvFzN9WPbx9bYKTDyKt7P2ueZO6W0nSiD0sk,289
 meutils/schemas/oneapi/_types.py,sha256=ClvAaNy3SahEN8lL8KEErHTD6HANelXUeKc_3iLfosQ,1488
-meutils/schemas/oneapi/common.py,sha256=Q6l0LuqvtdJTs3IqpxXRRIwGW89RYrEwKwZEwgnkPYM,22573
+meutils/schemas/oneapi/common.py,sha256=DPo8jsY0ytKFTILKi3-Apz6VK6cM_lBJ1xKqDNRjT88,22573
 meutils/schemas/oneapi/icons.py,sha256=T7W5gInBJoHe62wzMimbG_UI-wn3_-rmQ1O4O2z-CQY,1089
 meutils/schemas/oneapi/model_group_info.py,sha256=rGtflYJuFIjk5MsVEvK9JUR4IciX8jfErqeLqf8DIlQ,1586
 meutils/schemas/oneapi/model_info.py,sha256=_uwKEPIIqm7ZYfhmpxtXB2QNsS83SpJY-OaBzvogC9w,772
@@ -684,11 +685,11 @@ meutils/serving/celery/通用设计.py,sha256=kGdrJHJu9VoOkyGHREn0KUtBTibAaLIcG0
 meutils/serving/fastapi/__init__.py,sha256=_NvGfai2sMzsywCQk-hYRm-nTz0O6op2ln5kEUiqGqM,290
 meutils/serving/fastapi/common.py,sha256=xuVlnF_U4s9LQnwhUK3cbH5OcfEM0M6NqJ3gZm9enic,4681
 meutils/serving/fastapi/gunicorn.conf.py,sha256=1ylGijXbW8bVQoJu9TUCvkurVUGk0ZGHL2GYKtm2DfY,7791
-meutils/serving/fastapi/utils.py,sha256=vVQWig0-KBn9PmLYfbj-AQ7gpiOTXg7wdSrXL9Qn2nE,2994
+meutils/serving/fastapi/utils.py,sha256=H5lQSU7-IfJ2w9FWbaJ34LCbQSaNTFSU7z1pG5wZlRo,2965
 meutils/serving/fastapi/__demo/__init__.py,sha256=TxXjqy2ZxAkadPxqN92Xq3ixCUYkQ-4X6UxsReRpHhc,271
 meutils/serving/fastapi/__demo/异步任务.py,sha256=60_ruA4ljlTLIP5zxcejmm9WJ0SDuqpsO49SZK9vA_s,1444
 meutils/serving/fastapi/dependencies/__init__.py,sha256=shI1EgfH4gFuajmHGlzt_ArdDrFq8DqnUg7ycpFuYl0,245
-meutils/serving/fastapi/dependencies/auth.py,sha256=cZ5a5ibUc4BxHnuGgRkKl6GNe3vYKwYE8mhMXXQjZH4,342
+meutils/serving/fastapi/dependencies/auth.py,sha256=WDdFPRApBJrL8-APHAnQyMFrT7OnfeHg0oABwLVKm6Q,822
 meutils/serving/fastapi/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/serving/fastapi/exceptions/http_error.py,sha256=6NW48Iadu-LyDBtp_P7YHWhBfwkz3OKTerz585FSGUk,2064
 meutils/serving/fastapi/exceptions/validation_error.py,sha256=Q71wYfzGsVjLA-SQ3R5a8iT0kDG01mwriVUXHhvsTv0,1234
@@ -791,9 +792,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.11.8.36.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.11.29.11.8.36.dist-info/METADATA,sha256=tOMVYi2Fm1-fZ86b8Aw6PTSDWnHFTtPO1OpILfurCzE,6143
-MeUtils-2024.11.29.11.8.36.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.11.29.11.8.36.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.11.29.11.8.36.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.11.29.11.8.36.dist-info/RECORD,,
+MeUtils-2024.11.29.18.21.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.11.29.18.21.1.dist-info/METADATA,sha256=wWYffD75OIT0ZB6bzHGhCLoE9jhXH1kv5rein1bU1v0,6143
+MeUtils-2024.11.29.18.21.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.11.29.18.21.1.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.11.29.18.21.1.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.11.29.18.21.1.dist-info/RECORD,,

examples/_openaisdk/openai_tune.py

@@ -8,33 +8,14 @@
 # @Software     : PyCharm
 # @Description  :
 
-from meutils.pipe import *
-#  curl -X POST "https://any2chat.chatfire.cn/tune/v1/chat/completions" \
-# -H "Authorization: Bearer sk-tune-0UkSny4Fe7ouhF3GPI0lIAKIAj7B2kkJmOV" \
-# -H "Content-Type: application/json" \
-# -d '{
-#   "temperature": 0.8,
-#   "messages": [
-#   {
-#     "role": "user",
-#     "content": "1+1"
-#   }
-# ],
-#   "model": "anthropic/claude-3.5-sonnet",
-#   "stream": true,
-#   "frequency_penalty": 0,
-#   "max_tokens": 900
-# }'
+
 
 
 from meutils.pipe import *
 from openai import OpenAI
 
-base_url = "http://154.40.54.76:3000/v1"
-api_key = "sk-tune-0UkSny4Fe7ouhF3GPI0lIAKIAj7B2kkJmOV"
 client = OpenAI(
-    api_key=api_key,
-    base_url=base_url,
+
 )
 
 completion = client.chat.completions.create(
@@ -42,12 +23,13 @@ completion = client.chat.completions.create(
     # model="openai/gpt-4o-mini",
     # model="openai/gpt-4o",
     # model="anthropic/claude-3.5-sonnet",
-    model="gpt-4o-mini",
+    # model="gpt-4o-mini",
+    model="gpt-4-turbo",
 
     messages=[
         {"role": "user", "content": "1+1"},
     ],
-    # max_tokens=10
+    max_tokens=10000
 )
 
 print(completion)

meutils/async_task/__init__.py

@@ -8,4 +8,6 @@
 # @Software     : PyCharm
 # @Description  : 
 
-from meutils.async_task.common import worker, shared_task
+
+# from meutils.async_task.common import worker, shared_task, AsyncResult, states
+from meutils.async_task.common import *

meutils/async_task/common.py

@@ -10,25 +10,12 @@
 
 from meutils.pipe import *
 from meutils.decorators.retry import retrying
+
 from meutils.async_task import celery_config
 
 from celery import Celery, Task, shared_task, states
 
 
-class RetryableTask(Task):  # 实际上 在具体任务支持 执行重试就行
-    """shared_task(base=RetryableTask)"""
-
-    # 使用 tenacity 进行更灵活的重试控制
-    @retrying(
-        max_retries=6,
-        title="Celery 任务重试"
-    )
-    def run_with_retry(self, *args, **kwargs):
-        return self.run(*args, **kwargs)
-
-    def __call__(self, *args, **kwargs):
-        return self.run_with_retry(*args, **kwargs)
-
 
 worker = Celery()
 
@@ -41,9 +28,10 @@ worker.conf.update(
     task_track_started=True,
 )
 
-
 if __name__ == '__main__':
     print(worker.conf.humanize(with_defaults=False))
 
     print(worker.conf.broker_url)
     print(worker.conf.result_backend)
+
+    print(arun(get_task("59ddf636-3f27-4110-948e-5977c8cbe1b3")))

meutils/async_task/demo_create_tasks.py

@@ -44,12 +44,22 @@ if __name__ == '__main__':
     # test.ado_sync_task.apply_async(kwargs={'a': 1, 'b': 3})
     # print(AsyncResult("42e191a0-6099-419e-b61d-07bf7e2df2fc").result)
     # result.backend
-
+    # AsyncResult("42e191a0-6099-419e-b61d-07bf7e2df2fc").get()
     # AsyncResult(r.id).result
 
 
     # test.do_pydantic_task.apply_async(kwargs={'request': test.Request()})
 
     test.do_pydantic_task.apply_async(kwargs={"request": {"method": "POST", "url": "测试"}})
-    test.do_pydantic_task.apply_async(kwargs={"request": {"method": "xx"}})
-    test.do_pydantic_task.apply_async(args=({"method": "xxxxxxx"},))
+
+    print(type(test.do_pydantic_task))
+
+
+    # test.do_pydantic_task.apply_async(kwargs={"request": {"method": "POST", "url": "测试"}})
+    # test.do_pydantic_task.apply_async(kwargs={"request": {"method": "xx"}})
+    # test.do_pydantic_task.apply_async(args=({"method": "xxxxxxx"},))
+
+    #
+    # test.do_task_retrying.apply_async(kwargs={'name': "###do_task_retrying"})
+    # test.do_task_retry.apply_async(kwargs={'name': "###do_task_retry"})
+    # test.do_task_retry_backoff.apply_async(kwargs={'name': "###do_task_retry_backoff"})

meutils/async_task/tasks/__init__.py

@@ -7,3 +7,5 @@
 # @WeChat       : meutils
 # @Software     : PyCharm
 # @Description  : 
+
+

meutils/async_task/tasks/kling.py

@@ -6,28 +6,27 @@
 # @Author       : betterme
 # @WeChat       : meutils
 # @Software     : PyCharm
-# @Description  : 
+# @Description  : 注册任务
 
 from meutils.pipe import *
+from meutils.async_utils import async_to_sync_pro
 from meutils.decorators.retry import retrying
 from meutils.async_task import worker, shared_task
 
 from meutils.apis.kling import kolors_virtual_try_on
 
 
-@shared_task
-async def do_task(**kwargs):
-    return kwargs
-
-
-@shared_task
-@retrying(3)
-async def proxy_task(**kwargs):
-    pass
-
+@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):
+    response = await kolors_virtual_try_on.create_task(request)
     return response
 
 
+# celery_task
 
 
-# kolors_virtual_try_on.create_task
+if __name__ == '__main__':
+    pass
+    # create_task.apply_async()
+    # kling.create_task.apply_async(kwargs={"request": request.model_dump()})

meutils/async_task/tasks/test.py

@@ -45,23 +45,36 @@ def do_pydantic_task(request: Request):
 
 
 @shared_task(retry_kwargs={'max_retries': 10})
-def do_task_retry(args, kwargs):
+def do_task_retry(*args, **kwargs):
+    logger.debug("do_task_retry")
+
     return 1 / 0
 
+@shared_task(
+    default_retry_delay=3,
+    retry_backoff=True,
+    retry_kwargs={'max_retries': 10}
+)
+def do_task_retry_backoff_noautoretry(*args, **kwargs):
+    logger.debug("do_task_retry_backoff")
 
+    return 1 / 0
 @shared_task(
-    # autoretry_for=(Exception,),
+    autoretry_for=(Exception,),
     default_retry_delay=3,
     retry_backoff=True,
     retry_kwargs={'max_retries': 10}
 )
-def do_task_retry_backoff(args, kwargs):
+def do_task_retry_backoff(*args, **kwargs):
+    logger.debug("do_task_retry_backoff autoretry")
+
     return 1 / 0
 
 
 @shared_task(retry_kwargs={'max_retries': 3})
 @retrying(10)
-def do_task_retrying(args, kwargs):
+def do_task_retrying(*args, **kwargs):
+    logger.debug("do_task_retrying")
     return 1 / 0
 
 

meutils/async_task/utils.py

@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Project      : AI.  @by PyCharm
+# @File         : utils
+# @Time         : 2024/11/29 16:22
+# @Author       : betterme
+# @WeChat       : meutils
+# @Software     : PyCharm
+# @Description  : 通用异步设计，兼容oneapi监控
+
+from celery.result import AsyncResult
+
+from meutils.pipe import *
+from meutils.schemas.task_types import TaskResponse
+
+from meutils.db.orm import update_or_insert
+from meutils.schemas.db.oneapi_types import OneapiTask
+
+
+async def create_task(async_task, request: Union[BaseModel, dict]):
+    if not isinstance(request, dict):
+        request = request.model_dump()
+
+    result = async_task.apply_async(kwargs={"request": request})
+    task_id = result.id
+    return TaskResponse(task_id=task_id)
+
+
+async def get_task(
+        task_id: str,
+        remote_get_task: Optional[Callable] = None,
+        filter_kwargs: Optional[dict] = None
+):
+    result = AsyncResult(id=task_id)
+
+    if result.ready():
+        if result.successful():
+            data = result.get()  # system_fingerprint
+            token = data.pop("system_fingerprint", None)  # 远程任务 token/apikey
+
+            response = TaskResponse(
+                task_id=task_id,
+
+                message="Task completed successfully",
+                status=result.status,
+                data=data
+            )
+
+            if remote_get_task:  # 获取远程任务
+                response: TaskResponse = await remote_get_task(task_id, token)  # todo: 缓存一份
+
+                if not isinstance(data, dict):
+                    data = data.model_dump()
+                response.__dict__.update(data)
+
+        else:
+            response = TaskResponse(
+                task_id=task_id,
+
+                code=1,
+                message=str(result.result),
+                status=result.status,
+            )
+    else:
+        response = TaskResponse(
+            task_id=task_id,
+
+            message="Task is still running",
+            status=result.status,
+        )
+
+    # 更新到数据库：异步任务
+    update_fn = partial(update_oneapi_from_response, task_response=response)
+    asyncio.create_task(update_or_insert(OneapiTask, filter_kwargs, update_fn))  # 测试是否会执行
+
+    return response
+
+
+# todo: 可以设计更通用的
+async def update_oneapi_from_response(task: OneapiTask, task_response: TaskResponse):
+    if task.status in {"SUCCESS", "FAILURE"}: return False  # 跳出轮询，不再更新
+
+    task.data = task_response.model_dump(exclude_none=True, exclude={"system_fingerprint"})
+    task.status = task_response.status
+    task.progress = time.time() // 10 % 100
+
+    if task.status == "SUCCESS":
+        task.progress = "100%"
+    elif task.status == "FAILURE":
+        task.fail_reason = "查看详情"
+
+    task.updated_at = int(time.time())
+    task.finish_time = int(time.time())  # 不是实际时间
+
+
+if __name__ == '__main__':
+    pass

meutils/data/VERSION

@@ -1 +1 @@
-2024.11.29.11.08.36
+2024.11.29.18.21.01

meutils/db/orm.py

@@ -42,12 +42,12 @@ async def get_db():
         yield session
 
 
-async def update_or_insert(entity, kwargs: Optional[dict] = None, update_fn: Optional[Callable] = None,
+async def update_or_insert(entity, filter_kwargs: Optional[dict] = None, update_fn: Optional[Callable] = None,
                            n: int = 1):
     """
 
     :param entity: TASK 类
-    :param ident: 查询条件 字典 元组 第一个值是id
+    :param filter_kwargs: 查询条件 字典 元组 第一个值是id
     :param update_fn:
 
         def update_fn(data):
@@ -61,14 +61,14 @@ async def update_or_insert(entity, kwargs: Optional[dict] = None, update_fn: Opt
             await asyncio.sleep(n / i, 1)
 
             logger.debug(f"UPDATE_OR_INSERT: {entity.__name__}-{i}")
-            update_flag = await update_or_insert(entity, kwargs, update_fn)
+            update_flag = await update_or_insert(entity, filter_kwargs, update_fn)
             if update_flag is False:
                 logger.debug("提前跳出轮询")
                 break
 
-    kwargs = kwargs or {}
+    filter_kwargs = filter_kwargs or {}
     async with AsyncSession(engine) as session:
-        statement = select(entity).filter_by(**kwargs)
+        statement = select(entity).filter_by(**filter_kwargs)
         result = await session.exec(statement)
         data = result.first()  # result.all()
 
@@ -87,7 +87,7 @@ async def update_or_insert(entity, kwargs: Optional[dict] = None, update_fn: Opt
                 await session.refresh(data)
             return data
         else:
-            data = entity(**kwargs)
+            data = entity(**filter_kwargs)
             logger.debug(f"INSERT: {data}")
 
             session.add(data)
@@ -124,7 +124,7 @@ if __name__ == '__main__':
     #
     # arun(create_db_and_tables())
 
-    from meutils.schemas.db.oneapi_types import Tasks
+    from meutils.schemas.db.oneapi_types import OneapiTask
 
     filter_kwargs = {
         "task_id": "888",

meutils/schemas/db/oneapi_types.py

@@ -13,38 +13,6 @@ from meutils.pipe import *
 from sqlalchemy import JSON
 from sqlmodel import Field, Session, SQLModel, create_engine, select, insert, update, Column, DateTime, func
 
-# "NOT_START", "SUBMITTED", "QUEUED", "IN_PROGRESS", "FAILURE", "SUCCESS", "UNKNOWN"
-
-STATUSES = {
-    "not_start": "NOT_START",
-
-    "submitted": "SUBMITTED",
-
-    "starting": "QUEUED",
-    "queued": "QUEUED",
-    "STARTED": "QUEUED",
-    "started": "QUEUED",
-    "pending": "QUEUED",
-    "PENDING": "QUEUED",
-
-    "processing": "IN_PROGRESS",
-    "in_progress": "IN_PROGRESS",
-    "received": "IN_PROGRESS",
-    "RECEIVED": "IN_PROGRESS",
-
-    "succeed": "SUCCESS",
-    "success": "SUCCESS",
-    "succeeded": "SUCCESS",
-
-    "failed": "FAILURE",
-    "canceled": "FAILURE",
-    "FAILURE": "FAILURE",
-    "failure": "FAILURE",
-
-    "unknown": "UNKNOWN",
-
-}
-
 
 def get_default_name():
     return "xx"
@@ -63,7 +31,7 @@ class Hero(SQLModel, table=True):
     )
 
 
-class Tasks(SQLModel, table=True):
+class OneapiTask(SQLModel, table=True):
     """https://github.com/Calcium-Ion/new-api/blob/main/model/task.go"""
     id: Optional[int] = Field(default=None, primary_key=True)
 

meutils/schemas/oneapi/common.py

@@ -294,7 +294,7 @@ MODEL_RATIO = {
     "qwen2.5-math-72b-instruct": 4.13 / 2,
     "qwen2.5-coder-32b-instruct": 0.5,
     "qwen/qwq-32b-preview": 1,
-    "QWEN/QWQ-32B-PREVIEW": 1,
+    "Qwen/QwQ-32B-Preview": 1,
 
     "qwen1.5-7b-chat": 0.05,  # 特价
     "qwen1.5-14b-chat": 0.7,
@@ -606,7 +606,7 @@ COMPLETION_RATIO = {
 
     "qwen-turbo-2024-11-01": 3,
     "qwen/qwq-32b-preview": 2,
-    "QWEN/QWQ-32B-PREVIEW": 2,
+    "Qwen/QwQ-32B-Preview": 2,
 
 }
 

meutils/schemas/task_types.py

@@ -11,6 +11,60 @@ from enum import Enum
 
 from meutils.pipe import *
 
+# "NOT_START", "SUBMITTED", "QUEUED", "IN_PROGRESS", "FAILURE", "SUCCESS", "UNKNOWN"
+
+STATUSES = {
+    "not_start": "NOT_START",
+
+    "submitted": "SUBMITTED",
+
+    "starting": "QUEUED",
+    "queued": "QUEUED",
+    "STARTED": "QUEUED",
+    "started": "QUEUED",
+    "pending": "QUEUED",
+    "PENDING": "QUEUED",
+
+    "processing": "IN_PROGRESS",
+    "in_progress": "IN_PROGRESS",
+    "received": "IN_PROGRESS",
+    "RECEIVED": "IN_PROGRESS",
+
+    "succeed": "SUCCESS",
+    "success": "SUCCESS",
+    "succeeded": "SUCCESS",
+
+    "failed": "FAILURE",
+    "canceled": "FAILURE",
+    "FAILURE": "FAILURE",
+    "failure": "FAILURE",
+
+    "unknown": "UNKNOWN",
+
+}
+
+
+class TaskResponse(BaseModel):
+    """异步任务 通用响应体"""
+    task_id: Optional[str] = None
+
+    code: Optional[int] = 0
+    message: Optional[str] = None
+    status: Optional[str] = "submitted"
+    data: Optional[Any] = None
+
+    # 系统水印：可以存token
+    # user_id: Optional[str] = None
+    system_fingerprint: Optional[str] = None
+
+    def __init__(self, /, **data: Any):
+        super().__init__(**data)
+        self.status = STATUSES.get(self.status, "UNKNOWN")
+
+    class Config:
+        # 允许额外字段，增加灵活性
+        extra = 'allow'
+
 
 class TaskType(str, Enum):
     # 存储
@@ -115,7 +169,16 @@ if __name__ == '__main__':
 
     # print('kling_vip'.startswith(TaskType.kling))
 
-    print(Purpose.__members__)
-    print(list(Purpose))
+    # print(Purpose.__members__)
+    # print(list(Purpose))
+    #
+    # print(Purpose.oss in Purpose.__members__)
+
+    # , ** {"a": 1, "system_fingerprint": 1}
+    response = TaskResponse(system_fingerprint="121")
+
+    print(response.model_dump())
+
+    response.__dict__.update({"a": 1, "system_fingerprint": 1})
 
-    print(Purpose.oss in Purpose.__members__)
+    print(response.model_dump())

meutils/serving/fastapi/dependencies/auth.py

@@ -8,7 +8,31 @@
 # @Software     : PyCharm
 # @Description  : 
 
+from typing import Optional, Union
 
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+from fastapi import Depends, HTTPException, status
 
-get_bearer_token = HTTPBearer()
+http_bearer = HTTPBearer()
+
+
+# get_bearer_token = http_bearer
+
+
+# 定义获取token的函数
+async def get_bearer_token(
+        auth: Optional[HTTPAuthorizationCredentials] = Depends(http_bearer)
+) -> Optional[str]:
+    """
+    获取Bearer token
+    :param auth: HTTP认证凭证
+    :return: token字符串
+    """
+    if auth is None:
+        return None
+
+    return auth.credentials
+
+
+if __name__ == '__main__':
+    pass

meutils/serving/fastapi/utils.py

@@ -78,7 +78,7 @@ def limit(limit_value='3/second', error_message: Optional[str] = None, **kwargs)
 
 
 def check_api_key(auth: HTTPAuthorizationCredentials):
-    api_key = auth and auth.credentials or None
+    api_key = auth
     if api_key is None:
         detail = {
             "error": {