funboost 40.1__py3-none-any.whl → 40.4__py3-none-any.whl

funboost/core/booster.py

@@ -36,8 +36,8 @@ class Booster:
 
         """
         '''
-        # @boost('queue_test_f01', qps=0.2, broker_kind=2) # 老的入参方式
-        @boost(BoosterParams(queue_name='queue_test_f01', qps=0.2, broker_kind=2)) # 新的入参方式,所有入参放在 最流行的三方包 pydantic model BoosterParams 里面.
+        # @boost('queue_test_f01', qps=0.2, ) # 老的入参方式
+        @boost(BoosterParams(queue_name='queue_test_f01', qps=0.2, )) # 新的入参方式,所有入参放在 最流行的三方包 pydantic model BoosterParams 里面.
         def f(a, b):
             print(a + b)
 
@@ -58,7 +58,7 @@ class Booster:
         elif isinstance(queue_name, BoosterParams):
             boost_params = queue_name
         if isinstance(queue_name, str) or kwargs:
-            flogger.warning(f''' funboost 40.0版本以后： {BoostDecoParamsIsOldVersion.new_version_change_hint}''')
+            flogger.warning(f'''你的 {queue_name} 队列， funboost 40.0版本以后： {BoostDecoParamsIsOldVersion.new_version_change_hint}''')
         boost_params_merge = boost_params.copy()
         boost_params_merge.update_from_dict(kwargs)
         self.boost_params = boost_params_merge
@@ -196,7 +196,7 @@ class BoostersManager:
     @classmethod
     def get_or_create_booster_by_queue_name(cls, queue_name, ) -> Booster:
         """
-        当前进程获得booster对象。如果是多进程,会在新的进程内部创建一个新的booster对象,因为多进程操作有些中间件的同一个conn不行.
+        当前进程获得booster对象，如果是多进程,会在新的进程内部创建一个新的booster对象,因为多进程操作有些中间件的同一个conn不行.
         :param queue_name: 就是 @boost的入参。
         :return:
         """

funboost/core/exceptions.py

@@ -12,7 +12,7 @@ class ExceptionForPushToDlxqueue(Exception):
 
 class BoostDecoParamsIsOldVersion(Exception):
     new_version_change_hint = """
-你的@boost入参是老的方式.
+你的@boost入参是老的方式,建议用新的入参方式,老入参方式不再支持函数入参代码自动补全了。
 
 老版本的@boost装饰器方式是:
 @boost('queue_name_xx',qps=3)

funboost/core/func_params_model.py

@@ -7,7 +7,7 @@ from collections import OrderedDict
 
 from funboost.concurrent_pool import FunboostBaseConcurrentPool
 from funboost.constant import ConcurrentModeEnum, BrokerEnum
-from pydantic import BaseModel, validator, root_validator, PrivateAttr, Field
+from pydantic import BaseModel, validator, root_validator, PrivateAttr, Field, BaseConfig
 
 # noinspection PyUnresolvedReferences
 from funboost.core.loggers import develop_logger
@@ -32,6 +32,9 @@ def patch_for_pydantic_field_deepcopy():
 
 patch_for_pydantic_field_deepcopy()
 
+class NoExtraFieldsConfig(BaseConfig):
+    allow_mutation = False
+    extra = "forbid"
 
 class BaseJsonAbleModel(BaseModel):
     """
@@ -45,7 +48,7 @@ class BaseJsonAbleModel(BaseModel):
         for k, v in model_dict.items():
             if isinstance(v, typing.Callable):
                 model_dict_copy[k] = str(v)
-            elif k in ['specify_concurrent_pool', 'specify_async_loop']:
+            elif k in ['specify_concurrent_pool', 'specify_async_loop'] and v is not None:
                 model_dict_copy[k] = str(v)
             else:
                 model_dict_copy[k] = v
@@ -72,9 +75,10 @@ class BaseJsonAbleModel(BaseModel):
             setattr(self, k, v)
         return self
 
-    class Config:
+    class Config(BaseConfig):
         arbitrary_types_allowed = True
-
+        # allow_mutation = False
+        extra = "forbid"
 
 class FunctionResultStatusPersistanceConfig(BaseJsonAbleModel):
     is_save_status: bool  # 是否保存函数的运行状态信息
@@ -181,6 +185,11 @@ class BoosterParams(BaseJsonAbleModel):
 
         if values['concurrent_mode'] not in ConcurrentModeEnum.__dict__.values():
             raise ValueError('设置的并发模式不正确')
+        # 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():
+                raise ValueError(f'{cls.__name__} 的字段新增了父类 BoosterParams 不存在的字段 "{k}"') # 使 BoosterParams的子类,不能增加字段,只能覆盖字段.
         return values
 
 
@@ -243,3 +252,5 @@ if __name__ == '__main__':
     # print(FunctionResultStatusPersistanceConfig(is_save_result=True, is_save_status=True, expire_seconds=70 * 24 * 3600).update_from_kwargs(expire_seconds=100).get_str_dict())
     #
     # print(PriorityConsumingControlConfig().get_str_dict())
+
+    print(BoosterParams(queue_name='3213'))

funboost/funboost_config_deafult.py

@@ -101,59 +101,3 @@ class FunboostCommonConfig(DataClassBase):
     TIMEZONE = 'Asia/Shanghai'
 
 
-# class BoostDecoratorDefaultParams(DataClassBase):
-#     """
-#      @boost装饰器的默认全局配置
-#
-#     BoostDecoratorDefaultParams是@boost装饰器默认的全局入参。如果boost没有亲自指定某个入参，就自动使用这里的配置。
-#     这里的值不用配置，在boost装饰器中可以为每个消费者指定不同的入参，除非你嫌弃每个 boost 装饰器相同入参太多了，那么可以设置这里的全局默认值。
-#
-#     例如用户不想每次在boost装饰器指定broker_kind为哪种消息队列，可以设置broker_kind为用户自己希望的默认消息队列类型
-#
-#     boost入参可以ide跳转到boost函数的docstring查看
-#     boost入参也可以看文档3.3章节  https://funboost.readthedocs.io/zh/latest/articles/c3.html
-#
-#     BoostDecoratorDefaultParams这个类的属性名字和boost装饰器的入参名字一模一样，只有 queue_name 必须每个装饰器是不同的名字，不能作为全局的。
-#     所以boost装饰器只有一个是必传参数。
-#     """
-#
-#     broker_kind: int = BrokerEnum.PERSISTQUEUE  # 中间件选型见3.1章节 https://funboost.readthedocs.io/zh/latest/articles/c3.html
-#
-#     concurrent_mode = ConcurrentModeEnum.THREADING
-#     concurrent_num = 50
-#     specify_concurrent_pool = None
-#     specify_async_loop = None
-#     qps: float = 0
-#     is_using_distributed_frequency_control = False
-#     is_send_consumer_hearbeat_to_redis = False
-#
-#     max_retry_times = 3
-#     is_push_to_dlx_queue_when_retry_max_times = False
-#
-#     consumin_function_decorator = None
-#     function_timeout = 0
-#
-#     log_level = 10
-#     logger_prefix = ''
-#     create_logger_file = True
-#     log_filename = None
-#     is_show_message_get_from_broker = False
-#     is_print_detail_exception = True
-#
-#     msg_expire_senconds = 0
-#
-#     do_task_filtering = False
-#     task_filtering_expire_seconds = 0
-#
-#     # function_result_status_persistance_conf = FunctionResultStatusPersistanceConfig(False, False, 7 * 24 * 3600)
-#     user_custom_record_process_info_func = None
-#
-#     is_using_rpc_mode = False
-#     is_support_remote_kill_task = False
-#
-#     is_do_not_run_by_specify_time_effect = False
-#     do_not_run_by_specify_time = ('10:00:00', '22:00:00')
-#
-#     schedule_tasks_on_main_thread = False
-#
-#     broker_exclusive_config = {}

funboost/set_frame_config.py

@@ -140,7 +140,7 @@ def use_config_form_funboost_config_module():
         funboost_config_deafult.FunboostCommonConfig.update_cls_attribute(**m.FunboostCommonConfig().get_dict())
         # funboost_config_deafult.BoostDecoratorDefaultParams.update_cls_attribute(**m.BoostDecoratorDefaultParams().get_dict())
         if hasattr(m,'BoostDecoratorDefaultParams'):
-            raise ValueError('funboost 40.0版本之后，采用 pydantic model BoostParams类或子类入参，不支持 funboost_config.py的 BoostDecoratorDefaultParams配置')
+            raise ValueError('funboost 40.0版本之后，采用 pydantic model BoostParams类或子类入参，不支持 funboost_config.py的 BoostDecoratorDefaultParams 配置,请删除掉 BoostDecoratorDefaultParams 这个配置')
 
 
     except ModuleNotFoundError:

funboost/utils/dependency_packages_in_pythonpath/aioredis/__init__.py

@@ -1,59 +1,59 @@
-from aioredis.client import Redis, StrictRedis
-from aioredis.connection import (
-    BlockingConnectionPool,
-    Connection,
-    ConnectionPool,
-    SSLConnection,
-    UnixDomainSocketConnection,
-)
-from aioredis.exceptions import (
-    AuthenticationError,
-    AuthenticationWrongNumberOfArgsError,
-    BusyLoadingError,
-    ChildDeadlockedError,
-    ConnectionError,
-    DataError,
-    InvalidResponse,
-    PubSubError,
-    ReadOnlyError,
-    RedisError,
-    ResponseError,
-    TimeoutError,
-    WatchError,
-)
-from aioredis.utils import from_url
-
-
-def int_or_str(value):
-    try:
-        return int(value)
-    except ValueError:
-        return value
-
-
-__version__ = "2.0.1"
-VERSION = tuple(map(int_or_str, __version__.split(".")))
-
-__all__ = [
-    "AuthenticationError",
-    "AuthenticationWrongNumberOfArgsError",
-    "BlockingConnectionPool",
-    "BusyLoadingError",
-    "ChildDeadlockedError",
-    "Connection",
-    "ConnectionError",
-    "ConnectionPool",
-    "DataError",
-    "from_url",
-    "InvalidResponse",
-    "PubSubError",
-    "ReadOnlyError",
-    "Redis",
-    "RedisError",
-    "ResponseError",
-    "SSLConnection",
-    "StrictRedis",
-    "TimeoutError",
-    "UnixDomainSocketConnection",
-    "WatchError",
-]
+from aioredis.client import Redis, StrictRedis
+from aioredis.connection import (
+    BlockingConnectionPool,
+    Connection,
+    ConnectionPool,
+    SSLConnection,
+    UnixDomainSocketConnection,
+)
+from aioredis.exceptions import (
+    AuthenticationError,
+    AuthenticationWrongNumberOfArgsError,
+    BusyLoadingError,
+    ChildDeadlockedError,
+    ConnectionError,
+    DataError,
+    InvalidResponse,
+    PubSubError,
+    ReadOnlyError,
+    RedisError,
+    ResponseError,
+    TimeoutError,
+    WatchError,
+)
+from aioredis.utils import from_url
+
+
+def int_or_str(value):
+    try:
+        return int(value)
+    except ValueError:
+        return value
+
+
+__version__ = "2.0.1"
+VERSION = tuple(map(int_or_str, __version__.split(".")))
+
+__all__ = [
+    "AuthenticationError",
+    "AuthenticationWrongNumberOfArgsError",
+    "BlockingConnectionPool",
+    "BusyLoadingError",
+    "ChildDeadlockedError",
+    "Connection",
+    "ConnectionError",
+    "ConnectionPool",
+    "DataError",
+    "from_url",
+    "InvalidResponse",
+    "PubSubError",
+    "ReadOnlyError",
+    "Redis",
+    "RedisError",
+    "ResponseError",
+    "SSLConnection",
+    "StrictRedis",
+    "TimeoutError",
+    "UnixDomainSocketConnection",
+    "WatchError",
+]