admin-fixes

app.py

@@ -289,14 +289,6 @@ def create_app(language='en'):
             with gr.Tab(t['chat']['title']):
                 # Settings row (agentic only)
                 with gr.Row():
-                    model_name = gr.Textbox(
-                        label="Model (HF)",
-                        value=os.getenv("MODEL_NAME", "meta-llama/Llama-3.1-8B-Instruct"),
-                        info=(
-                            "Requires HF Inference API token (HF_TOKEN or HUGGINGFACEHUB_API_TOKEN)"
-                        ),
-                    )
-                    gr.Markdown("Agentic mode only. No local fallback. Set `HF_TOKEN` in Secrets.")
                     gr.LoginButton()
                 billing_notice = gr.Markdown("")
 
@@ -318,8 +310,11 @@ def create_app(language='en'):
                         reframe_output = gr.Markdown(label="Reframe Suggestion")
                         situations_output = gr.Markdown(label="Similar Situations")
 
-                # Internal state for agent instance and agentic enable flag
+                # Internal state for agent instance, selected model, and agentic enable flag
                 agent_state = gr.State(value=None)
+                model_state = gr.State(
+                    value=os.getenv("MODEL_NAME", "meta-llama/Llama-3.1-8B-Instruct")
+                )
                 agentic_enabled_state = gr.State(value=True)
                 # Admin runtime settings (e.g., per-user limit override)
                 admin_state = gr.State(value={"per_user_limit_override": None})
@@ -499,6 +494,11 @@ def create_app(language='en'):
                             return "anon"
 
                     user_id = _user_id(request, profile)
+                    interactions_before = 0
+                    try:
+                        interactions_before = _interactions_today(user_id)
+                    except Exception:
+                        interactions_before = 0
 
                     # Per-user interaction quota (counts 1 per message)
                     def _interactions_today(uid: str) -> int:
@@ -544,7 +544,7 @@ def create_app(language='en'):
                             per_user_limit = int(override)
                     except Exception:
                         pass
-                    if per_user_limit is not None and _interactions_today(user_id) >= max(
+                    if per_user_limit is not None and interactions_before >= max(
                         0, per_user_limit
                     ):
                         _inc_metric("blocked_interactions")
@@ -593,6 +593,7 @@ def create_app(language='en'):
                         return
                     # Count one interaction for this user upfront
                     _inc_interactions_today(user_id)
+                    interactions_after = interactions_before + 1
 
                     # Lazily initialize agent if requested
                     _ensure_hf_token_env()
@@ -720,7 +721,7 @@ def create_app(language='en'):
                         remaining = (
                             None
                             if per_user_limit is None
-                            else max(0, per_user_limit - _interactions_today(user_id))
+                            else max(0, per_user_limit - interactions_after)
                         )
                         if remaining is not None:
                             notice = (
@@ -746,7 +747,7 @@ def create_app(language='en'):
                     inputs=[
                         msg_input,
                         chatbot_ui,
-                        model_name,
+                        model_state,
                         agent_state,
                         agentic_enabled_state,
                         admin_state,
@@ -767,7 +768,7 @@ def create_app(language='en'):
                     inputs=[
                         msg_input,
                         chatbot_ui,
-                        model_name,
+                        model_state,
                         agent_state,
                         agentic_enabled_state,
                         admin_state,
@@ -802,8 +803,8 @@ def create_app(language='en'):
             with gr.Tab(t['learn']['title']):
                 create_learn_tab(t['learn'], COGNITIVE_DISTORTIONS)
 
-            # Owner Tab (visible content only for Space owner)
-            with gr.Tab("Owner"):
+            # Owner Tab (hidden unless Space owner is logged in)
+            with gr.Tab("Owner", visible=False) as owner_tab:
                 # Locked panel shown to non-admins
                 locked_panel = gr.Column(visible=True)
                 with locked_panel:
@@ -815,6 +816,20 @@ def create_app(language='en'):
                     gr.Markdown("## Admin Dashboard")
                     admin_summary = gr.Markdown("")
                     admin_limit_info = gr.Markdown("")
+                    # Owner-only model selection
+                    model_dropdown = gr.Dropdown(
+                        label="Model (HF)",
+                        choices=[
+                            "meta-llama/Llama-3.1-8B-Instruct",
+                            "meta-llama/Llama-3.1-70B-Instruct",
+                            "Qwen/Qwen2.5-7B-Instruct",
+                            "mistralai/Mixtral-8x7B-Instruct-v0.1",
+                            "google/gemma-2-9b-it",
+                        ],
+                        value=os.getenv("MODEL_NAME", "meta-llama/Llama-3.1-8B-Instruct"),
+                        allow_custom_value=True,
+                        info="Only visible to owner. Requires HF Inference API token.",
+                    )
                     with gr.Row():
                         override_tb = gr.Textbox(
                             label="Per-user interaction limit override (blank to clear)"
@@ -824,7 +839,12 @@ def create_app(language='en'):
 
                 def _owner_is(profile: "gr.OAuthProfile | None") -> bool:
                     try:
-                        owner = (os.getenv("OWNER_USER") or "").strip().lower()
+                        # Prefer explicit OWNER_USER, fallback to the Space author (useful if OWNER_USER not set)
+                        owner = (
+                            os.getenv("OWNER_USER")
+                            or os.getenv("SPACE_AUTHOR_NAME")
+                            or ""
+                        ).strip().lower()
                         if not owner:
                             return False
                         # Try common profile fields
@@ -918,8 +938,9 @@ def create_app(language='en'):
                 def show_admin(profile: "gr.OAuthProfile | None"):
                     visible = _owner_is(profile)
                     return (
-                        gr.update(visible=visible),
-                        gr.update(visible=not visible),
+                        gr.update(visible=visible),  # owner_tab
+                        gr.update(visible=visible),  # admin_panel
+                        gr.update(visible=not visible),  # locked_panel
                         _summarize_metrics_md() if visible else "",
                         _limit_info_md(admin_state.value if hasattr(admin_state, "value") else None)
                         if visible
@@ -945,6 +966,7 @@ def create_app(language='en'):
                     return _summarize_metrics_md()
 
                 # Wire admin interactions
+                model_dropdown.change(lambda v: v, inputs=[model_dropdown], outputs=[model_state])
                 set_override_btn.click(
                     admin_set_limit,
                     inputs=[override_tb, admin_state],
@@ -952,9 +974,12 @@ def create_app(language='en'):
                 )
                 refresh_btn.click(admin_refresh, outputs=[admin_summary])
 
-    # Gate admin panel visibility on load (OAuth)
+    # Gate Owner tab & admin panel visibility on load (OAuth)
     try:
-        app.load(show_admin, outputs=[admin_panel, locked_panel, admin_summary, admin_limit_info])
+        app.load(
+            show_admin,
+            outputs=[owner_tab, admin_panel, locked_panel, admin_summary, admin_limit_info],
+        )
     except Exception:
         # If OAuth not available, keep admin hidden
         pass