Update app.py

app.py

@@ -1,3 +1,38 @@
+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}/"
@@ -6,8 +41,8 @@ def manage_instance(action, confirmed=False):
     try:
         conn = get_conn()
         server = conn.compute.find_server(instance_id)
+        
         if not server:
-            # Yielding 2 values: [Label, Markdown]
             yield "❌ Error: Instance ID not found.", gr.update(visible=False)
             return
 
@@ -21,19 +56,22 @@ def manage_instance(action, confirmed=False):
             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): 
+            for i in range(24): 
                 try:
-                    if requests.get(full_url, timeout=3).status_code < 400:
+                    response = requests.get(full_url, timeout=3)
+                    if response.status_code < 400:
                         yield "🎉 Success! Ready.", gr.update(value=f"### [Visit: {clean_link}]({full_url})", visible=True)
                         return
                 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)
+                
+                # IMPORTANT: Yield 2 values every loop to keep Gradio happy
+                yield f"🔄 Milestone 3/3: Software booting (Attempt {i+1}/24)...", gr.update(visible=False)
                 time.sleep(5)
             
-            yield "⚠️ Service slow.", gr.update(value=f"### [Try Manual Link: {clean_link}]({full_url})", visible=True)
+            yield "⚠️ Service slow.", gr.update(value=f"### [Manual Link: {clean_link}]({full_url})", visible=True)
 
         elif action == "shelve":
             yield "💤 Shelving Begin... (Saving and Stopping)", gr.update(visible=False)
@@ -42,5 +80,36 @@ def manage_instance(action, confirmed=False):
             yield "🛌 Instance is now SHELVED.", gr.update(visible=False)
 
     except Exception as e:
-        # Error handling also requires 2 return values
-        yield f"❌ Error: {str(e)}", gr.update(visible=False)
+        yield f"❌ Error: {str(e)}", gr.update(visible=False)
+
+# UI Layout
+with gr.Blocks() as demo:
+    gr.Markdown("# 🚀 ComFit Copilot Control Panel")
+    
+    with gr.Row():
+        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="Confirm Shelve", value=False)
+            shelve_btn = gr.Button("💤 Shelve (Stop)", variant="stop", interactive=False)
+    
+    status_label = gr.Label(value="Ready")
+    link_box = gr.Markdown(visible=False)
+
+    # UI Logic
+    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])
+
+    # Timer for status refresh (Gradio 5/6 style)
+    timer = gr.Timer(30)
+    timer.tick(fn=get_current_status, outputs=live_status)
+    demo.load(fn=get_current_status, outputs=live_status)
+
+# Start the app and apply the theme
+if __name__ == "__main__":
+    demo.launch(theme=gr.themes.Soft())