funboost 44.5__py3-none-any.whl → 44.7__py3-none-any.whl

funboost/__init__.py

@@ -13,7 +13,7 @@ set_frame_config这个模块的 use_config_form_funboost_config_module() 是核
 这段注释说明和使用的用户无关,只和框架开发人员有关.
 '''
 
-__version__ = "44.5"
+__version__ = "44.7"
 
 from funboost.set_frame_config import show_frame_config
 
@@ -31,12 +31,13 @@ from funboost.utils.paramiko_util import ParamikoFolderUploader
 
 from funboost.consumers.base_consumer import (wait_for_possible_has_finish_all_tasks_by_conusmer_list,
                                               FunctionResultStatus, AbstractConsumer)
-
+from funboost.consumers.empty_consumer import EmptyConsumer
 from funboost.core.exceptions import ExceptionForRetry, ExceptionForRequeue, ExceptionForPushToDlxqueue
 from funboost.core.active_cousumer_info_getter import ActiveCousumerProcessInfoGetter
 from funboost.core.msg_result_getter import HasNotAsyncResult, ResultFromMongo
 from funboost.publishers.base_publisher import (PriorityConsumingControlConfig,
                                                 AbstractPublisher, AsyncResult, AioAsyncResult)
+from funboost.publishers.empty_publisher import EmptyPublisher
 from funboost.factories.broker_kind__publsiher_consumer_type_map import register_custom_broker
 from funboost.factories.publisher_factotry import get_publisher
 from funboost.factories.consumer_factory import get_consumer

funboost/constant.py

@@ -1,5 +1,7 @@
 # coding= utf-8
 class BrokerEnum:
+    EMPTY = 'empty' # 空的实现，需要搭配 boost入参的 consumer_override_cls 和 publisher_override_cls使用，或者被继承。
+
     RABBITMQ_AMQPSTORM = 'RABBITMQ_AMQPSTORM'  # 使用 amqpstorm 包操作rabbitmq  作为 分布式消息队列，支持消费确认.强烈推荐这个作为funboost中间件。
     RABBITMQ = RABBITMQ_AMQPSTORM
 

funboost/consumers/base_consumer.py

@@ -562,6 +562,9 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         """
         self._do_not_delete_extra_from_msg = True
 
+    def user_custom_record_process_info_func(self,current_function_result_status:FunctionResultStatus):  # 这个可以继承
+        pass
+
     # noinspection PyProtectedMember
     def _run(self, kw: dict, ):
         # print(kw)
@@ -633,7 +636,7 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
                     self._current_time_for_execute_task_times_every_unit_time = time.time()
                     self._consuming_function_cost_time_total_every_unit_time = 0
                     self._execute_task_times_every_unit_time = 0
-
+            self.user_custom_record_process_info_func(current_function_result_status) # 两种方式都可以自定义,记录结果.
             if self.consumer_params.user_custom_record_process_info_func:
                 self.consumer_params.user_custom_record_process_info_func(current_function_result_status)
         except BaseException as e:
@@ -657,7 +660,10 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         try:
             function_run = self.consuming_function
             if self._consuming_function_is_asyncio:
+                fct._fct_local_data._asyncio_use_thread_concurrent_mode = True
                 function_run = sync_or_async_fun_deco(function_run)
+            else:
+                fct._fct_local_data._asynco_use_thread_concurrent_mode = False
             function_timeout = self._get_priority_conf(kw, 'function_timeout')
             function_run = function_run if self.consumer_params.consumin_function_decorator is None else self.consumer_params.consumin_function_decorator(function_run)
             function_run = function_run if not function_timeout else self._concurrent_mode_dispatcher.timeout_deco(
@@ -823,7 +829,7 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
         try:
             corotinue_obj = self.consuming_function(**function_only_params)
             if not asyncio.iscoroutine(corotinue_obj):
-                log_msg = f'''当前设置的并发模式为 async 并发模式，但消费函数不是异步协程函数，请不要把消费函数 {self.consuming_function.__name__} 的 concurrent_mode 设置为 4'''
+                log_msg = f'''当前设置的并发模式为 async 并发模式，但消费函数不是异步协程函数，请不要把消费函数 {self.consuming_function.__name__} 的 concurrent_mode 设置错误'''
                 # self.logger.critical(msg=f'{log_msg} \n')
                 # self.error_file_logger.critical(msg=f'{log_msg} \n')
                 self.logger.critical(msg=log_msg)

funboost/consumers/empty_consumer.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# @Author  : ydf
+# @Time    : 2023/8/8 0008 13:32
+
+import abc
+from funboost.consumers.base_consumer import AbstractConsumer
+
+
+class EmptyConsumer(AbstractConsumer, metaclass=abc.ABCMeta):
+    """
+    空的消费者没实现，空的实现，需要搭配 boost入参的 consumer_override_cls 和 publisher_override_cls使用，或者被继承。
+    """
+    def custom_init(self):
+        pass
+
+    @abc.abstractmethod
+    def _shedual_task(self):
+        raise NotImplemented('not realization')
+
+    @abc.abstractmethod
+    def _confirm_consume(self, kw):
+        raise NotImplemented('not realization')
+
+    @abc.abstractmethod
+    def _requeue(self, kw):
+        raise NotImplemented('not realization')

funboost/consumers/redis_consumer.py

@@ -17,20 +17,20 @@ class RedisConsumer(AbstractConsumer, RedisMixin):
     redis作为中间件实现的，使用redis list 结构实现的。
     这个如果消费脚本在运行时候随意反复重启或者非正常关闭或者消费宕机，会丢失大批任务。高可靠需要用rabbitmq或者redis_ack_able或者redis_stream的中间件方式。
 
-    这个是复杂版，一次性拉取100个，简单版在 funboost/consumers/redis_consumer_simple.py
+    这个是复杂版，一次性拉取100个,减少和redis的交互，简单版在 funboost/consumers/redis_consumer_simple.py
     """
 
-    BROKER_EXCLUSIVE_CONFIG_DEFAULT = {'redis_bulk_push':1}   #redis_bulk_push 是否redis批量推送
+    BROKER_EXCLUSIVE_CONFIG_DEFAULT = {'redis_bulk_push':1,'pull_msg_batch_size':100}   #redis_bulk_push 是否redis批量推送
 
     # noinspection DuplicatedCode
     def _shedual_task(self):
+        pull_msg_batch_size =  self.consumer_params.broker_exclusive_config['pull_msg_batch_size']
         while True:
             # if False:
             #     pass
             with self.redis_db_frame.pipeline() as p:
-                get_msg_batch_size = 100
-                p.lrange(self._queue_name, 0, get_msg_batch_size - 1)
-                p.ltrim(self._queue_name, get_msg_batch_size, -1)
+                p.lrange(self._queue_name, 0, pull_msg_batch_size- 1)
+                p.ltrim(self._queue_name, pull_msg_batch_size, -1)
                 task_str_list = p.execute()[0]
             if task_str_list:
                 # self.logger.debug(f'从redis的 [{self._queue_name}] 队列中 取出的消息是：  {task_str_list}  ')

funboost/consumers/redis_consumer_ack_able.py

@@ -99,6 +99,7 @@ class RedisConsumerAckAble(ConsumerConfirmMixinWithTheHelpOfRedisByHearbeat, Abs
     # print(script_4(keys=["text_pipelien1","text_pipelien1b"]))
     """
 
+    BROKER_EXCLUSIVE_CONFIG_DEFAULT = { 'pull_msg_batch_size': 100}
 
     def _shedual_task000(self):
         # 可以采用lua脚本，也可以采用redis的watch配合pipeline使用。比代码分两行pop和zadd比还能减少一次io交互，还能防止丢失小概率一个任务。
@@ -122,8 +123,9 @@ class RedisConsumerAckAble(ConsumerConfirmMixinWithTheHelpOfRedisByHearbeat, Abs
                 time.sleep(0.5)
 
     def _shedual_task(self):
-        lua = '''
-                     local task_list = redis.call("lrange", KEYS[1],0,99)
+        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)
                      if (#task_list > 0) then
                         for task_index,task_value in ipairs(task_list)

funboost/consumers/redis_stream_consumer.py

@@ -14,7 +14,7 @@ class RedisStreamConsumer(AbstractConsumer, RedisMixin):
     redis 的 stream 结构 作为中间件实现的。需要redis 5.0以上，redis stream结构 是redis的消息队列，概念类似kafka，功能远超 list结构。
     """
     GROUP = 'funboost_group'
-    BROKER_EXCLUSIVE_CONFIG_DEFAULT = {'group': 'funboost_group'}
+    BROKER_EXCLUSIVE_CONFIG_DEFAULT = {'group': 'funboost_group','pull_msg_batch_size': 100}
 
     def custom_init(self):
         self.group = self.consumer_params.broker_exclusive_config['group'] or self.GROUP
@@ -33,6 +33,7 @@ class RedisStreamConsumer(AbstractConsumer, RedisMixin):
         self.keep_circulating(60, block=False)(self._requeue_tasks_which_unconfirmed)()
 
     def _shedual_task(self):
+        pull_msg_batch_size = self.consumer_params.broker_exclusive_config['pull_msg_batch_size']
 
         try:
             self.redis_db_frame.xgroup_create(self._queue_name,self.group , id=0, mkstream=True)
@@ -41,7 +42,7 @@ class RedisStreamConsumer(AbstractConsumer, RedisMixin):
         while True:
             # redis服务端必须是5.0以上，并且确保这个键的类型是stream不能是list数据结构。
             results = self.redis_db_frame.xreadgroup(self.group, self.consumer_identification,
-                                                              {self.queue_name: ">"}, count=100, block=60 * 1000)
+                                                              {self.queue_name: ">"}, count=pull_msg_batch_size, block=60 * 1000)
             if results:
                 # self.logger.debug(f'从redis的 [{self._queue_name}] stream 中 取出的消息是：  {results}  ')
                 self._print_message_get_from_broker( results)

funboost/core/current_task.py

@@ -54,7 +54,7 @@ class __ThreadCurrentTask:
 
 
     _fct_local_data = threading.local()
-
+    _fct_local_data._asyncio_use_thread_concurrent_mode = False
 
     @property
     def function_params(self):
@@ -146,7 +146,14 @@ class __AsyncioCurrentTask:
 asyncio_current_task = __AsyncioCurrentTask()
 
 def funboost_current_task():
-    return asyncio_current_task if is_asyncio_environment() else thread_current_task
+    if is_asyncio_environment():
+        if getattr(__ThreadCurrentTask._fct_local_data,'_asyncio_use_thread_concurrent_mode',None) is True:
+            # 如果用户使用的是默认的ConcurrentModeEnum.THREADING并发模式，那么也使用线程获取上下文
+            return thread_current_task
+        else:
+            return asyncio_current_task
+    else:
+        return thread_current_task
 
 
 def get_current_taskid():

funboost/core/funboost_current_task_context_thread.py

@@ -0,0 +1,12 @@
+# import threading
+#
+# from funboost.core.current_task import thread_current_task
+#
+#
+# class FctThread(threading.Thread):
+#     thread_current_task__dict_key = 'thread_current_task__dict'
+#
+#
+#     def run(self):
+#         thread_current_task._fct_local_data.__dict__.update(getattr(self,self.thread_current_task__dict_key))  # 把funboost的消费线程上下文需要传递到线程上下文里面来.
+#         super().run()

funboost/core/func_params_model.py

@@ -178,13 +178,18 @@ class BoosterParams(BaseJsonAbleModel):
 
     consuming_function: typing.Callable = None  # 消费函数,在@boost时候不用指定,因为装饰器知道下面的函数.
 
-    broker_kind: str = BrokerEnum.PERSISTQUEUE  # 中间件选型见3.1章节 https://funboost.readthedocs.io/zh/latest/articles/c3.html
+    broker_kind: str = BrokerEnum.SQLITE_QUEUE  # 中间件选型见3.1章节 https://funboost.readthedocs.io/zh/latest/articles/c3.html
 
     broker_exclusive_config: dict = {}  # 加上一个不同种类中间件非通用的配置,不同中间件自身独有的配置，不是所有中间件都兼容的配置，因为框架支持30种消息队列，消息队列不仅仅是一般的先进先出queue这么简单的概念，
     # 例如kafka支持消费者组，rabbitmq也支持各种独特概念例如各种ack机制 复杂路由机制，有的中间件原生能支持消息优先级有的中间件不支持,每一种消息队列都有独特的配置参数意义，可以通过这里传递。每种中间件能传递的键值对可以看consumer类的 BROKER_EXCLUSIVE_CONFIG_DEFAULT
 
     should_check_publish_func_params: bool = True  # 消息发布时候是否校验消息发布内容,比如有的人发布消息,函数只接受a,b两个入参,他去传2个入参,或者传参不存在的参数名字,  如果消费函数你非要写*args,**kwargs,那就需要关掉发布消息时候的函数入参检查
 
+    consumer_override_cls: typing.Optional[typing.Type] = None  # 使用 consumer_override_cls 和 publisher_override_cls 来自定义重写或新增消费者 发布者,见文档4.21b介绍，
+    publisher_override_cls: typing.Optional[typing.Type] = None
+
+    # func_params_is_pydantic_model: bool = False  # funboost 兼容支持 函数娼还是 pydantic model类型，funboost在发布之前和取出来时候自己转化。
+
     auto_generate_info: dict = {}  # 自动生成的信息,不需要用户主动传参.
 
     @root_validator(skip_on_failure=True)
@@ -245,6 +250,7 @@ class PriorityConsumingControlConfig(BaseJsonAbleModel):
     misfire_grace_time: typing.Union[int, None] = None
     other_extra_params: dict = None  # 其他参数, 例如消息优先级 , priority_control_config=PriorityConsumingControlConfig(other_extra_params={'priroty': priorityxx})，
 
+
     @root_validator(skip_on_failure=True)
     def cehck_values(cls, values: dict):
         if values['countdown'] and values['eta']:
@@ -266,6 +272,8 @@ class PublisherParams(BaseJsonAbleModel):
     broker_kind: str = None
     broker_exclusive_config: dict = {}
     should_check_publish_func_params: bool = True  # 消息发布时候是否校验消息发布内容,比如有的人发布消息,函数只接受a,b两个入参,他去传2个入参,或者传参不存在的参数名字,  如果消费函数你非要写*args,**kwargs,那就需要关掉发布消息时候的函数入参检查
+    publisher_override_cls: typing.Optional[typing.Type] = None
+    # func_params_is_pydantic_model: bool = False  # funboost 兼容支持 函数娼还是 pydantic model类型，funboost在发布之前和取出来时候自己转化。
 
 
 if __name__ == '__main__':
@@ -277,4 +285,4 @@ if __name__ == '__main__':
     # print(PriorityConsumingControlConfig().get_str_dict())
 
     print(BoosterParams(queue_name='3213', specify_concurrent_pool=FlexibleThreadPool(100)).json_pre())
-    print(PublisherParams.schema_json())
+    print(PublisherParams.schema_json())

funboost/factories/broker_kind__publsiher_consumer_type_map.py

@@ -1,6 +1,6 @@
 import typing
 
-
+from funboost.publishers.empty_publisher import EmptyPublisher
 from funboost.publishers.http_publisher import HTTPPublisher
 from funboost.publishers.nats_publisher import NatsPublisher
 from funboost.publishers.peewee_publisher import PeeweePublisher
@@ -25,6 +25,7 @@ from funboost.publishers.redis_stream_publisher import RedisStreamPublisher
 from funboost.publishers.mqtt_publisher import MqttPublisher
 from funboost.publishers.httpsqs_publisher import HttpsqsPublisher
 
+from funboost.consumers.empty_consumer import EmptyConsumer
 from funboost.consumers.redis_consumer_priority import RedisPriorityConsumer
 from funboost.consumers.redis_pubsub_consumer import RedisPbSubConsumer
 from funboost.consumers.http_consumer import HTTPConsumer
@@ -80,6 +81,7 @@ broker_kind__publsiher_consumer_type_map = {
     BrokerEnum.PEEWEE: (PeeweePublisher, PeeweeConsumer),
     BrokerEnum.REDIS_PUBSUB: (RedisPubSubPublisher, RedisPbSubConsumer),
     BrokerEnum.REIDS_ACK_USING_TIMEOUT: (RedisPublisher, RedisConsumerAckUsingTimeout),
+    BrokerEnum.EMPTY:(EmptyPublisher,EmptyConsumer),
 
 }
 

funboost/factories/consumer_factory.py

@@ -20,4 +20,12 @@ def get_consumer(boost_params: BoosterParams) -> AbstractConsumer:
 
     if boost_params.broker_kind not in broker_kind__publsiher_consumer_type_map:
         raise ValueError(f'设置的中间件种类数字不正确,你设置的值是 {boost_params.broker_kind} ')
-    return broker_kind__publsiher_consumer_type_map[boost_params.broker_kind][1](boost_params)
+    consumer_cls = broker_kind__publsiher_consumer_type_map[boost_params.broker_kind][1]
+    if not boost_params.consumer_override_cls:
+        return consumer_cls(boost_params)
+    else:
+        ConsumerClsOverride = type(f'{consumer_cls.__name__}__{boost_params.consumer_override_cls.__name__}', (boost_params.consumer_override_cls, consumer_cls, AbstractConsumer), {})
+        # class ConsumerClsOverride(boost_params.consumer_override_cls, consumer_cls, AbstractConsumer):
+        #     pass
+
+        return ConsumerClsOverride(boost_params)

funboost/factories/publisher_factotry.py

@@ -32,4 +32,13 @@ def get_publisher(publisher_params: PublisherParams) -> AbstractPublisher:
     regist_to_funboost(broker_kind)  # 动态注册中间件到框架是为了延迟导入，用户没安装不需要的第三方包不报错。
     if broker_kind not in broker_kind__publsiher_consumer_type_map:
         raise ValueError(f'设置的中间件种类数字不正确,你设置的值是 {broker_kind} ')
-    return broker_kind__publsiher_consumer_type_map[broker_kind][0](publisher_params)
+    publisher_cls = broker_kind__publsiher_consumer_type_map[broker_kind][0]
+    if not publisher_params.publisher_override_cls:
+        return publisher_cls(publisher_params)
+    else:
+        PublsiherClsOverride = type(f'{publisher_cls.__name__}__{publisher_params.publisher_override_cls.__name__}', (publisher_params.publisher_override_cls, publisher_cls, AbstractPublisher), {})
+        # class PublsiherClsOverride(publisher_params.publisher_override_cls, publisher_cls, AbstractPublisher):
+        #     pass
+
+        return PublsiherClsOverride(publisher_params)
+

funboost/publishers/empty_publisher.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# @Author  : ydf
+# @Time    : 2023/8/8 0008 12:12
+
+import abc
+from funboost.publishers.base_publisher import AbstractPublisher
+
+
+class EmptyPublisher(AbstractPublisher, metaclass=abc.ABCMeta):
+    """
+    空的发布者，空的实现，需要搭配 boost入参的 consumer_override_cls 和 publisher_override_cls使用，或者被继承。
+    """
+
+    def custom_init(self):
+        pass
+
+    @abc.abstractmethod
+    def concrete_realization_of_publish(self, msg: str):
+        raise NotImplemented('not realization')
+
+    @abc.abstractmethod
+    def clear(self):
+        raise NotImplemented('not realization')
+
+    @abc.abstractmethod
+    def get_message_count(self):
+        raise NotImplemented('not realization')
+
+    @abc.abstractmethod
+    def close(self):
+        raise NotImplemented('not realization')

funboost/set_frame_config.py

@@ -98,7 +98,7 @@ def show_frame_config():
         #             only_print_on_main_process(f'{var_name}:                {var_value[0]}{"*" * (len(var_value) - 2)}{var_value[-1]}')
         #         else:
         #             only_print_on_main_process(f'{var_name}:                {var_value}')
-        logger_prompt.debug(f'''读取的 BrokerConnConfig 配置是:\n {funboost_config_deafult.BrokerConnConfig().get_json(indent=None)} ''')
+        logger_prompt.debug(f'''读取的 BrokerConnConfig 配置是:\n {funboost_config_deafult.BrokerConnConfig().get_pwd_enc_json(indent=4)} ''')
 
         logger_prompt.debug(f'''读取的 FunboostCommonConfig 配置是:\n  {funboost_config_deafult.FunboostCommonConfig().get_json(indent=None)} ''')
 

funboost/utils/class_utils.py

@@ -0,0 +1,51 @@
+#
+#
+# # def get_child_custom_attr(child_cls:type,):
+# #     __dict = child_cls.__dict__
+#
+# def merge_cls(cls1:type,cls2:type):
+#     class Cls(cls2):
+#         pass
+#     for k,v in cls1.__dict__.items():
+#         if k.startswith('__') and k.endswith('__'):
+#             continue
+#         print(k,v)
+#         setattr(Cls,k,v)
+#     return Cls
+#
+#
+# if __name__ == '__main__':
+#     class Parent:
+#         attr1=1
+#         def method_from_parent(self):
+#             print('method_from_parent')
+#
+#         def method_from_parent2(self):
+#             print('method_from_parent2')
+#
+#
+#     class Child(Parent):
+#         attr1=2
+#         attr2=22
+#
+#         def method_from_parent2(self):
+#             print('method_from_parent2chile')
+#         def method_from_child(self:Parent):
+#             print('method_from_child')
+#
+#     class Child2(Parent,Parent):
+#         attr1 = 3
+#
+#     class Child2b(Child2):
+#         attr1 = '2b'
+#
+#
+#     class Child2New(Child2b,Child):
+#         pass
+#
+#
+#     print(Child2().method_from_parent2())
+#     print(Child2New().method_from_parent2())
+#
+#
+#

funboost/utils/decorators.py

@@ -509,7 +509,7 @@ def cached_method_result_for_instance(fun):
 
 
 class FunctionResultCacher:
-    logger = LogManager('FunctionResultChche').get_logger_and_add_handlers()
+    logger = LogManager('FunctionResultChche').get_logger_and_add_handlers(log_level_int=20)
     func_result_dict = {}
     """
     {

funboost/utils/simple_data_class.py

@@ -1,7 +1,10 @@
+import json
+
 import copy
 import typing
 
 from funboost.utils import json_helper
+from funboost.utils.str_utils import PwdEnc, StrHelper
 
 
 class DataClassBase:
@@ -34,6 +37,20 @@ class DataClassBase:
     def get_json(self,indent=4):
         return json_helper.dict_to_un_strict_json(self.get_dict(),indent=indent)
 
+    def get_pwd_enc_json(self,indent=4):
+        """防止打印密码明文,泄漏密码"""
+        dict_new = {}
+        for k, v in self.get_dict().items():
+            # only_print_on_main_process(f'{k} :  {v}')
+            if isinstance(v, (bool, tuple, dict, float, int)):
+                dict_new[k] = v
+            else:
+                v_enc =PwdEnc.enc_broker_uri(str(v))
+                if StrHelper(k).judge_contains_str_list(['pwd', 'pass_word', 'password', 'passwd', 'pass']):
+                    v_enc = PwdEnc.enc_pwd(v_enc)
+                dict_new[k] = v_enc
+        return json.dumps(dict_new, ensure_ascii=False, indent=indent)
+
     @classmethod
     def update_cls_attribute(cls,**kwargs):
         for k ,v in kwargs.items():

funboost/utils/str_utils.py

@@ -0,0 +1,51 @@
+import re
+
+
+class PwdEnc:
+
+    @classmethod
+    def enc_broker_uri(cls, uri: str):
+        protocol_split_list = uri.split('://')
+        if len(protocol_split_list) != 2:
+            return uri
+        user_pass__ip_port_split_list = protocol_split_list[1].split('@')
+        if len(user_pass__ip_port_split_list) != 2:
+            return uri
+        user__pass_split_list = user_pass__ip_port_split_list[0].split(':')
+        if len(user__pass_split_list) != 2:
+            return uri
+        user = user__pass_split_list[0]
+        pwd = user__pass_split_list[1]
+        pwd_enc = cls.enc_pwd(pwd)
+        return f'{protocol_split_list[0]}://{user}:{pwd_enc}@{user_pass__ip_port_split_list[1]}'
+
+    @staticmethod
+    def enc_pwd(pwd: str, plain_len=3):
+        pwd_enc = pwd
+        if len(pwd_enc) > plain_len:
+            pwd_enc = f'{pwd_enc[:plain_len]}{"*" * (len(pwd_enc) - plain_len)}'
+        return pwd_enc
+
+
+class StrHelper:
+    def __init__(self, strx: str):
+        self.strx = strx
+
+    def judge_contains_str_list(self, str_list: list, ignore_case=True):
+        for str1 in str_list:
+            if str1 in self.strx:
+                return True
+            if ignore_case:
+                if str1.lower() in self.strx.lower():
+                    return True
+        return False
+
+
+if __name__ == '__main__':
+    str1 = "amqp://admin:abc234@108.55.33.99:5672/"
+    str2 = "redis://:myRedisPass1234@127.0.0.1:6379/0"
+    print(PwdEnc.enc_broker_uri(str1))
+    print(PwdEnc.enc_broker_uri(str2))
+    print(PwdEnc.enc_pwd('465460dsdsd'))
+
+

{funboost-44.5.dist-info → funboost-44.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 44.5
+Version: 44.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-44.5.dist-info → funboost-44.7.dist-info}/RECORD

@@ -1,9 +1,9 @@
-funboost/__init__.py,sha256=SZjnt-z8sKQPl0tLwiU4sF1_SY1lu1tVoq3V7hnNAAI,3834
+funboost/__init__.py,sha256=VvKY_geEn7zzd9pPmdIQtFCoFxFSf-fycagti5lnwsY,3957
 funboost/__init__old.py,sha256=07A1MLsxLtuRQQOIfDyphddOwNBrGe34enoHWAnjV14,20379
 funboost/__main__.py,sha256=-6Nogi666Y0LN8fVm3JmHGTOk8xEGWvotW_GDbSaZME,1065
-funboost/constant.py,sha256=gtxcH0o8OdlDOD4Yt23zKt887NqlWHb00ja76ttKyrM,7624
+funboost/constant.py,sha256=-QFaxH3tX9AlK9Fmq2hNjxuBWXpmnpCpuZayj7c-xW8,7768
 funboost/funboost_config_deafult.py,sha256=K-kCFGEjD107wHWFspNrIWsPNSVteP2Xww1yRbXd-Wk,6651
-funboost/set_frame_config.py,sha256=fnc9yIWTxVnqFrUQrXTGPWBzHgPNebsf-xnzYpktY9U,14339
+funboost/set_frame_config.py,sha256=ueaAjIOSGXrOj-Wyz5rov2tQFnkQHBePJrJ8k0tO3jM,14344
 funboost/assist/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 funboost/assist/celery_helper.py,sha256=EOxsl-y65JPwHrmL0LTGAj1nKLbS0qyRbuXcJ0xo9wc,5721
 funboost/assist/dramatiq_helper.py,sha256=9mUyfBMAJXzwvB8LwOmapn3rY30a6UXt3tNOfL6OXoM,2106
@@ -33,10 +33,11 @@ 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=yvXRXY1pZJMe32RMx2Hs73xF9ZIDkgSRhPUvh27WD9k,76525
+funboost/consumers/base_consumer.py,sha256=ZauakWwhNTpZMPNzTwL9US2YqQWxBVBZJ7pnayaUW3E,76980
 funboost/consumers/celery_consumer.py,sha256=9gtz7nlZkmv3ErmaseT0_Q__ltSPx-fOcwi-TMPoaLA,9220
 funboost/consumers/confirm_mixin.py,sha256=eY6fNwx51Hn4bQSYRjyTRwOqfCGsikVnd2Ga_Ep31N4,6062
 funboost/consumers/dramatiq_consumer.py,sha256=ozmeAfeF0U-YNYHK4suQB0N264h5AZdfMH0O45Mh-8A,2229
+funboost/consumers/empty_consumer.py,sha256=pU5py60l-JDQFTJlaMpfuFyzRGqDUnOrpKhG9gOg39A,759
 funboost/consumers/http_consumer.py,sha256=2MVqEzHW9qIKWvgIQS7VncGfvpmWhQ3BWWjfyHWC-as,2179
 funboost/consumers/http_consumer000.py,sha256=PiiSLSQB-hHgS1vAn8DoHD2siC3zO6_kKjVW0g6AFIc,4379
 funboost/consumers/httpsqs_consumer.py,sha256=kaqOcrKMLrSR27XqeiheRDmpF1KDVDghgbHcefTjqt8,1171
@@ -59,14 +60,14 @@ funboost/consumers/rabbitmq_pika_consumer.py,sha256=51IkRUSR0v2v7BUlA8oInx81VGeO
 funboost/consumers/rabbitmq_pika_consumerv0.py,sha256=rIQToBTBqGdjnzMhg0vyZMY87NtK_Uw8ggiTu39JQ_w,4777
 funboost/consumers/rabbitmq_rabbitpy_consumer.py,sha256=xxINY037pmgF3_lJA-zhf9qUIUx6DdqC7tsUOQL3dL4,1330
 funboost/consumers/redis_brpoplpush_consumer.py,sha256=HqjgjjEibq7D-5XFpJtyaPvtfXD5zbq9cjSHx4aM1gU,2952
-funboost/consumers/redis_consumer.py,sha256=63QbUfEftr29XNG7989UgLWM9Adn01A5gPiBMMGQc0w,2559
-funboost/consumers/redis_consumer_ack_able.py,sha256=e83pwbxYKdXfD-suUh_5uTQwomBB2-FU0xo_iRvLKFo,7221
+funboost/consumers/redis_consumer.py,sha256=z4opk78FHIes8LJVnDlQtmEQjuJEZo-g3NFN04lBStE,2668
+funboost/consumers/redis_consumer_ack_able.py,sha256=7zP9BQNfONLBbYJFjgNtIPVqbHwklAdcPUIA8Y7M8go,7411
 funboost/consumers/redis_consumer_ack_using_timeout.py,sha256=PMSafTcj5cKrVZ10IkrjU3zIdmHevcuVRT4WxslrLSw,4204
 funboost/consumers/redis_consumer_priority.py,sha256=C-ftnlGPPoB7YV3GvwLu9POVGDn_GKlBqO6NlsZ-hdY,5566
 funboost/consumers/redis_consumer_simple.py,sha256=3YrmxSRh8dpece_JR3Lwx8zsn-GBSP1S92lhUIQ3FoU,804
 funboost/consumers/redis_filter.py,sha256=rKNFz8mxVo4n4o8v3MP4UqdPAtoK7msQ-1xRgzFfts0,7290
 funboost/consumers/redis_pubsub_consumer.py,sha256=8V8EqobKpEXzpsQx_H3A-JBKLsWOsE0n16g62tUMMYY,1122
-funboost/consumers/redis_stream_consumer.py,sha256=xRfrtpCHxBpPHSto1mu3URN7IivX3klFgQM8IxC5tqs,6396
+funboost/consumers/redis_stream_consumer.py,sha256=LVQa19MDfSlC8SYSYFPwJnJi62UIzfPHAbBVysLmNw8,6538
 funboost/consumers/rocketmq_consumer.py,sha256=23KLRz8iO9e_x7asrceRJYhwJFMruUgmKw7m3pHVkw0,1692
 funboost/consumers/rq_consumer.py,sha256=JX84k6Jiv4pBiQMmnhdJ7s7Qz4ub5TWS4T7qTF-WdlM,876
 funboost/consumers/sqlachemy_consumer.py,sha256=PawUaNV7EZWBQVWXkGaXy1Z16hUgxU4BLDeUFR83ewM,1300
@@ -83,12 +84,13 @@ 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=dEr3uFzGg3Tik3fvCm20WREIPpWO825Crj-DzBtby1w,17224
-funboost/core/current_task.py,sha256=rAIQVLqYqtlHVRkjl17yki-mqvuMb640ssGmto4RSdA,4864
+funboost/core/current_task.py,sha256=MF8WfMtdmJaO779OoUNmRswbZcToyRx8TbJwxqemfo8,5255
 funboost/core/exceptions.py,sha256=pLF7BkRJAfDiWp2_xGZqencmwdPiSQI1NENbImExknY,1311
 funboost/core/fabric_deploy_helper.py,sha256=foieeqlNySuU9axJzNF6TavPjIUSYBx9UO3syVKUiyY,9999
 funboost/core/funboost_config_getter.py,sha256=TDccp5pQamkoJXkwyPwGsQGDJY8ej8ZT8L8RESSAD2w,382
+funboost/core/funboost_current_task_context_thread.py,sha256=RRhqmRl943jBccgTrsfra4lS20X0zB2TtLAUaZn_A18,441
 funboost/core/funboost_time.py,sha256=IbB4dFCpg3oGUe90ssAJ_x0eDPtAVfvsUr4esdoKaOk,1777
-funboost/core/func_params_model.py,sha256=UWpPujyCj5xwsu6kqjSneDmekNTWkqt0AoLlEDl2RmA,19173
+funboost/core/func_params_model.py,sha256=T-P-prhqCIPf0r5ZKPOTF7nawest4S1w0SRE0iynpvc,19849
 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=1MZjedV6TGdaAjmj9q-ykgoTI_BtG9ZQm58PLOMVdDM,2362
@@ -103,9 +105,9 @@ funboost/core/cli/discovery_boosters.py,sha256=mbEyv0bUIGcmgkfXLI_Q1IK1QvVwKyro8
 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
-funboost/factories/broker_kind__publsiher_consumer_type_map.py,sha256=Xb7KNGxGpWzxuHp0bT9aALBhDBWeRwnLsmYsx6GoLZU,9811
-funboost/factories/consumer_factory.py,sha256=rPceMsUr2mrcFXL-_3kQGknNiADjfgTh9wXG1qd8yAw,1041
-funboost/factories/publisher_factotry.py,sha256=JOvECeovdDRXWvh_dqnNoXX-A3M9vUjVRMCpaCl_R_Q,2040
+funboost/factories/broker_kind__publsiher_consumer_type_map.py,sha256=fra2cuBiFLtEaPKnkPTaC7YAoHahOfZ6HNvhUwt71Mc,9988
+funboost/factories/consumer_factory.py,sha256=EaAw3OZJkGepkQxKkDvMshHjIVOQva_N6nUEhLO4JwU,1500
+funboost/factories/publisher_factotry.py,sha256=4651sxnbIAi6sFEUQdlUuv8UkbMQIE_Pbzm-1DimAs8,2535
 funboost/function_result_web/app.py,sha256=WFAsAoPqCVeTxKS31UvkAhuRqUurg-j8D3c9RtHZEyY,5059
 funboost/function_result_web/functions.py,sha256=qIyzwxj6GgxsCuXdEBKcFkpBEGwDbLI8hGlm6xddJOc,7514
 funboost/function_result_web/__pycache__/functions.cpython-39.pyc,sha256=wHZE_O32HUmbgLitQ2ZhgleoHDhmoSCGK0M2tym1kus,4188
@@ -128,6 +130,7 @@ funboost/publishers/celery_publisher.py,sha256=uc9N1uLW74skUCw8dsnvxORM2O3cy4SiI
 funboost/publishers/celery_publisher000.py,sha256=2XLOyU2__vlIUTi5L15uf0BJqAIjxbc3kCLIRDSOY9w,3966
 funboost/publishers/confluent_kafka_publisher.py,sha256=B4rF6gljixOMyN6L2eL1gzqTv97uoy7TTzgKUhHljEQ,4749
 funboost/publishers/dramatiq_publisher.py,sha256=IH9F-Ps1r94WDu2a7cZbJqWlBgblDbEcpjGj2rl-9WE,1413
+funboost/publishers/empty_publisher.py,sha256=Com5m-mkjXpcWxKZZneymhLNaRJNaGAtvwjhwHmECgg,870
 funboost/publishers/http_publisher.py,sha256=pS3z_AVqH6h4PAgqB7usihvzLJP5ZzfPKQRMQfHrJHQ,753
 funboost/publishers/httpsqs_publisher.py,sha256=PS6h8-mn3wYFfMOsPt4tal8p0yZgYgrYYO9ZnIl9CwU,2737
 funboost/publishers/huey_publisher.py,sha256=9HBrsqTO61iPB1nI5fYOQNPuOaX4I4Wmb1BRNODAE_0,1118
@@ -170,9 +173,10 @@ funboost/utils/__init__.py,sha256=rAyXE7lgCo_3VdMvGrIJiqsTHv2nZPTJDTj1f6s_KgE,58
 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=EZ98CzeoaN2H8iOABTOPefMVfdrii9XDwATqZ0_CkUQ,1153
 funboost/utils/ctrl_c_end.py,sha256=FgT9An-qsUA5gW-V-UKWqOh5shC7C_uvTFn0fS7i8GI,439
 funboost/utils/custom_pysnooper.py,sha256=7yXLKEMY_JjPRRt0Y0N-wV2CFhILlYNh40Y6uRBUaj8,5923
-funboost/utils/decorators.py,sha256=wLHTT8PvoDv_O5CMykD2KXLVEX9HWge5OIvLN-jnWes,26585
+funboost/utils/decorators.py,sha256=lyi9TCBg__7xkoV17AZhRItTn95vU2XMtOxfXJVV5B4,26601
 funboost/utils/develop_log.py,sha256=Wsx0ongGjTit5xqgk1BztYlVEkC6d0-Y7GENXLedVqY,271
 funboost/utils/expire_lock.py,sha256=AOkd1KlvZeIwQaz8ZoKxLpGxWgqQ4mfNHcFphh04o8Q,4732
 funboost/utils/json_helper.py,sha256=GvPVJJ2f6MvOmABP2t006yBxXQIFJSJAeshiNoJ9Vsk,2259
@@ -186,7 +190,8 @@ funboost/utils/redis_manager.py,sha256=iG3e9k3oedtKcGwDnjKA0hUFsk_MSlvVM2C3m3K97
 funboost/utils/redis_manager_old.py,sha256=c3RBXN6dM3kjVBqkCdotpZuYmFs4d9emfp5iJgC61Us,5516
 funboost/utils/resource_monitoring.py,sha256=EWq7hqQLM2hYpbkv4sVw9YcpHLxfg8arcGz-QXw9lf0,5710
 funboost/utils/restart_python.py,sha256=bFbV0_24ajL8hBwVRLxWe9v9kTwiX1fGLhXRroNnmgQ,1418
-funboost/utils/simple_data_class.py,sha256=CPiiywEAUSK4eKIxGlzOua1ZSkO_sVsMt157i8MwWO0,1543
+funboost/utils/simple_data_class.py,sha256=AVaMOyM2o7fszFoG6U8qGly7fIUZt10o5x5mIFYzI9k,2277
+funboost/utils/str_utils.py,sha256=Mxi8BW3-QTBozxioTKpmEh00hOibT-_5dctMjz4miUs,1608
 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
@@ -237,9 +242,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=z-KQTxXapfu2ScJxISGe7QGffASuyJYL6JGsLXxD6O0,2332
 funboost/utils/times/version.py,sha256=JiZLGTB-HYyBOV4xS0rnx2K2OqVMTebUj30sZRbrleE,16
-funboost-44.5.dist-info/LICENSE,sha256=9EPP2ktG_lAPB8PjmWV-c9BiaJHc_FP6pPLcUrUwx0E,11562
-funboost-44.5.dist-info/METADATA,sha256=zLZbTFVIri6UWPuxmCFqKyOwYthPFxg4KmFeFCE568Y,31691
-funboost-44.5.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-funboost-44.5.dist-info/entry_points.txt,sha256=yMSSAGRzRAAhGyNNQHw24MooKlDZsaJ499_D6fPl58A,96
-funboost-44.5.dist-info/top_level.txt,sha256=K8WuKnS6MRcEWxP1NvbmCeujJq6TEfbsB150YROlRw0,9
-funboost-44.5.dist-info/RECORD,,
+funboost-44.7.dist-info/LICENSE,sha256=9EPP2ktG_lAPB8PjmWV-c9BiaJHc_FP6pPLcUrUwx0E,11562
+funboost-44.7.dist-info/METADATA,sha256=sWXcozUL0NVSYgPv7MgdgduVHExNH9_VPravfYjjPlI,31691
+funboost-44.7.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+funboost-44.7.dist-info/entry_points.txt,sha256=yMSSAGRzRAAhGyNNQHw24MooKlDZsaJ499_D6fPl58A,96
+funboost-44.7.dist-info/top_level.txt,sha256=K8WuKnS6MRcEWxP1NvbmCeujJq6TEfbsB150YROlRw0,9
+funboost-44.7.dist-info/RECORD,,