Update app.py

app.py

@@ -7,11 +7,12 @@ from openstack import exceptions
 
 # GLOBAL SHARED STATE
 active_user_count = 0
-is_comfit_alive = False  # Track if software is reachable across all sessions
+is_comfit_alive = False
 clean_link = "comfit-copilot.mch250095.projects.jetstream-cloud.org:3000"
 full_url = f"http://{clean_link}"
 
 def get_conn():
+    """Authenticates with Jetstream2 (OpenStack) using Application Credentials."""
     return openstack.connect(
         auth_url=os.getenv("OS_AUTH_URL"),
         application_credential_id=os.getenv("OS_APPLICATION_CREDENTIAL_ID"),
@@ -22,6 +23,7 @@ def get_conn():
     )
 
 def get_current_status():
+    """Background task to fetch status and sync shared link visibility."""
     global active_user_count, is_comfit_alive
     try:
         conn = get_conn()
@@ -39,7 +41,7 @@ def get_current_status():
             }
             status_text = status_map.get(server.status, f"❓ STATE: {server.status}")
         
-        # Background health check to update the global 'is_comfit_alive' flag
+        # Shared health check for the URL
         if "RUNNING" in status_text:
             try:
                 if requests.get(full_url, timeout=2).status_code < 500:
@@ -51,19 +53,15 @@ def get_current_status():
         else:
             is_comfit_alive = False
 
-        # Determine link visibility for the live timer update
         link_update = gr.update(value=f"### [Visit: {clean_link}]({full_url})", visible=is_comfit_alive)
-        
         return status_text, f"👥 Active Users: {active_user_count}", link_update
     except Exception as e:
         return f"❌ Error: {str(e)}", f"👥 Active Users: {active_user_count}", gr.update()
 
 def user_joined():
-    global active_user_count, is_comfit_alive
+    global active_user_count
     active_user_count += 1
-    # If already alive, show the link immediately on page load
-    link_visibility = gr.update(value=f"### [Visit: {clean_link}]({full_url})", visible=is_comfit_alive)
-    return f"👥 Active Users: {active_user_count}", link_visibility
+    return f"👥 Active Users: {active_user_count}"
 
 def user_left():
     global active_user_count
@@ -80,14 +78,14 @@ def manage_instance():
             yield ("❌ Error: Instance Not Found", gr.update(visible=False))
             return
 
+        # Multi-user bypass
         if server.status != "ACTIVE":
-            yield ("⏳ Milestone 1/3: Un-shelving...", gr.update(visible=False))
+            yield ("⏳ Milestone 1/3: Un-shelving Begin...", gr.update(visible=False))
             if server.status == "SHELVED_OFFLOADED":
                 conn.compute.unshelve_server(server)
             conn.compute.wait_for_server(server, status='ACTIVE', wait=600)
-            yield ("✅ Milestone 2/3: VM is ACTIVE.", gr.update(visible=False))
+            yield ("✅ Milestone 2/3: Unshelved! VM is now ACTIVE.", gr.update(visible=False))
 
-        # Check software
         yield ("🔄 Milestone 3/3: Connecting to ComFit...", gr.update(visible=False))
         for i in range(24): 
             try:
@@ -101,11 +99,11 @@ def manage_instance():
     except Exception as e:
         yield (f"❌ Error: {str(e)}", gr.update(visible=False))
 
-# Combined JS for Sound + Inactivity Timeout (Change MAX_IDLE here)
+# JavaScript for sound + Inactivity Timeout
 combined_js = """
 <script>
 let idleTime = 0;
-const MAX_IDLE = 10; // <--- CHANGE TIMEOUT HERE (in minutes)
+const MAX_IDLE = 10; // <--- CHANGE TIMEOUT HERE (Minutes)
 
 function playNotification(status) {
     if (status.includes("RUNNING")) {
@@ -132,6 +130,8 @@ setInterval(function() {
 
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.HTML(combined_js)
+    
+    # Session state for cleanup
     session_tracker = gr.State(value="active", delete_callback=user_left)
 
     gr.Markdown("# 🚀 ComFit Copilot Shared Control Panel")
@@ -140,19 +140,43 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         live_status = gr.Textbox(label="Live Jetstream2 Status (5s refresh)", interactive=False)
         user_display = gr.Textbox(label="Space Activity", interactive=False)
 
-    activate_btn = gr.Button("🚀 Activate / Access ComFit Copilot", variant="primary")
+    with gr.Row():
+        activate_btn = gr.Button("🚀 Activate / Access ComFit Copilot", variant="primary")
+        refresh_btn = gr.Button("🔄 Force Refresh Status", variant="secondary")
+    
     status_label = gr.Label(value="Ready")
     link_box = gr.Markdown(visible=False)
 
+    # Instructions section
+    gr.Markdown("---")
+    gr.Markdown("""
+    ### 📖 Instructions for Visitors
+    
+    **Step 1: Check Current Status**  
+    Review the **Live Jetstream2 Status**. If it shows `SLEEPING (SHELVED)`, the server is off. If it shows `RUNNING (ACTIVE)`, the application is already live for everyone!
+    
+    **Step 2: Access or Wake Up**  
+    - If a **Visit Link** is already visible, simply click it to open ComFit Copilot.
+    - If no link is visible, click **Activate / Access ComFit Copilot**. This will trigger the un-shelving process.
+    
+    **Step 3: Track Milestones**  
+    The control panel will cycle through three milestones: Un-shelving, VM Activation, and Software Booting. Please be patient while the cloud prepares your environment.
+    
+    **Step 4: Automatic Session Timeout**  
+    If you do not interact with this page for **10 minutes**, your session will expire. The [Jetstream2 instance](https://docs.jetstream-cloud.org) will also auto-shelve after its own period of inactivity.
+    """)
+
+    # UI Event Listeners
     live_status.change(None, inputs=live_status, js="(s) => playNotification(s)")
     activate_btn.click(fn=manage_instance, outputs=[status_label, link_box])
+    refresh_btn.click(fn=get_current_status, outputs=[live_status, user_display, link_box])
 
-    # Timer refreshes status, user count, and global link visibility every 5s
+    # Automatic 5-second timer
     timer = gr.Timer(5)
     timer.tick(fn=get_current_status, outputs=[live_status, user_display, link_box])
     
-    # Load initial shared state for new users
-    demo.load(fn=user_joined, outputs=[user_display, link_box])
+    # Initialization
+    demo.load(fn=user_joined, outputs=user_display)
     demo.load(fn=get_current_status, outputs=[live_status, user_display, link_box])
 
 if __name__ == "__main__":