Merge branch 'main' into rescore

Author: Arslan-Siraj

settings.json

@@ -1,4 +1,8 @@
 {
+    "app-name": "NuXLApp",
+    "version": "0.0.1",
+    "repository-name": "nuxl-app",
+    "openms-version": "3.2.0",
     "analytics": {
         "google-analytics": {
             "enabled": false,

src/common.py

@@ -4,6 +4,7 @@
 import sys
 import uuid
 import time
+import psutil
 from typing import Any
 from pathlib import Path
 from streamlit.components.v1 import html
@@ -23,11 +24,18 @@
 # Detect system platform
 OS_PLATFORM = sys.platform
 
+@st.fragment(run_every=5)
+def monitor_hardware():
+    cpu_progress = psutil.cpu_percent(interval=None) / 100
+    ram_progress = 1 - psutil.virtual_memory().available / psutil.virtual_memory().total
 
-# set these variables according to your project
-APP_NAME = "NuXL"
-REPOSITORY_NAME = "nuxl-app"
+    st.text(f"Ram ({ram_progress * 100:.2f}%)")
+    st.progress(ram_progress)
 
+    st.text(f"CPU ({cpu_progress * 100:.2f}%)")
+    st.progress(cpu_progress)
+
+    st.caption(f"Last fetched at: {time.strftime('%H:%M:%S')}")
 
 def load_params(default: bool = False) -> dict[str, Any]:
     """
@@ -110,7 +118,7 @@ def page_setup(page: str = "") -> dict[str, Any]:
 
     # Set Streamlit page configurations
     st.set_page_config(
-        page_title=APP_NAME,
+        page_title=st.session_state.settings["app-name"],
         page_icon="assets/openms_transparent_bg_logo.svg",
         layout="wide",
         initial_sidebar_state="auto",
@@ -202,7 +210,7 @@ def page_setup(page: str = "") -> dict[str, Any]:
         if "windows" in sys.argv:
             os.chdir("../nuxl-app-main")
         # Define the directory where all workspaces will be stored
-        workspaces_dir = Path("..", "workspaces-" + REPOSITORY_NAME)
+        workspaces_dir = Path("..", "workspaces-" + st.session_state.settings["repository-name"])
         if "workspace" in st.query_params:
             st.session_state.workspace = Path(workspaces_dir, st.query_params.workspace)
         elif st.session_state.location == "online":
@@ -277,7 +285,7 @@ def render_sidebar(page: str = "") -> None:
         if page == "main":
             st.markdown("🖥️ **Workspaces**")
             # Define workspaces directory outside of repository
-            workspaces_dir = Path("..", "workspaces-"+REPOSITORY_NAME)
+            workspaces_dir = Path("..", "workspaces-"+st.session_state.settings["repository-name"])
             # Online: show current workspace name in info text and option to change to other existing workspace
             if st.session_state.location == "online":
                 # Change workspace...
@@ -365,8 +373,37 @@ def change_workspace():
 **{st.session_state['workspace'].name}**
 """
                 )
+        with st.expander("📊 **Resource Utilization**"):
+            monitor_hardware()
+            
         st.image("assets/OpenMS_new.png", "powered by")
-        #st.logo()
+            
+        
+        # Display OpenMS WebApp Template Version from settings.json
+        with st.container():
+            st.markdown(
+                """
+                <style>
+                .version-box {
+                    border: 1px solid #a4a5ad; 
+                    padding: 10px;
+                    border-radius: 0.5rem;
+                    text-align: center;
+                    display: flex;
+                    justify-content: center;
+                    align-items: center; 
+                }
+                </style>
+                """,
+                unsafe_allow_html=True,
+            )
+            version_info = st.session_state.settings["version"]
+            app_name = st.session_state.settings["app-name"]
+            st.markdown(
+                f'<div class="version-box">{app_name}<br>Version: {version_info}</div>',
+                unsafe_allow_html=True,
+            )
+
     return params
 
 def v_space(n: int, col=None) -> None: