update: config dict inplace change for backward compatibility, use existing rclone function, moving type hint imports in the conditional block

Author: shrey

datashuttle/configs/config_class.py

@@ -127,14 +127,13 @@ def load_from_file(self) -> None:
 
         load_configs.convert_str_and_pathlib_paths(config_dict, "str_to_path")
 
-        config_dict = self.ensure_backwards_compatibilty_for_config(
-            config_dict
-        )
+        self.update_config_for_backward_compatability_if_required(config_dict)
+
         self.data = config_dict
 
-    def ensure_backwards_compatibilty_for_config(
+    def update_config_for_backward_compatability_if_required(
         self, config_dict: Dict
-    ) -> Dict:
+    ):
         canonical_config_keys_to_add = [
             "gdrive_client_id",
             "gdrive_root_folder_id",
@@ -143,16 +142,20 @@ def ensure_backwards_compatibilty_for_config(
         ]
 
         # All keys shall be missing for a backwards compatibility update
-        needs_update = all(
-            key not in config_dict.keys()
-            for key in canonical_config_keys_to_add
-        )
-        if needs_update:
+        if not (
+            all(
+                key in config_dict.keys()
+                for key in canonical_config_keys_to_add
+            )
+        ):
+            assert not any(
+                key in config_dict.keys()
+                for key in canonical_config_keys_to_add
+            )
+
             for key in canonical_config_keys_to_add:
                 config_dict[key] = None
 
-        return config_dict
-
     # -------------------------------------------------------------------------
     # Utils
     # -------------------------------------------------------------------------

datashuttle/tui/screens/setup_aws.py

@@ -31,7 +31,7 @@ def compose(self) -> ComposeResult:
         yield Container(
             Horizontal(
                 Static(
-                    "Ready to setup AWS connection. " "Press OK to proceed",
+                    "Ready to setup AWS connection. Press OK to proceed",
                     id="setup_aws_messagebox_message",
                 ),
                 id="setup_aws_messagebox_message_container",

datashuttle/utils/folders.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import json
-import subprocess
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -22,7 +21,7 @@
 from pathlib import Path
 
 from datashuttle.configs import canonical_folders, canonical_tags
-from datashuttle.utils import ssh, utils, validation
+from datashuttle.utils import rclone, ssh, utils, validation
 from datashuttle.utils.custom_exceptions import NeuroBlueprintError
 
 # -----------------------------------------------------------------------------
@@ -564,16 +563,11 @@ def search_gdrive_or_aws_for_folders(
     The json contains file/folder info about each file/folder like name, type, etc.
     """
 
-    command = (
-        "rclone lsjson "
+    output = rclone.call_rclone(
+        "lsjson "
         f"{cfg.get_rclone_config_name()}:{search_path.as_posix()} "
         f'--include "{search_prefix}"',
-    )
-    output = subprocess.run(
-        command,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        shell=True,
+        pipe_std=True,
     )
 
     all_folder_names: List[str] = []

datashuttle/utils/rclone.py

@@ -1,14 +1,20 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Dict, List, Literal, Optional
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+    from datashuttle.configs.config_class import Configs
+    from datashuttle.utils.custom_types import TopLevelFolder
+
 import os
 import platform
 import subprocess
 import tempfile
-from pathlib import Path
 from subprocess import CompletedProcess
-from typing import Dict, List, Literal, Optional
 
-from datashuttle.configs.config_class import Configs
 from datashuttle.utils import utils
-from datashuttle.utils.custom_types import TopLevelFolder
 
 
 def call_rclone(command: str, pipe_std: bool = False) -> CompletedProcess: