funboost 45.0__py3-none-any.whl → 45.1__py3-none-any.whl

funboost/__init__.py

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

funboost/__init__old.py

@@ -179,7 +179,7 @@ def boost(queue_name,
     funboost.funboost_config_deafult.BoostDecoratorDefaultParams 的值会自动被你项目根目录下的funboost_config.BoostDecoratorDefaultParams的值覆盖，
     如果boost装饰器不传参，默认使用funboost_config.BoostDecoratorDefaultParams的配置
 
-    入参也可以看文档 https://funboost.readthedocs.io/zh/latest/articles/c3.html   3.3章节。
+    入参也可以看文档 https://funboost.readthedocs.io/zh-cn/latest/articles/c3.html   3.3章节。
 
     # 为了代码提示好，这里重复一次入参意义。被此装饰器装饰的函数f，函数f对象本身自动加了一些方法，例如f.push 、 f.consume等。
     :param queue_name: 队列名字。

funboost/constant.py

@@ -103,3 +103,6 @@ class ConstStrForClassMethod:
     FIRST_PARAM_NAME = 'first_param_name'
     CLS_NAME = 'cls_name'
     OBJ_INIT_PARAMS = 'obj_init_params'
+    CLS_MODULE = 'cls_module'
+    CLS_FILE = 'cls_file'
+

funboost/consumers/base_consumer.py

@@ -38,6 +38,7 @@ from funboost.core.func_params_model import BoosterParams, PublisherParams, Base
 from funboost.core.task_id_logger import TaskIdLogger
 from funboost.constant import FunctionKind
 from funboost.utils.json_helper import JsonUtils
+from nb_libs.path_helper import PathHelper
 from nb_log import (get_logger, LoggerLevelSetterMixin, LogManager, is_main_process,
                     nb_log_config_default)
 from funboost.core.loggers import FunboostFileLoggerMixin, logger_prompt
@@ -581,11 +582,13 @@ class AbstractConsumer(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
                     method_first_param_name = k
                     method_first_param_value = v
                     break
-            method_cls = getattr(sys.modules[self.consumer_params.consuming_function_class_module],
-                                 self.consumer_params.consuming_function_class_name)
+            # method_cls = getattr(sys.modules[self.consumer_params.consuming_function_class_module],
+            #                      self.consumer_params.consuming_function_class_name)
             if self.publisher_params.consuming_function_kind == FunctionKind.CLASS_METHOD:
+                method_cls = getattr(PathHelper(method_first_param_value[ConstStrForClassMethod.CLS_FILE]).import_as_module(),method_first_param_value[ConstStrForClassMethod.CLS_NAME])
                 real_function_only_params[method_first_param_name] = method_cls
             elif self.publisher_params.consuming_function_kind == FunctionKind.INSTANCE_METHOD:
+                method_cls = getattr(PathHelper(method_first_param_value[ConstStrForClassMethod.CLS_FILE]).import_as_module(), method_first_param_value[ConstStrForClassMethod.CLS_NAME])
                 obj = method_cls(**method_first_param_value[ConstStrForClassMethod.OBJ_INIT_PARAMS])
                 real_function_only_params[method_first_param_name] = obj
             # print(real_function_only_params)

funboost/core/booster.py

@@ -90,16 +90,17 @@ class Booster:
         if len(kwargs) == 0 and len(args) == 1 and isinstance(args[0], typing.Callable):
             consuming_function = args[0]
             self.boost_params.consuming_function = consuming_function
+            self.boost_params.consuming_function_raw = consuming_function
             # print(consuming_function)
             # print(ClsHelper.get_method_kind(consuming_function))
             # print(inspect.getsourcelines(consuming_function))
             if self.boost_params.consuming_function_kind is None:
                 self.boost_params.consuming_function_kind = ClsHelper.get_method_kind(consuming_function)
-            if self.boost_params.consuming_function_kind in [FunctionKind.CLASS_METHOD,FunctionKind.INSTANCE_METHOD]:
-                if self.boost_params.consuming_function_class_module is None:
-                    self.boost_params.consuming_function_class_module = consuming_function.__module__
-                if self.boost_params.consuming_function_class_name is None:
-                    self.boost_params.consuming_function_class_name = consuming_function.__qualname__.split('.')[0]
+            # if self.boost_params.consuming_function_kind in [FunctionKind.CLASS_METHOD,FunctionKind.INSTANCE_METHOD]:
+            #     if self.boost_params.consuming_function_class_module is None:
+            #         self.boost_params.consuming_function_class_module = consuming_function.__module__
+            #     if self.boost_params.consuming_function_class_name is None:
+            #         self.boost_params.consuming_function_class_name = consuming_function.__qualname__.split('.')[0]
             logger_prompt.debug(f''' {self.boost_params.queue_name} booster 配置是 {self.boost_params.json_str_value()}''')
             self.consuming_function = consuming_function
             self.is_decorated_as_consume_function = True

funboost/core/func_params_model.py

@@ -179,8 +179,9 @@ class BoosterParams(BaseJsonAbleModel):
     schedule_tasks_on_main_thread: bool = False  # 直接在主线程调度任务，意味着不能直接在当前主线程同时开启两个消费者。
 
     consuming_function: typing.Callable = None  # 消费函数,在@boost时候不用指定,因为装饰器知道下面的函数.
+    consuming_function_raw: typing.Callable = None
 
-    broker_kind: str = BrokerEnum.SQLITE_QUEUE  # 中间件选型见3.1章节 https://funboost.readthedocs.io/zh/latest/articles/c3.html
+    broker_kind: str = BrokerEnum.SQLITE_QUEUE  # 中间件选型见3.1章节 https://funboost.readthedocs.io/zh-cn/latest/articles/c3.html
 
     broker_exclusive_config: dict = {}  # 加上一个不同种类中间件非通用的配置,不同中间件自身独有的配置，不是所有中间件都兼容的配置，因为框架支持30种消息队列，消息队列不仅仅是一般的先进先出queue这么简单的概念，
     # 例如kafka支持消费者组，rabbitmq也支持各种独特概念例如各种ack机制 复杂路由机制，有的中间件原生能支持消息优先级有的中间件不支持,每一种消息队列都有独特的配置参数意义，可以通过这里传递。每种中间件能传递的键值对可以看consumer类的 BROKER_EXCLUSIVE_CONFIG_DEFAULT
@@ -193,10 +194,9 @@ class BoosterParams(BaseJsonAbleModel):
     # func_params_is_pydantic_model: bool = False  # funboost 兼容支持 函数娼还是 pydantic model类型，funboost在发布之前和取出来时候自己转化。
 
     auto_generate_info: dict = {}  # 自动生成的信息,不需要用户主动传参.
-    consuming_function_class:typing.Optional[typing.Type] = None
+
     consuming_function_kind :typing.Optional[str]= None  #自动生成的信息,不需要用户主动传参.
-    consuming_function_class_module:typing.Optional[str] = None #自动生成的信息,不需要用户主动传参.
-    consuming_function_class_name: typing.Optional[str] = None #自动生成的信息,不需要用户主动传参.
+
 
     @root_validator(skip_on_failure=True)
     def check_values(cls, values: dict):
@@ -295,8 +295,7 @@ class PublisherParams(BaseJsonAbleModel):
     # func_params_is_pydantic_model: bool = False  # funboost 兼容支持 函数娼还是 pydantic model类型，funboost在发布之前和取出来时候自己转化。
 
     consuming_function_kind: typing.Optional[str] = None  # 自动生成的信息,不需要用户主动传参.
-    consuming_function_class_module: typing.Optional[str] = None  # 自动生成的信息,不需要用户主动传参.
-    consuming_function_class_name: typing.Optional[str] = None  # 自动生成的信息,不需要用户主动传参.
+
 
 
 if __name__ == '__main__':

funboost/core/helper_funs.py

@@ -28,7 +28,7 @@ def delete_keys_and_return_new_dict(dictx: dict, keys: list = None):
 def block_python_main_thread_exit():
     """
 
-    https://funboost.readthedocs.io/zh/latest/articles/c10.html#runtimeerror-cannot-schedule-new-futures-after-interpreter-shutdown
+    https://funboost.readthedocs.io/zh-cn/latest/articles/c10.html#runtimeerror-cannot-schedule-new-futures-after-interpreter-shutdown
 
     主要是用于 python3.9以上 定时任务报错，  定时任务报错 RuntimeError: cannot schedule new futures after interpreter shutdown
     如果主线程结束了，apscheduler就会报这个错，加上这个while 1 ： time.sleep(100) 目的就是阻止主线程退出。

funboost/publishers/base_publisher.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 # @Author  : ydf
 # @Time    : 2022/8/8 0008 11:57
+from pathlib import Path
+
 import abc
 import copy
 import inspect
@@ -8,6 +10,7 @@ import atexit
 import json
 import logging
 import multiprocessing
+import sys
 import threading
 import time
 import typing
@@ -30,8 +33,6 @@ from funboost.core.task_id_logger import TaskIdLogger
 from funboost.utils import decorators
 from funboost.funboost_config_deafult import BrokerConnConfig, FunboostCommonConfig
 
-
-
 RedisAsyncResult = AsyncResult  # 别名
 RedisAioAsyncResult = AioAsyncResult  # 别名
 
@@ -257,14 +258,23 @@ class AbstractPublisher(LoggerLevelSetterMixin, metaclass=abc.ABCMeta, ):
             # func_args_list.insert(0, {'first_param_name': self.publish_params_checker.all_arg_name[0],
             #        'cls_type': ClsHelper.get_classs_method_cls(self.publisher_params.consuming_function).__name__},
             #                       )
-            func_args_list.insert(0, {ConstStrForClassMethod.FIRST_PARAM_NAME: self.publish_params_checker.all_arg_name[0],
-                                 ConstStrForClassMethod.CLS_NAME: self.publisher_params.consuming_function_class_name,})
+            cls = func_args_list[0]
+            # print(cls,cls.__name__, sys.modules[cls.__module__].__file__)
+            func_args_list[0] = {ConstStrForClassMethod.FIRST_PARAM_NAME: self.publish_params_checker.all_arg_name[0],
+                                 ConstStrForClassMethod.CLS_NAME: cls.__name__,
+                                 ConstStrForClassMethod.CLS_FILE: Path(sys.modules[cls.__module__].__file__).resolve().as_posix(),
+                                 }
         elif self.publisher_params.consuming_function_kind == FunctionKind.INSTANCE_METHOD:
-            if not hasattr(func_args[0],ConstStrForClassMethod.OBJ_INIT_PARAMS):
+            obj = func_args[0]
+            cls = type(obj)
+            if not hasattr(obj, ConstStrForClassMethod.OBJ_INIT_PARAMS):
                 raise ValueError(f'消费函数 {self.publisher_params.consuming_function} 是实例方法，实例必须有 {ConstStrForClassMethod.OBJ_INIT_PARAMS} 属性')
             func_args_list[0] = {ConstStrForClassMethod.FIRST_PARAM_NAME: self.publish_params_checker.all_arg_name[0],
-                                 ConstStrForClassMethod.OBJ_INIT_PARAMS: getattr(func_args[0],ConstStrForClassMethod.OBJ_INIT_PARAMS),
-                                 ConstStrForClassMethod.CLS_NAME: self.publisher_params.consuming_function_class_name}
+                                 ConstStrForClassMethod.CLS_NAME: cls.__name__,
+                                 ConstStrForClassMethod.CLS_FILE: Path(sys.modules[cls.__module__].__file__).resolve().as_posix(),
+                                 ConstStrForClassMethod.OBJ_INIT_PARAMS: getattr(obj, ConstStrForClassMethod.OBJ_INIT_PARAMS),
+
+                                 }
 
         for index, arg in enumerate(func_args_list):
             # print(index,arg,self.publish_params_checker.position_arg_name_list)

funboost/set_frame_config.py

@@ -63,7 +63,7 @@ def show_funboost_flag():
 
     logger_prompt.debug('\033[0m' + funboost_flag_str2 + '\033[0m')
 
-    logger_prompt.debug(f'''分布式函数调度框架funboost文档地址：  \033[0m https://funboost.readthedocs.io/zh/latest/ \033[0m ''')
+    logger_prompt.debug(f'''分布式函数调度框架funboost文档地址：  \033[0m https://funboost.readthedocs.io/zh-cn/latest/ \033[0m ''')
 
 
 show_funboost_flag()

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",
+]