fix: simplify login flow & paper list UI

libs/ktem/ktem/pages/chat/__init__.py

@@ -271,76 +271,72 @@ def on_building_ui(self):
                     self.hint_page = HintPage(self._app)
 
             with gr.Column(scale=6, elem_id="chat-area"):
+                self.chat_panel = ChatPanel(self._app)
+
                 if KH_DEMO_MODE:
                     self.paper_list = PaperListPage(self._app)
 
-                self.chat_panel = ChatPanel(self._app)
-
-                with gr.Row():
-                    with gr.Accordion(
-                        label="Chat settings",
-                        elem_id="chat-settings-expand",
-                        open=False,
-                    ):
-                        with gr.Row(elem_id="quick-setting-labels"):
-                            gr.HTML("Reasoning method")
-                            gr.HTML("Model", visible=not KH_DEMO_MODE)
-                            gr.HTML("Language")
-
-                        with gr.Row():
-                            reasoning_setting = (
-                                self._app.default_settings.reasoning.settings["use"]
-                            )
-                            model_setting = (
-                                self._app.default_settings.reasoning.options[
-                                    "simple"
-                                ].settings["llm"]
-                            )
-                            language_setting = (
-                                self._app.default_settings.reasoning.settings["lang"]
-                            )
-                            citation_setting = (
-                                self._app.default_settings.reasoning.options[
-                                    "simple"
-                                ].settings["highlight_citation"]
-                            )
+                with gr.Accordion(
+                    label="Chat settings",
+                    elem_id="chat-settings-expand",
+                    open=False,
+                    visible=not KH_DEMO_MODE,
+                ) as self.chat_settings:
+                    with gr.Row(elem_id="quick-setting-labels"):
+                        gr.HTML("Reasoning method")
+                        gr.HTML("Model", visible=not KH_DEMO_MODE)
+                        gr.HTML("Language")
+
+                    with gr.Row():
+                        reasoning_setting = (
+                            self._app.default_settings.reasoning.settings["use"]
+                        )
+                        model_setting = self._app.default_settings.reasoning.options[
+                            "simple"
+                        ].settings["llm"]
+                        language_setting = (
+                            self._app.default_settings.reasoning.settings["lang"]
+                        )
+                        citation_setting = self._app.default_settings.reasoning.options[
+                            "simple"
+                        ].settings["highlight_citation"]
 
-                            self.reasoning_type = gr.Dropdown(
-                                choices=reasoning_setting.choices[:REASONING_LIMITS],
-                                value=reasoning_setting.value,
-                                container=False,
-                                show_label=False,
-                            )
-                            self.model_type = gr.Dropdown(
-                                choices=model_setting.choices,
-                                value=model_setting.value,
-                                container=False,
-                                show_label=False,
-                                visible=not KH_DEMO_MODE,
-                            )
-                            self.language = gr.Dropdown(
-                                choices=language_setting.choices,
-                                value=language_setting.value,
-                                container=False,
-                                show_label=False,
-                            )
+                        self.reasoning_type = gr.Dropdown(
+                            choices=reasoning_setting.choices[:REASONING_LIMITS],
+                            value=reasoning_setting.value,
+                            container=False,
+                            show_label=False,
+                        )
+                        self.model_type = gr.Dropdown(
+                            choices=model_setting.choices,
+                            value=model_setting.value,
+                            container=False,
+                            show_label=False,
+                            visible=not KH_DEMO_MODE,
+                        )
+                        self.language = gr.Dropdown(
+                            choices=language_setting.choices,
+                            value=language_setting.value,
+                            container=False,
+                            show_label=False,
+                        )
 
-                            self.citation = gr.Dropdown(
-                                choices=citation_setting.choices,
-                                value=citation_setting.value,
-                                container=False,
-                                show_label=False,
-                                interactive=True,
-                                elem_id="citation-dropdown",
-                            )
+                        self.citation = gr.Dropdown(
+                            choices=citation_setting.choices,
+                            value=citation_setting.value,
+                            container=False,
+                            show_label=False,
+                            interactive=True,
+                            elem_id="citation-dropdown",
+                        )
 
-                            self.use_mindmap = gr.State(value=True)
-                            self.use_mindmap_check = gr.Checkbox(
-                                label="Mindmap (on)",
-                                container=False,
-                                elem_id="use-mindmap-checkbox",
-                                value=True,
-                            )
+                        self.use_mindmap = gr.State(value=True)
+                        self.use_mindmap_check = gr.Checkbox(
+                            label="Mindmap (on)",
+                            container=False,
+                            elem_id="use-mindmap-checkbox",
+                            value=True,
+                        )
 
             with gr.Column(
                 scale=INFO_PANEL_SCALES[False], elem_id="chat-info-panel"
@@ -523,8 +519,8 @@ def on_register_events(self):
                 ]
                 + self._indices_input,
             ).then(
-                lambda: gr.update(visible=False),
-                outputs=[self.paper_list.accordion],
+                lambda: (gr.update(visible=False), gr.update(visible=True)),
+                outputs=[self.paper_list.accordion, self.chat_settings],
             ).then(
                 fn=None,
                 inputs=None,
@@ -678,8 +674,8 @@ def on_register_events(self):
 
         if KH_DEMO_MODE:
             onConvSelect = onConvSelect.then(
-                lambda: gr.update(visible=False),
-                outputs=[self.paper_list.accordion],
+                lambda: (gr.update(visible=False), gr.update(visible=True)),
+                outputs=[self.paper_list.accordion, self.chat_settings],
             )
 
         onConvSelect = (
@@ -804,8 +800,8 @@ def raise_error_on_state(state):
                 outputs=[self.quick_urls],
                 show_progress="hidden",
             ).then(
-                lambda: gr.update(visible=False),
-                outputs=[self.paper_list.accordion],
+                lambda: (gr.update(visible=False), gr.update(visible=True)),
+                outputs=[self.paper_list.accordion, self.chat_settings],
             ).then(
                 fn=None,
                 inputs=None,

libs/ktem/ktem/pages/chat/control.py

@@ -159,12 +159,19 @@ def on_building_ui(self):
             with gr.Row():
                 self.btn_demo_login = gr.Button(
                     "Sign-in to create new chat",
-                    link="/login-app/",
                     min_width=120,
                     size="sm",
                     scale=1,
                     variant="primary",
                 )
+                _js_redirect = """
+                () => {
+                    url = '/login' + window.location.search;
+                    window.open(url, '_blank');
+                }
+                """
+                self.btn_demo_login.click(None, js=_js_redirect)
+
                 self.btn_demo_logout = gr.Button(
                     "Sign-out",
                     min_width=120,

sso_app_demo.py

@@ -5,7 +5,6 @@
 from decouple import config
 from fastapi import FastAPI, Request
 from fastapi.responses import FileResponse
-from ktem.assets import KotaemonTheme
 from starlette.config import Config
 from starlette.middleware.sessions import SessionMiddleware
 from starlette.responses import RedirectResponse
@@ -25,30 +24,6 @@
 SECRET_KEY = config("SECRET_KEY", default="default-secret-key")
 
 
-save_api_key_js = """
-function(api_key) {
-    setStorage('google_api_key', api_key);
-    window.location.href = "/app";
-}
-"""
-
-global_js = """
-function () {
-  // store info in local storage
-  globalThis.setStorage = (key, value) => {
-      localStorage.setItem(key, value)
-  }
-  globalThis.getStorage = (key, value) => {
-    item = localStorage.getItem(key);
-    return item ? item : value;
-  }
-  globalThis.removeFromStorage = (key) => {
-      localStorage.removeItem(key)
-  }
-}
-"""
-
-
 def add_session_middleware(app):
     config_data = {
         "GOOGLE_CLIENT_ID": GOOGLE_CLIENT_ID,
@@ -98,11 +73,6 @@ async def logout(request: Request):
 async def login(request: Request):
     root_url = gr.route_utils.get_root_url(request, "/login", None)
     redirect_uri = f"{root_url}/auth"
-    # If your app is running on https, you should ensure that the
-    # `redirect_uri` is https, e.g. uncomment the following lines:
-    #
-    # from urllib.parse import urlparse, urlunparse
-    # redirect_uri = urlunparse(urlparse(str(redirect_uri))._replace(scheme='https'))
     return await oauth.google.authorize_redirect(request, redirect_uri)
 
 
@@ -116,39 +86,6 @@ async def auth(request: Request):
     return RedirectResponse(url="/")
 
 
-with gr.Blocks(
-    theme=KotaemonTheme(),
-    css=gradio_app._css,
-    js=global_js,
-) as login_demo:
-    with gr.Column(elem_id="login-row"):
-        gr.Markdown("<h1 style='text-align:center;'>Welcome to Kotaemon</h1>")
-        gr.Button(
-            "Login with Google",
-            link="/login",
-            variant="primary",
-            elem_id="google-login",
-        )
-        # with gr.Accordion(
-        #     "Or use your own Gemini API key",
-        #     elem_id="user-api-key-wrapper",
-        #     open=False,
-        # ):
-        #     api_key_input = gr.Textbox(
-        #         placeholder="API Key",
-        #         label="Enter your Gemini API key",
-        #     )
-        #     api_key_save_btn = gr.Button(
-        #         "Save",
-        #     )
-
-    # api_key_save_btn.click(
-    #     fn=lambda _: True,
-    #     inputs=[api_key_input],
-    #     js=save_api_key_js,
-    # )
-
-app = gr.mount_gradio_app(app, login_demo, path="/login-app")
 app = gr.mount_gradio_app(
     app,
     main_demo,