Bug fix about authentication

app.py

@@ -66,6 +66,24 @@ def _require_user(request: gr.Request | None) -> str:
     return get_current_user(request)
 
 
+def _resolve_username(
+    profile: gr.OAuthProfile | None,
+    request: gr.Request | None,
+    current_username: str | None = None,
+) -> str:
+    """Resolve the authenticated username from OAuth profile, request, or stored state."""
+
+    if profile is not None:
+        username: str | None = getattr(profile, "username", None)
+        if isinstance(username, str) and username.strip():
+            return username.strip()
+
+    if current_username is not None and current_username.strip():
+        return current_username.strip()
+
+    return _require_user(request)
+
+
 def _notebook_choices(notebooks: list[NotebookRecord]) -> list[tuple[str, str]]:
     """Map notebook records into dropdown choices."""
 
@@ -116,30 +134,36 @@ def _refresh_notebook_state(
     return _render_login_status(username), gr.Dropdown(choices=choices, value=value)
 
 
-def load_session(request: gr.Request) -> tuple[str, gr.Dropdown, list[tuple[str, str]], gr.Dropdown]:
+def load_session(
+    profile: gr.OAuthProfile | None,
+    request: gr.Request,
+) -> tuple[str, gr.Dropdown, list[tuple[str, str]], gr.Dropdown, str]:
     """Initialize login status and notebook selector when the UI loads."""
 
     try:
-        username: str = _require_user(request)
+        username: str = _resolve_username(profile, request)
         login_status, notebook_dropdown = _refresh_notebook_state(username)
     except NotAuthenticatedError:
         login_status = _render_logged_out_status()
         notebook_dropdown = gr.Dropdown(choices=[], value=None)
+        username = ""
     empty_chat: list[tuple[str, str]] = []
     artifact_dropdown = gr.Dropdown(choices=[], value=None)
-    return login_status, notebook_dropdown, empty_chat, artifact_dropdown
+    return login_status, notebook_dropdown, empty_chat, artifact_dropdown, username
 
 
 def create_notebook_ui(
     notebook_name: str,
+    current_username: str,
+    profile: gr.OAuthProfile | None,
     request: gr.Request,
-) -> tuple[str, gr.Dropdown, str]:
+) -> tuple[str, gr.Dropdown, str, str]:
     """Create a notebook and refresh the selector."""
 
-    username: str = _require_user(request)
+    username: str = _resolve_username(profile, request, current_username)
     notebook: NotebookRecord = create_notebook(username, notebook_name)
     login_status, dropdown = _refresh_notebook_state(username, notebook["id"])
-    return login_status, dropdown, ""
+    return login_status, dropdown, "", username
 
 
 def on_notebook_change(_notebook_id: str | None) -> tuple[list[tuple[str, str]], gr.Dropdown, str]:
@@ -199,11 +223,13 @@ def _ingest_text(
 def ingest_upload_ui(
     notebook_id: str | None,
     file_path: str | None,
+    current_username: str,
+    profile: gr.OAuthProfile | None,
     request: gr.Request,
 ) -> str:
     """Ingest an uploaded local file through the backend ingestion APIs."""
 
-    username: str = _require_user(request)
+    username: str = _resolve_username(profile, request, current_username)
     if not notebook_id:
         raise gr.Error("Select a notebook before uploading a source.")
     if not file_path:
@@ -222,11 +248,13 @@ def ingest_upload_ui(
 def ingest_url_ui(
     notebook_id: str | None,
     url: str,
+    current_username: str,
+    profile: gr.OAuthProfile | None,
     request: gr.Request,
 ) -> str:
     """Ingest a URL source through the backend ingestion APIs."""
 
-    username: str = _require_user(request)
+    username: str = _resolve_username(profile, request, current_username)
     if not notebook_id:
         raise gr.Error("Select a notebook before ingesting a URL.")
     if not url or not url.strip():
@@ -246,11 +274,13 @@ def send_chat_ui(
     notebook_id: str | None,
     question: str,
     history: list[tuple[str, str]] | None,
+    current_username: str,
+    profile: gr.OAuthProfile | None,
     request: gr.Request,
 ) -> tuple[list[tuple[str, str]], str]:
     """Send one chat question and append the grounded answer to the chat history."""
 
-    username: str = _require_user(request)
+    username: str = _resolve_username(profile, request, current_username)
     if not notebook_id:
         raise gr.Error("Select a notebook before asking a question.")
     if not question or not question.strip():
@@ -279,11 +309,13 @@ def _append_artifact_path(current_paths: list[str] | None, artifact: ArtifactRef
 def generate_report_ui(
     notebook_id: str | None,
     artifact_paths: list[str] | None,
+    current_username: str,
+    profile: gr.OAuthProfile | None,
     request: gr.Request,
 ) -> tuple[list[str], gr.Dropdown]:
     """Generate a report artifact and update the download list."""
 
-    username: str = _require_user(request)
+    username: str = _resolve_username(profile, request, current_username)
     if not notebook_id:
         raise gr.Error("Select a notebook before generating a report.")
     artifact = generate_report(username, notebook_id)
@@ -293,11 +325,13 @@ def generate_report_ui(
 def generate_quiz_ui(
     notebook_id: str | None,
     artifact_paths: list[str] | None,
+    current_username: str,
+    profile: gr.OAuthProfile | None,
     request: gr.Request,
 ) -> tuple[list[str], gr.Dropdown]:
     """Generate a quiz artifact and update the download list."""
 
-    username: str = _require_user(request)
+    username: str = _resolve_username(profile, request, current_username)
     if not notebook_id:
         raise gr.Error("Select a notebook before generating a quiz.")
     artifact = generate_quiz(username, notebook_id)
@@ -307,11 +341,13 @@ def generate_quiz_ui(
 def generate_podcast_ui(
     notebook_id: str | None,
     artifact_paths: list[str] | None,
+    current_username: str,
+    profile: gr.OAuthProfile | None,
     request: gr.Request,
 ) -> tuple[list[str], gr.Dropdown]:
     """Generate a podcast transcript artifact and update the download list."""
 
-    username: str = _require_user(request)
+    username: str = _resolve_username(profile, request, current_username)
     if not notebook_id:
         raise gr.Error("Select a notebook before generating a transcript.")
     artifact = generate_podcast_transcript(username, notebook_id)
@@ -326,10 +362,15 @@ def select_artifact_download(artifact_path: str | None) -> Path | None:
     return Path(artifact_path)
 
 
-def export_notebook_ui(notebook_id: str | None, request: gr.Request) -> Path:
+def export_notebook_ui(
+    notebook_id: str | None,
+    current_username: str,
+    profile: gr.OAuthProfile | None,
+    request: gr.Request,
+) -> Path:
     """Export the selected notebook as a zip archive."""
 
-    username: str = _require_user(request)
+    username: str = _resolve_username(profile, request, current_username)
     if not notebook_id:
         raise gr.Error("Select a notebook before exporting.")
     return export_notebook_zip(username, notebook_id)
@@ -337,6 +378,7 @@ def export_notebook_ui(notebook_id: str | None, request: gr.Request) -> Path:
 
 with gr.Blocks(title="NotebookLM Clone") as demo:
     artifact_paths_state = gr.State(value=[])
+    username_state = gr.State(value="")
 
     gr.Markdown("# NotebookLM Clone")
     with gr.Row():
@@ -389,13 +431,13 @@ with gr.Blocks(title="NotebookLM Clone") as demo:
     demo.load(
         load_session,
         inputs=None,
-        outputs=[login_status, notebook_dropdown, chat_history, artifact_dropdown],
+        outputs=[login_status, notebook_dropdown, chat_history, artifact_dropdown, username_state],
     )
 
     create_notebook_button.click(
         create_notebook_ui,
-        inputs=[new_notebook_name],
-        outputs=[login_status, notebook_dropdown, new_notebook_name],
+        inputs=[new_notebook_name, username_state],
+        outputs=[login_status, notebook_dropdown, new_notebook_name, username_state],
     )
 
     notebook_dropdown.change(
@@ -410,37 +452,37 @@ with gr.Blocks(title="NotebookLM Clone") as demo:
 
     upload_button.click(
         ingest_upload_ui,
-        inputs=[notebook_dropdown, file_input],
+        inputs=[notebook_dropdown, file_input, username_state],
         outputs=[ingest_status],
     )
 
     url_button.click(
         ingest_url_ui,
-        inputs=[notebook_dropdown, url_input],
+        inputs=[notebook_dropdown, url_input, username_state],
         outputs=[ingest_status],
     )
 
     ask_button.click(
         send_chat_ui,
-        inputs=[notebook_dropdown, question_input, chat_history],
+        inputs=[notebook_dropdown, question_input, chat_history, username_state],
         outputs=[chat_history, question_input],
     )
 
     report_button.click(
         generate_report_ui,
-        inputs=[notebook_dropdown, artifact_paths_state],
+        inputs=[notebook_dropdown, artifact_paths_state, username_state],
         outputs=[artifact_paths_state, artifact_dropdown],
     )
 
     quiz_button.click(
         generate_quiz_ui,
-        inputs=[notebook_dropdown, artifact_paths_state],
+        inputs=[notebook_dropdown, artifact_paths_state, username_state],
         outputs=[artifact_paths_state, artifact_dropdown],
     )
 
     podcast_button.click(
         generate_podcast_ui,
-        inputs=[notebook_dropdown, artifact_paths_state],
+        inputs=[notebook_dropdown, artifact_paths_state, username_state],
         outputs=[artifact_paths_state, artifact_dropdown],
     )
 
@@ -452,7 +494,7 @@ with gr.Blocks(title="NotebookLM Clone") as demo:
 
     export_button.click(
         export_notebook_ui,
-        inputs=[notebook_dropdown],
+        inputs=[notebook_dropdown, username_state],
         outputs=[export_download],
     )