addftool 0.2.11__py3-none-any.whl → 0.2.14__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

@@ -16,6 +16,8 @@ def add_api(parser):
     parser.add_argument("-a", "--api", help="api url")
     parser.add_argument("-n", "--name", help="name")
     parser.add_argument("-c", "--container", help="container")
+    parser.add_argument("-u", "--url", type=str, default="",
+                        help="blob url")
 
 
 def get_ubuntu_version():  
@@ -180,7 +182,10 @@ def mount_main(args):
 
 
 def get_token(args, info=False):
-    return get_sas_token(args.api, args.name, args.container, args.key, info=info)
+    if args.url and args.url != "":
+        return get_sas_token_for_blob_url(args.api, args.url, args.key, info=info)
+    else:
+        return get_sas_token(args.api, args.name, args.container, args.key, info=info)
 
 
 # create a new function for function calling
@@ -240,7 +245,7 @@ def parse_sas_token_from_blobfuse_config(config_file):
     with open(config_file, 'r') as f:
         try:
             config = yaml.safe_load(f)
-            if 'sas' in config["azstorage"]:
+            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']
@@ -299,7 +304,7 @@ def update_blobfuse2_config(config_file, api_url, key, hour_threshold=48, view=F
     is_success = False
     try:
         sas_token, blob_url, expiry_time = parse_sas_token_from_blobfuse_config(config_file)
-        if view:
+        if view and blob_url is not None:
             print(f"{blob_url} expiry time: {expiry_time}")
             return False
         if expiry_time is not None:
@@ -315,7 +320,7 @@ def update_blobfuse2_config(config_file, api_url, key, hour_threshold=48, view=F
     return is_success
 
 
-def refresh_all_blobfuse2_configs(api_url, key, hour_threshold=48, view=False):
+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"
@@ -326,7 +331,11 @@ def refresh_all_blobfuse2_configs(api_url, key, hour_threshold=48, view=False):
             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:
@@ -334,7 +343,21 @@ def refresh_all_blobfuse2_configs(api_url, key, hour_threshold=48, view=False):
 
 
 def refresh_main(args):
-    refresh_all_blobfuse2_configs(args.api, args.key, hour_threshold=args.hour_threshold, view=args.view)
+    # 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):

{addftool-0.2.11.dist-info → addftool-0.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: addftool
-Version: 0.2.11
+Version: 0.2.14
 Requires-Dist: cryptography
 Requires-Dist: requests
 Requires-Dist: PyYAML

{addftool-0.2.11.dist-info → addftool-0.2.14.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=IwDvXAkHurFWOGPdfn2HSeTPXAc5E7Nwc_cR68vOZXs,14133
+addftool/addf_portal.py,sha256=CnOAq3JLQjK9-OyYWDYcmtLBM68L3N6WeP5NjBod4zc,1819
+addftool/blob.py,sha256=RzPpIrBPNKr5KS4sScHFWqsYW9tA8EY-H0fSrlmns8w,15272
 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.11.dist-info/METADATA,sha256=0A9h1LjUl8cX-fkqYrVcwpSrJB4J3m9IPVnEziheAwI,221
-addftool-0.2.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-addftool-0.2.11.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
-addftool-0.2.11.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
-addftool-0.2.11.dist-info/RECORD,,
+addftool-0.2.14.dist-info/METADATA,sha256=zoxoB1uMObhyvZIvn3UJ8bSIZ5x8JMUdHyot0phXIGk,221
+addftool-0.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+addftool-0.2.14.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
+addftool-0.2.14.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
+addftool-0.2.14.dist-info/RECORD,,