funboost 41.6__tar.gz → 41.8__tar.gz

{funboost-41.6/funboost.egg-info → funboost-41.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 41.6
+Version: 41.8
 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

{funboost-41.6 → funboost-41.8}/funboost/__init__.py

@@ -13,7 +13,7 @@ set_frame_config这个模块的 use_config_form_funboost_config_module() 是核
 这段注释说明和使用的用户无关,只和框架开发人员有关.
 '''
 
-__version__ = "41.6"
+__version__ = "41.8"
 
 from funboost.set_frame_config import show_frame_config
 
@@ -61,4 +61,4 @@ from funboost.concurrent_pool.custom_threadpool_executor import show_current_thr
 # set_interrupt_signal_handler()
 
 # 有的包默认没加handlers，原始的日志不漂亮且不可跳转不知道哪里发生的。这里把warnning级别以上的日志默认加上handlers。
-# nb_log.get_logger(name='', log_level_int=30, log_filename='pywarning.log')
+# nb_log.get_logger(name='', log_level_int=30, _log_filename='pywarning.log')

{funboost-41.6 → funboost-41.8}/funboost/__init__old.py

@@ -25,7 +25,7 @@ from funboost.utils import nb_print, patch_print, LogManager, get_logger, Logger
 
 
 # 有的包默认没加handlers，原始的日志不漂亮且不可跳转不知道哪里发生的。这里把warnning级别以上的日志默认加上handlers。
-# nb_log.get_logger(name='', log_level_int=30, log_filename='pywarning.log')
+# nb_log.get_logger(name='', log_level_int=30, _log_filename='pywarning.log')
 
 
 class Booster(LoggerMixin):

{funboost-41.6 → funboost-41.8}/funboost/concurrent_pool/async_pool_executor.py

@@ -159,6 +159,10 @@ class AsyncPoolExecutorGtPy310(AsyncPoolExecutorLtPy310):
 
 AsyncPoolExecutor = AsyncPoolExecutorLtPy310 if sys.version_info.minor < 10 else AsyncPoolExecutorGtPy310
 
+if sys.platform == "darwin":  # mac 上会出错
+      import selectors
+      selectors.DefaultSelector = selectors.PollSelector
+
 if __name__ == '__main__':
     def test_async_pool_executor():
         from funboost.concurrent_pool import CustomThreadPoolExecutor as ThreadPoolExecutor

{funboost-41.6 → funboost-41.8}/funboost/consumers/base_consumer.py

@@ -164,7 +164,11 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         self._last_timestamp_print_msg_num = 0
 
         self._result_persistence_helper: ResultPersistenceHelper
-        self.consumer_params.broker_exclusive_config.update(self.BROKER_EXCLUSIVE_CONFIG_DEFAULT)
+        self._check_broker_exclusive_config()
+        broker_exclusive_config_merge = dict()
+        broker_exclusive_config_merge.update(self.BROKER_EXCLUSIVE_CONFIG_DEFAULT)
+        broker_exclusive_config_merge.update(self.consumer_params.broker_exclusive_config)
+        self.consumer_params.broker_exclusive_config = broker_exclusive_config_merge
 
         self._stop_flag = None
         self._pause_flag = None  # 暂停消费标志，从reids读取
@@ -201,11 +205,11 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
                                             'code_filename': Path(self.consuming_function.__code__.co_filename).as_posix()
                                             }
 
-        self._check_broker_exclusive_config()
+
         self._has_start_delay_task_scheduler = False
         self._consuming_function_is_asyncio = inspect.iscoroutinefunction(self.consuming_function)
         self.custom_init()
-        # develop_logger.warning(consumer_params.log_filename)
+        # develop_logger.warning(consumer_params._log_filename)
         self.publisher_params = PublisherParams(queue_name=consumer_params.queue_name, consuming_function=consumer_params.consuming_function,
                                                 broker_kind=self.BROKER_KIND, log_level=consumer_params.log_level,
                                                 logger_prefix=consumer_params.logger_prefix,
@@ -213,7 +217,6 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
                                                 log_filename=consumer_params.log_filename,
                                                 broker_exclusive_config=self.consumer_params.broker_exclusive_config)
         if is_main_process:
-            print(self.consumer_params.get_str_dict())
             self.logger.info(f'{self.queue_name} consumer 的消费者配置:\n {self.consumer_params.json_str_value()}')
         atexit.register(self.join_shedual_task_thread)
 
@@ -232,11 +235,12 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         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):
-        broker_exclusive_config_keys = self.consumer_params.broker_exclusive_config.keys()
-        if set(self.consumer_params.broker_exclusive_config.keys()).issubset(broker_exclusive_config_keys):
-            self.logger.info(f'当前消息队列中间件能支持特殊独有配置 {self.consumer_params.broker_exclusive_config.keys()}')
-        else:
-            self.logger.warning(f'当前消息队列中间件含有不支持的特殊配置 {self.consumer_params.broker_exclusive_config.keys()}，能支持的特殊独有配置包括 {broker_exclusive_config_keys}')
+        broker_exclusive_config_keys = self.BROKER_EXCLUSIVE_CONFIG_DEFAULT.keys()
+        if self.consumer_params.broker_exclusive_config:
+            if set(self.consumer_params.broker_exclusive_config.keys()).issubset(broker_exclusive_config_keys):
+                self.logger.info(f'当前消息队列中间件能支持特殊独有配置 {self.consumer_params.broker_exclusive_config.keys()}')
+            else:
+                self.logger.warning(f'当前消息队列中间件含有不支持的特殊配置 {self.consumer_params.broker_exclusive_config.keys()}，能支持的特殊独有配置包括 {broker_exclusive_config_keys}')
 
     def _check_monkey_patch(self):
         if self.consumer_params.concurrent_mode == ConcurrentModeEnum.GEVENT:

{funboost-41.6 → funboost-41.8}/funboost/consumers/kombu_consumer.py

@@ -175,7 +175,7 @@ Transport Options
         self._middware_name = self.kombu_url.split(":")[0]
         # logger_name = f'{self.consumer_params.logger_prefix}{self.__class__.__name__}--{self._middware_name}--{self._queue_name}'
         # self.logger = get_logger(logger_name, log_level_int=self.consumer_params.log_level,
-        #                          log_filename=f'{logger_name}.log' if self.consumer_params.create_logger_file else None,
+        #                          _log_filename=f'{logger_name}.log' if self.consumer_params.create_logger_file else None,
         #                          formatter_template=FunboostCommonConfig.NB_LOG_FORMATER_INDEX_FOR_CONSUMER_AND_PUBLISHER,
         #                          )  #
         if self.kombu_url.startswith('filesystem://'):

{funboost-41.6 → funboost-41.8}/funboost/core/func_params_model.py

@@ -57,14 +57,13 @@ class BaseJsonAbleModel(BaseModel):
         try:
             return json.dumps(self.get_str_dict(), ensure_ascii=False, )
         except TypeError as e:
-            return  self.get_str_dict()
-
+            return str(self.get_str_dict())
 
     def json_pre(self):
         try:
             return json.dumps(self.get_str_dict(), ensure_ascii=False, indent=4)
         except TypeError as e:
-            return  self.get_str_dict()
+            return str(self.get_str_dict())
 
     def update_from_dict(self, dictx: dict):
         for k, v in dictx.items():

{funboost-41.6 → funboost-41.8}/funboost/publishers/kombu_publisher.py

@@ -49,7 +49,7 @@ class KombuPublisher(AbstractPublisher, ):
         self._kombu_broker_url_prefix = self.kombu_url.split(":")[0]
         # logger_name = f'{self._logger_prefix}{self.__class__.__name__}--{self._kombu_broker_url_prefix}--{self._queue_name}'
         # self.logger = get_logger(logger_name, log_level_int=self._log_level_int,
-        #                          log_filename=f'{logger_name}.log' if self._is_add_file_handler else None,
+        #                          _log_filename=f'{logger_name}.log' if self._is_add_file_handler else None,
         #                          formatter_template=FunboostCommonConfig.NB_LOG_FORMATER_INDEX_FOR_CONSUMER_AND_PUBLISHER,
         #                          )  #
         if self.kombu_url.startswith('filesystem://'):

{funboost-41.6 → funboost-41.8}/funboost/publishers/redis_publisher_priority.py

@@ -37,7 +37,7 @@ class RedisPriorityPublisher(FlushRedisQueueMixin,AbstractPublisher, RedisMixin,
 
     def concrete_realization_of_publish(self, msg):
         queue_name = self.build_queue_name_by_msg(msg)
-        self.logger.debug([queue_name, msg])
+        # self.logger.debug([queue_name, msg])
         self.redis_db_frame.rpush(queue_name, msg)
 
 

{funboost-41.6 → funboost-41.8}/funboost/utils/redis_manager.py

@@ -30,7 +30,7 @@ class RedisManager(object):
         self._key = (host, port, db, username, password,)
         if self._key not in self.__class__._redis_db__conn_map:
             self.__class__._redis_db__conn_map[self._key] = redis5.Redis(host=host, port=port, db=db, username=username,
-                                                                         password=password, max_connections=100, decode_responses=True)
+                                                                         password=password, max_connections=1000, decode_responses=True)
         self.redis = self.__class__._redis_db__conn_map[self._key]
 
     def get_redis(self) -> redis5.Redis:
@@ -47,7 +47,7 @@ class AioRedisManager(object):
         self._key = (host, port, db, username, password,)
         if self._key not in self.__class__._redis_db__conn_map:
             self.__class__._redis_db__conn_map[self._key] = AioRedis(host=host, port=port, db=db, username=username,
-                                                                     password=password, max_connections=100, decode_responses=True)
+                                                                     password=password, max_connections=1000, decode_responses=True)
         self.redis = self.__class__._redis_db__conn_map[self._key]
 
     def get_redis(self) -> AioRedis:

{funboost-41.6 → funboost-41.8/funboost.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 41.6
+Version: 41.8
 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