funboost 41.5__tar.gz → 41.7__tar.gz

{funboost-41.5/funboost.egg-info → funboost-41.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 41.5
+Version: 41.7
 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.5 → funboost-41.7}/funboost/__init__.py

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

{funboost-41.5 → funboost-41.7}/funboost/consumers/base_consumer.py

@@ -164,7 +164,10 @@ 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)
+        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读取
@@ -206,6 +209,7 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         self._consuming_function_is_asyncio = inspect.iscoroutinefunction(self.consuming_function)
         self.custom_init()
         # develop_logger.warning(consumer_params.log_filename)
+        print(self.consumer_params.broker_exclusive_config)
         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,
@@ -231,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.5 → funboost-41.7}/funboost/core/func_params_model.py

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

{funboost-41.5 → funboost-41.7}/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.5 → funboost-41.7/funboost.egg-info}/PKG-INFO

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