MeUtils 2024.11.28.18.37.5__py3-none-any.whl → 2024.11.28.19.0.49__py3-none-any.whl

{MeUtils-2024.11.28.18.37.5.dist-info → MeUtils-2024.11.28.19.0.49.dist-info}/METADATA

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

{MeUtils-2024.11.28.18.37.5.dist-info → MeUtils-2024.11.28.19.0.49.dist-info}/RECORD

@@ -416,14 +416,14 @@ 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=QpkvoT6u-IBAlVgIevDkvEe_kVfW96UkS7i3NQHG63Y,303
-meutils/async_task/celery_config.py,sha256=1Z1r96Dr8u-FKMN_5ayJMaMFtXHvJ2IAwStABYy3hAM,2867
+meutils/async_task/celery_config.py,sha256=T1TaH93LmGoBDrBB-5lrLHJ1e_jkAx-MXON70Q2s9VM,2892
 meutils/async_task/common.py,sha256=TY-YdhFKgHMbSAz16OCHcpHJFDTtgc4AWRkMUa3Lcpc,1217
-meutils/async_task/demo_create_tasks.py,sha256=mW-WiMIW8aVWqC-AezEYdS_hVFXX2MiRgkMAGTOOvkk,1261
+meutils/async_task/demo_create_tasks.py,sha256=y8A2rViFZe3rvrEJyw6DYkExoa4wndP_Fq-XEJNJ894,1263
 meutils/async_task/通用设计.py,sha256=kGdrJHJu9VoOkyGHREn0KUtBTibAaLIcG0O6hEJNhLA,3232
 meutils/async_task/tasks/__init__.py,sha256=2ilRdLq7JNpFU_xFc54r5JGOuNhx5r-zoyXqxC4WWIg,244
 meutils/async_task/tasks/_all.py,sha256=Vz63k9yvgj-IBGjekm0u2t571TTT0nMRMqcPvPqJAbY,533
 meutils/async_task/tasks/kling.py,sha256=Z2Z0orhh3VFUkvfTr66lO4fw9hLoxoVBv3Vz6gxEU-8,516
-meutils/async_task/tasks/test.py,sha256=vl0Rbww94puURt2Kz9IUYhkTnHxh-O5bAt3HAnDMsUQ,891
+meutils/async_task/tasks/test.py,sha256=oEaS0xJwJwHE0Fce71I89p0Aa5P0iWbd-EtLorJsemE,925
 meutils/async_task/tasks/vidu.py,sha256=obBG4_bf1oPIlLxeca1s1dGOnlyam2xYRy-8TrH3ZTk,620
 meutils/async_utils/__init__.py,sha256=IiJLRm258jkM4xAjUKOD7tVwHIemj7_1CuzXCu3TuQU,284
 meutils/async_utils/background.py,sha256=dl6UaMIFBZDB1uxSZzGFJdSnpt3Xo0flK7gwsokVy78,1464
@@ -457,7 +457,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=-02Cc5xRJN1z9rUvLSppFUExAt0nfpUx0icKHIlLMhw,19
+meutils/data/VERSION,sha256=jFSGFzT2KvzeEqyvtL4o3E7VdXK782EDJk9XMaj7gec,19
 meutils/data/_FLAG,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/_SUCCESS,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meutils/data/__init__.py,sha256=Hfwkkxs4zHqKhxht0YrhS566a9P5axtmgNvM5wF8ceQ,243
@@ -676,7 +676,7 @@ meutils/serving/celery/__init__.py,sha256=sYFX-Pyejsv-H4v3uZ4VTpFblljl9sMsGxj0-D
 meutils/serving/celery/_conf.py,sha256=VbWeUy1pH4h-DL1o3kys_y8fj6vvUgd3e1xC1_bMqVw,2109
 meutils/serving/celery/_demo.py,sha256=qKc74PT4Z5t6eyQVKNc7MjDqSsx1fbQAqs8GLJOiDF8,514
 meutils/serving/celery/_run_fastapi.py,sha256=s6bx4o7bzRomSHhCppKTLydBacqsI3hG3BwUKFZvKnY,415
-meutils/serving/celery/config.py,sha256=remJwCTf8PHDtVS54Ar26e7Q1Cva5pj8ANfPom2ZM9g,3689
+meutils/serving/celery/config.py,sha256=Q92n3gkVL0zo74cSZ1U7PMDRkoAJ6kuPBbWZ3kgm_LE,3680
 meutils/serving/celery/router.py,sha256=6MTC7MsiaTFh9Qocus9MtP0fIU6uEDFgzV5v8uw7tO0,1104
 meutils/serving/celery/tasks.py,sha256=07QE9MYzaANDlg6crx6apuR6wfmNuryUKt76J8pEPIc,1526
 meutils/serving/celery/通用设计.py,sha256=kGdrJHJu9VoOkyGHREn0KUtBTibAaLIcG0O6hEJNhLA,3232
@@ -790,9 +790,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.28.18.37.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-MeUtils-2024.11.28.18.37.5.dist-info/METADATA,sha256=s7V7OOLH_Ntl_02jPu90z-gbOevW-0q5tulHyMM8ANw,6143
-MeUtils-2024.11.28.18.37.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-MeUtils-2024.11.28.18.37.5.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
-MeUtils-2024.11.28.18.37.5.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
-MeUtils-2024.11.28.18.37.5.dist-info/RECORD,,
+MeUtils-2024.11.28.19.0.49.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+MeUtils-2024.11.28.19.0.49.dist-info/METADATA,sha256=4IlkvZCz2H53-KGYw6CJ5QImJG_YAWWaDu2AudrRYmo,6143
+MeUtils-2024.11.28.19.0.49.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+MeUtils-2024.11.28.19.0.49.dist-info/entry_points.txt,sha256=lufZlBHRqqZKdY-ZQJ4CSZb0qhV5hQC37egZna9M7ug,357
+MeUtils-2024.11.28.19.0.49.dist-info/top_level.txt,sha256=cInfxMmkgNOskurdjwP5unau4rA7Uw48nu07tYhS7KY,22
+MeUtils-2024.11.28.19.0.49.dist-info/RECORD,,

meutils/async_task/celery_config.py

@@ -27,16 +27,12 @@ task_serializer = 'json'
 result_serializer = 'json'
 accept_content = ['json']
 
-# 任务执行设置
-task_soft_time_limit = 10 * 60  # 任务软超时时间（秒）
-task_time_limit = 6 * task_soft_time_limit  # 任务硬超时时间（秒）
-
-worker_max_tasks_per_child = 256  # 每个worker执行多少个任务后自动重启
-worker_prefetch_multiplier = 4  # 预取任务数
-
 # 并发配置
 worker_pool = 'gevent'  # 工作进程池类型，可选：'prefork'、'eventlet'、'gevent'
-worker_concurrency = 4  # worker并发数，一般设置为CPU核心数
+worker_pool_restarts = True
+worker_concurrency = 8  # worker并发数，一般设置为CPU核心数
+worker_prefetch_multiplier = 4  # 预取任务数
+worker_max_tasks_per_child = 256  # 每个worker执行多少个任务后自动重启
 
 # 任务队列配置
 task_default_queue = 'default'  # 默认队列
@@ -46,6 +42,10 @@ task_queues = (
     Queue('low_priority', Exchange('low_priority'), routing_key='low_priority'),
 )
 
+# 任务执行设置
+task_soft_time_limit = 10 * 60  # 任务软超时时间（秒）
+task_time_limit = 6 * task_soft_time_limit  # 任务硬超时时间（秒）
+
 # 任务重试配置
 task_publish_retry = True  # 发布任务失败时重试
 task_publish_retry_policy = {
@@ -74,16 +74,13 @@ worker_log_format = '[%(asctime)s: %(levelname)s/%(processName)s] %(message)s'
 worker_task_log_format = '[%(asctime)s: %(levelname)s/%(processName)s] [%(task_name)s(%(task_id)s)] %(message)s'
 
 # 性能优化
-worker_disable_rate_limits = True  # 禁用任务频率限制
 task_acks_late = True  # 任务执行完成后再确认
 task_reject_on_worker_lost = True  # worker异常关闭时任务会被重新分配
-
+worker_disable_rate_limits = True  # 禁用任务频率限制
 
 # 结果后端配置
 result_expires = 30 * 24 * 3600  # 结果过期时间（秒）
 result_persistent = True  # 结果持久化存储
 
-
-
 # 任务执行配置
-# task_always_eager = False  # 是否立即执行任务（调试用）
+# task_always_eager = False  # 是否立即执行任务（调试用）

meutils/async_task/demo_create_tasks.py

@@ -15,7 +15,7 @@ from meutils.async_task.tasks import test
 from celery.result import AsyncResult
 
 
-print(worker.conf)
+# print(worker.conf)
 
 # @shared_task(
 #     autoretry_for=(Exception,),      # 自动重试的异常类型

meutils/async_task/tasks/test.py

@@ -15,8 +15,10 @@ from meutils.async_task import worker, shared_task
 
 
 @shared_task
-def do_sync_task(**kwargs):
+def do_sync_task(sleep=10, **kwargs):
     logger.debug("同步任务")
+    time.sleep(sleep)
+
     return kwargs
 
 
@@ -40,4 +42,4 @@ def proxy_task(**kwargs):
 
 
 if __name__ == '__main__':
-    print(do_sync_task.apply_async(kwargs={'a': 1, 'b': 2}))
+    print(do_sync_task.apply_async(kwargs={'a': 1, 'b': 2}))

meutils/data/VERSION

@@ -1 +1 @@
-2024.11.28.18.37.05
+2024.11.28.19.00.49

meutils/serving/celery/config.py

@@ -11,7 +11,7 @@
 from meutils.pipe import *
 from datetime import timedelta
 
-from celery import Celery, Task, shared_task
+from celery import Task, shared_task
 from kombu import Exchange, Queue
 from tenacity import retry, stop_after_attempt, wait_exponential
 
@@ -47,11 +47,10 @@ accept_content = ['json']
 task_soft_time_limit = 10 * 60  # 任务软超时时间（秒）
 task_time_limit = 6 * task_soft_time_limit  # 任务硬超时时间（秒）
 
-worker_max_tasks_per_child = 256  # 每个worker执行多少个任务后自动重启
-worker_prefetch_multiplier = 4  # 预取任务数
-
 # 并发配置
-worker_concurrency = 4  # worker并发数，一般设置为CPU核心数
+worker_concurrency = 8  # worker并发数，一般设置为CPU核心数
+worker_prefetch_multiplier = 4  # 预取任务数
+worker_max_tasks_per_child = 256  # 每个worker执行多少个任务后自动重启
 
 # 任务队列配置
 task_default_queue = 'default'  # 默认队列