refactor retrieve_all_from_ss

Author: msarkis-icr

shared/sessionstate.py

@@ -19,19 +19,17 @@ def save_in_ss(data_dict):
 
 
 def retrieve_all_from_ss():
-    OK = ss_get("LOGIN_OK", False)
-    MY_SSH = ss_get("MY_SSH", None)
-    username = ss_get("user_name", "")
-    GROUPS = ss_get("GROUPS", "")
-    GROUP = ss_get("GROUP", "")
-    SCRATCH = ss_get("SCRATCH", "")
-    RDS = ss_get("RDS", "")
-    PROJECT = ss_get("PROJECT", None)
-    SAMPLE = ss_get("SAMPLE", None)
-    PIPELINE = ss_get("PIPELINE", "select")
-    return OK, MY_SSH, username, GROUPS, GROUP, SCRATCH, RDS, PROJECT, SAMPLE, PIPELINE
-
-
-#    keys = ["LOGIN_OK", "MY_SSH", "user_name", "GROUPS", "GROUP", "SCRATCH", "RDS"]
-# def retrieve_all_from_ss(keys):
-#     return {key: ss_get(key, default_value) for key, default_value in zip(keys, [False, None, "", "", "", "", ""])}
+    keys_defaults = {
+        "LOGIN_OK": False,
+        "MY_SSH": None,
+        "user_name": "",
+        "GROUPS": "",
+        "GROUP": "",
+        "SCRATCH": "",
+        "RDS": "",
+        "PROJECT": None,
+        "SAMPLE": None,
+        "PIPELINE": "select",
+    }
+
+    return tuple(ss_get(key, default) for key, default in keys_defaults.items())

tabs/tab_command.py

@@ -15,7 +15,18 @@
 if "job_id" not in st.session_state:
     ss_set("job_id", "")
 # pull saved values if set, otherwise set to defaults
-OK, MY_SSH, username, GROUPS, GROUP, SCRATCH, RDS, PROJECT, SAMPLE, PIPELINE = retrieve_all_from_ss()
+(
+    OK,
+    MY_SSH,
+    username,
+    GROUPS,
+    GROUP,
+    SCRATCH,
+    RDS,
+    PROJECT,
+    SAMPLE,
+    PIPELINE,
+) = retrieve_all_from_ss()
 
 
 def get_path_to_script(selected_pipeline, selected_project, selected="all"):

tabs/tab_logon.py

@@ -8,7 +8,7 @@
 def tab():
     # pull saved values if set, otherwise set to defaults
     keys = ["LOGIN_OK", "MY_SSH", "user_name", "GROUPS", "GROUP", "SCRATCH", "RDS", "PROJECT", "SAMPLE"]
-    OK, MY_SSH, username, GROUPS, GROUP, SCRATCH, RDS, PROJECT, SAMPLE, PIPELINE = retrieve_all_from_ss()
+    (OK, MY_SSH, username, GROUPS, GROUP, SCRATCH, RDS, PROJECT, SAMPLE, PIPELINE) = retrieve_all_from_ss()
     cols = st.columns(3)
     with cols[0]:
         server = st.text_input("Enter your remote server:", "alma.icr.ac.uk", key="server")

views/login.py

@@ -12,7 +12,7 @@
 
 tl.tab()
 # pull saved values if set, otherwise set to defaults
-OK, MY_SSH, username, GROUPS, GROUP, SCRATCH, RDS, PROJECT, SAMPLE, PIPELINE = retrieve_all_from_ss()
+(OK, MY_SSH, username, GROUPS, GROUP, SCRATCH, RDS, PROJECT, SAMPLE, PIPELINE) = retrieve_all_from_ss()
 
 
 # I want to move between tabs automatically

views/run_pipeline.py

@@ -15,7 +15,7 @@ def reset_button_state():
 st.write("Select your pipeline and your project, then submit the process")
 
 # pull saved values if set, otherwise set to defaults
-OK, MY_SSH, username, GROUPS, GROUP, SCRATCH, RDS, PROJECT, SAMPLE, PIPELINE = retrieve_all_from_ss()
+(OK, MY_SSH, username, GROUPS, GROUP, SCRATCH, RDS, PROJECT, SAMPLE, PIPELINE) = retrieve_all_from_ss()
 
 samples = ["all", "demo"]  # , "customised"]