funboost 47.8__py3-none-any.whl → 48.0__py3-none-any.whl

funboost/__init__.py

@@ -13,7 +13,7 @@ set_frame_config这个模块的 use_config_form_funboost_config_module() 是核
 这段注释说明和使用的用户无关,只和框架开发人员有关.
 '''
 
-__version__ = "47.8"
+__version__ = "48.0"
 
 from funboost.set_frame_config import show_frame_config
 
@@ -42,7 +42,7 @@ from funboost.factories.broker_kind__publsiher_consumer_type_map import register
 from funboost.factories.publisher_factotry import get_publisher
 from funboost.factories.consumer_factory import get_consumer
 
-from funboost.timing_job import fsdf_background_scheduler, timing_publish_deco, funboost_aps_scheduler
+from funboost.timing_job import fsdf_background_scheduler, timing_publish_deco, funboost_aps_scheduler,ApsJobAdder
 from funboost.constant import BrokerEnum, ConcurrentModeEnum
 
 from funboost.core.booster import boost, Booster, BoostersManager
@@ -58,7 +58,7 @@ from funboost.utils.ctrl_c_end import ctrl_c_recv
 from funboost.utils.redis_manager import RedisMixin
 from funboost.concurrent_pool.custom_threadpool_executor import show_current_threads_num
 
-from funboost.core.current_task import funboost_current_task
+from funboost.core.current_task import funboost_current_task,fct,get_current_taskid
 
 
 # atexit.register(ctrl_c_recv)  # 还是需要用户自己在代码末尾加才可以.

funboost/assist/celery_helper.py

@@ -85,7 +85,7 @@ class CeleryHelper:
 
         if is_start_consume_all_queues is False:
             to_be_start_work_celery_queue_name_set_new = copy.copy(cls.to_be_start_work_celery_queue_name_set)
-            to_be_start_work_celery_queue_name_set_new.update(set(start_consume_queue_name_list))
+            to_be_start_work_celery_queue_name_set_new.update(set(start_consume_queue_name_list or []))
         else:
             from funboost import BoostersManager
             # print(BoostersManager.get_all_queues())

funboost/consumers/base_consumer.py

@@ -403,13 +403,9 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
     logger_apscheduler = get_logger('push_for_apscheduler_use_database_store', log_filename='push_for_apscheduler_use_database_store.log')
 
     @classmethod
-    def _push_apscheduler_task_to_broker(cls, queue_name, msg, runonce_uuid):
+    def _push_apscheduler_task_to_broker(cls, queue_name, msg):
         funboost_lazy_impoter.BoostersManager.get_or_create_booster_by_queue_name(queue_name).publish(msg)
-        # key = 'apscheduler.redisjobstore_runonce'
-        # if RedisMixin().redis_db_frame.sadd(key, runonce_uuid):  # 这样可以阻止多次启动同队列名消费者 redis jobstore多次运行函数.
-        #     cls.logger_apscheduler.debug(f'延时任务用普通消息重新发布到普通队列 {msg}')
-        #     funboost_lazy_impoter.BoostersManager.get_or_create_booster_by_queue_name(queue_name).publish(msg)
-
+       
     @abc.abstractmethod
     def _shedual_task(self):
         """
@@ -512,7 +508,7 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
             # print(msg_no_delay)
             # 数据库作为apscheduler的jobstores时候， 不能用 self.pbulisher_of_same_queue.publish，self不能序列化
             self._delay_task_scheduler.add_job(self._push_apscheduler_task_to_broker, 'date', run_date=run_date,
-                                               kwargs={'queue_name': self.queue_name, 'msg': msg_no_delay, 'runonce_uuid': str(uuid.uuid4())},
+                                               kwargs={'queue_name': self.queue_name, 'msg': msg_no_delay, },
                                                misfire_grace_time=misfire_grace_time,
                                               )
             self._confirm_consume(kw)

funboost/consumers/redis_consumer_ack_able.py

@@ -126,7 +126,7 @@ class RedisConsumerAckAble(ConsumerConfirmMixinWithTheHelpOfRedisByHearbeat, Abs
         pull_msg_batch_size = self.consumer_params.broker_exclusive_config['pull_msg_batch_size']
         lua = f'''
                      local task_list = redis.call("lrange", KEYS[1],0,{pull_msg_batch_size-1})
-                     redis.call("ltrim", KEYS[1],100,-1)
+                     redis.call("ltrim", KEYS[1],{pull_msg_batch_size},-1)
                      if (#task_list > 0) then
                         for task_index,task_value in ipairs(task_list)
                         do

funboost/core/current_task.py

@@ -158,6 +158,43 @@ def funboost_current_task():
     else:
         return thread_current_task
 
+class _FctProxy:
+    """后来多新增这个类了，"""
+    @property
+    def fct_context(self) ->FctContext:
+        ct = funboost_current_task()
+        return ct.get_fct_context()
+
+    @property
+    def function_params(self):
+        return self.fct_context.function_params
+
+    @property
+    def full_msg(self) -> dict:
+        return self.fct_context.full_msg
+
+    @property
+    def function_result_status(self) -> FunctionResultStatus:
+        return self.fct_context.function_result_status
+
+    @property
+    def task_id(self) -> FunctionResultStatus:
+        return self.fct_context.function_result_status.task_id
+
+    @property
+    def logger(self) -> logging.Logger:
+        return self.fct_context.logger
+
+    def __str__(self):
+        return f'<{self.__class__.__name__} [{self.function_result_status.get_status_dict()}]>'
+
+"""
+可以直接导入这个fct，不需要 手动写 fct = funboost_current_task() 了。 直接 from funboost import fct就完了，不需要先 fct = funboost_current_task()。
+funboost的fct 相当于flask的request那种对象 ，自动线程/协程 级别隔离。 多个线程不会互相干扰。
+"""
+fct = _FctProxy()
+
+
 
 def get_current_taskid():
     # return fct.function_result_status.task_id

funboost/core/func_params_model.py

@@ -154,6 +154,7 @@ class BoosterParams(BaseJsonAbleModel):
     retry_interval: typing.Union[float, int] = 0  # 函数出错后间隔多少秒再重试.
     is_push_to_dlx_queue_when_retry_max_times: bool = False  # 函数达到最大重试次数仍然没成功，是否发送到死信队列,死信队列的名字是 队列名字 + _dlx。
 
+
     consumin_function_decorator: typing.Callable = None  # 函数的装饰器。因为此框架做参数自动转指点，需要获取精准的入参名称，不支持在消费函数上叠加 @ *args  **kwargs的装饰器，如果想用装饰器可以这里指定。
     function_timeout: typing.Union[int, float,None] = None  # 超时秒数，函数运行超过这个时间，则自动杀死函数。为0是不限制。 谨慎使用,非必要别去设置超时时间,设置后性能会降低(因为需要把用户函数包装到另一个线单独的程中去运行),而且突然强制超时杀死运行中函数,可能会造成死锁.(例如用户函数在获得线程锁后突然杀死函数,别的线程再也无法获得锁了)
 
@@ -206,13 +207,13 @@ class BoosterParams(BaseJsonAbleModel):
     # func_params_is_pydantic_model: bool = False  # funboost 兼容支持 函数娼还是 pydantic model类型，funboost在发布之前和取出来时候自己转化。
 
     consuming_function_kind: typing.Optional[str] = None  # 自动生成的信息,不需要用户主动传参,如果自动判断失误就传递。是判断消费函数是函数还是实例方法还是类方法。如果传递了，就不自动获取函数类型。
-    ''' consuming_function_kind 可以为以下类型，
+    """ consuming_function_kind 可以为以下类型，
     class FunctionKind:
         CLASS_METHOD = 'CLASS_METHOD'
         INSTANCE_METHOD = 'INSTANCE_METHOD'
         STATIC_METHOD = 'STATIC_METHOD'
         COMMON_FUNCTION = 'COMMON_FUNCTION'
-    '''
+    """
 
     auto_generate_info: dict = {}  # 自动生成的信息,不需要用户主动传参.
 

funboost/timing_job/__init__.py

@@ -1,221 +1,6 @@
-"""
-集成定时任务。
-"""
-import atexit
+from  funboost.timing_job.timing_job_base import (FsdfBackgroundScheduler ,
+funboost_aps_scheduler ,fsdf_background_scheduler,timing_publish_deco,FunboostBackgroundScheduler,push_fun_params_to_broker )
 
-import time
-from apscheduler.executors.pool import BasePoolExecutor
 
-from typing import Union
-import threading
 
-from apscheduler.schedulers.background import BackgroundScheduler
-# noinspection PyProtectedMember
-from apscheduler.schedulers.base import STATE_STOPPED, STATE_RUNNING
-from apscheduler.util import undefined
-from threading import TIMEOUT_MAX
-import deprecated
-from funboost.utils.redis_manager import RedisMixin
-
-from funboost.funboost_config_deafult import FunboostCommonConfig
-
-from funboost.consumers.base_consumer import AbstractConsumer
-from funboost.core.booster import BoostersManager, Booster
-
-from funboost import BoosterParams
-from funboost.concurrent_pool.custom_threadpool_executor import ThreadPoolExecutorShrinkAble
-
-
-@deprecated.deprecated(reason='以后不要再使用这种方式，对于job_store为数据库时候需要序列化不好。使用内存和数据库都兼容的添加任务方式: add_push_job')
-def timing_publish_deco(consuming_func_decorated_or_consumer: Union[callable, AbstractConsumer]):
-    def _deco(*args, **kwargs):
-        if getattr(consuming_func_decorated_or_consumer, 'is_decorated_as_consume_function', False) is True:
-            consuming_func_decorated_or_consumer.push(*args, **kwargs)
-        elif isinstance(consuming_func_decorated_or_consumer, AbstractConsumer):
-            consuming_func_decorated_or_consumer.publisher_of_same_queue.push(*args, **kwargs)
-        else:
-            raise TypeError('consuming_func_decorated_or_consumer 必须是被 boost 装饰的函数或者consumer类型')
-
-    return _deco
-
-
-def push_fun_params_to_broker(queue_name: str, *args, runonce_uuid=None, **kwargs):
-    """
-    queue_name 队列名字
-    *args **kwargs 是消费函数的入参
-    发布消息中可以包括,runonce_uuid这个入参,确保分布式多个脚本都启动了定时器,导致每个定时器重复发布到消息队列,值你自己写  str(uuid.uuid4())
-    # 不需要传递 runonce_uuid 了，已经用专门的 FunboostBackgroundSchedulerProcessJobsWithinRedisLock 解决了。
-    """
-    if runonce_uuid:   # 不需要传递 runonce_uuid 了，已经用专门的 FunboostBackgroundSchedulerProcessJobsWithinRedisLock 解决了 process_jobs的问题。
-        key = 'apscheduler.redisjobstore_runonce2'
-        if RedisMixin().redis_db_frame.sadd(key, runonce_uuid):
-            BoostersManager.get_or_create_booster_by_queue_name(queue_name).push(*args, **kwargs)
-    else:
-        BoostersManager.get_or_create_booster_by_queue_name(queue_name).push(*args, **kwargs)
-
-
-class ThreadPoolExecutorForAps(BasePoolExecutor):
-    """
-    An executor that runs jobs in a concurrent.futures thread pool.
-
-    Plugin alias: ``threadpool``
-
-    :param max_workers: the maximum number of spawned threads.
-    :param pool_kwargs: dict of keyword arguments to pass to the underlying
-        ThreadPoolExecutor constructor
-    """
-
-    def __init__(self, max_workers=10, pool_kwargs=None):
-        pool = ThreadPoolExecutorShrinkAble(int(max_workers), )
-        super().__init__(pool)
-
-
-class FunboostBackgroundScheduler(BackgroundScheduler):
-    """
-    自定义的， 继承了官方BackgroundScheduler，
-    通过重写 _main_loop ，使得动态修改增加删除定时任务配置更好。
-    """
-
-    _last_wait_seconds = None
-    _last_has_task = False
-
-    @deprecated.deprecated(reason='以后不要再使用这种方式，对于job_store为数据库时候需要序列化不好。使用内存和数据库都兼容的添加任务方式: add_push_job')
-    def add_timing_publish_job(self, func, trigger=None, args=None, kwargs=None, id=None, name=None,
-                               misfire_grace_time=undefined, coalesce=undefined, max_instances=undefined,
-                               next_run_time=undefined, jobstore='default', executor='default',
-                               replace_existing=False, **trigger_args):
-        return self.add_job(timing_publish_deco(func), trigger, args, kwargs, id, name,
-                            misfire_grace_time, coalesce, max_instances,
-                            next_run_time, jobstore, executor,
-                            replace_existing, **trigger_args)
-
-    def add_push_job(self, func: Booster, trigger=None, args=None, kwargs=None, runonce_uuid=None,
-                     id=None, name=None,
-                     misfire_grace_time=undefined, coalesce=undefined, max_instances=undefined,
-                     next_run_time=undefined, jobstore='default', executor='default',
-                     replace_existing=False, **trigger_args, ):
-        """
-        :param func: 被@boost装饰器装饰的函数
-        :param trigger:
-        :param args:
-        :param kwargs:
-        :param id:
-        :param name:
-        :param misfire_grace_time:
-        :param coalesce:
-        :param max_instances:
-        :param next_run_time:
-        :param jobstore:
-        :param executor:
-        :param replace_existing:
-        :param trigger_args:
-        :return:
-        """
-        # args = args or {}
-        # kwargs['queue_name'] = func.queue_name
-
-        """
-        用户如果不使用funboost的 FunboostBackgroundScheduler 类型对象，而是使用原生的apscheduler类型对象，可以scheduler.add_job(push_fun_params_to_broker,args=(,),kwargs={}) 
-        push_fun_params_to_broker函数入参是消费函数队列的 queue_name 加上 原消费函数的入参
-        """
-        if args is None:
-            args = tuple()
-        args_list = list(args)
-        args_list.insert(0, func.queue_name)
-        args = tuple(args_list)
-        kwargs = kwargs or {}
-        kwargs['runonce_uuid'] = runonce_uuid  # 忽略，用户不需要传递runonce_uuid入参。
-        return self.add_job(push_fun_params_to_broker, trigger, args, kwargs, id, name,
-                            misfire_grace_time, coalesce, max_instances,
-                            next_run_time, jobstore, executor,
-                            replace_existing, **trigger_args, )
-
-    def start(self, paused=False, block_exit=True):
-        # def _block_exit():
-        #     while True:
-        #         time.sleep(3600)
-        #
-        # threading.Thread(target=_block_exit,).start()  # 既不希望用BlockingScheduler阻塞主进程也不希望定时退出。
-        # self._daemon = False
-        def _when_exit():
-            while 1:
-                # print('阻止退出')
-                time.sleep(100)
-
-        if block_exit:
-            atexit.register(_when_exit)
-        super().start(paused=paused, )
-        # _block_exit()   # python3.9 判断守护线程结束必须主线程在运行。你自己在你的运行代碼的最末尾加上 while 1： time.sleep(100)  ,来阻止主线程退出。
-
-    def _main_loop00000(self):
-        """
-        原来的代码是这，动态添加任务不友好。
-        :return:
-        """
-        wait_seconds = threading.TIMEOUT_MAX
-        while self.state != STATE_STOPPED:
-            print(6666, self._event.is_set(), wait_seconds)
-            self._event.wait(wait_seconds)
-            print(7777, self._event.is_set(), wait_seconds)
-            self._event.clear()
-            wait_seconds = self._process_jobs()
-
-    def _main_loop(self):
-        """原来的_main_loop 删除所有任务后wait_seconds 会变成None，无限等待。
-        或者下一个需要运行的任务的wait_seconds是3600秒后，此时新加了一个动态任务需要3600秒后，
-        现在最多只需要1秒就能扫描到动态新增的定时任务了。
-        """
-        MAX_WAIT_SECONDS_FOR_NEX_PROCESS_JOBS = 0.5
-        wait_seconds = None
-        while self.state == STATE_RUNNING:
-            if wait_seconds is None:
-                wait_seconds = MAX_WAIT_SECONDS_FOR_NEX_PROCESS_JOBS
-            self._last_wait_seconds = min(wait_seconds, MAX_WAIT_SECONDS_FOR_NEX_PROCESS_JOBS)
-            if wait_seconds in (None, TIMEOUT_MAX):
-                self._last_has_task = False
-            else:
-                self._last_has_task = True
-            time.sleep(self._last_wait_seconds)  # 这个要取最小值，不然例如定时间隔0.1秒运行，不取最小值，不会每隔0.1秒运行。
-            wait_seconds = self._process_jobs()
-
-    def _create_default_executor(self):
-        return ThreadPoolExecutorForAps()  # 必须是apscheduler pool的子类
-
-
-FsdfBackgroundScheduler = FunboostBackgroundScheduler  # 兼容一下名字，fsdf是 function-scheduling-distributed-framework 老框架名字的缩写
-# funboost_aps_scheduler定时配置基于内存的，不可以跨机器远程动态添加/修改/删除定时任务配置。如果需要动态增删改查定时任务，可以使用funboost_background_scheduler_redis_store
-
-funboost_aps_scheduler = FunboostBackgroundScheduler(timezone=FunboostCommonConfig.TIMEZONE, daemon=False, )
-fsdf_background_scheduler = funboost_aps_scheduler  # 兼容一下老名字。
-
-if __name__ == '__main__':
-    # 定时运行消费演示
-    import datetime
-    from funboost import boost, BrokerEnum, fsdf_background_scheduler, timing_publish_deco, run_forever
-
-
-    @Booster(boost_params=BoosterParams(queue_name='queue_test_666', broker_kind=BrokerEnum.LOCAL_PYTHON_QUEUE))
-    def consume_func(x, y):
-        print(f'{x} + {y} = {x + y}')
-
-
-    print(consume_func, type(consume_func))
-
-    # 定时每隔3秒执行一次。
-    funboost_aps_scheduler.add_push_job(consume_func,
-                                        'interval', id='3_second_job', seconds=3, kwargs={"x": 5, "y": 6})
-
-    # 定时，只执行一次
-    funboost_aps_scheduler.add_push_job(consume_func,
-                                        'date', run_date=datetime.datetime(2020, 7, 24, 13, 53, 6), args=(5, 6,))
-
-    # 定时，每天的11点32分20秒都执行一次。
-    funboost_aps_scheduler.add_push_job(consume_func,
-                                        'cron', day_of_week='*', hour=18, minute=22, second=20, args=(5, 6,))
-
-    # 启动定时
-    funboost_aps_scheduler.start()
-
-    # 启动消费
-    consume_func.consume()
-    run_forever()
+from funboost.timing_job.timing_push import ApsJobAdder

funboost/timing_job/apscheduler_use_redis_store.py

@@ -5,6 +5,7 @@ from funboost.timing_job import FunboostBackgroundScheduler
 from funboost.funboost_config_deafult import BrokerConnConfig, FunboostCommonConfig
 from funboost.utils.decorators import RedisDistributedBlockLockContextManager
 
+
 """
 这个是使用redis作为定时任务持久化，支持跨机器好跨进程，外部远程 动态修改/添加/删除定时任务
 """
@@ -51,8 +52,12 @@ jobstores = {
 
 funboost_background_scheduler_redis_store = FunboostBackgroundSchedulerProcessJobsWithinRedisLock(timezone=FunboostCommonConfig.TIMEZONE, daemon=False, jobstores=jobstores)
 
-"""
 
+
+
+
+
+"""
 跨python解释器 跨机器动态修改定时任务配置的例子在
 
 test_frame/test_apschedual/test_aps_redis_store.py

funboost/timing_job/timing_job_base.py

@@ -0,0 +1,213 @@
+"""
+集成定时任务。
+"""
+import atexit
+
+import time
+from apscheduler.executors.pool import BasePoolExecutor
+
+from typing import Union
+import threading
+
+from apscheduler.schedulers.background import BackgroundScheduler
+# noinspection PyProtectedMember
+from apscheduler.schedulers.base import STATE_STOPPED, STATE_RUNNING
+from apscheduler.util import undefined
+from threading import TIMEOUT_MAX
+import deprecated
+from funboost.utils.redis_manager import RedisMixin
+
+from funboost.funboost_config_deafult import FunboostCommonConfig
+
+from funboost.consumers.base_consumer import AbstractConsumer
+from funboost.core.booster import BoostersManager, Booster
+
+from funboost import BoosterParams
+from funboost.concurrent_pool.custom_threadpool_executor import ThreadPoolExecutorShrinkAble
+
+
+@deprecated.deprecated(reason='以后不要再使用这种方式，对于job_store为数据库时候需要序列化不好。使用内存和数据库都兼容的添加任务方式: add_push_job')
+def timing_publish_deco(consuming_func_decorated_or_consumer: Union[callable, AbstractConsumer]):
+    def _deco(*args, **kwargs):
+        if getattr(consuming_func_decorated_or_consumer, 'is_decorated_as_consume_function', False) is True:
+            consuming_func_decorated_or_consumer.push(*args, **kwargs)
+        elif isinstance(consuming_func_decorated_or_consumer, AbstractConsumer):
+            consuming_func_decorated_or_consumer.publisher_of_same_queue.push(*args, **kwargs)
+        else:
+            raise TypeError('consuming_func_decorated_or_consumer 必须是被 boost 装饰的函数或者consumer类型')
+
+    return _deco
+
+
+def push_fun_params_to_broker(queue_name: str, *args, **kwargs):
+    """
+    queue_name 队列名字
+    *args **kwargs 是消费函数的入参
+    """
+    
+    BoostersManager.get_or_create_booster_by_queue_name(queue_name).push(*args, **kwargs)
+
+
+class ThreadPoolExecutorForAps(BasePoolExecutor):
+    """
+    An executor that runs jobs in a concurrent.futures thread pool.
+
+    Plugin alias: ``threadpool``
+
+    :param max_workers: the maximum number of spawned threads.
+    :param pool_kwargs: dict of keyword arguments to pass to the underlying
+        ThreadPoolExecutor constructor
+    """
+
+    def __init__(self, max_workers=10, pool_kwargs=None):
+        pool = ThreadPoolExecutorShrinkAble(int(max_workers), )
+        super().__init__(pool)
+
+
+class FunboostBackgroundScheduler(BackgroundScheduler):
+    """
+    自定义的， 继承了官方BackgroundScheduler，
+    通过重写 _main_loop ，使得动态修改增加删除定时任务配置更好。
+    """
+
+    _last_wait_seconds = None
+    _last_has_task = False
+
+    @deprecated.deprecated(reason='以后不要再使用这种方式，对于job_store为数据库时候需要序列化不好。使用内存和数据库都兼容的添加任务方式: add_push_job')
+    def add_timing_publish_job(self, func, trigger=None, args=None, kwargs=None, id=None, name=None,
+                               misfire_grace_time=undefined, coalesce=undefined, max_instances=undefined,
+                               next_run_time=undefined, jobstore='default', executor='default',
+                               replace_existing=False, **trigger_args):
+        return self.add_job(timing_publish_deco(func), trigger, args, kwargs, id, name,
+                            misfire_grace_time, coalesce, max_instances,
+                            next_run_time, jobstore, executor,
+                            replace_existing, **trigger_args)
+
+    def add_push_job(self, func: Booster, trigger=None, args=None, kwargs=None, 
+                     id=None, name=None,
+                     misfire_grace_time=undefined, coalesce=undefined, max_instances=undefined,
+                     next_run_time=undefined, jobstore='default', executor='default',
+                     replace_existing=False, **trigger_args, ):
+        """
+        :param func: 被@boost装饰器装饰的函数
+        :param trigger:
+        :param args:
+        :param kwargs:
+        :param id:
+        :param name:
+        :param misfire_grace_time:
+        :param coalesce:
+        :param max_instances:
+        :param next_run_time:
+        :param jobstore:
+        :param executor:
+        :param replace_existing:
+        :param trigger_args:
+        :return:
+        """
+        # args = args or {}
+        # kwargs['queue_name'] = func.queue_name
+
+        """
+        用户如果不使用funboost的 FunboostBackgroundScheduler 类型对象，而是使用原生的apscheduler类型对象，可以scheduler.add_job(push_fun_params_to_broker,args=(,),kwargs={}) 
+        push_fun_params_to_broker函数入参是消费函数队列的 queue_name 加上 原消费函数的入参
+        """
+        if args is None:
+            args = tuple()
+        args_list = list(args)
+        args_list.insert(0, func.queue_name)
+        args = tuple(args_list)
+        return self.add_job(push_fun_params_to_broker, trigger, args, kwargs, id, name,
+                            misfire_grace_time, coalesce, max_instances,
+                            next_run_time, jobstore, executor,
+                            replace_existing, **trigger_args, )
+
+    def start(self, paused=False, block_exit=True):
+        # def _block_exit():
+        #     while True:
+        #         time.sleep(3600)
+        #
+        # threading.Thread(target=_block_exit,).start()  # 既不希望用BlockingScheduler阻塞主进程也不希望定时退出。
+        # self._daemon = False
+        def _when_exit():
+            while 1:
+                # print('阻止退出')
+                time.sleep(100)
+
+        if block_exit:
+            atexit.register(_when_exit)
+        super().start(paused=paused, )
+        # _block_exit()   # python3.9 判断守护线程结束必须主线程在运行。你自己在你的运行代碼的最末尾加上 while 1： time.sleep(100)  ,来阻止主线程退出。
+
+    def _main_loop00000(self):
+        """
+        原来的代码是这，动态添加任务不友好。
+        :return:
+        """
+        wait_seconds = threading.TIMEOUT_MAX
+        while self.state != STATE_STOPPED:
+            print(6666, self._event.is_set(), wait_seconds)
+            self._event.wait(wait_seconds)
+            print(7777, self._event.is_set(), wait_seconds)
+            self._event.clear()
+            wait_seconds = self._process_jobs()
+
+    def _main_loop(self):
+        """原来的_main_loop 删除所有任务后wait_seconds 会变成None，无限等待。
+        或者下一个需要运行的任务的wait_seconds是3600秒后，此时新加了一个动态任务需要3600秒后，
+        现在最多只需要1秒就能扫描到动态新增的定时任务了。
+        """
+        MAX_WAIT_SECONDS_FOR_NEX_PROCESS_JOBS = 0.5
+        wait_seconds = None
+        while self.state != STATE_STOPPED:
+            if wait_seconds is None:
+                wait_seconds = MAX_WAIT_SECONDS_FOR_NEX_PROCESS_JOBS
+            self._last_wait_seconds = min(wait_seconds, MAX_WAIT_SECONDS_FOR_NEX_PROCESS_JOBS)
+            if wait_seconds in (None, TIMEOUT_MAX):
+                self._last_has_task = False
+            else:
+                self._last_has_task = True
+            time.sleep(self._last_wait_seconds)  # 这个要取最小值，不然例如定时间隔0.1秒运行，不取最小值，不会每隔0.1秒运行。
+            wait_seconds = self._process_jobs()
+
+    def _create_default_executor(self):
+        return ThreadPoolExecutorForAps()  # 必须是apscheduler pool的子类
+
+
+FsdfBackgroundScheduler = FunboostBackgroundScheduler  # 兼容一下名字，fsdf是 function-scheduling-distributed-framework 老框架名字的缩写
+# funboost_aps_scheduler定时配置基于内存的，不可以跨机器远程动态添加/修改/删除定时任务配置。如果需要动态增删改查定时任务，可以使用funboost_background_scheduler_redis_store
+
+funboost_aps_scheduler = FunboostBackgroundScheduler(timezone=FunboostCommonConfig.TIMEZONE, daemon=False, )
+fsdf_background_scheduler = funboost_aps_scheduler  # 兼容一下老名字。
+
+if __name__ == '__main__':
+    # 定时运行消费演示
+    import datetime
+    from funboost import boost, BrokerEnum, fsdf_background_scheduler, timing_publish_deco, run_forever
+
+
+    @Booster(boost_params=BoosterParams(queue_name='queue_test_666', broker_kind=BrokerEnum.LOCAL_PYTHON_QUEUE))
+    def consume_func(x, y):
+        print(f'{x} + {y} = {x + y}')
+
+
+    print(consume_func, type(consume_func))
+
+    # 定时每隔3秒执行一次。
+    funboost_aps_scheduler.add_push_job(consume_func,
+                                        'interval', id='3_second_job', seconds=3, kwargs={"x": 5, "y": 6})
+
+    # 定时，只执行一次
+    funboost_aps_scheduler.add_push_job(consume_func,
+                                        'date', run_date=datetime.datetime(2020, 7, 24, 13, 53, 6), args=(5, 6,))
+
+    # 定时，每天的11点32分20秒都执行一次。
+    funboost_aps_scheduler.add_push_job(consume_func,
+                                        'cron', day_of_week='*', hour=18, minute=22, second=20, args=(5, 6,))
+
+    # 启动定时
+    funboost_aps_scheduler.start()
+
+    # 启动消费
+    consume_func.consume()
+    run_forever()

funboost/timing_job/timing_push.py

@@ -0,0 +1,136 @@
+from funboost.utils import redis_manager
+from funboost.core.booster import BoostersManager, Booster
+
+from apscheduler.jobstores.redis import RedisJobStore
+from funboost.timing_job.timing_job_base import funboost_aps_scheduler, undefined
+from funboost.timing_job.apscheduler_use_redis_store import FunboostBackgroundSchedulerProcessJobsWithinRedisLock
+from funboost.funboost_config_deafult import FunboostCommonConfig
+
+
+class ApsJobAdder:
+    """
+    20250116新增加的统一的新增定时任务的方式，推荐这种方式。
+    用户不用像之前再去关心使用哪个apscheduler对象去添加定时任务了。
+
+    例如 add_numbers 是@boost装饰的消费函数
+    ApsJobAdder(add_numbers,job_store_kind='memory').add_push_job(
+        args=(1, 2),
+        trigger='date',  # 使用日期触发器
+        run_date='2025-01-16 18:23:50',  # 设置运行时间
+        # id='add_numbers_job'  # 任务ID
+    )
+
+    """
+
+    queue__redis_aps_map = {}
+
+    def __init__(self, booster: Booster, job_store_kind: str = 'memory'):
+        """
+        Initialize the ApsJobAdder.
+
+        :param booster: A Booster object representing the function to be scheduled.
+        :param job_store_kind: The type of job store to use. Default is 'memory'.
+                               Can be 'memory' or 'redis'.
+        """
+        self.booster = booster
+        self.job_store_kind = job_store_kind
+
+    @classmethod
+    def get_funboost_redis_apscheduler(cls, queue_name):
+        """ 
+        每个队列名字的定时任务用不同的redis jobstore的 jobs_key 和 run_times_key，防止互相干扰和取出不属于自己的任务
+        """
+        if queue_name in cls.queue__redis_aps_map:
+            return cls.queue__redis_aps_map[queue_name]
+        redis_jobstores = {
+
+            "default": RedisJobStore(**redis_manager.get_redis_conn_kwargs(),
+                                     jobs_key=f'funboost.apscheduler.{queue_name}.jobs',
+                                     run_times_key=f'funboost.apscheduler.{queue_name}.run_times',
+                                     )
+        }
+        redis_aps = FunboostBackgroundSchedulerProcessJobsWithinRedisLock(timezone=FunboostCommonConfig.TIMEZONE,
+                                                                          daemon=False, jobstores=redis_jobstores)
+        cls.queue__redis_aps_map[queue_name] = redis_aps
+        return redis_aps
+
+    @property
+    def aps_obj(self):
+        if self.job_store_kind == 'redis':
+            return self.get_funboost_redis_apscheduler(self.booster.queue_name)
+        elif self.job_store_kind == 'memory':
+            return funboost_aps_scheduler
+        else:
+            raise ValueError('Unsupported job_store_kind')
+
+    def add_push_job(self, trigger=None, args=None, kwargs=None, 
+                     id=None, name=None,
+                     misfire_grace_time=undefined, coalesce=undefined, max_instances=undefined,
+                     next_run_time=undefined, jobstore='default', executor='default',
+                     replace_existing=False, **trigger_args,):
+        """
+        这里的入参都是和apscheduler的add_job的入参一样的，funboost作者没有创造新的入参。
+        但是官方apscheduler的入参第一个入参是函数，
+        funboost的ApsJobAdder对象.add_push_job入参去掉了函数，因为类的实例化时候会把函数传进来，不需要再麻烦用户一次了。
+        """
+      
+        if not getattr(self.aps_obj, 'has_started_flag', False):
+            self.aps_obj.has_started_flag = True
+            self.aps_obj.start(paused=False)
+        return self.aps_obj.add_push_job(self.booster, trigger, args, kwargs, id, name,
+                                         misfire_grace_time, coalesce, max_instances,
+                                         next_run_time, jobstore, executor,
+                                         replace_existing, **trigger_args, )
+
+
+
+
+
+if __name__ == '__main__':
+    """
+    2025年后定时任务现在推荐使用 ApsJobAdder 写法 ，用户不需要亲自选择使用 apscheduler对象来添加定时任务
+    """
+    from funboost import boost, BrokerEnum,ctrl_c_recv,BoosterParams,ApsJobAdder
+  
+
+    # 定义任务处理函数
+    @BoosterParams(queue_name='sum_queue3', broker_kind=BrokerEnum.REDIS)
+    def sum_two_numbers(x, y):  
+        result = x + y 
+        print(f'The sum of {x} and {y} is {result}')  
+        
+    # 启动消费者
+    sum_two_numbers.consume()
+    
+    # 发布任务
+    sum_two_numbers.push(3, 5)
+    sum_two_numbers.push(10, 20)
+    
+    # 使用ApsJobAdder添加定时任务， 里面的定时语法，和apscheduler是一样的，用户需要自己熟悉知名框架apscheduler的add_job定时入参
+
+    # 方式1：指定日期执行一次
+    ApsJobAdder(sum_two_numbers, job_store_kind='redis').add_push_job(
+        trigger='date',
+        run_date='2025-01-17 23:25:40', 
+        args=(7, 8)
+    )
+
+    # 方式2：固定间隔执行
+    ApsJobAdder(sum_two_numbers, job_store_kind='memory').add_push_job(
+        trigger='interval', 
+        seconds=5, 
+        args=(4, 6)
+    )
+
+    # 方式3：使用cron表达式定时执行
+    ApsJobAdder(sum_two_numbers, job_store_kind='redis').add_push_job(
+        trigger='cron',
+        day_of_week='*', 
+        hour=23, 
+        minute=49, 
+        second=50,
+        kwargs={"x":50,"y":60},
+        replace_existing=True,
+        id='cron_job1')
+        
+    ctrl_c_recv()

funboost/utils/class_utils2.py

@@ -0,0 +1,94 @@
+import copy
+import gc
+import inspect
+import re
+import sys
+import traceback
+import typing
+
+import nb_log
+from types import MethodType, FunctionType
+
+
+
+
+class ClsHelper:
+    @staticmethod
+    def is_static_method(func):
+        # 获取类名
+        class_name = func.__qualname__.split('.')[0]
+        # 使用 inspect 获取函数的原始定义
+        return isinstance(func, staticmethod) or (inspect.isfunction(func) and func.__qualname__.startswith(f'{class_name}.'))
+
+    # 判断函数是否是实例方法
+    @staticmethod
+    def is_instance_method(method):
+        # 检查方法是否是绑定到类实例上的方法
+        return inspect.ismethod(method) or (inspect.isfunction(method) and getattr(method, '__self__', None) is not None)
+
+    @staticmethod
+    def is_class_method(method):
+        # 检查方法是否是类方法
+        return isinstance(method, classmethod) or (inspect.isfunction(method) and method.__self__ is None)
+
+
+
+    @classmethod
+    def is_common_function(cls, method):
+        if cls.is_static_method(method):
+            return False
+        if cls.is_class_method(method):
+            return False
+        if cls.is_instance_method(method):
+            return False
+        if isinstance(method, FunctionType):
+            sourcelines = inspect.getsourcelines(method)
+            for line in sourcelines[0][:50]:
+                if not line.replace(' ', '').startswith('#'):
+                    if not re.search('\(\s*?self\s*?,', line):
+                        return True
+
+    @classmethod
+    def get_method_kind(cls, method: typing.Callable) -> str:
+        func =method
+        try:
+            if cls.is_instance_method(func):
+                return "实例方法"
+            if cls.is_static_method(func):
+                return "静态方法"
+            if cls.is_class_method(func):
+                return "类方法"
+            if inspect.isfunction(func):
+                return "模块级函数"
+        except Exception as e:
+            print(traceback.format_exc())
+
+    @staticmethod
+    def get_obj_init_params_for_funboost(obj_init_params: dict):
+        obj_init_params.pop('self')
+        return copy.deepcopy(obj_init_params)
+
+
+
+
+if __name__ == '__main__':
+    def module_function():
+        return "I am a module-level function"
+
+
+    class MyClass:
+        @staticmethod
+        def static_method():
+            return "I am a static method"
+
+        @classmethod
+        def class_method(cls):
+            return "I am a class method"
+
+        def instance_method(self):
+            return "I am a instance method"
+
+    print(ClsHelper.get_method_kind(module_function))  # 输出: 模块级函数
+    print(ClsHelper.get_method_kind(MyClass.static_method))  # 输出: 静态方法
+    print(ClsHelper.get_method_kind(MyClass.class_method))  # 输出: 类方法
+    print(ClsHelper.get_method_kind(MyClass.instance_method))  # 输出: 实例方法

funboost/utils/ctrl_c_end.py

@@ -4,7 +4,7 @@ import time
 
 
 def ctrl_c_recv():
-    for i in range(4):
+    for i in range(3):
         while 1:
             try:
                 time.sleep(2)

funboost/utils/dependency_packages_in_pythonpath/aioredis/readme.md

@@ -1,3 +1,9 @@
+---
+noteId: "647378a1e9bb11efa4500f7226f4d3b6"
+tags: []
+
+---
+
 
 ## 1 asioredis包将不再更新 ，ptyhon 3.11 版本 import aioredis会出错。
 

funboost/utils/dependency_packages_in_pythonpath/readme.md

@@ -1,3 +1,9 @@
+---
+noteId: "647378a0e9bb11efa4500f7226f4d3b6"
+tags: []
+
+---
+
 ## 这个文件夹被添加到 sys.path中去了。
 
 funboost __init__.py 第一行就把这个添加到 sys.path了,相当于 export PYTHONPATH 了。

{funboost-47.8.dist-info → funboost-48.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 47.8
+Version: 48.0
 Summary: pip install funboost，python全功能分布式函数调度框架,funboost的功能是全面性重量级，用户能想得到的功能99%全都有;funboost的使用方式是轻量级，只有@boost一行代码需要写。支持python所有类型的并发模式和一切知名消息队列中间件，支持如 celery dramatiq等框架整体作为funboost中间件，python函数加速器，框架包罗万象，用户能想到的控制功能全都有。一统编程思维，兼容50% python业务场景，适用范围广。只需要一行代码即可分布式执行python一切函数，99%用过funboost的pythoner 感受是　简易 方便 强劲 强大，相见恨晚 
 Home-page: https://github.com/ydf0509/funboost
 Author: bfzs
@@ -44,7 +44,7 @@ Requires-Dist: redis3
 Requires-Dist: redis5
 Requires-Dist: redis
 Requires-Dist: setuptools_rust
-Requires-Dist: fabric2==2.6.0
+Requires-Dist: fabric2>=2.6.0
 Requires-Dist: nb_filelock
 Requires-Dist: pysnooper
 Requires-Dist: deprecated

{funboost-47.8.dist-info → funboost-48.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-funboost/__init__.py,sha256=gGdwQNfBRHTxuO6qr1GbN4lP8sUjj9eYuIprVOrHfr4,3956
+funboost/__init__.py,sha256=Ctao94tU5bAybW_spUlf55MhEaGzoyff3i7t4KHF4so,3991
 funboost/__init__old.py,sha256=9Kv3cPLnPkbzMRnuJFVkPsuDdx1CdcSIuITkpdncZSc,20382
 funboost/__main__.py,sha256=-6Nogi666Y0LN8fVm3JmHGTOk8xEGWvotW_GDbSaZME,1065
 funboost/constant.py,sha256=STzRDZbuCC5FFV-uD_0r2beGsD1Zni4kregzR11z3Ok,8148
 funboost/funboost_config_deafult.py,sha256=K-kCFGEjD107wHWFspNrIWsPNSVteP2Xww1yRbXd-Wk,6651
 funboost/set_frame_config.py,sha256=kxYo_x2pMihwfTgFWrLxNbgI0IbFYC_HpSd9YLQM1ig,14439
 funboost/assist/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-funboost/assist/celery_helper.py,sha256=zJKVx2CoTQE9o1LBrXTrORS9av5hTDSXRgYf6NZMyw0,6480
+funboost/assist/celery_helper.py,sha256=zhyAIBIbnPcS8pdp0oqVh57Jx-hIDX0njTZiYZFCLFw,6486
 funboost/assist/dramatiq_helper.py,sha256=9mUyfBMAJXzwvB8LwOmapn3rY30a6UXt3tNOfL6OXoM,2106
 funboost/assist/faststream_helper.py,sha256=BmBaFsvsjQK2SO71ulHRsEwO28uYZm2uMMvXkHzLi1E,631
 funboost/assist/huey_helper.py,sha256=PuJHIzK5oRd5RzbuxLMHhWlkKO3J-ObRK0mrMs_iQWs,1770
@@ -35,7 +35,7 @@ funboost/concurrent_pool/backup/async_pool_executor0223.py,sha256=RVUZiylUvpTm6U
 funboost/concurrent_pool/backup/async_pool_executor_back.py,sha256=KL6zEQaa1KkZOlAO85mCC1gwLm-YC5Ghn21IUom0UKM,9598
 funboost/concurrent_pool/backup/async_pool_executor_janus.py,sha256=OHMWJ9l3EYTpPpcrPrGGKd4K0tmQ2PN8HiX0Dta0EOo,5728
 funboost/consumers/__init__.py,sha256=ZXY_6Kut1VYNQiF5aWEgIWobsW1ht9YUP0TdRZRWFqI,126
-funboost/consumers/base_consumer.py,sha256=q1e37C-6898qP3Y98Tf-bSNg_CJYqQTx0Cog5tjCRXo,82433
+funboost/consumers/base_consumer.py,sha256=-b398kkcptpc7w6GqILWpUf838IcNEfWfaqj1m7HFEY,81961
 funboost/consumers/celery_consumer.py,sha256=nQpSkzPBJ4bRpxn4i9ms0axrJiq9RWhb4lG2nAdCIig,9254
 funboost/consumers/confirm_mixin.py,sha256=5xC9AAQr_MY4tbSed8U-M6tOVmh69Qv9X0ld0JLT9Tk,6185
 funboost/consumers/dramatiq_consumer.py,sha256=ozmeAfeF0U-YNYHK4suQB0N264h5AZdfMH0O45Mh-8A,2229
@@ -64,7 +64,7 @@ funboost/consumers/rabbitmq_pika_consumerv0.py,sha256=rIQToBTBqGdjnzMhg0vyZMY87N
 funboost/consumers/rabbitmq_rabbitpy_consumer.py,sha256=xxINY037pmgF3_lJA-zhf9qUIUx6DdqC7tsUOQL3dL4,1330
 funboost/consumers/redis_brpoplpush_consumer.py,sha256=HA3WYKNHuSFZJwTe5EEMFAQfTCK6E2upyFnvdQReJug,2967
 funboost/consumers/redis_consumer.py,sha256=RdxJvWWQvQdjXWWdUebmgB7KRDWQBeF87Q9kd_DeUZk,2735
-funboost/consumers/redis_consumer_ack_able.py,sha256=7zP9BQNfONLBbYJFjgNtIPVqbHwklAdcPUIA8Y7M8go,7411
+funboost/consumers/redis_consumer_ack_able.py,sha256=CiPIo-ToujSUy1uvznWc1QuxBfeOyOmYbH6P77r9apI,7429
 funboost/consumers/redis_consumer_ack_using_timeout.py,sha256=E-7Ci3yb1-THvGoqDNyHJm_zYThIcacHEuUQbPU5e-0,4228
 funboost/consumers/redis_consumer_priority.py,sha256=C-ftnlGPPoB7YV3GvwLu9POVGDn_GKlBqO6NlsZ-hdY,5566
 funboost/consumers/redis_consumer_simple.py,sha256=trPrMHSVU1Y_fY-xz5tFFmt1zjV-9_joPYRHqvyZnL8,874
@@ -87,12 +87,12 @@ funboost/contrib/save_result_status_to_sqldb.py,sha256=AxvD7nHs4sjr9U0kwEZzyPKrs
 funboost/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 funboost/core/active_cousumer_info_getter.py,sha256=09fEc-BTEIRfDDfHmOvKnMjLjtOyp4edLsUlAXUR_Qs,4966
 funboost/core/booster.py,sha256=GNQLDutqiFH8ymQZgBUi0vhzlBm9VD97usLGlAzjnJY,20287
-funboost/core/current_task.py,sha256=Oils18_vAqGvV4pqM6yYwnhMaFn3nrpzo1PO48HHidQ,5799
+funboost/core/current_task.py,sha256=AuvrLjLGxfONILzQAd0Vm0nXDsDjf_7gOc3vGy_6r5I,7004
 funboost/core/exceptions.py,sha256=pLF7BkRJAfDiWp2_xGZqencmwdPiSQI1NENbImExknY,1311
 funboost/core/fabric_deploy_helper.py,sha256=foieeqlNySuU9axJzNF6TavPjIUSYBx9UO3syVKUiyY,9999
 funboost/core/funboost_config_getter.py,sha256=b5nAdAmUxahskY-ohB7ptf2gKywFlDA0Fq1cWroxxbs,384
 funboost/core/funboost_time.py,sha256=a0MacbUBfYk8mf7D3UUyCxH5QJsu8YiGVXwJqPnSQH0,1779
-funboost/core/func_params_model.py,sha256=n7nYsnjR04nPtQilqmfDzOXzKmLx86CC970tNdtA47g,22510
+funboost/core/func_params_model.py,sha256=X4ibmg9lmv7kRg2-ym__HicCGK5VJns0DedVxL8S9Hw,22512
 funboost/core/function_result_status_config.py,sha256=PyjqAQOiwsLt28sRtH-eYRjiI3edPFO4Nde0ILFRReE,1764
 funboost/core/function_result_status_saver.py,sha256=yHKZF9MjmhI-Q4Mkrka7DdweJ0wpgfLmgfAlsfkCeCk,9274
 funboost/core/helper_funs.py,sha256=SsMa7A3iJyLek6v1qRK02kINebDp6kuAmlYkrYLXwQ0,2369
@@ -172,15 +172,18 @@ funboost/queues/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 funboost/queues/memory_queues_map.py,sha256=e1S_cnjnCVI4DBsA_iupF51S_eX4OvCtlefQCqS1TYA,424
 funboost/queues/peewee_queue.py,sha256=FrwegrilkHZG6Y1cGdl5Bt_UtA25f7m5TJQJMZ9YnJI,5280
 funboost/queues/sqla_queue.py,sha256=b-2QPvvuMxklm41ibZhGKehaAV9trXBQFCOHzgThx_s,11080
-funboost/timing_job/__init__.py,sha256=UF13HdQZq27FxdoZ-9KHLUuI5kGAvcDgC9sS5QplmAo,10362
+funboost/timing_job/__init__.py,sha256=_rIiU7pMXe-IwUCeok50hSiWXoUoMBar22u6-pZLlAI,265
 funboost/timing_job/apscheduler_use_mysql_store.py,sha256=ss92DiSLzbWuVIo19sTLgC99GessltWLOlqqOd4AIL4,471
-funboost/timing_job/apscheduler_use_redis_store.py,sha256=RNZVerUTTzpSFMFEHWkDrUOSz71B4Ml_hlcavkL1tAA,2933
+funboost/timing_job/apscheduler_use_redis_store.py,sha256=Iwr9x1SnGU4wU5PmMWRAoV72AoSTSuB8aLJKBGCjJs4,2943
+funboost/timing_job/timing_job_base.py,sha256=Ho-fg1mh3uVctQaolOZ_SDMd-1gnb3UTIMuBy0iztJ8,9479
+funboost/timing_job/timing_push.py,sha256=NrmMQ4JIlzoSUCLFaibxnPiPCkjRU7rVBNqpEKUVNbo,5630
 funboost/utils/__init__.py,sha256=rAyXE7lgCo_3VdMvGrIJiqsTHv2nZPTJDTj1f6s_KgE,586
 funboost/utils/apscheduler_monkey.py,sha256=CcUISbqX6nMWSxr_QjZ26IvvhUk_ojYZWRaKenpsKfE,3124
 funboost/utils/block_exit.py,sha256=BnfxNYo3lnmhk686RAEoc4u3D4RU_iEMMMgu5L8gIuI,96
 funboost/utils/bulk_operation.py,sha256=B4FBxlz5f4oqlKDWqer7axn4gnDSfsYoMW2zSUCnGcQ,10101
 funboost/utils/class_utils.py,sha256=xtP9RU_5vVnWye7QXXqkloDzwVE5N3N-4_2fUZNfXlo,3591
-funboost/utils/ctrl_c_end.py,sha256=FgT9An-qsUA5gW-V-UKWqOh5shC7C_uvTFn0fS7i8GI,439
+funboost/utils/class_utils2.py,sha256=ND45cMR385xG4fOmwWDHxXFOmcEi1ZG8B0iN8_6ZAeo,3015
+funboost/utils/ctrl_c_end.py,sha256=uSlMEbcyrbeosZ6E816AwlXxVZ7KuExwMfz6WJXlyB0,439
 funboost/utils/custom_pysnooper.py,sha256=7yXLKEMY_JjPRRt0Y0N-wV2CFhILlYNh40Y6uRBUaj8,5923
 funboost/utils/decorators.py,sha256=gpwof-Nw__iFjeJjVQWx1l-scnxTivxcCI_0XqhMu6c,27885
 funboost/utils/develop_log.py,sha256=Wsx0ongGjTit5xqgk1BztYlVEkC6d0-Y7GENXLedVqY,271
@@ -209,7 +212,7 @@ funboost/utils/dependency_packages/mongomq/test.py,sha256=Tcmme3U3KXFSkdknO71bge
 funboost/utils/dependency_packages/mongomq/utils.py,sha256=ljhcLhNf3yOc7IgnuRdFqLtwTGynRNd2uXZNRvStAL0,377
 funboost/utils/dependency_packages_in_pythonpath/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 funboost/utils/dependency_packages_in_pythonpath/add_to_pythonpath.py,sha256=eOaK0Cr1yAmLcHhOM5-nV9XxXhQFZQkiaBECY65sFuc,341
-funboost/utils/dependency_packages_in_pythonpath/readme.md,sha256=rlYsPSNqIdhp8L8WOJiONQLrPnPhrdFLdnZr2lAg1n0,920
+funboost/utils/dependency_packages_in_pythonpath/readme.md,sha256=CRo6NJXeq0TwW56_gCJrW4dId1MTejWt9t-Sq8pJHC0,982
 funboost/utils/dependency_packages_in_pythonpath/__pycache__/__init__.cpython-311.pyc,sha256=XpiufbSphxt8UXSMqXz9vOGejT4noRAKE3dnfsEGvAg,187
 funboost/utils/dependency_packages_in_pythonpath/__pycache__/__init__.cpython-37.pyc,sha256=Oy1-_q-VLcFLQ7RRp8B-fbBkNOb2SepePLYW4L5DQ6U,165
 funboost/utils/dependency_packages_in_pythonpath/__pycache__/__init__.cpython-39.pyc,sha256=a54jxiFA239ImQBOQalJk2t8AULxlc3yxz-QaxcWAUo,169
@@ -224,7 +227,7 @@ funboost/utils/dependency_packages_in_pythonpath/aioredis/exceptions.py,sha256=S
 funboost/utils/dependency_packages_in_pythonpath/aioredis/lock.py,sha256=CnB9LpvykAEXEdQyBEcgUU7iHxwNF3xuGzX7UYuUbiQ,11651
 funboost/utils/dependency_packages_in_pythonpath/aioredis/log.py,sha256=qTxLRo5EqoHZIGqMguzLm90mtThBRYje_FaZz-fDbhg,427
 funboost/utils/dependency_packages_in_pythonpath/aioredis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-funboost/utils/dependency_packages_in_pythonpath/aioredis/readme.md,sha256=BUZVchvn4henUdpA48IuF6SSSsnzdsMSff8l0MU4R2A,617
+funboost/utils/dependency_packages_in_pythonpath/aioredis/readme.md,sha256=D-YD-NjTpC1AArLqLWujHH9msvlBC6zL4LuoogSk_ok,679
 funboost/utils/dependency_packages_in_pythonpath/aioredis/sentinel.py,sha256=ldPwRIOWVskKsItBwFqbqPfraMlFsGs42_ZDXtxza5U,12536
 funboost/utils/dependency_packages_in_pythonpath/aioredis/utils.py,sha256=90Dgj62Q9ABGVAwAPwufo3OKM2s0ws6LeQMZg8ifJb0,1284
 funboost/utils/dependency_packages_in_pythonpath/aioredis/__pycache__/__init__.cpython-311.pyc,sha256=PGpc0JrGU6UjKZ7WgxlpsCL2OuhJhWpE9WrxMHREtPc,1696
@@ -283,9 +286,9 @@ funboost/utils/pysnooper_ydf/utils.py,sha256=evSmGi_Oul7vSP47AJ0DLjFwoCYCfunJZ1m
 funboost/utils/pysnooper_ydf/variables.py,sha256=QejRDESBA06KG9OH4sBT4J1M55eaU29EIHg8K_igaXo,3693
 funboost/utils/times/__init__.py,sha256=Y4bQD3SIA_E7W2YvHq2Qdi0dGM4H2DxyFNdDOuFOq1w,2417
 funboost/utils/times/version.py,sha256=11XfnZVVzOgIhXXdeN_mYfdXThfrsbQHpA0wCjz-hpg,17
-funboost-47.8.dist-info/LICENSE,sha256=9EPP2ktG_lAPB8PjmWV-c9BiaJHc_FP6pPLcUrUwx0E,11562
-funboost-47.8.dist-info/METADATA,sha256=rFVuEVx9Wz3We7blHCura3eoVHcFYIuRkWuuQfqcl40,33382
-funboost-47.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-funboost-47.8.dist-info/entry_points.txt,sha256=yMSSAGRzRAAhGyNNQHw24MooKlDZsaJ499_D6fPl58A,96
-funboost-47.8.dist-info/top_level.txt,sha256=K8WuKnS6MRcEWxP1NvbmCeujJq6TEfbsB150YROlRw0,9
-funboost-47.8.dist-info/RECORD,,
+funboost-48.0.dist-info/LICENSE,sha256=9EPP2ktG_lAPB8PjmWV-c9BiaJHc_FP6pPLcUrUwx0E,11562
+funboost-48.0.dist-info/METADATA,sha256=eOfSzKu5y7_WNG9qboIt5IuuiTgGzD-gwNQnpvjUZJ4,33382
+funboost-48.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+funboost-48.0.dist-info/entry_points.txt,sha256=yMSSAGRzRAAhGyNNQHw24MooKlDZsaJ499_D6fPl58A,96
+funboost-48.0.dist-info/top_level.txt,sha256=K8WuKnS6MRcEWxP1NvbmCeujJq6TEfbsB150YROlRw0,9
+funboost-48.0.dist-info/RECORD,,