Update app.py

app.py

@@ -1,25 +1,21 @@
-# app.py — STABLE VERSION UPDATED WITH USERNAME/PASSWORD
+# app.py — FINAL VERSION
 import gradio as gr
-# --- MODIFIED: Updated backend imports ---
 from backend import (
     login_user,
     signup_user,
     get_user_runs,
     get_run_logs,
     queue_training_run,
-    start_training_if_free,
     publish_run_to_hub,
     run_inference
 )
 from utils import ARCH_ANALOGIES, get_auto_hyperparams
 
-# ------------------------------ STATE (MODIFIED) ------------------------------
-# HF Token is no longer stored globally. Username is stored instead.
+# ------------------------------ STATE ------------------------------
 user_state = {"user_id": None, "username": "", "arch_config": {}}
 
 # ------------------------------ BACKEND WRAPPERS (UI LOGIC) ------------------------------
 
-# --- NEW: Login and Signup Actions ---
 def login_action(username, password):
     user_id, msg = login_user(username, password)
     if user_id:
@@ -27,32 +23,30 @@ def login_action(username, password):
         user_state["username"] = username
         runs_list = page_processes()
         return gr.update(visible=False), gr.update(visible=True), msg, runs_list
-    else:
-        return gr.update(), gr.update(), msg, ""
+    return gr.update(), gr.update(), msg, ""
 
 def signup_action(username, password):
     user_id, msg = signup_user(username, password)
     if user_id:
-        # On success, go back to the login page with a success message
         return gr.update(visible=False), gr.update(visible=True), msg
-    else:
-        # On failure, show an error message on the signup page
-        return gr.update(), gr.update(), msg
+    return gr.update(), gr.update(), msg
 
-# --- (The following functions are from the old stable version, unchanged) ---
 def page_processes():
     if not user_state.get("user_id"): return "Login required."
     runs = get_user_runs(user_state["user_id"])
-    run_list = "\n".join([f"🍳 Run #{r[0]} | {r[1].upper()} x{r[2]} layers | Status: {r[3]}" for r in runs]) or "No runs yet. Start cooking!"
+    run_list = "\n".join([f"🍳 Run #{r[0]} | {r[1].upper()} x{r[2]}L | Status: {r[3]}" for r in runs]) or "No runs yet."
     return run_list
 
 def load_run_logs(run_id_str):
     try:
         run_id = int(run_id_str)
-        logs, status = get_run_logs(run_id)
+        user_id = user_state["user_id"]
+        logs, status = get_run_logs(user_id, run_id)
+        if status == "unknown":
+            return "Error: Run not found or you do not have permission to view it."
         return f"Status: {status}\n\n{logs}"
     except:
-        return "Invalid or empty Run ID."
+        return "Invalid Run ID format. Please enter a number."
 
 def page_architecture_next(arch_type, num_layers):
     analogy = ARCH_ANALOGIES.get(arch_type, "")
@@ -63,52 +57,34 @@ def page_architecture_next(arch_type, num_layers):
 
 def page_hyperparams_next(lr, epochs, batch_size):
     config = user_state["arch_config"]
-    final_config = {
-        "arch_type": config["arch_type"],
-        "num_layers": config["num_layers"],
-        "learning_rate": float(lr) if lr else config["auto_config"]["learning_rate"],
-        "epochs": int(epochs) if epochs else config["auto_config"]["epochs"],
-        "batch_size": int(batch_size) if batch_size else config["auto_config"]["batch_size"],
-    }
+    final_config = {"arch_type": config["arch_type"], "num_layers": config["num_layers"], "learning_rate": float(lr) if lr else config["auto_config"]["learning_rate"], "epochs": int(epochs) if epochs else config["auto_config"]["epochs"], "batch_size": int(batch_size) if batch_size else config["auto_config"]["batch_size"]}
     queue_training_run(user_state["user_id"], final_config)
-    # The new parallel backend handles calling start_training_if_free() automatically
-    refreshed_runs = page_processes()
-    return gr.update(visible=False), gr.update(visible=True), refreshed_runs
+    return gr.update(visible=False), gr.update(visible=True), page_processes()
 
 def get_completed_runs():
     all_runs = get_user_runs(user_state["user_id"])
     return [r for r in all_runs if r[3] == 'completed']
 
-def go_to_inference_page():
+def go_to_page_with_run_list(page_to_show):
     completed_runs = get_completed_runs()
     if not completed_runs:
-        gr.Warning("You have no completed models to test! Finish a training run first.")
+        gr.Warning("You have no completed models! Finish a training run first.")
         return gr.update(), gr.update(), gr.update(choices=[])
     choices = [(f"Run #{r[0]}: {r[1].upper()} x{r[2]}L", r[0]) for r in completed_runs]
-    return gr.update(visible=False), gr.update(visible=True), gr.update(choices=choices, value=choices[0][1])
-
-def go_to_publish_page():
-    completed_runs = get_completed_runs()
-    if not completed_runs:
-        gr.Warning("You have no completed models to publish! Finish a training run first.")
-        return gr.update(), gr.update(), gr.update(choices=[]), gr.update()
-    choices = [(f"Run #{r[0]}: {r[1].upper()} x{r[2]}L", r[0]) for r in completed_runs]
-    return gr.update(visible=False), gr.update(visible=True), gr.update(choices=choices, value=choices[0][1]), ""
+    return gr.update(visible=False), page_to_show, gr.update(choices=choices, value=choices[0][1])
 
 def inference_action(run_id, prompt):
-    if not run_id: return "Error: Please select a model from the dropdown."
+    if not run_id: return "Error: Please select a model."
     try: return run_inference(run_id, prompt)
     except Exception as e: return f"Error: {str(e)}"
 
-# --- MODIFIED: Publish action now takes the HF token from the UI ---
 def publish_action(run_id, hf_token, description):
     if not run_id: return "Error: Please select a model to publish."
-    if not hf_token.strip(): return "Error: Hugging Face Token is required to publish."
+    if not hf_token: return "Error: Hugging Face Token is required."
     try:
-        run_details = next((r for r in get_completed_runs() if r[0] == run_id), None)
-        repo_name = f"llm-kitchen-{run_details[1]}-{run_details[2]}L-run{run_id}" if run_details else f"llm-kitchen-run-{run_id}"
-        url = publish_run_to_hub(run_id, hf_token, repo_name, description.strip())
-        return f"🚀 Published! View at: {url}"
+        run_info = next((r for r in get_completed_runs() if r[0] == run_id), None)
+        repo_name = f"llm-kitchen-{run_info[1]}-{run_info[2]}L-run{run_id}" if run_info else f"llm-kitchen-run-{run_id}"
+        return publish_run_to_hub(run_id, hf_token, repo_name, description.strip())
     except Exception as e:
         return f"Publish failed: {str(e)}"
 
@@ -118,7 +94,6 @@ with gr.Blocks(title="LLM Kitchen 🍳", theme=gr.themes.Soft()) as demo:
     gr.Markdown("# 🍳 Welcome to LLM Kitchen")
     gr.Markdown("### Cook your own language model — from scratch!")
 
-    # --- NEW: SIGNUP PAGE ---
     with gr.Group(visible=False) as page_signup_ui:
         gr.Markdown("### 📝 Create a New Account")
         signup_user_input = gr.Textbox(label="Username")
@@ -127,7 +102,6 @@ with gr.Blocks(title="LLM Kitchen 🍳", theme=gr.themes.Soft()) as demo:
         signup_msg = gr.Markdown()
         go_to_login_btn = gr.Button("Already have an account? Log In")
 
-    # --- NEW: LOGIN PAGE (Replaces old HF Token login) ---
     with gr.Group() as page_login_ui:
         gr.Markdown("### 🔐 Login to the Kitchen")
         login_user_input = gr.Textbox(label="Username")
@@ -136,41 +110,36 @@ with gr.Blocks(title="LLM Kitchen 🍳", theme=gr.themes.Soft()) as demo:
         login_msg = gr.Markdown()
         go_to_signup_btn = gr.Button("Don't have an account? Sign Up")
 
-    # ---- PAGE 2: PROCESSES (Unchanged) ----
     with gr.Group(visible=False) as page_processes_ui:
-        gr.Markdown("### 🧑‍🍳 Your Processes")
+        gr.Markdown(f"### 🧑‍🍳 Your Processes")
         with gr.Row():
-            refresh_btn = gr.Button("🔄 Refresh List")
-            inference_btn = gr.Button("🧪 Go to Inference Kitchen")
-            publish_btn = gr.Button("🚀 Go to Publishing Bay")
+            refresh_btn = gr.Button("🔄 Refresh")
+            inference_btn = gr.Button("🧪 Inference Kitchen")
+            publish_btn = gr.Button("🚀 Publishing Bay")
         runs_display = gr.Textbox(label="Your Training Runs", lines=8, interactive=False)
         with gr.Accordion("View Raw Logs", open=False):
-            run_id_input = gr.Textbox(label="Enter a Run ID to view its logs")
+            run_id_input = gr.Textbox(label="Enter a Run ID")
             view_logs_btn = gr.Button("View Logs")
             logs_display = gr.Textbox(label="Training Logs", lines=10, interactive=False)
         new_run_btn = gr.Button("➕ Start New Process", variant="primary")
 
-    # ---- PAGE 3: INFERENCE KITCHEN (Unchanged) ----
     with gr.Group(visible=False) as page_inference_ui:
         gr.Markdown("### 🧪 Inference Kitchen")
-        inf_run_id_dropdown = gr.Dropdown(label="Select a Completed Model to Use")
-        prompt_input = gr.Textbox(label="Your Prompt", lines=3, placeholder="e.g., Explain gravity like I'm five...")
+        inf_run_id_dropdown = gr.Dropdown(label="Select a Completed Model")
+        prompt_input = gr.Textbox(label="Your Prompt", lines=3)
         infer_btn = gr.Button("Generate Answer")
         output_text = gr.Textbox(label="Model's Answer", lines=5, interactive=False)
         back_from_inf = gr.Button("⬅️ Back to Processes")
 
-    # ---- PAGE 4: PUBLISHING BAY (MODIFIED) ----
     with gr.Group(visible=False) as page_publish_ui:
         gr.Markdown("### 🚀 Publishing Bay")
         pub_run_id_dropdown = gr.Dropdown(label="Select a Completed Model to Publish")
-        # --- NEW: HF Token input field ---
-        pub_hf_token_input = gr.Textbox(label="Your Hugging Face Token (with write permissions)", type="password", placeholder="hf_...")
-        pub_description_input = gr.Textbox(label="Model Card Description", lines=4, placeholder="Write a short description for your model card...")
+        pub_hf_token_input = gr.Textbox(label="Your Hugging Face Token (with write permissions)", type="password")
+        pub_description_input = gr.Textbox(label="Model Card Description", lines=4)
         publish_now_btn = gr.Button("Publish to Hugging Face Hub", variant="primary")
         publish_status = gr.Markdown()
         back_from_pub = gr.Button("⬅️ Back to Processes")
 
-    # ---- PAGE 5 & 6: ARCHITECTURE & HYPERPARAMETERS (Unchanged) ----
     with gr.Group(visible=False) as page_arch_ui:
         gr.Markdown("### 🏗️ Step 2: Choose Your Architecture")
         arch_dropdown = gr.Dropdown(["cnn", "rnn", "transformer"], label="Architecture Type")
@@ -178,34 +147,31 @@ with gr.Blocks(title="LLM Kitchen 🍳", theme=gr.themes.Soft()) as demo:
         arch_next_btn = gr.Button("Next → Hyperparameters")
         arch_analogy = gr.Markdown()
         auto_suggestion = gr.Markdown()
+
     with gr.Group(visible=False) as page_hyper_ui:
-        gr.Markdown("### 🧂 Step 3: Season Your Model (Hyperparameters)")
-        gr.Markdown("Use Auto-Seasoning™ (pre-filled) or customize manually")
+        gr.Markdown("### 🧂 Step 3: Season Your Model")
         lr_input = gr.Number(label="Learning Rate")
         epochs_input = gr.Number(label="Epochs", precision=0)
         batch_input = gr.Number(label="Batch Size", precision=0)
         hyper_next_btn = gr.Button("Start Cooking! 🍲")
 
-    # ------------------------------ EVENTS (MODIFIED) ------------------------------
-
-    # --- NEW: Auth flow events ---
+    # ------------------------------ EVENTS ------------------------------
     go_to_signup_btn.click(lambda: (gr.update(visible=False), gr.update(visible=True)), outputs=[page_login_ui, page_signup_ui])
     go_to_login_btn.click(lambda: (gr.update(visible=False), gr.update(visible=True)), outputs=[page_signup_ui, page_login_ui])
     login_btn.click(login_action, inputs=[login_user_input, login_pass_input], outputs=[page_login_ui, page_processes_ui, login_msg, runs_display])
     signup_btn.click(signup_action, inputs=[signup_user_input, signup_pass_input], outputs=[page_signup_ui, page_login_ui, signup_msg])
-
-    # --- Old events, mostly unchanged ---
+    
     refresh_btn.click(page_processes, outputs=runs_display)
     view_logs_btn.click(load_run_logs, inputs=run_id_input, outputs=logs_display)
-    new_run_btn.click(lambda: (gr.update(visible=False), gr.update(visible=True), "", ""), outputs=[page_processes_ui, page_arch_ui, arch_analogy, auto_suggestion])
+    new_run_btn.click(lambda: (gr.update(visible=False), gr.update(visible=True)), outputs=[page_processes_ui, page_arch_ui])
     arch_next_btn.click(page_architecture_next, inputs=[arch_dropdown, layers_slider], outputs=[page_arch_ui, page_hyper_ui, arch_analogy, auto_suggestion, lr_input, epochs_input, batch_input])
     hyper_next_btn.click(page_hyperparams_next, inputs=[lr_input, epochs_input, batch_input], outputs=[page_hyper_ui, page_processes_ui, runs_display])
-    inference_btn.click(go_to_inference_page, outputs=[page_processes_ui, page_inference_ui, inf_run_id_dropdown])
+
+    inference_btn.click(lambda: go_to_page_with_run_list(gr.update(visible=True)), outputs=[page_processes_ui, page_inference_ui, inf_run_id_dropdown])
     infer_btn.click(inference_action, inputs=[inf_run_id_dropdown, prompt_input], outputs=output_text)
     back_from_inf.click(lambda: (gr.update(visible=False), gr.update(visible=True)), outputs=[page_inference_ui, page_processes_ui])
     
-    # --- MODIFIED: Publish event now includes the HF token input ---
-    publish_btn.click(go_to_publish_page, outputs=[page_processes_ui, page_publish_ui, pub_run_id_dropdown, publish_status])
+    publish_btn.click(lambda: go_to_page_with_run_list(gr.update(visible=True)), outputs=[page_processes_ui, page_publish_ui, pub_run_id_dropdown])
     publish_now_btn.click(publish_action, inputs=[pub_run_id_dropdown, pub_hf_token_input, pub_description_input], outputs=publish_status)
     back_from_pub.click(lambda: (gr.update(visible=False), gr.update(visible=True)), outputs=[page_publish_ui, page_processes_ui])