Upload app.py

app.py

@@ -464,7 +464,9 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
                     su_user = gr.Textbox(label="Username", info="3–32 chars: letters, numbers, _ . -")
                     su_email = gr.Textbox(label="Email (optional)")
                     su_pw = gr.Textbox(label="Password", type="password", info="At least 6 characters")
-                    su_langs = gr.CheckboxGroup(label="Languages you can evaluate", choices=lang_choices())
+                    su_lang = gr.Dropdown(label="Language", choices=lang_choices(),
+                                          allow_custom_value=True,
+                                          info="The language you will evaluate.")
                     su_code = gr.Textbox(label="Admin code (optional)", type="password",
                                          info="Leave blank for a normal reviewer account.")
                     su_btn = gr.Button("Create account", variant="primary")
@@ -519,13 +521,6 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
                 progress_tbl = gr.Dataframe(
                     headers=["Language", "Rated", "Total", "Remaining"], interactive=False)
 
-            # ---------- Profile tab ----------
-            with gr.Tab("My languages"):
-                gr.Markdown("Choose which languages you are eligible to evaluate.")
-                prof_langs = gr.CheckboxGroup(label="Languages", choices=lang_choices())
-                prof_save = gr.Button("Save", variant="primary", size="sm")
-                prof_msg = gr.Markdown()
-
         # ---------- Admin view (entirely separate from reviewer tabs) ----------
         with gr.Column(visible=False) as admin_panel:
             gr.Markdown("### Languages")
@@ -555,8 +550,9 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
                 headers=["id", "language", "sample_name", "model", "reference"],
                 interactive=False, label="Samples")
             with gr.Row():
-                del_sample_id = gr.Number(label="Delete sample by id", precision=0)
-                del_btn = gr.Button("Delete", variant="stop", scale=0, size="sm")
+                del_sample = gr.Dropdown(label="Select a sample to delete", choices=[],
+                                         allow_custom_value=True, scale=3)
+                del_btn = gr.Button("Delete selected", variant="stop", scale=0, size="sm")
 
             gr.Markdown("### Users")
             refresh_users_btn = gr.Button("Refresh users", size="sm")
@@ -591,7 +587,7 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
         if not user:
             # keep typed credentials so the user can correct them
             return (gr.update(), gr.update(), None, "❌ Invalid username or password.",
-                    gr.update(), gr.update(), gr.update(), gr.update(), gr.update(),
+                    gr.update(), gr.update(), gr.update(), gr.update(),
                     gr.update(), gr.update())
         sess = user_session(user["id"])
         is_admin = sess["role"] == "admin"
@@ -605,8 +601,6 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
             gr.update(visible=not is_admin),                # reviewer_tabs
             gr.update(visible=is_admin),                    # admin_panel
             gr.update(choices=rl, value=None),              # rate_lang
-            gr.update(choices=lang_choices(),
-                      value=[l["id"] for l in sess["languages"]]),  # prof_langs
             gr.update(value=""),                            # li_user  (clear)
             gr.update(value=""),                            # li_pw    (clear)
         )
@@ -614,27 +608,28 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
     li_btn.click(
         do_login, [li_user, li_pw],
         [auth_col, app_col, session, li_msg, greeting, reviewer_tabs, admin_panel,
-         rate_lang, prof_langs, li_user, li_pw],
+         rate_lang, li_user, li_pw],
     )
     li_pw.submit(  # allow Enter-to-login
         do_login, [li_user, li_pw],
         [auth_col, app_col, session, li_msg, greeting, reviewer_tabs, admin_panel,
-         rate_lang, prof_langs, li_user, li_pw],
+         rate_lang, li_user, li_pw],
     )
 
-    def do_signup(username, email, password, lang_ids, code):
+    def do_signup(username, email, password, lang_id, code):
         role = "admin" if (code and code == ADMIN_CODE) else "reviewer"
+        lang_ids = [lang_id] if lang_id else []
         try:
-            create_user(username, email, password, role=role, language_ids=lang_ids or [])
+            create_user(username, email, password, role=role, language_ids=lang_ids)
         except ValueError as e:
             # keep fields so the user can fix the problem
             return (f"❌ {e}", gr.update(), gr.update(), gr.update(), gr.update(), gr.update())
         note = " (admin account)" if role == "admin" else ""
         return ("✅ Account created" + note + ". Switch to the **Sign in** tab to continue.",
                 gr.update(value=""), gr.update(value=""), gr.update(value=""),
-                gr.update(value=[]), gr.update(value=""))
-    su_btn.click(do_signup, [su_user, su_email, su_pw, su_langs, su_code],
-                 [su_msg, su_user, su_email, su_pw, su_langs, su_code])
+                gr.update(value=None), gr.update(value=""))
+    su_btn.click(do_signup, [su_user, su_email, su_pw, su_lang, su_code],
+                 [su_msg, su_user, su_email, su_pw, su_lang, su_code])
 
     def do_logout():
         return (gr.update(visible=True), gr.update(visible=False), None, "")
@@ -715,23 +710,13 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
         return f"Progress for **{sess['username']}**:", rows
     refresh_prog_btn.click(load_progress, [session], [progress_md, progress_tbl])
 
-    # ---- Profile ----
-    def save_profile(sess, lang_ids):
-        if not sess:
-            return "❌ Not signed in.", sess, gr.update()
-        set_user_languages(sess["id"], lang_ids or [])
-        new_sess = user_session(sess["id"])
-        rl = reviewer_lang_choices(new_sess)
-        return "✅ Languages updated.", new_sess, gr.update(choices=rl, value=None)
-    prof_save.click(save_profile, [session, prof_langs], [prof_msg, session, rate_lang])
-
     # ---- Admin: languages ----
     def _languages_table():
         return [[l["id"], l["code"], l["name"]] for l in list_languages()]
 
     def _lang_dropdown_updates():
         ch = lang_choices()
-        return (gr.update(choices=ch), gr.update(choices=ch), gr.update(choices=ch), gr.update(choices=ch))
+        return (gr.update(choices=ch), gr.update(choices=ch), gr.update(choices=ch))
 
     def admin_add_language(sess, code, name):
         if not sess or sess["role"] != "admin":
@@ -743,7 +728,7 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
         return (f"✅ Added {name} ({code}).", _languages_table(), *_lang_dropdown_updates())
     al_btn.click(
         admin_add_language, [session, al_code, al_name],
-        [al_msg, langs_tbl, up_lang, res_lang, su_langs, prof_langs],
+        [al_msg, langs_tbl, up_lang, res_lang, su_lang],
     )
 
     # ---- Admin: samples ----
@@ -751,13 +736,17 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
         return [[s["id"], f"{s['language_name']} ({s['language_code']})", s["sample_name"],
                  s["model_name"], "yes" if s["is_reference"] else "no"] for s in list_samples()]
 
+    def _sample_delete_choices():
+        return [(f"#{s['id']} — {s['sample_name']}  ({s['model_name']}, {s['language_code']})", s["id"])
+                for s in list_samples()]
+
     def admin_upload(sess, language_id, files, model, is_ref, transcript):
         if not sess or sess["role"] != "admin":
-            return "❌ Admin only.", _samples_table()
+            return "❌ Admin only.", _samples_table(), gr.update()
         if not language_id:
-            return "❌ Choose a language first.", _samples_table()
+            return "❌ Choose a language first.", _samples_table(), gr.update()
         if not files:
-            return "❌ No files selected.", _samples_table()
+            return "❌ No files selected.", _samples_table(), gr.update()
         count = 0
         for f in files:
             path = f if isinstance(f, str) else getattr(f, "name", None)
@@ -765,19 +754,23 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
                 add_sample(language_id, path, model_name=model, is_reference=is_ref, transcript=transcript)
                 count += 1
             except Exception as e:  # noqa
-                return f"❌ Error on a file: {e}", _samples_table()
-        return f"✅ Uploaded {count} sample(s).", _samples_table()
+                return (f"❌ Error on a file: {e}", _samples_table(),
+                        gr.update(choices=_sample_delete_choices()))
+        return (f"✅ Uploaded {count} sample(s).", _samples_table(),
+                gr.update(choices=_sample_delete_choices(), value=None))
     up_btn.click(admin_upload, [session, up_lang, up_files, up_model, up_isref, up_transcript],
-                 [up_msg, samples_tbl])
+                 [up_msg, samples_tbl, del_sample])
 
     def admin_delete_sample(sess, sid):
         if not sess or sess["role"] != "admin":
-            return "❌ Admin only.", _samples_table()
+            return "❌ Admin only.", _samples_table(), gr.update()
         if not sid:
-            return "❌ Enter a sample id.", _samples_table()
+            return ("❌ Select a sample to delete.", _samples_table(),
+                    gr.update(choices=_sample_delete_choices()))
         delete_sample(int(sid))
-        return f"✅ Deleted sample {int(sid)}.", _samples_table()
-    del_btn.click(admin_delete_sample, [session, del_sample_id], [up_msg, samples_tbl])
+        return (f"✅ Deleted sample #{int(sid)} (and any ratings it had).", _samples_table(),
+                gr.update(choices=_sample_delete_choices(), value=None))
+    del_btn.click(admin_delete_sample, [session, del_sample], [up_msg, samples_tbl, del_sample])
 
     # ---- Admin: users ----
     def _users_table():
@@ -823,17 +816,18 @@ with gr.Blocks(title="Plotweaver AI — TTS MOS Evaluation",
         return export_results(language_id)
     export_btn.click(admin_export, [session, res_lang], [res_file])
 
-    # Populate admin tables right after an admin logs in.
-    li_btn.click(lambda s: (_languages_table(), _samples_table(), _users_table())
-                 if s and s["role"] == "admin" else ([], [], []),
-                 [session], [langs_tbl, samples_tbl, users_tbl])
+    # Populate admin tables + delete picker right after an admin logs in.
+    li_btn.click(lambda s: (_languages_table(), _samples_table(), _users_table(),
+                            gr.update(choices=_sample_delete_choices()))
+                 if s and s["role"] == "admin" else ([], [], [], gr.update(choices=[])),
+                 [session], [langs_tbl, samples_tbl, users_tbl, del_sample])
 
     # Refresh language-dependent choices on every page load, so newly added
     # languages appear in the signup form (and admin dropdowns) without a restart.
     def refresh_lang_choices():
         ch = lang_choices()
         return (gr.update(choices=ch), gr.update(choices=ch), gr.update(choices=ch))
-    demo.load(refresh_lang_choices, None, [su_langs, up_lang, res_lang])
+    demo.load(refresh_lang_choices, None, [su_lang, up_lang, res_lang])
 
 
 if __name__ == "__main__":