funboost 43.4__py3-none-any.whl → 43.5__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.5"
 
 from funboost.set_frame_config import show_frame_config
 

funboost/core/fabric_deploy_helper.py

@@ -4,7 +4,7 @@ import sys
 import threading
 import time
 import os
-
+from pathlib import Path
 from fabric2 import Connection
 
 # from funboost.core.booster import Booster
@@ -13,16 +13,12 @@ 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 +67,17 @@ 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\
+    # 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)
+    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)
     if user == 'root':  # 文件夹会被自动创建，无需用户创建。
         remote_dir = f'/codes/{python_proj_dir_short}'
     else:
@@ -101,7 +101,7 @@ def fabric_deploy(booster:Booster, host, port, user, 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-43.4.dist-info → funboost-43.5.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-funboost/__init__.py,sha256=Asj6x0xGXr9H1kCXh2hFMM15NJhNzrf24jbHxUQiCHA,3832
+funboost/__init__.py,sha256=9m4awOfwh6jOpU0vXnRXGjl-v8FAhzH32l_Zf_tcQOc,3832
 funboost/__init__old.py,sha256=07A1MLsxLtuRQQOIfDyphddOwNBrGe34enoHWAnjV14,20379
 funboost/__main__.py,sha256=-6Nogi666Y0LN8fVm3JmHGTOk8xEGWvotW_GDbSaZME,1065
 funboost/constant.py,sha256=Yxt3WJt9D8ybcrgiojOy0qjnq5mffwTnTJplerGL0Oo,7188
@@ -84,7 +84,7 @@ funboost/core/active_cousumer_info_getter.py,sha256=09fEc-BTEIRfDDfHmOvKnMjLjtOy
 funboost/core/booster.py,sha256=Y_HqdK1mOFUyTzuEU070kTWQfXR7j0WVHIOfrAdPhAQ,15831
 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=0J8UPVL8djFCteN5W7vDbEjkVBkX0L3Y02DrTJ0rKiI,9198
 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
@@ -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.5.dist-info/LICENSE,sha256=9EPP2ktG_lAPB8PjmWV-c9BiaJHc_FP6pPLcUrUwx0E,11562
+funboost-43.5.dist-info/METADATA,sha256=tHdHWHRRcXgHt2nAXURtwVBPEmM4fIIwnid17re9pxg,30410
+funboost-43.5.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+funboost-43.5.dist-info/entry_points.txt,sha256=yMSSAGRzRAAhGyNNQHw24MooKlDZsaJ499_D6fPl58A,96
+funboost-43.5.dist-info/top_level.txt,sha256=K8WuKnS6MRcEWxP1NvbmCeujJq6TEfbsB150YROlRw0,9
+funboost-43.5.dist-info/RECORD,,