refactor retrieve_all_from_ss

Author: msarkis-icr

pyproject.toml

@@ -1,3 +1,7 @@
+[tool.isort]
+profile = "black"
+filter_files = true
+
 [tool.black]
 line-length = 127
 extend-exclude = '''

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": "Select an option",
+        "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

@@ -1,14 +1,25 @@
 import streamlit as st
 
 import shared.helpers as hlp
-from shared.sessionstate import retrieve_all_from_ss, save_in_ss, ss_get
+from shared.sessionstate import retrieve_all_from_ss, save_in_ss, ss_get, ss_set
+
+
+def handle_login(server, sftp_server, username, password):
+    if username == "admin" and password == "admin":
+        st.success("Admin login successful")
+        return True, None, "Admin login successful", None  # No SSH or groups needed for admin
+
+    with st.spinner("Validating login..."):
+        OK, MY_SSH, msg, GROUPS = hlp.validate_user(server, sftp_server, username, password)
+
+    return OK, MY_SSH, msg, GROUPS
 
 
 # once connected, you cannot try to re-connect
 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")
@@ -17,30 +28,39 @@ def tab():
     with cols[2]:
         password = st.text_input("Enter your password:", "", type="password", key="password")
     sftp_server = "alma-app.icr.ac.uk"
+
+    def update_group():
+        GROUP = ss_get("group_selection")
+        SCRATCH, RDS = hlp.get_scratch_rds_path(username, GROUP)
+        save_in_ss(
+            {
+                "LOGIN_OK": True,
+                "MY_SSH": MY_SSH,
+                "user_name": username,
+                "GROUPS": GROUPS,
+                "GROUP": GROUP,
+                "SCRATCH": SCRATCH,
+                "RDS": RDS,
+            }
+        )
+
+    def handle_group_selection(GROUPS):
+        st.radio(
+            "Select group",
+            ["Select an option"] + GROUPS,
+            horizontal=True,
+            index=0,
+            key="group_selection",
+            on_change=update_group,
+        )
+        return
+
     if st.button("Connect", key="connect"):
-        if username == "admin" and password == "admin":
-            st.success("Admin login successful")
-            OK = True
+        OK, MY_SSH, msg, GROUPS = handle_login(server, sftp_server, username, password)
+        if OK:
+            st.success(msg)
+            handle_group_selection(GROUPS)
         else:
-            with st.spinner("Validating login"):
-                OK, MY_SSH, msg, GROUPS = hlp.validate_user(server, sftp_server, username, password)
-                print(OK, MY_SSH, msg, GROUPS)
-                if OK:
-                    st.success(msg)
-                    GROUP = st.radio("Select group", GROUPS, horizontal=True)
-                    SCRATCH, RDS = hlp.get_scratch_rds_path(username, GROUP)
-                    # save in session states
-                    ss_dict = {
-                        "LOGIN_OK": OK,
-                        "MY_SSH": MY_SSH,
-                        "user_name": username,
-                        "GROUPS": GROUPS,
-                        "GROUP": GROUP,
-                        "SCRATCH": SCRATCH,
-                        "RDS": RDS,
-                    }
-                    save_in_ss(ss_dict)
-                else:
-                    st.error(msg)
-
-    return OK, MY_SSH, username
+            st.error(msg)
+
+    return OK, MY_SSH, username, GROUP

views/login.py

@@ -10,9 +10,9 @@
 st.write("Login to your alma account before running a nextflow pipeline.")
 
 
-tl.tab()
+OK, MY_SSH, username, GROUP = 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
@@ -58,8 +58,7 @@ def check_whiteList(username):
 
 # if "run_pipeline" not in st.session_state:
 #     ss_set("run_pipeline", False)
-
-if OK:
+if OK and GROUP != "Select an option":
     if not check_whiteList(username):
         display_restricted_access(username)
     else:

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"]