addftool 0.2.10__py3-none-any.whl → 0.2.13__py3-none-any.whl

addftool/addf_portal.py

@@ -7,9 +7,28 @@ from addftool.sleep import add_sleep_args, sleep_main
 
 from addftool.blob import add_blob_args, blob_main
 
+# Import version information
+try:
+    from importlib.metadata import version
+    __version__ = version("addftool")
+except ImportError:
+    # Fallback for older Python versions
+    import pkg_resources
+    __version__ = pkg_resources.get_distribution("addftool").version
+except:
+    # Fallback if package is not installed
+    __version__ = "0.2.11"  # Keep in sync with pyproject.toml
+
 
 def get_args():
     parser = argparse.ArgumentParser(description="Addf's tool")
+    
+    # Add version argument
+    parser.add_argument(
+        '--version', '-v', 
+        action='version', 
+        version=f'addftool {__version__}'
+    )
 
     subparsers = parser.add_subparsers(dest='command', help='Sub-command help')
     add_killer_args(subparsers)

addftool/blob.py

@@ -5,6 +5,8 @@ import json
 import yaml
 import tempfile
 from cryptography.fernet import Fernet
+import yaml
+import datetime
 
 from .util import execute_command
 
@@ -231,6 +233,128 @@ def get_sas_token_for_blob_url(api_url, blob_url, key, info=False):
     return get_sas_token(api_url, an, cn, key, info=info)
 
 
+def parse_sas_token_from_blobfuse_config(config_file):
+    sas_token = None
+    account_name = None
+    container_name = None
+    with open(config_file, 'r') as f:
+        try:
+            config = yaml.safe_load(f)
+            if 'sas' in config["azstorage"] and config["azstorage"]['mode'] == 'sas':
+                sas_token = config['azstorage']['sas']
+            if 'account-name' in config["azstorage"]:
+                account_name = config['azstorage']['account-name']
+            if 'container' in config["azstorage"]:
+                container_name = config['azstorage']['container']
+            else:
+                print(f"No 'sas' found in config file: {config_file}")
+        except yaml.YAMLError as exc:
+            print(exc)
+    
+    if sas_token is None:
+        return None, None, None
+
+    # parse expiry time from sas token
+    expiry_time = None
+    try:
+        sas_parts = sas_token.split('&')
+        for part in sas_parts:
+            if part.startswith('se='):
+                expiry_time = part[3:]
+                break
+    except Exception as e:
+        print(f"Error parsing expiry time from sas token: {e}")
+    
+    # Expiry Time: 2025-10-28T05%3A22Z, convert into timestamp
+    if expiry_time is not None:
+        try:
+            expiry_time = datetime.datetime.strptime(expiry_time, "%Y-%m-%dT%H%%3A%MZ")
+        except Exception as e:
+            print(f"Error converting expiry time to timestamp: {e}")
+    
+    blob_url = f"https://{account_name}.blob.core.windows.net/{container_name}"
+    return sas_token, blob_url, expiry_time
+
+
+def update_blobfuse2_yaml_sas_token(config_file, new_sas_token):
+    with open(config_file, 'r') as f:
+        try:
+            config = yaml.safe_load(f)
+        except yaml.YAMLError as exc:
+            print(exc)
+            return False
+    
+    config['azstorage']['sas'] = new_sas_token
+
+    with open(config_file, 'w') as f:
+        try:
+            yaml.dump(config, f)
+            return True
+        except yaml.YAMLError as exc:
+            print(exc)
+            return False
+
+
+def update_blobfuse2_config(config_file, api_url, key, hour_threshold=48, view=False):
+    is_success = False
+    try:
+        sas_token, blob_url, expiry_time = parse_sas_token_from_blobfuse_config(config_file)
+        if view and blob_url is not None:
+            print(f"{blob_url} expiry time: {expiry_time}")
+            return False
+        if expiry_time is not None:
+            now = datetime.datetime.now()
+            time_left = expiry_time - now if expiry_time is not None else None
+            if time_left is not None and time_left.total_seconds() < 3600 * hour_threshold:
+                updated_sas_token = get_sas_token_for_blob_url(api_url, blob_url, key)
+                if updated_sas_token:
+                    is_success = update_blobfuse2_yaml_sas_token(config_file, updated_sas_token)
+    except Exception as e:
+        print(f"Error updating blobfuse2 config: {e}")
+        return False
+    return is_success
+
+
+def refresh_all_blobfuse2_configs(api_url, key, hour_threshold=48, view=False, selected_mount_paths=None):
+    from addftool.process.utils import get_processes
+    if not view:
+        assert api_url is not None and key is not None, "api url and key must be provided when not in view mode"
+    procs = get_processes(command="blobfuse2", contains=False)
+    for proc in procs:
+        config_file = None
+        for arg in proc['command'][1:]:
+            if arg.startswith("--config-file="):
+                config_file = arg.split("=", 1)[1]
+                break
+        if selected_mount_paths is not None and config_file is not None:
+            mount_path = proc['command'][2]
+            # print(f"mount_path: {mount_path}, selected_mount_paths: {selected_mount_paths}")
+            if mount_path not in selected_mount_paths:
+                continue
+        if config_file is not None:
+            state = update_blobfuse2_config(config_file, api_url, key, hour_threshold=hour_threshold, view=view)
+            if state:
+                print(f"Updated SAS token in config file for {' '.join(proc['command'])}")
+
+
+def refresh_main(args):
+    # only update current user's blobfuse2 configs
+    selected_mount_paths = []
+    # df -h | grep blobfuse2
+    current_user_file_systems = os.popen("df -h | grep blobfuse2").readlines()
+    for line in current_user_file_systems:
+        parts = line.split()
+        if len(parts) >= 6:
+            mount_path = parts[5]
+            selected_mount_paths.append(mount_path)
+        
+    print(f"selected_mount_paths for current user: {selected_mount_paths}")
+    refresh_all_blobfuse2_configs(
+        args.api, args.key, hour_threshold=args.hour_threshold, 
+        view=args.view, selected_mount_paths=selected_mount_paths, 
+    )
+
+
 def add_args(parser):
     subparsers = parser.add_subparsers(dest='blob_command', help='Sub-command help')
     install_parser = subparsers.add_parser('install', help='Install help')
@@ -251,6 +375,12 @@ def add_args(parser):
     token_parser = subparsers.add_parser('token', help='Token help')
     add_api(token_parser)
 
+    refresh_parser = subparsers.add_parser('refresh', help='Refresh help')
+    refresh_parser.add_argument("-k", "--key", help="f key", type=str)
+    refresh_parser.add_argument("-a", "--api", help="api url", type=str)
+    refresh_parser.add_argument("-v", "--view", help="view token info", action="store_true")
+    refresh_parser.add_argument("-s", "--hour_threshold", help="hour threshold", type=int, default=48)
+
 def add_blob_args(subparsers):
     deploy_parser = subparsers.add_parser('blob', help='Blob help')
     add_args(deploy_parser)
@@ -267,6 +397,8 @@ def blob_main(args):
         mount_main(args)
     elif args.blob_command == 'token':
         print(get_token(args, info=False))
+    elif args.blob_command == 'refresh':
+        refresh_main(args)
 
 
 def main():

{addftool-0.2.10.dist-info → addftool-0.2.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: addftool
-Version: 0.2.10
+Version: 0.2.13
 Requires-Dist: cryptography
 Requires-Dist: requests
 Requires-Dist: PyYAML
@@ -8,4 +8,3 @@ Requires-Dist: psutil
 Requires-Dist: fabric
 Requires-Dist: gevent
 Requires-Dist: parallel-ssh
-

{addftool-0.2.10.dist-info → addftool-0.2.13.dist-info}/RECORD

@@ -1,6 +1,6 @@
 addftool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-addftool/addf_portal.py,sha256=vc8opPzValNFPwJne5C5LbZvgcJ0eMBJSWDSiM23OPM,1274
-addftool/blob.py,sha256=vyjJHlQZuGrpEiaRF-Bdmow_TMnhXtXEGL31qA5Hb-g,9742
+addftool/addf_portal.py,sha256=CnOAq3JLQjK9-OyYWDYcmtLBM68L3N6WeP5NjBod4zc,1819
+addftool/blob.py,sha256=prGpDy_esyBL53a5R3yVJdGiXQSPFuU4is1yM9dp2qo,15037
 addftool/broadcast_folder.py,sha256=GQBuSL8Ch537V_fSBHesWyqT3KRYry68pbYOKy2bDj4,19619
 addftool/sleep.py,sha256=kykcZR2tA0ZpRUwQf6IIUdJ4dYkolyD91FdriViq9Nc,11771
 addftool/sync.py,sha256=ZpYxbM8uiPFrV7ODmOaM7asVPCWaxBixA-arVc-1kfs,14045
@@ -13,8 +13,8 @@ addftool/deploy/vscode_server.py,sha256=tLtSvlcK2fEOaw6udWt8dNELVhwv9F59hF5DJJ-1
 addftool/process/__init__.py,sha256=Dze8OrcyjQlAbPrjE_h8bMi8W4b3OJyZOjTucPrkJvM,3721
 addftool/process/utils.py,sha256=JldxnwanLJOgxaPgmCJh7SeBRaaj5rFxWWxh1hpsvbA,2609
 addftool/ssh/__init__.py,sha256=h5_rCO0A6q2Yw9vFguQZZp_ApAJsT1dcnKnbKKZ0cDM,4409
-addftool-0.2.10.dist-info/METADATA,sha256=01FZkhGtA7aa_vx22DMHcoFcuN6rPagl6Y0xYMKkd9o,222
-addftool-0.2.10.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-addftool-0.2.10.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
-addftool-0.2.10.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
-addftool-0.2.10.dist-info/RECORD,,
+addftool-0.2.13.dist-info/METADATA,sha256=C8_l-dQvZoQ8gkxbP86PYJsfAHzjNiMhBW5lCtq8rCI,221
+addftool-0.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+addftool-0.2.13.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
+addftool-0.2.13.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
+addftool-0.2.13.dist-info/RECORD,,

{addftool-0.2.10.dist-info → addftool-0.2.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any