funboost 42.9__py3-none-any.whl → 43.0__py3-none-any.whl

funboost/__init__.py

@@ -13,7 +13,7 @@ set_frame_config这个模块的 use_config_form_funboost_config_module() 是核
 这段注释说明和使用的用户无关,只和框架开发人员有关.
 '''
 
-__version__ = "42.9"
+__version__ = "43.0"
 
 from funboost.set_frame_config import show_frame_config
 

funboost/consumers/base_consumer.py

@@ -7,6 +7,7 @@
 
 框架做主要的功能都是在这个文件里面实现的.
 """
+import functools
 import typing
 import abc
 import copy
@@ -29,10 +30,11 @@ from threading import Lock
 import asyncio
 
 import nb_log
-from funboost.core.current_task import funboost_current_task
+from funboost.core.current_task import funboost_current_task, get_current_taskid
 from funboost.core.loggers import develop_logger
 
 from funboost.core.func_params_model import BoosterParams, PublisherParams
+from funboost.core.task_id_logger import TaskIdLogger
 from nb_log import (get_logger, LoggerLevelSetterMixin, LogManager, CompatibleLogger,
                     LoggerMixinDefaultWithFileHandler, stdout_write, is_main_process,
                     nb_log_config_default)
@@ -67,6 +69,8 @@ from funboost.utils import decorators, time_util, redis_manager
 from funboost.constant import ConcurrentModeEnum, BrokerEnum
 from funboost.core import kill_remote_task
 from funboost.core.exceptions import ExceptionForRequeue, ExceptionForPushToDlxqueue
+# from funboost.core.booster import BoostersManager  互相导入
+from funboost.core.lazy_impoter import LazyImpoter
 
 
 # patch_apscheduler_run_job()
@@ -76,9 +80,6 @@ class GlobalVars:
     has_start_a_consumer_flag = False
 
 
-
-
-
 # noinspection DuplicatedCode
 class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
     time_interval_for_check_do_not_run_time = 60
@@ -229,12 +230,13 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
             logger_prefix += '--'
             # logger_name = f'{logger_prefix}{self.__class__.__name__}--{concurrent_name}--{queue_name}--{self.consuming_function.__name__}'
         logger_name = f'funboost.{logger_prefix}{self.__class__.__name__}--{self.queue_name}'
+        self.logger_name = logger_name
         log_filename = self.consumer_params.log_filename or f'funboost.{self.queue_name}.log'
-        self.logger = get_logger(logger_name,
-                                 log_level_int=self.consumer_params.log_level,
-                                 log_filename=log_filename if self.consumer_params.create_logger_file else None,
-                                 error_log_filename=nb_log.generate_error_file_name(log_filename),
-                                 formatter_template=FunboostCommonConfig.NB_LOG_FORMATER_INDEX_FOR_CONSUMER_AND_PUBLISHER, )
+        self.logger = LogManager(logger_name, logger_cls=TaskIdLogger).get_logger_and_add_handlers(
+            log_level_int=self.consumer_params.log_level,
+            log_filename=log_filename if self.consumer_params.create_logger_file else None,
+            error_log_filename=nb_log.generate_error_file_name(log_filename),
+            formatter_template=FunboostCommonConfig.NB_LOG_FORMATER_INDEX_FOR_CONSUMER_AND_PUBLISHER, )
         self.logger.info(f'队列 {self.queue_name} 的日志写入到 {nb_log_config_default.LOG_PATH} 文件夹的 {log_filename} 和 {nb_log.generate_error_file_name(log_filename)} 文件中')
 
     def _check_broker_exclusive_config(self):
@@ -362,8 +364,7 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         key = 'apscheduler.redisjobstore_runonce'
         if RedisMixin().redis_db_frame.sadd(key, runonce_uuid):  # 这样可以阻止多次启动同队列名消费者 redis jobstore多次运行函数.
             cls.logger_apscheduler.debug(f'延时任务用普通消息重新发布到普通队列 {msg}')
-            from funboost.core.booster import BoostersManager
-            BoostersManager.get_or_create_booster_by_queue_name(queue_name).publish(msg)
+            LazyImpoter().BoostersManager.get_or_create_booster_by_queue_name(queue_name).publish(msg)
 
     @abc.abstractmethod
     def _shedual_task(self):
@@ -603,9 +604,10 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         t_start = time.time()
         # function_result_status.run_times = current_retry_times + 1
         fct = funboost_current_task()
-        fct.function_params=function_only_params
-        fct.full_msg=kw['body']
+        fct.function_params = function_only_params
+        fct.full_msg = kw['body']
         fct.function_result_status = function_result_status
+        fct.logger = self.logger
         try:
             function_run = self.consuming_function
             if self._consuming_function_is_asyncio:
@@ -633,6 +635,9 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
             function_result_status.success = True
             if self.consumer_params.log_level <= logging.DEBUG:
                 result_str_to_be_print = str(function_result_status.result)[:100] if len(str(function_result_status.result)) < 100 else str(function_result_status.result)[:100] + '  。。。。。  '
+                # print(funboost_current_task().task_id)
+                # print(fct.function_result_status.task_id)
+                # print(get_current_taskid())
                 self.logger.debug(f' 函数 {self.consuming_function.__name__}  '
                                   f'第{current_retry_times + 1}次 运行, 正确了，函数运行时间是 {round(time.time() - t_start, 4)} 秒,入参是 {function_only_params} , '
                                   f'结果是  {result_str_to_be_print}   {self._get_concurrent_info()}  ')
@@ -768,6 +773,7 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         fct.function_params = function_only_params
         fct.full_msg = kw['body']
         fct.function_result_status = function_result_status
+        fct.logger = self.logger
         try:
             corotinue_obj = self.consuming_function(**function_only_params)
             if not asyncio.iscoroutine(corotinue_obj):

funboost/core/cli/discovery_boosters.py

@@ -7,7 +7,7 @@ import importlib.util
 # import nb_log
 from funboost.core.loggers import FunboostFileLoggerMixin
 from funboost.utils.decorators import flyweight
-
+from funboost.core.lazy_impoter import LazyImpoter
 
 @flyweight
 class BoosterDiscovery(FunboostFileLoggerMixin):
@@ -66,8 +66,7 @@ class BoosterDiscovery(FunboostFileLoggerMixin):
                 spec = importlib.util.spec_from_file_location('module', file_path)
                 module = importlib.util.module_from_spec(spec)
                 spec.loader.exec_module(module)
-        from funboost.core.booster import BoostersManager
-        BoostersManager.show_all_boosters()
+        LazyImpoter().BoostersManager.show_all_boosters()
 
 
 if __name__ == '__main__':

funboost/core/current_task.py

@@ -1,14 +1,10 @@
 import contextvars
+import logging
 import threading
 import asyncio
 from funboost.core.function_result_status_saver import FunctionResultStatus
 
-
-class ThreadCurrentTask:
-    """
-    用于在用户自己函数内部去获取 消息的完整体,当前重试次数等.
-    """
-    """ 用法例子 
+""" 用法例子 
     '''
     fct = funboost_current_task()
     print(fct.function_result_status.get_status_dict())
@@ -49,31 +45,52 @@ if __name__ == '__main__':
     f.consume()
 
     """
-    _local_data = threading.local()
+
+
+class ThreadCurrentTask:
+    """
+    用于在用户自己函数内部去获取 消息的完整体,当前重试次数等.
+    """
+
+
+    _fct_local_data = threading.local()
+
 
     @property
     def function_params(self):
-        return self._local_data.function_params
+        return self._fct_local_data.function_params
 
     @function_params.setter
     def function_params(self, function_params: dict):
-        self._local_data.function_params = function_params
+        self._fct_local_data.function_params = function_params
 
     @property
     def full_msg(self) -> dict:
-        return self._local_data.full_msg
+        return self._fct_local_data.full_msg
 
     @full_msg.setter
     def full_msg(self, full_msg: dict):
-        self._local_data.full_msg = full_msg
+        self._fct_local_data.full_msg = full_msg
 
     @property
     def function_result_status(self) -> FunctionResultStatus:
-        return self._local_data.function_result_status
+        return self._fct_local_data.function_result_status
 
     @function_result_status.setter
     def function_result_status(self, function_result_status: FunctionResultStatus):
-        self._local_data.function_result_status = function_result_status
+        self._fct_local_data.function_result_status = function_result_status
+
+    @property
+    def task_id(self) -> FunctionResultStatus:
+        return self.function_result_status.task_id
+
+    @property
+    def logger(self) -> logging.Logger:
+        return self._fct_local_data.logger
+
+    @logger.setter
+    def logger(self, logger: logging.Logger):
+        self._fct_local_data.logger = logger
 
 
 def is_asyncio_environment():
@@ -88,6 +105,7 @@ class AsyncioCurrentTask:
     _function_params = contextvars.ContextVar("function_params")
     _full_msg = contextvars.ContextVar("full_msg")
     _function_result_status = contextvars.ContextVar("function_result_status")
+    _logger = contextvars.ContextVar('logger')
 
     @property
     def function_params(self):
@@ -113,14 +131,36 @@ class AsyncioCurrentTask:
     def function_result_status(self, function_result_status: FunctionResultStatus):
         self._function_result_status.set(function_result_status)
 
+    @property
+    def task_id(self) :
+        return self.function_result_status.task_id
+
+    @property
+    def logger(self) -> logging.Logger:
+        return self._logger.get()
+
+    @logger.setter
+    def logger(self, logger: logging.Logger):
+        self._logger.set(logger)
+
 
 def funboost_current_task():
     return AsyncioCurrentTask() if is_asyncio_environment() else ThreadCurrentTask()
 
 
+def get_current_taskid():
+    fct = funboost_current_task()
+    # return fct.function_result_status.task_id
+    try:
+        return fct.task_id  # 不在funboost的消费函数里面就获取不到上下文了
+    except AttributeError as e:
+        # print(e,type(e))
+        return 'no_task_id'
+
 if __name__ == '__main__':
     print(is_asyncio_environment())
     print()
     for i in range(100000):
         funboost_current_task()
+        print(get_current_taskid())
     print()

funboost/core/func_params_model.py

@@ -138,7 +138,7 @@ class BoosterParams(BaseJsonAbleModel):
     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] = 0  # 超时秒数，函数运行超过这个时间，则自动杀死函数。为0是不限制。
+    function_timeout: typing.Union[int, float] = 0  # 超时秒数，函数运行超过这个时间，则自动杀死函数。为0是不限制。 谨慎使用,非必要别去设置超时时间,设置后性能会降低(因为需要把用户函数包装到另一个线单独的程中去运行),而且突然强制超时杀死运行中函数,可能会造成死锁.(例如用户函数在获得线程锁后突然杀死函数,别的线程再也无法获得锁了)
 
     log_level: int = logging.DEBUG  # 消费者和发布者的日志级别,建议设置DEBUG级别,不然无法知道正在运行什么消息
     logger_prefix: str = ''  # 日志名字前缀,可以设置前缀
@@ -160,7 +160,7 @@ class BoosterParams(BaseJsonAbleModel):
     is_using_rpc_mode: bool = False  # 是否使用rpc模式，可以在发布端获取消费端的结果回调，但消耗一定性能，使用async_result.result时候会等待阻塞住当前线程。
     rpc_result_expire_seconds: int = 600  # 保存rpc结果的过期时间.
 
-    is_support_remote_kill_task: bool = False  # 是否支持远程任务杀死功能，如果任务数量少，单个任务耗时长，确实需要远程发送命令来杀死正在运行的函数，才设置为true，否则不建议开启此功能。
+    is_support_remote_kill_task: bool = False  # 是否支持远程任务杀死功能，如果任务数量少，单个任务耗时长，确实需要远程发送命令来杀死正在运行的函数，才设置为true，否则不建议开启此功能。(是把函数放在单独的线程中实现的,随时准备线程被远程命令杀死,所以性能会降低)
 
     is_do_not_run_by_specify_time_effect: bool = False  # 是否使不运行的时间段生效
     do_not_run_by_specify_time: tuple = ('10:00:00', '22:00:00')  # 不运行的时间段,在这个时间段自动不运行函数.
@@ -193,7 +193,7 @@ class BoosterParams(BaseJsonAbleModel):
         # if not set(values.keys()).issubset(set(BoosterParams.__fields__.keys())):
         #     raise ValueError(f'{cls.__name__} 的字段包含了父类 BoosterParams 不存在的字段')
         for k in values.keys():
-            if k not in BoosterParams.__fields__.keys():
+            if k not in BoosterParams.model_fields.keys():
                 raise ValueError(f'{cls.__name__} 的字段新增了父类 BoosterParams 不存在的字段 "{k}"')  # 使 BoosterParams的子类,不能增加字段,只能覆盖字段.
         return values
 
@@ -224,7 +224,7 @@ class PriorityConsumingControlConfig(BaseJsonAbleModel):
     例如消费为add函数，可以每个独立的任务设置不同的超时时间，不同的重试次数，是否使用rpc模式。这里的配置优先，可以覆盖生成消费者时候的配置。
     """
 
-    function_timeout: typing.Union[float, int] = None
+    function_timeout: typing.Union[float, int] = 0
     max_retry_times: int = None
     is_print_detail_exception: bool = None
     msg_expire_senconds: int = None

funboost/core/lazy_impoter.py

@@ -0,0 +1,25 @@
+from funboost.utils.decorators import cached_method_result
+
+
+class LazyImpoter:
+    """
+    延迟导入,避免需要互相导入.
+    """
+
+    @property
+    @cached_method_result
+    def BoostersManager(self):
+        from funboost.core.booster import BoostersManager
+        return BoostersManager
+
+    # @property
+    # @cached_method_result
+    # def get_current_taskid(self):
+    #     from funboost.core.current_task import get_current_taskid
+    #     return get_current_taskid
+
+
+if __name__ == '__main__':
+    for i in range(10000):
+        LazyImpoter().BoostersManager
+        LazyImpoter().BoostersManager

funboost/core/muliti_process_enhance.py

@@ -7,12 +7,11 @@ from concurrent.futures import ProcessPoolExecutor
 from funboost.core.booster import Booster
 from funboost.core.helper_funs import run_forever
 from funboost.core.loggers import flogger
-
+from funboost.core.lazy_impoter import LazyImpoter
 
 
 def _run_consumer_in_new_process(queue_name, ):
-    from funboost.core.booster import BoostersManager
-    booster_current_pid = BoostersManager.get_or_create_booster_by_queue_name(queue_name)
+    booster_current_pid = LazyImpoter().BoostersManager.get_or_create_booster_by_queue_name(queue_name)
     # booster_current_pid = boost(**boost_params)(consuming_function)
     booster_current_pid.consume()
     # ConsumersManager.join_all_consumer_shedual_task_thread()
@@ -50,8 +49,7 @@ def run_consumer_with_multi_process(booster: Booster, process_num=1):
 
 
 def _multi_process_pub_params_list_in_new_process(queue_name, msgs: List[dict]):
-    from funboost.core.booster import BoostersManager
-    booster_current_pid = BoostersManager.get_or_create_booster_by_queue_name(queue_name)
+    booster_current_pid = LazyImpoter().BoostersManager.get_or_create_booster_by_queue_name(queue_name)
     publisher = booster_current_pid.publisher
     publisher.set_log_level(20)  # 超高速发布，如果打印详细debug日志会卡死屏幕和严重降低代码速度。
     for msg in msgs:

funboost/core/task_id_logger.py

@@ -0,0 +1,13 @@
+import functools
+
+from nb_log import CompatibleLogger
+from funboost.core.current_task import get_current_taskid
+
+
+class TaskIdLogger(CompatibleLogger):
+    def _log(self, level, msg, args, exc_info=None, extra=None, stack_info=False):
+        extra = extra or {}
+        if 'task_id' not in extra:
+            extra['task_id'] = get_current_taskid()
+        extra['sys_getframe_n'] = 3
+        super()._log(level, msg, args, exc_info, extra, stack_info)

funboost/funboost_config_deafult.py

@@ -5,6 +5,7 @@ import pytz
 from funboost.constant import BrokerEnum, ConcurrentModeEnum
 from funboost.core.func_params_model import FunctionResultStatusPersistanceConfig
 from funboost.utils.simple_data_class import DataClassBase
+from nb_log import nb_log_config_default
 
 '''
 funboost_config.py 文件是第一次运行框架自动生成到你的项目根目录的，不需要用由户手动创建。
@@ -96,7 +97,11 @@ class BrokerConnConfig(DataClassBase):
 
 class FunboostCommonConfig(DataClassBase):
     # nb_log包的第几个日志模板，内置了7个模板，可以在你当前项目根目录下的nb_log_config.py文件扩展模板。
-    NB_LOG_FORMATER_INDEX_FOR_CONSUMER_AND_PUBLISHER = 11  # 7是简短的不可跳转，5是可点击跳转的，11是可显示ip 进程 线程的模板。
+    # NB_LOG_FORMATER_INDEX_FOR_CONSUMER_AND_PUBLISHER = 11  # 7是简短的不可跳转，5是可点击跳转的，11是可显示ip 进程 线程的模板。
+    NB_LOG_FORMATER_INDEX_FOR_CONSUMER_AND_PUBLISHER = logging.Formatter(
+        f'%(asctime)s-({nb_log_config_default.computer_ip},{nb_log_config_default.computer_name})-[p%(process)d_t%(thread)d] - %(name)s - "%(filename)s:%(lineno)d" - %(funcName)s - %(levelname)s - %(task_id)s - %(message)s',
+        "%Y-%m-%d %H:%M:%S",)   # 这个是带task_id的日子模板,日子可以显示task_id,方便用户窗帘排查某一个任务的所有日志.
+
     TIMEZONE = 'Asia/Shanghai'  # 时区
 
     # 以下配置是修改funboost的一些命名空间和启动时候的日志级别,新手不熟练就别去屏蔽日志了

funboost/publishers/base_publisher.py

@@ -26,6 +26,7 @@ from pikav1.exceptions import AMQPError as PikaAMQPError
 # from nb_log import LoggerLevelSetterMixin, LoggerMixin
 from funboost.core.loggers import LoggerLevelSetterMixin, FunboostFileLoggerMixin, get_logger
 from funboost.core.msg_result_getter import AsyncResult, AioAsyncResult
+from funboost.core.task_id_logger import TaskIdLogger
 from funboost.utils import decorators, time_util
 from funboost.funboost_config_deafult import BrokerConnConfig, FunboostCommonConfig
 
@@ -160,7 +161,7 @@ class AbstractPublisher(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
             logger_prefix += '--'
         logger_name = f'funboost.{logger_prefix}{self.__class__.__name__}--{self.queue_name}'
         log_filename = self.publisher_params.log_filename or f'funboost.{self.queue_name}.log'
-        self.logger = get_logger(logger_name,
+        self.logger = nb_log.LogManager(logger_name,logger_cls=TaskIdLogger).get_logger_and_add_handlers(
                                  log_level_int=self.publisher_params.log_level,
                                  log_filename=log_filename if self.publisher_params.create_logger_file else None,
                                  error_log_filename=nb_log.generate_error_file_name(log_filename),
@@ -213,7 +214,7 @@ class AbstractPublisher(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         decorators.handle_exception(retry_times=10, is_throw_error=True, time_sleep=0.1)(
             self.concrete_realization_of_publish)(json.dumps(msg, ensure_ascii=False))
 
-        self.logger.debug(f'向{self._queue_name} 队列，推送消息 耗时{round(time.time() - t_start, 4)}秒  {msg_function_kw}')  # 显示msg太长了。
+        self.logger.debug(f'向{self._queue_name} 队列，推送消息 耗时{round(time.time() - t_start, 4)}秒  {msg_function_kw}',extra={'task_id':task_id})  # 显示msg太长了。
         with self._lock_for_count:
             self.count_per_minute += 1
             self.publish_msg_num_total += 1

funboost/utils/dependency_packages_in_pythonpath/func_timeout/dafunc.py

@@ -9,12 +9,14 @@
 '''
 
 import copy
+import functools
 import inspect
 import threading
 import time
 import types
 import sys
 
+
 from .exceptions import FunctionTimedOut
 from .StoppableThread import StoppableThread
 
@@ -27,6 +29,8 @@ from functools import wraps
 __all__ = ('func_timeout', 'func_set_timeout')
 
 
+
+
 def func_timeout(timeout, func, args=(), kwargs=None):
     '''
         func_timeout - Runs the given function for up to #timeout# seconds.
@@ -60,7 +64,11 @@ def func_timeout(timeout, func, args=(), kwargs=None):
     exception = []
     isStopped = False
 
-    def funcwrap(args2, kwargs2):
+    from funboost.core.current_task import ThreadCurrentTask
+
+    def funcwrap(args2, kwargs2,_fct_local_data_dict):
+        fct = ThreadCurrentTask()
+        fct._fct_local_data.__dict__.update(_fct_local_data_dict)  # 把funboost的消费线程上下文需要传递到超时线程上下文里面来.
         try:
             ret.append( func(*args2, **kwargs2) )
         except FunctionTimedOut:
@@ -76,7 +84,9 @@ def func_timeout(timeout, func, args=(), kwargs=None):
                 e.__traceback__ = exc_info[2].tb_next
                 exception.append( e )
 
-    thread = StoppableThread(target=funcwrap, args=(args, kwargs))
+
+    # fct = funboost_current_task()
+    thread = StoppableThread(target=funcwrap, args=(args, kwargs,ThreadCurrentTask()._fct_local_data.__dict__))
     thread.daemon = True
 
     thread.start()

funboost/utils/mongo_util.py

@@ -1,12 +1,17 @@
 # -*- coding: utf-8 -*-
 # @Author  : ydf
 # @Time    : 2022/9/17 0017 15:26
+import functools
 import os
 import pymongo
-from funboost.funboost_config_deafult import BrokerConnConfig
 from funboost.utils import decorators
 
 
+@functools.lru_cache()
+def _get_mongo_url():
+    from funboost.funboost_config_deafult import BrokerConnConfig
+    return BrokerConnConfig.MONGO_CONNECT_URL
+
 class MongoMixin0000:
     """
     mixin类被继承，也可以直接实例化。
@@ -20,7 +25,7 @@ class MongoMixin0000:
     @property
     @decorators.cached_method_result
     def mongo_client(self):
-        return pymongo.MongoClient(BrokerConnConfig.MONGO_CONNECT_URL, connect=False)  # connect等于False原因见注释
+        return pymongo.MongoClient(_get_mongo_url(), connect=False)  # connect等于False原因见注释
 
     @property
     @decorators.cached_method_result
@@ -46,7 +51,7 @@ class MongoMixin:
         pid = os.getpid()
         key = pid
         if key not in MongoMixin.processid__client_map:
-            MongoMixin.processid__client_map[key] = pymongo.MongoClient(BrokerConnConfig.MONGO_CONNECT_URL,
+            MongoMixin.processid__client_map[key] = pymongo.MongoClient(_get_mongo_url(),
                                                                         connect=False, maxIdleTimeMS=60 * 1000, minPoolSize=3, maxPoolSize=20)
         return MongoMixin.processid__client_map[key]
 

funboost/utils/time_util.py

@@ -1,13 +1,18 @@
 # coding=utf-8
+import functools
 import typing
 import datetime
 import time
 import re
 import pytz
-from funboost.funboost_config_deafult import BrokerConnConfig,FunboostCommonConfig
+
 
 from funboost.utils import nb_print
 
+@functools.lru_cache()
+def _get_funboost_timezone():
+    from funboost.funboost_config_deafult import FunboostCommonConfig
+    return FunboostCommonConfig.TIMEZONE
 
 def build_defualt_date():
     """
@@ -78,11 +83,11 @@ class DatetimeConverter:
         elif isinstance(datetimex, (int, float)):
             if datetimex < 1:
                 datetimex += 86400
-            self.datetime_obj = datetime.datetime.fromtimestamp(datetimex, tz=pytz.timezone(FunboostCommonConfig.TIMEZONE))  # 时间戳0在windows会出错。
+            self.datetime_obj = datetime.datetime.fromtimestamp(datetimex, tz=pytz.timezone(_get_funboost_timezone()))  # 时间戳0在windows会出错。
         elif isinstance(datetimex, datetime.datetime):
             self.datetime_obj = datetimex
         elif datetimex is None:
-            self.datetime_obj = datetime.datetime.now(tz=pytz.timezone(FunboostCommonConfig.TIMEZONE))
+            self.datetime_obj = datetime.datetime.now(tz=pytz.timezone(_get_funboost_timezone()))
         else:
             raise ValueError('实例化时候的传参不符合规定')
 

{funboost-42.9.dist-info → funboost-43.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 42.9
+Version: 43.0
 Summary: pip install funboost，python全功能分布式函数调度框架,。支持python所有类型的并发模式和一切知名消息队列中间件，支持如 celery dramatiq等框架整体作为funboost中间件，python函数加速器，框架包罗万象，用户能想到的控制功能全都有。一统编程思维，兼容50% python业务场景，适用范围广。只需要一行代码即可分布式执行python一切函数，99%用过funboost的pythoner 感受是　简易 方便 强劲 强大，相见恨晚 
 Home-page: https://github.com/ydf0509/funboost
 Author: bfzs
@@ -26,7 +26,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: nb-log >=12.2
+Requires-Dist: nb-log >=12.4
 Requires-Dist: eventlet ==0.33.3
 Requires-Dist: gevent ==22.10.2
 Requires-Dist: pymongo ==4.3.3

{funboost-42.9.dist-info → funboost-43.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-funboost/__init__.py,sha256=XzfCfRudODC_6yXZwNCJB6jCk41f9E7odZe2b2RoxvY,3832
+funboost/__init__.py,sha256=NI7kJXtPqFdy-Ec4B5D7yZ_ZrMJATgNc6taBTimys1c,3832
 funboost/__init__old.py,sha256=07A1MLsxLtuRQQOIfDyphddOwNBrGe34enoHWAnjV14,20379
 funboost/__main__.py,sha256=-6Nogi666Y0LN8fVm3JmHGTOk8xEGWvotW_GDbSaZME,1065
 funboost/constant.py,sha256=haAbx2cvTN9itPzBG4v3_ODIi1-RudvBj6s_QjniqjU,7162
-funboost/funboost_config_deafult.py,sha256=9F8xhjJqe32HNcDGVCTyaJRAv_2Ei2zDoKwNC-QJk5c,6053
+funboost/funboost_config_deafult.py,sha256=uiz0eiLNaZ7poKWdebEajexpFi4g2ddmQxJm2O_tMUw,6552
 funboost/set_frame_config.py,sha256=bEsW4a4EuE3PpyypNuWSfsB-_bvT94pktJGKk4r-rlo,14328
 funboost/assist/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 funboost/assist/celery_helper.py,sha256=ae8nbwHEulXa9gSKrNkW87SS8BZx7ZJwzWYY6hniE2g,5603
@@ -33,7 +33,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=SgZT4G8ynJf71OsRC3MQhM6-exVDGLvpPU52G4Y2-5w,73311
+funboost/consumers/base_consumer.py,sha256=XGf6ykD8MgyBv782SH-_ySXRgXyPWqOIXHnrsv7fMWw,73716
 funboost/consumers/celery_consumer.py,sha256=W25gbGyimf8KG5lLbtgar3Ix7F3O4cIRBLtRq8nJ0AE,9216
 funboost/consumers/confirm_mixin.py,sha256=eY6fNwx51Hn4bQSYRjyTRwOqfCGsikVnd2Ga_Ep31N4,6062
 funboost/consumers/dramatiq_consumer.py,sha256=ozmeAfeF0U-YNYHK4suQB0N264h5AZdfMH0O45Mh-8A,2229
@@ -82,20 +82,22 @@ 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=k6UPxfW7QdhfdVu9yprHkF46jLO2eXTqTZPYkukmyZc,15741
-funboost/core/current_task.py,sha256=DNBNJtnFSy8NtEvUoAHVjPgf2pXV7L95fkKdixaqfeE,3699
+funboost/core/current_task.py,sha256=PMY-5ANxAUdYoxwoJWD7hW5J6xnEFX3uTrndrGgyu7M,4763
 funboost/core/exceptions.py,sha256=pLF7BkRJAfDiWp2_xGZqencmwdPiSQI1NENbImExknY,1311
 funboost/core/fabric_deploy_helper.py,sha256=KPjifNy1G1tDOT2eaR0X8hegot0HUk5vF-P1DnhxME4,8941
-funboost/core/func_params_model.py,sha256=jVPWke_UpwZ_Ik28_dL_j8h2dSrtYlEFTtUWMIw2KCA,17594
+funboost/core/func_params_model.py,sha256=hk2aUKfG2eIcfoj6yEerXg4X9emrUt3AmFBP4V5iCGw,18013
 funboost/core/function_result_status_config.py,sha256=PyjqAQOiwsLt28sRtH-eYRjiI3edPFO4Nde0ILFRReE,1764
 funboost/core/function_result_status_saver.py,sha256=UdokGSwU630t70AZnT9Ecj7GpYXORBDivlc9kadoI2E,9172
 funboost/core/helper_funs.py,sha256=M9Ad9EzgHdP581X-vuFgCavJRoezLGXlXSFg7zyMWD0,1578
 funboost/core/kill_remote_task.py,sha256=MZ5vWLGt6SxyN76h5Lf_id9tyVUzjR-qXNyJwXaGlZY,8129
+funboost/core/lazy_impoter.py,sha256=OlECyAt7JJewsKqSVYZHDG3ZifN3TjoMb6H4Dd8XCHU,642
 funboost/core/loggers.py,sha256=173aXdqE8nAe8t6OcVMNAFsCUClVrWQovdQhTAg9IyM,2407
 funboost/core/msg_result_getter.py,sha256=oZDuLDR5XQNzzvgDTsA7wroICToPwrkU9-OAaXXUQSk,8031
-funboost/core/muliti_process_enhance.py,sha256=0wgy8qnxfg_g-BtlKfysH6TZ9s97EWTdLFVWPAVUGw0,3601
+funboost/core/muliti_process_enhance.py,sha256=GQ2ohI4kFlBHSmZtvnoG8-pYyxyPatCs4S8fpp1t6hc,3569
+funboost/core/task_id_logger.py,sha256=McbJxLpRwTyrOpIZJkIYfB2z0Zduxm5F4_vFhMEVHKs,467
 funboost/core/try_get_user_funboost_common_config.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 funboost/core/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-funboost/core/cli/discovery_boosters.py,sha256=68SUEQnN3KN8_mfLHN2ho1z02vHAA-gHhTGfUAf4kz8,3811
+funboost/core/cli/discovery_boosters.py,sha256=hwbYq8BlhXktw0qezDALMice8Pao4RKIEZ4raf-LInE,3816
 funboost/core/cli/funboost_cli_user_templ.py,sha256=XUpKLxRKtYfebPUM8wii64kB0HW8L7j9LnRpT0xCfQI,2243
 funboost/core/cli/funboost_fire.py,sha256=OT0SNi9Zb0Tom2E0cWuArQs0obUowAA_rpCF7GdaKPs,5065
 funboost/factories/__init__.py,sha256=s7kKKjR1HU5eMjPD6r5b-SXTVMo1zBp2JjOAtkyt5Yo,178
@@ -120,7 +122,7 @@ funboost/function_result_web/static/js/jquery-1.11.0.min.js,sha256=ryQZ3RXgnqkTz
 funboost/function_result_web/templates/index.html,sha256=YM0582Q4t2da-xBf3Ga0McIfcsT9H98rjZck-irMkGo,20387
 funboost/function_result_web/templates/login.html,sha256=q37dj7O0LeyiV38Zd5P1Qn_qmhjdFomuYTRY1Yk48Bo,2007
 funboost/publishers/__init__.py,sha256=xqBHlvsJQVPfbdvP84G0LHmVB7-pFBS7vDnX1Uo9pVY,131
-funboost/publishers/base_publisher.py,sha256=sWpSDG5BfUrI7wTQ-3FX_dqaHXL5Or8axcmLAglUEG0,14944
+funboost/publishers/base_publisher.py,sha256=aDtuj2w8Ad2qA0X7Z5N4KWz_-3uVw7os77undqbhvb8,15085
 funboost/publishers/celery_publisher.py,sha256=uc9N1uLW74skUCw8dsnvxORM2O3cy4SiI7tUZRmvkHA,2336
 funboost/publishers/celery_publisher000.py,sha256=2XLOyU2__vlIUTi5L15uf0BJqAIjxbc3kCLIRDSOY9w,3966
 funboost/publishers/confluent_kafka_publisher.py,sha256=gC4SUk6I_7zjSngcbTI7oTJ7sza3oE3PE19KQkwCpn4,4802
@@ -173,7 +175,7 @@ funboost/utils/decorators.py,sha256=phLa1u_W8wuhkVNVesRU6zjWA_b4sONfrvzO_sPVdtw,
 funboost/utils/develop_log.py,sha256=Wsx0ongGjTit5xqgk1BztYlVEkC6d0-Y7GENXLedVqY,271
 funboost/utils/expire_lock.py,sha256=AOkd1KlvZeIwQaz8ZoKxLpGxWgqQ4mfNHcFphh04o8Q,4732
 funboost/utils/json_helper.py,sha256=HDdtLyZBGpWbUm7vmTypKXd8K-Hb-9BaxpdmRlKMYUI,1849
-funboost/utils/mongo_util.py,sha256=g8VDiZNPSBxm1GBY-ZQrhAjzfThUNp26k2-QvXITfiw,2987
+funboost/utils/mongo_util.py,sha256=g2AdsanKm2v9X-OaTCS6hx_0JvRw5WukXIttN3TD9sI,3069
 funboost/utils/monkey_color_log.py,sha256=QChhQMTB6phZ2eBaPq-9tFZF1n7pWeJgmJPIB_ugkvs,7367
 funboost/utils/monkey_patches.py,sha256=vGmtPuTwNLbS8T3gpufSC_cD8_Vnp85roZrCpJZUSE4,2890
 funboost/utils/mqtt_util.py,sha256=BfCmyYwI-B8VL9499_IuYlJDCbv6ZhwyWThMf8dANOU,3199
@@ -184,7 +186,7 @@ funboost/utils/redis_manager_old.py,sha256=c3RBXN6dM3kjVBqkCdotpZuYmFs4d9emfp5iJ
 funboost/utils/resource_monitoring.py,sha256=vf1htYa3a4wlMfQqksvIINMw8laiXwG5N8NXU2Zm3qQ,5532
 funboost/utils/restart_python.py,sha256=bFbV0_24ajL8hBwVRLxWe9v9kTwiX1fGLhXRroNnmgQ,1418
 funboost/utils/simple_data_class.py,sha256=CPiiywEAUSK4eKIxGlzOua1ZSkO_sVsMt157i8MwWO0,1543
-funboost/utils/time_util.py,sha256=0QVNFW6AYwBarGoV08eFIioGUG66hM8qYGAfXVg6jn4,5439
+funboost/utils/time_util.py,sha256=smWhB0fdxgazBYI-t2E61mcIlBk78GcVnl2M8Ko8jVQ,5533
 funboost/utils/un_strict_json_dumps.py,sha256=uh2mXNRCq5dJcqMhb9CkfvehfEGYZAgI6RY1oLcYX_M,408
 funboost/utils/dependency_packages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 funboost/utils/dependency_packages/mongomq/__init__.py,sha256=yP7LHPsZ5ResiexksmtyJc9HGbMJWwZ0gOvHk2vNcz0,131
@@ -236,7 +238,7 @@ funboost/utils/dependency_packages_in_pythonpath/aioredis/__pycache__/utils.cpyt
 funboost/utils/dependency_packages_in_pythonpath/aioredis/__pycache__/utils.cpython-39.pyc,sha256=UyZJDglEyha0S4-6X4Jno7rAOPbXq6E-km0Fi_JnsJU,2017
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/StoppableThread.py,sha256=mvlE6n4bPDVem2cVBJLItEG_JEQhCogLjukFkJKF8c8,5246
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/__init__.py,sha256=rnAnFnfFPy5_x3lw4xcRJ_fzjHZuxWrdLdVujqglHwg,587
-funboost/utils/dependency_packages_in_pythonpath/func_timeout/dafunc.py,sha256=_eLe328DPJcHmKwjTwsazi7Hg9eNAYXopT35d_iGF0U,9297
+funboost/utils/dependency_packages_in_pythonpath/func_timeout/dafunc.py,sha256=GgxgDs_9aLaGBUrjibGzVD6ahJGwUuRAaNnliIrQhSA,9667
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/exceptions.py,sha256=tUEaspemq_dS460EQvUMMSxeeyjIbgfEHIdxIC6ZhaU,3974
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/py2_raise.py,sha256=9tpZLQ3-zIgU_ixazydwZmw8rFg7ybjI9alNYfSvwRk,169
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/py3_raise.py,sha256=Odvg1FtXTEC--Ru1EIfsHASamBpOm9hdXY7OnlEUObA,280
@@ -247,7 +249,7 @@ funboost/utils/dependency_packages_in_pythonpath/func_timeout/__pycache__/__init
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/__pycache__/__init__.cpython-37.pyc,sha256=ACdP5kS3R-5Bt2Qk-sq6RHF3LaOyywwVyM9R7L8m1-Q,763
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/__pycache__/__init__.cpython-39.pyc,sha256=5J3PkkFxVDKw4aFL59LwtJC5SDtteQT9ibIBR_1DkF8,767
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/__pycache__/dafunc.cpython-311.pyc,sha256=lm1W6uTCo09YyK_P5WNpBr1dBMMBwl8Pt6ItwMyBNGA,11447
-funboost/utils/dependency_packages_in_pythonpath/func_timeout/__pycache__/dafunc.cpython-37.pyc,sha256=9BDSFUqtY6nNXyULNlC5YgqU1jIC33FBwaQsGqglTQQ,8208
+funboost/utils/dependency_packages_in_pythonpath/func_timeout/__pycache__/dafunc.cpython-37.pyc,sha256=XjkqdpT_VqoFfi2LzJ5TpYUAtfUpan-zCjbacxkeCeQ,8394
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/__pycache__/dafunc.cpython-39.pyc,sha256=aYRhjAhdcweDRI_wlh1UU_tFnWHr9at5Ywz-p6tw0QI,8001
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/__pycache__/exceptions.cpython-311.pyc,sha256=9v_YQPA5cUlVs-3UHbVwfiIE8UBzPD1HyWzApfBSR7Y,4592
 funboost/utils/dependency_packages_in_pythonpath/func_timeout/__pycache__/exceptions.cpython-37.pyc,sha256=UXQJRMqqUOpudiCLxFYM2RWF8JXerjUttXl6Fiw55OE,3708
@@ -262,9 +264,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-42.9.dist-info/LICENSE,sha256=9EPP2ktG_lAPB8PjmWV-c9BiaJHc_FP6pPLcUrUwx0E,11562
-funboost-42.9.dist-info/METADATA,sha256=pKonNSFLcVH_ITNycv0MYSg_rdIodpXfuVODRZYxoV0,30477
-funboost-42.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-funboost-42.9.dist-info/entry_points.txt,sha256=yMSSAGRzRAAhGyNNQHw24MooKlDZsaJ499_D6fPl58A,96
-funboost-42.9.dist-info/top_level.txt,sha256=K8WuKnS6MRcEWxP1NvbmCeujJq6TEfbsB150YROlRw0,9
-funboost-42.9.dist-info/RECORD,,
+funboost-43.0.dist-info/LICENSE,sha256=9EPP2ktG_lAPB8PjmWV-c9BiaJHc_FP6pPLcUrUwx0E,11562
+funboost-43.0.dist-info/METADATA,sha256=GBk3jqN0aSIzwkPLe8Yj96eRrCeIV6RbdrS-u7qzOt0,30477
+funboost-43.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+funboost-43.0.dist-info/entry_points.txt,sha256=yMSSAGRzRAAhGyNNQHw24MooKlDZsaJ499_D6fPl58A,96
+funboost-43.0.dist-info/top_level.txt,sha256=K8WuKnS6MRcEWxP1NvbmCeujJq6TEfbsB150YROlRw0,9
+funboost-43.0.dist-info/RECORD,,