Update app.py

app.py

@@ -438,7 +438,6 @@ def install_schema(con: sqlite3.Connection, schema: Dict[str,Any]):
             cols_sql.append(f"PRIMARY KEY ({', '.join(pk)})")
         create_sql = f"CREATE TABLE {t['name']} ({', '.join(cols_sql)})"
         cur.execute(create_sql)
-    # Add FKs (SQLite requires them inline on create; to be safe, we validate only)
     # Insert rows
     for t in schema.get("tables", []):
         if not t.get("rows"):
@@ -732,7 +731,14 @@ def log_attempt(user_id: str, qid: str, category: str, correct: bool, sql_text:
 def start_session(name: str, session: dict):
     name = (name or "").strip()
     if not name:
-        return session, gr.update(value="Please enter your name to begin.", visible=True), gr.update(visible=False), gr.update(visible=False), None, gr.update(visible=False), pd.DataFrame(), pd.DataFrame()
+        return (session,
+                gr.update(value="Please enter your name to begin.", visible=True),
+                gr.update(visible=False),
+                gr.update(visible=False),
+                None,
+                gr.update(visible=False),
+                pd.DataFrame(),
+                pd.DataFrame())
 
     slug = "-".join(name.lower().split())
     user_id = slug[:64] if slug else f"user-{int(time.time())}"
@@ -869,6 +875,7 @@ with gr.Blocks(title="Adaptive SQL Trainer — Randomized Domains") as demo:
     )
 
     with gr.Row():
+        # -------- Left column: controls + quick preview ----------
         with gr.Column(scale=1):
             name_box = gr.Textbox(label="Your Name", placeholder="e.g., Jordan Alvarez")
             start_btn = gr.Button("Start / Resume Session", variant="primary")
@@ -890,18 +897,8 @@ with gr.Blocks(title="Adaptive SQL Trainer — Randomized Domains") as demo:
             tbl_dd = gr.Dropdown(choices=list_tables_for_preview(), label="Pick table/view", interactive=True)
             tbl_btn = gr.Button("Preview")
             preview_df = gr.Dataframe(value=pd.DataFrame(), interactive=False)
-            
-            # Progress by Category (labeled)
-            mastery_df = gr.Dataframe(
-                headers=["category","attempts","correct","accuracy"],
-                col_count=(4, "dynamic"),
-                row_count=(0, "dynamic"),
-                interactive=False
-            )
-            
-            # Result Preview (always show query results here)
-            result_df = gr.Dataframe(value=pd.DataFrame(), interactive=False)
 
+        # -------- Right column: task + feedback + mastery + results ----------
         with gr.Column(scale=2):
             prompt_md = gr.Markdown(visible=False)
             sql_input = gr.Textbox(label="Your SQL", placeholder="Type SQL here (end ; optional).", lines=6, visible=False)
@@ -918,11 +915,16 @@ with gr.Blocks(title="Adaptive SQL Trainer — Randomized Domains") as demo:
 
             gr.Markdown("---")
             gr.Markdown("### Your Progress by Category")
-            mastery_df = gr.Dataframe(headers=["category","attempts","correct","accuracy"], row_count=(0, "dynamic"), interactive=False)
+            mastery_df = gr.Dataframe(
+                headers=["category","attempts","correct","accuracy"],
+                col_count=(4, "dynamic"),
+                row_count=(0, "dynamic"),
+                interactive=False
+            )
 
             gr.Markdown("---")
             gr.Markdown("### Result Preview")
-            result_df = gr.Dataframe(headers=[], interactive=False)
+            result_df = gr.Dataframe(value=pd.DataFrame(), interactive=False)
 
     # Wire events
     start_btn.click(