funboost 43.4__py3-none-any.whl → 43.6__py3-none-any.whl

funboost/__init__.py

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

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/core/fabric_deploy_helper.py

@@ -4,25 +4,25 @@ 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
 
 # import nb_log
 from funboost.core.loggers import get_funboost_file_logger
 from funboost.core.booster import Booster
+
 logger = get_funboost_file_logger(__name__)
 
-def _remove_drive_letter(path):
-    if os.name == 'nt' and len(path) >= 3 and path[1] == ':':
-        return path[2:]
-    else:
-        return path
 
 # noinspection PyDefaultArgument
-def fabric_deploy(booster:Booster, host, port, user, password,
+
+
+
+def fabric_deploy(booster: Booster, host, port, user, password,
                   path_pattern_exluded_tuple=('/.git/', '/.idea/', '/dist/', '/build/'),
                   file_suffix_tuple_exluded=('.pyc', '.log', '.gz'),
                   only_upload_within_the_last_modify_time=3650 * 24 * 60 * 60,
@@ -71,13 +71,22 @@ def fabric_deploy(booster:Booster, host, port, user, password,
     task_fun.fabric_deploy('192.168.6.133', 22, 'ydf', '123456', process_num=2) 只需要这样就可以自动部署在远程机器运行，无需任何额外操作。
     """
     # print(locals())
-    python_proj_dir = _remove_drive_letter(sys.path[1].replace('\\', '/') + '/')
+    python_proj_dir = sys.path[1].replace('\\', '/') + '/'
     python_proj_dir_short = python_proj_dir.split('/')[-2]
     # 获取被调用函数所在模块文件名
-    file_name = _remove_drive_letter(sys._getframe(2).f_code.co_filename.replace('\\', '/'))  # noqa\
-    print(file_name,python_proj_dir)
-    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
+    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,15 +102,13 @@ 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'''
         logger.warning(f'{kill_shell} 命令杀死 {process_mark} 标识的进程')
         # uploader.ssh.exec_command(kill_shell)
-        conn.run(kill_shell, encoding='utf-8',warn=True)  # 不想提示，免得烦扰用户以为有什么异常了。所以用上面的paramiko包的ssh.exec_command
+        conn.run(kill_shell, encoding='utf-8', warn=True)  # 不想提示，免得烦扰用户以为有什么异常了。所以用上面的paramiko包的ssh.exec_command
 
         python_exec_str = f'''export is_funboost_remote_run=1;export PYTHONPATH={remote_dir}:$PYTHONPATH ;{python_interpreter} -c "from {relative_module} import {func_name};{func_name}.multi_process_consume({process_num})"  -funboostmark {process_mark} '''
         shell_str = f'''cd {remote_dir}; {python_exec_str}'''

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/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.4.dist-info → funboost-43.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funboost
-Version: 43.4
+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
@@ -27,6 +27,7 @@ Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: nb-log >=12.6
+Requires-Dist: nb-libs >=0.9
 Requires-Dist: pymongo ==4.3.3
 Requires-Dist: AMQPStorm ==2.10.6
 Requires-Dist: rabbitpy ==2.0.1

{funboost-43.4.dist-info → funboost-43.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-funboost/__init__.py,sha256=Asj6x0xGXr9H1kCXh2hFMM15NJhNzrf24jbHxUQiCHA,3832
+funboost/__init__.py,sha256=d69oDPS-2ViwXUkHN7P-OC1DiWpXIz8fOx1K_V4qC8I,3832
 funboost/__init__old.py,sha256=07A1MLsxLtuRQQOIfDyphddOwNBrGe34enoHWAnjV14,20379
 funboost/__main__.py,sha256=-6Nogi666Y0LN8fVm3JmHGTOk8xEGWvotW_GDbSaZME,1065
 funboost/constant.py,sha256=Yxt3WJt9D8ybcrgiojOy0qjnq5mffwTnTJplerGL0Oo,7188
@@ -81,16 +81,16 @@ funboost/contrib/redis_consume_latest_msg_broker.py,sha256=ESortBZ2qu_4PBCa3e3Fe
 funboost/contrib/save_result_status_to_sqldb.py,sha256=AxvD7nHs4sjr9U0kwEZzyPKrsGdU_JzEgzzhh_V1_4w,4071
 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=Y_HqdK1mOFUyTzuEU070kTWQfXR7j0WVHIOfrAdPhAQ,15831
+funboost/core/booster.py,sha256=UjkMjhEYchUB-FyaFhrVM1XeMTpDdONBKjZXa4ADlgQ,15845
 funboost/core/current_task.py,sha256=rAIQVLqYqtlHVRkjl17yki-mqvuMb640ssGmto4RSdA,4864
 funboost/core/exceptions.py,sha256=pLF7BkRJAfDiWp2_xGZqencmwdPiSQI1NENbImExknY,1311
-funboost/core/fabric_deploy_helper.py,sha256=vI68U_3HsL5LtsP-CvnTdKCVC7qhdVI0QdW6l-XW9rs,9163
+funboost/core/fabric_deploy_helper.py,sha256=wJXR7pua3PVau63r3GFhPa_JlMgFnBsqdJFqYWrv7Sw,9598
 funboost/core/func_params_model.py,sha256=ChxvSq_iVuYnGR_CdN9h9qNtvBq8sZ4BocdzCjgsQHc,18167
 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=M9Ad9EzgHdP581X-vuFgCavJRoezLGXlXSFg7zyMWD0,1578
 funboost/core/kill_remote_task.py,sha256=MZ5vWLGt6SxyN76h5Lf_id9tyVUzjR-qXNyJwXaGlZY,8129
-funboost/core/lazy_impoter.py,sha256=3t2t0h9rUHd59wMh6xQQ-xYgxs1BP1Ntcjv6KuitSLM,1930
+funboost/core/lazy_impoter.py,sha256=BnnCcTanjn-ghBXxQQE3BfhajVc60-2_cAe4XtmHDmI,2128
 funboost/core/loggers.py,sha256=173aXdqE8nAe8t6OcVMNAFsCUClVrWQovdQhTAg9IyM,2407
 funboost/core/msg_result_getter.py,sha256=oZDuLDR5XQNzzvgDTsA7wroICToPwrkU9-OAaXXUQSk,8031
 funboost/core/muliti_process_enhance.py,sha256=64rkVa5Eel-0EY2B7lc1dQTRwX4ehARVvcxQVDa6jr0,3568
@@ -171,7 +171,7 @@ funboost/utils/block_exit.py,sha256=BnfxNYo3lnmhk686RAEoc4u3D4RU_iEMMMgu5L8gIuI,
 funboost/utils/bulk_operation.py,sha256=u1cBL9qo3G-Pvr75coMg5p6EQxDkc8Iuf4C_PJI7BJQ,10013
 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=TQ_LR5eligJNnVrZETiJvaq1LZ3OqVd8aRBJY_9TOTY,26063
+funboost/utils/decorators.py,sha256=AbZ3SkAJMGG6BrWGI-Zcz7GJqONjjGtxu8y1QUZGT8c,26127
 funboost/utils/develop_log.py,sha256=Wsx0ongGjTit5xqgk1BztYlVEkC6d0-Y7GENXLedVqY,271
 funboost/utils/expire_lock.py,sha256=AOkd1KlvZeIwQaz8ZoKxLpGxWgqQ4mfNHcFphh04o8Q,4732
 funboost/utils/json_helper.py,sha256=HDdtLyZBGpWbUm7vmTypKXd8K-Hb-9BaxpdmRlKMYUI,1849
@@ -264,9 +264,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=Y4bQD3SIA_E7W2YvHq2Qdi0dGM4H2DxyFNdDOuFOq1w,2417
 funboost/utils/times/version.py,sha256=11XfnZVVzOgIhXXdeN_mYfdXThfrsbQHpA0wCjz-hpg,17
-funboost-43.4.dist-info/LICENSE,sha256=9EPP2ktG_lAPB8PjmWV-c9BiaJHc_FP6pPLcUrUwx0E,11562
-funboost-43.4.dist-info/METADATA,sha256=3mgY8IrUDSZ0pWYP4dnHF4WfcfWzY1UHLJCH1_VhejA,30410
-funboost-43.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-funboost-43.4.dist-info/entry_points.txt,sha256=yMSSAGRzRAAhGyNNQHw24MooKlDZsaJ499_D6fPl58A,96
-funboost-43.4.dist-info/top_level.txt,sha256=K8WuKnS6MRcEWxP1NvbmCeujJq6TEfbsB150YROlRw0,9
-funboost-43.4.dist-info/RECORD,,
+funboost-43.6.dist-info/LICENSE,sha256=9EPP2ktG_lAPB8PjmWV-c9BiaJHc_FP6pPLcUrUwx0E,11562
+funboost-43.6.dist-info/METADATA,sha256=3abU2sNFQyHTeXo3ijQ81LEyTAO1IahWpSIhX5FO--U,30440
+funboost-43.6.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+funboost-43.6.dist-info/entry_points.txt,sha256=yMSSAGRzRAAhGyNNQHw24MooKlDZsaJ499_D6fPl58A,96
+funboost-43.6.dist-info/top_level.txt,sha256=K8WuKnS6MRcEWxP1NvbmCeujJq6TEfbsB150YROlRw0,9
+funboost-43.6.dist-info/RECORD,,