Update app.py

app.py

@@ -1,38 +1,3 @@
-import os
-import time
-import requests
-import gradio as gr
-import openstack
-from openstack import exceptions
-
-def get_conn():
-    return openstack.connect(
-        auth_url=os.getenv("OS_AUTH_URL"),
-        application_credential_id=os.getenv("OS_APPLICATION_CREDENTIAL_ID"),
-        application_credential_secret=os.getenv("OS_APPLICATION_CREDENTIAL_SECRET"),
-        auth_type="v3applicationcredential",
-        region_name="IU",
-        interface="public"
-    )
-
-def get_current_status():
-    try:
-        conn = get_conn()
-        instance_id = os.getenv("OS_INSTANCE_ID")
-        server = conn.compute.find_server(instance_id)
-        if server:
-            status_map = {
-                "ACTIVE": "🟢 RUNNING (ACTIVE)",
-                "SHELVED_OFFLOADED": "💤 SLEEPING (SHELVED)",
-                "SHUTOFF": "🔴 POWERED OFF",
-                "BUILD": "🛠️ STARTING...",
-                "SHELVING": "⏳ SAVING STATE..."
-            }
-            return status_map.get(server.status, f"❓ STATE: {server.status}")
-        return "❌ Error: Instance Not Found"
-    except Exception as e:
-        return f"❌ Connection Error: {str(e)}"
-
 def manage_instance(action, confirmed=False):
     clean_link = "chat.mch250095.projects.jetstream-cloud.org"
     full_url = f"https://{clean_link}/"
@@ -42,7 +7,7 @@ def manage_instance(action, confirmed=False):
         conn = get_conn()
         server = conn.compute.find_server(instance_id)
         if not server:
-            # Yielding 2 values to match [status_label, link_box]
+            # Yielding 2 values: [Label, Markdown]
             yield "❌ Error: Instance ID not found.", gr.update(visible=False)
             return
 
@@ -51,63 +16,31 @@ def manage_instance(action, confirmed=False):
             if server.status == "SHELVED_OFFLOADED":
                 conn.compute.unshelve_server(server)
             
+            # Wait for VM to reach ACTIVE state
             conn.compute.wait_for_server(server, status='ACTIVE', wait=180)
             yield "✅ Milestone 2/3: Unshelved! VM is now ACTIVE.", gr.update(visible=False)
 
             yield "🔄 Milestone 3/3: Waiting for software...", gr.update(visible=False)
+            # Poll for the web service to boot (~30s)
             for _ in range(24): 
                 try:
                     if requests.get(full_url, timeout=3).status_code < 400:
                         yield "🎉 Success! Ready.", gr.update(value=f"### [Visit: {clean_link}]({full_url})", visible=True)
                         return
-                except: pass
+                except:
+                    pass
+                # Must yield 2 values even inside a loop to keep UI responsive
+                yield "🔄 Milestone 3/3: Software still booting...", gr.update(visible=False)
                 time.sleep(5)
+            
             yield "⚠️ Service slow.", gr.update(value=f"### [Try Manual Link: {clean_link}]({full_url})", visible=True)
 
         elif action == "shelve":
-            # FIX: Always yield TWO values to satisfy Gradio's output requirement
-            yield "⏳ Shelving Begin... (Saving and Stopping)", gr.update(visible=False)
-            
+            yield "💤 Shelving Begin... (Saving and Stopping)", gr.update(visible=False)
             conn.compute.shelve_server(server)
-            
-            # Use SDK to wait for state change
             conn.compute.wait_for_server(server, status='SHELVED_OFFLOADED', wait=180)
-            
-            yield "💤 Instance is now SHELVED.", gr.update(visible=False)
+            yield "🛌 Instance is now SHELVED.", gr.update(visible=False)
 
     except Exception as e:
-        # FIX: Always yield TWO values on error
-        yield f"❌ Error: {str(e)}", gr.update(visible=False)
-
-# UI Layout - Theme moved to launch() later to avoid UserWarning
-with gr.Blocks() as demo:
-    gr.Markdown("# 🚀 ComFit Copilot Control Panel")
-    
-    with gr.Row():
-        # Textbox for live status
-        live_status = gr.Textbox(label="Live Jetstream2 Status", value="Checking...", interactive=False)
-
-    with gr.Row():
-        activate_btn = gr.Button("🚀 Activate (Unshelve)", variant="primary")
-        
-        with gr.Column():
-            confirm_check = gr.Checkbox(label="I am done working and want to Shelve", value=False)
-            shelve_btn = gr.Button("💤 Shelve (Save & Stop)", variant="stop", interactive=False)
-    
-    status_label = gr.Label(value="Ready")
-    link_box = gr.Markdown(visible=False)
-
-    # Enable Shelve button only if checkbox is ticked
-    confirm_check.change(fn=lambda x: gr.update(interactive=x), inputs=confirm_check, outputs=shelve_btn)
-
-    activate_btn.click(fn=lambda: manage_instance("activate"), outputs=[status_label, link_box])
-    shelve_btn.click(fn=lambda: manage_instance("shelve", True), outputs=[status_label, link_box])
-
-    # NEW GRADIO 5/6 WAY: Use a Timer component for periodic updates
-    timer = gr.Timer(30)
-    timer.tick(fn=get_current_status, outputs=live_status)
-    # Also run once on load
-    demo.load(fn=get_current_status, outputs=live_status)
-
-# Pass theme to launch() as requested by the warning
-demo.launch(theme=gr.themes.Soft())
+        # Error handling also requires 2 return values
+        yield f"❌ Error: {str(e)}", gr.update(visible=False)