funboost 43.5__tar.gz → 43.6__tar.gz

{funboost-43.5/funboost.egg-info → funboost-43.6}/PKG-INFO

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

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

{funboost-43.5 → funboost-43.6}/funboost/core/booster.py

@@ -66,7 +66,7 @@ class Booster:
             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
+        self.boost_params:BoosterParams = boost_params_merge
         self.queue_name = boost_params_merge.queue_name
 
     def __str__(self):

{funboost-43.5 → funboost-43.6}/funboost/core/fabric_deploy_helper.py

@@ -4,9 +4,10 @@ import sys
 import threading
 import time
 import os
+import typing
 from pathlib import Path
 from fabric2 import Connection
-
+from nb_libs.path_helper import PathHelper
 # from funboost.core.booster import Booster
 from funboost.utils.paramiko_util import ParamikoFolderUploader
 
@@ -18,6 +19,9 @@ logger = get_funboost_file_logger(__name__)
 
 
 # noinspection PyDefaultArgument
+
+
+
 def fabric_deploy(booster: Booster, host, port, user, password,
                   path_pattern_exluded_tuple=('/.git/', '/.idea/', '/dist/', '/build/'),
                   file_suffix_tuple_exluded=('.pyc', '.log', '.gz'),
@@ -70,14 +74,19 @@ def fabric_deploy(booster: Booster, host, port, user, password,
     python_proj_dir = sys.path[1].replace('\\', '/') + '/'
     python_proj_dir_short = python_proj_dir.split('/')[-2]
     # 获取被调用函数所在模块文件名
-    file_name = sys._getframe(2).f_code.co_filename.replace('\\', '/')  # noqa\
-    # print(file_name,python_proj_dir)
-    # print(Path(file_name).relative_to(Path(python_proj_dir)))
-    # print(8888)
-    # relative_file_name = re.sub(f'^{python_proj_dir}', '', file_name)
+    file_name = sys._getframe(2).f_code.co_filename.replace('\\', '/')  # noqa
     relative_file_name = Path(file_name).relative_to(Path(python_proj_dir)).as_posix()
     relative_module = relative_file_name.replace('/', '.')[:-3]  # -3是去掉.py
-    print(relative_module)
+    func_name = booster.consuming_function.__name__
+    module_obj = PathHelper(sys._getframe(2).f_code.co_filename).import_as_module()  # noqa
+
+    """以下这种是为了兼容 函数没有@boost.而是使用 boosterxx = BoostersManager.build_booster() 来创建的booster. 下面的 python_exec_str 中需要用到 func_name """
+    for var_name,var_value in module_obj.__dict__.items():
+        if isinstance(var_value,Booster) and var_value.queue_name == booster.queue_name:
+            func_name = var_name
+
+    # print(file_name, python_proj_dir, relative_module, func_name)
+    # print(relative_module)
     if user == 'root':  # 文件夹会被自动创建，无需用户创建。
         remote_dir = f'/codes/{python_proj_dir_short}'
     else:
@@ -93,9 +102,7 @@ def fabric_deploy(booster: Booster, host, port, user, password,
         logger.info(f'上传 本地文件夹代码 {python_proj_dir}  上传到远程 {host} 的 {remote_dir} 文件夹耗时 {round(time.perf_counter() - t_start, 3)} 秒')
         # conn.run(f'''export PYTHONPATH={remote_dir}:$PYTHONPATH''')
 
-        func_name = booster.consuming_function.__name__
         queue_name = booster.consumer.queue_name
-
         process_mark = f'funboost_fabric_mark__{queue_name}__{func_name}'
         conn = Connection(host, port=port, user=user, connect_kwargs={"password": password}, )
         kill_shell = f'''ps -aux|grep {process_mark}|grep -v grep|awk '{{print $2}}' |xargs kill -9'''

{funboost-43.5 → funboost-43.6}/funboost/core/lazy_impoter.py

@@ -26,8 +26,11 @@ class LazyImpoter(SingletonBaseNew):
 lazy_impoter = LazyImpoter()
 
 
-class GeventImporter(SingletonBaseNew):
+# noinspection SpellCheckingInspection
+@singleton
+class GeventImporter:
     """
+    避免提前导入
     import gevent
     from gevent import pool as gevent_pool
     from gevent import monkey
@@ -38,6 +41,7 @@ class GeventImporter(SingletonBaseNew):
     @cached_method_result
     def gevent(self):
         import gevent
+        print('导入gevent')
         return gevent
 
     @property
@@ -50,6 +54,7 @@ class GeventImporter(SingletonBaseNew):
     @cached_method_result
     def monkey(self):
         from gevent import monkey
+        print('导入gevent')
         return monkey
 
     @property
@@ -59,13 +64,16 @@ class GeventImporter(SingletonBaseNew):
         return JoinableQueue
 
 
-class EventletImporter(SingletonBaseCustomInit):
+@singleton
+class EventletImporter:
     """
+    避免提前导入
     from eventlet import greenpool, monkey_patch, patcher, Timeout
     """
 
-    def _custom_init(self, ):
+    def __init__(self):
         from eventlet import greenpool, monkey_patch, patcher, Timeout
+        print('导入eventlet')
         self.greenpool = greenpool
         self.monkey_patch = monkey_patch
         self.patcher = patcher
@@ -76,3 +84,4 @@ if __name__ == '__main__':
     for i in range(10000):
         # lazy_impoter.BoostersManager
         EventletImporter().greenpool
+        GeventImporter().JoinableQueue

{funboost-43.5 → funboost-43.6}/funboost/utils/decorators.py

@@ -5,6 +5,7 @@ import abc
 import logging
 import random
 import uuid
+from typing import TypeVar
 
 from flask import request as flask_request
 # noinspection PyUnresolvedReferences
@@ -148,8 +149,8 @@ def synchronized(func):
 
     return lock_func
 
-
-def singleton(cls):
+ClSX = TypeVar('CLSX')
+def singleton(cls:ClSX)  -> ClSX:
     """
     单例模式装饰器,新加入线程锁，更牢固的单例模式，主要解决多线程如100线程同时实例化情况下可能会出现三例四例的情况,实测。
     """

{funboost-43.5 → funboost-43.6/funboost.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 43.5
+Version: 43.6
 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-43.5 → funboost-43.6}/funboost.egg-info/requires.txt

@@ -1,4 +1,5 @@
 nb_log>=12.6
+nb_libs>=0.9
 pymongo==4.3.3
 AMQPStorm==2.10.6
 rabbitpy==2.0.1

{funboost-43.5 → funboost-43.6}/setup.py

@@ -63,6 +63,7 @@ setup(
     ],
     install_requires=[
         'nb_log>=12.6',
+        'nb_libs>=0.9',
         # 'eventlet==0.33.3',
         # 'gevent==22.10.2',
         'pymongo==4.3.3',  # 3.5.1  -> 4.0.2
@@ -110,6 +111,7 @@ setup(
         'frozenlist',
         'fire',
         'pydantic',
+
     ],
     extras_require={'all': extra_brokers,
                     'extra_brokers': extra_brokers,