Update app.py

app.py

@@ -13,6 +13,7 @@ from datetime import datetime
 from typing import Optional
 
 import gradio as gr
+from huggingface_hub import whoami as _hf_whoami
 
 # Import our CBT knowledge base
 from cbt_knowledge import (
@@ -29,7 +30,8 @@ try:
     from agents import CBTAgent
 
     AGENT_AVAILABLE = True
-except Exception:
+except Exception as e:
+    print(f"Error importing CBTAgent: {e}")
     CBTAgent = None  # type: ignore
     AGENT_AVAILABLE = False
 
@@ -44,7 +46,7 @@ def load_translations():
                 translations[lang] = json.load(f)
         except FileNotFoundError:
             # Fallback to embedded translations if files don't exist
-            pass
+            print(f"Error loading translations for {lang}: FileNotFoundError")
 
     # Fallback translations
     if 'en' not in translations:
@@ -185,7 +187,7 @@ class CBTChatbot:
         message: str,
         history: list[list[str]],
         use_agent: bool = False,
-        agent: Optional["CBTAgent"] = None,
+        agent: Optional[CBTAgent] = None,
     ) -> tuple[list[list[str]], str, str, str]:
         """
         Process user message and generate response with CBT analysis
@@ -332,6 +334,55 @@ def create_app(language='en'):
                         distortions_output = gr.Markdown(label="Patterns Detected")
                         reframe_output = gr.Markdown(label="Reframe Suggestion")
                         situations_output = gr.Markdown(label="Similar Situations")
+                        # Owner-only Admin controls (gated at load)
+                        admin_accordion = gr.Accordion(
+                            "Owner Controls", open=False, visible=False
+                        )
+                        with admin_accordion:
+                            # Locked message for non-owners (kept hidden unless needed)
+                            chat_locked_panel = gr.Markdown(
+                                "### Owner only\nPlease log in with your Hugging Face account.",
+                                visible=False,
+                            )
+                            chat_admin_panel = gr.Column(visible=False)
+                            with chat_admin_panel:
+                                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)"
+                                    )
+                                    set_override_btn = gr.Button(
+                                        "Set Limit Override", variant="secondary"
+                                    )
+                                    refresh_btn = gr.Button(
+                                        "Refresh Metrics", variant="secondary"
+                                    )
+                                gr.Markdown("### Debug")
+                                owner_identity_md = gr.Markdown("")
+                                with gr.Row():
+                                    identity_btn = gr.Button(
+                                        "Refresh Identity", variant="secondary"
+                                    )
+                                    storage_btn = gr.Button(
+                                        "Check /data", variant="secondary"
+                                    )
+                                storage_info_md = gr.Markdown("")
 
                 # Internal state for agent instance, selected model, and agentic enable flag
                 agent_state = gr.State(value=None)
@@ -510,7 +561,8 @@ def create_app(language='en'):
                                             username = prof[key]
                                         if username:
                                             break
-                                    except Exception:
+                                    except Exception as e:
+                                        print(f"Error getting username from profile: {e}")
                                         pass
                                 raw = f"oauth:{username or 'unknown'}"
                             # req is expected to be provided by Gradio
@@ -526,17 +578,12 @@ def create_app(language='en'):
                                 sess = getattr(req, "session_hash", None) or "?"
                                 raw = f"ipua:{ip}|{ua}|{sess}"
                             return hashlib.sha256(f"{salt}|{raw}".encode()).hexdigest()
-                        except Exception:
+                        except Exception as e:
+                            print(f"Error getting user id: {e}")
                             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)
+                    # Helper functions for tracking per-user interactions
                     def _interactions_today(uid: str) -> int:
                         data = _load_call_log()
                         day = _today_key()
@@ -547,15 +594,13 @@ def create_app(language='en'):
                             else {}
                         )
                         val = inter.get(uid, 0)
-                        # Validar tipo antes de convertir
                         if isinstance(val, (str, int, float)):
                             try:
                                 return int(val)
-                            except Exception:
+                            except Exception as e:
+                                print(f"Error getting interactions today: {e}")
                                 return 0
-                        else:
-                            return 0
-
+                        return 0
 
                     def _inc_interactions_today(uid: str):
                         data = _load_call_log()
@@ -571,6 +616,14 @@ def create_app(language='en'):
                         data[day] = day_blob
                         _save_call_log(data)
 
+                    # Determine how many interactions the user has already had today
+                    try:
+                        interactions_before = _interactions_today(user_id)
+                    except Exception as e:
+                        print(f"Error getting interactions today: {e}")
+                        interactions_before = 0
+
+                    # Per-user interaction quota (counts 1 per message)
                     max_interactions_env = os.getenv("HF_AGENT_MAX_INTERACTIONS_PER_USER")
                     try:
                         # Default to a generous 12 if not configured
@@ -826,10 +879,10 @@ def create_app(language='en'):
                         billing_notice,
                         agentic_enabled_state,
                     ],
-                ).then(clear_input, outputs=[msg_input])
+                ).then(fn=clear_input, outputs=[msg_input])
 
                 send_btn.click(
-                    respond_stream,
+                    fn=respond_stream,
                     inputs=[
                         msg_input,
                         chatbot_ui,
@@ -854,7 +907,7 @@ def create_app(language='en'):
                     return h, d, r, s, ""
 
                 clear_btn.click(
-                    _clear_session_and_notice,
+                    fn=_clear_session_and_notice,
                     outputs=[
                         chatbot_ui,
                         distortions_output,
@@ -868,50 +921,10 @@ def create_app(language='en'):
             with gr.Tab(t['learn']['title']):
                 create_learn_tab(t['learn'], COGNITIVE_DISTORTIONS)
 
-            # 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:
-                    gr.Markdown("### Owner only\nPlease log in with your Hugging Face account.")
-
-                # Admin panel
-                admin_panel = gr.Column(visible=False)
-                with admin_panel:
-                    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)"
-                        )
-                        set_override_btn = gr.Button("Set Limit Override", variant="secondary")
-                        refresh_btn = gr.Button("Refresh Metrics", variant="secondary")
-
-                    gr.Markdown("### Debug")
-                    owner_identity_md = gr.Markdown("")
-                    with gr.Row():
-                        identity_btn = gr.Button("Refresh Identity", variant="secondary")
-                        storage_btn = gr.Button("Check /data", variant="secondary")
-                    storage_info_md = gr.Markdown("")
-
-                def _owner_is(profile: "gr.OAuthProfile | None") -> bool:
+                def _owner_is(profile: gr.OAuthProfile | None, request: gr.Request | None = None) -> bool:
                     try:
-                        # Prefer explicit OWNER_USER, fallback to the Space author (useful if OWNER_USER not set)
+                        # 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")
@@ -919,7 +932,7 @@ def create_app(language='en'):
                         ).strip().lower()
                         if not owner:
                             return False
-                        # Try common profile fields
+                        # Try common OAuth profile fields
                         username = None
                         for key in ("preferred_username", "username", "login", "name", "sub", "id"):
                             try:
@@ -929,12 +942,21 @@ def create_app(language='en'):
                                     username = profile[key]
                                 if username:
                                     break
-                            except Exception:
+                            except Exception as e:
+                                print(f"Error getting username from profile: {e}")
                                 pass
+                        # Fallback to request.username provided by Gradio when OAuth is enabled
+                        if not username and request is not None:
+                            try:
+                                username = getattr(request, "username", None)
+                            except Exception as e:
+                                print(f"Error getting username from request: {e}")
+                                username = None
                         if not username:
                             return False
                         return str(username).lower() == owner
-                    except Exception:
+                    except Exception as e:
+                        print(f"Error checking owner: {e}")
                         return False
 
                 def _metrics_paths():
@@ -1007,18 +1029,6 @@ def create_app(language='en'):
                         f"{override if override else 'None'})"
                     )
 
-                def show_admin(profile: "gr.OAuthProfile | None"):
-                    visible = _owner_is(profile)
-                    return (
-                        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
-                        else "",
-                    )
-
                 def admin_set_limit(override_text: str, settings: dict | None):
                     # Only update runtime state; does not change env var
                     try:
@@ -1030,14 +1040,15 @@ def create_app(language='en'):
                             if override <= 0:
                                 override = None
                         settings["per_user_limit_override"] = override
-                    except Exception:
+                    except Exception as e:
+                        print(f"Error setting limit override: {e}")
                         settings = {"per_user_limit_override": None}
                     return settings, _limit_info_md(settings)
 
                 def admin_refresh():
                     return _summarize_metrics_md()
 
-                def _profile_username(profile: gr.OAuthProfile | None) -> str:
+                def _profile_username(profile: gr.OAuthProfile | None, request: gr.Request | None = None) -> str:
                     try:
                         for key in ("preferred_username", "username", "login", "name", "sub", "id"):
                             if hasattr(profile, key):
@@ -1046,22 +1057,29 @@ def create_app(language='en'):
                                     return str(v)
                             elif isinstance(profile, dict) and key in profile and profile[key]:
                                 return str(profile[key])
-                    except Exception:
+                    except Exception as e:
+                        print(f"Error getting username from profile: {e}")
+                        pass
+                    try:
+                        if request is not None and getattr(request, "username", None):
+                            return str(request.username)
+                    except Exception as e:
+                        print(f"Error getting username from request: {e}")
                         pass
                     return "unknown"
 
-                def identity_refresh(profile: gr.OAuthProfile | None):
-                    viewer = _profile_username(profile)
-                    visible = _owner_is(profile)
+                def identity_refresh(profile: gr.OAuthProfile | None, request: gr.Request | None = None):
+                    viewer = _profile_username(profile, request)
+                    visible = _owner_is(profile, request)
                     token_info = ""
-                    try:
-                        from huggingface_hub import whoami as _hf_whoami  # local import
+                    try:  # local import
                         info = _hf_whoami()
                         uname = info.get("name") or info.get("fullname") or "?"
                         ttype = info.get("type", "?")
                         orgs = ", ".join([o.get("name", "?") for o in info.get("orgs", [])])
                         token_info = f"Token user: `{uname}` (type: {ttype}); orgs: [{orgs}]"
                     except Exception as e:
+                        print(f"Error getting token info whoami: {e}")
                         token_info = f"Token whoami failed: {e}"
                     return (
                         f"Logged in as (OAuth): `{viewer}`\n\n"
@@ -1095,22 +1113,22 @@ def create_app(language='en'):
                         return f"/data check failed: {e}"
 
                 # Wire admin interactions
-                model_dropdown.change(lambda v: v, inputs=[model_dropdown], outputs=[model_state])
+                model_dropdown.change(fn=lambda v: v, inputs=[model_dropdown], outputs=[model_state])
                 set_override_btn.click(
-                    admin_set_limit,
+                    fn=admin_set_limit,
                     inputs=[override_tb, admin_state],
                     outputs=[admin_state, admin_limit_info],
                 )
-                refresh_btn.click(admin_refresh, outputs=[admin_summary])
-                identity_btn.click(identity_refresh, outputs=[owner_identity_md])
-                storage_btn.click(storage_check, outputs=[storage_info_md])
+                refresh_btn.click(fn=admin_refresh, outputs=[admin_summary])
+                identity_btn.click(fn=identity_refresh, outputs=[owner_identity_md])
+                storage_btn.click(fn=storage_check, outputs=[storage_info_md])
 
-    # Gate Owner tab & admin panel visibility on load (OAuth)
+    # Gate admin panel visibility on load (OAuth)
     try:
         # Also populate identity + storage placeholders
-        def _load(profile: "gr.OAuthProfile | None"):
-            visible = _owner_is(profile)
-            ident = identity_refresh(profile) if visible else ""
+        def _load(profile: gr.OAuthProfile | None, request: gr.Request | None = None):
+            visible = _owner_is(profile, request)
+            ident = identity_refresh(profile, request) if visible else ""
             return (
                 gr.update(visible=visible),
                 gr.update(visible=visible),
@@ -1125,9 +1143,11 @@ def create_app(language='en'):
 
         app.load(
             _load,
-            outputs=[owner_tab, admin_panel, locked_panel, admin_summary, admin_limit_info, owner_identity_md, storage_info_md],
+            outputs=[admin_accordion, chat_admin_panel, chat_locked_panel, admin_summary,
+                     admin_limit_info, owner_identity_md, storage_info_md],
         )
-    except Exception:
+    except Exception as e:
+        print(f"Error loading app: {e}")
         # If OAuth not available, keep admin hidden
         pass