changes

app.py

@@ -1,69 +1,17 @@
-import patch_gradio
-
 import gradio as gr
-import gradio.utils
-
-from auth import attach_oauth
-
-
-if gradio.utils.get_space() is not None:
-    URL, PORT = "https://wauplin-gradio-oauth-test.hf.space", 7860
-else:
-    URL, PORT = "http://localhost:5173", 5173
-
-TEMPLATE = """
-### Name:     {name}
-### Username: {preferred_username}
-### Profile:  {profile}
-### Website:  {website}
-
-![Profile Picture]({picture})
-
-You can manage your connected applications in your [settings](https://huggingface.co/settings/connected-applications).
-"""
-
-
-def show_profile(request: gr.Request) -> str:
-    # request.session in case of websockets (see `def get_request_params`)
-    # request.request.session in case of direct call
-    session = getattr(request, "session", None) or getattr(request.request, "session", None)
-    if session is None:  # should never happen...
-        return "No session attached"
-    if "user" not in session:
-        return "Please login first"
-    return TEMPLATE.format(**session["user"])
+from typing import Optional
 
 
-def js_open(url: str) -> str:
-    # Taken from https://cmgdo.com/external-link-in-gradio-button/
-    return f"function() {{window.open('{url}', '_blank');}}"
+def hello(profile: Optional[gr.OAuthProfile]) -> str:
+    if profile is None:
+        return "I don't know you."
+    return f"Hello {profile.name}"
 
 
 with gr.Blocks() as demo:
-    with gr.Row():
-        login_button = gr.Button("Login")
-        login_button.click(None, None, None, _js=js_open(f"{URL}/login/huggingface"))
-
-        logout_button = gr.Button("Logout")
-        logout_button.click(None, None, None, _js=js_open(f"{URL}/logout"))
-
-    profile_btn = gr.Button("Show profile")
-    output = gr.Markdown()
-    profile_btn.click(fn=show_profile, outputs=output)
-
-
-old_create_app = gradio.networking.App.create_app
-
-
-def patched_create_app(*args, **kwargs):
-    app = old_create_app(*args, **kwargs)
-    attach_oauth(app)
-    return app
-
-
-gradio.networking.App.create_app = patched_create_app
-
-print(URL)
+    gr.LoginButton()
+    gr.LogoutButton()
+    gr.Markdown().attach_load_event(hello, None)
 
-demo.queue()
-demo.launch(server_port=PORT)
+print("http://localhost:5173")
+demo.launch(server_port=5173)

app2.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+import gradio as gr
+import gradio.utils
+
+
+if gradio.utils.get_space() is not None:
+    URL, PORT = "https://wauplin-gradio-oauth-test.hf.space", 7860
+else:
+    URL, PORT = "http://localhost:5173", 5173
+
+TEMPLATE = """
+### Name:     {name}
+### Username: {preferred_username}
+### Profile:  {profile}
+### Website:  {website}
+
+![Profile Picture]({picture})
+
+You can manage your connected applications in your [settings](https://huggingface.co/settings/connected-applications).
+"""
+
+
+def show_profile(profile: gr.OAuthProfile) -> str:
+    # request.session in case of websockets (see `def get_request_params`)
+    # request.request.session in case of direct call
+    return TEMPLATE.format(**profile)
+
+
+with gr.Blocks() as demo:
+    with gr.Row():
+        gr.LoginButton()
+        gr.LogoutButton()
+
+    profile_btn = gr.Button("Show profile")
+    output = gr.Markdown()
+    profile_btn.click(fn=show_profile, outputs=output)
+
+print(URL)
+
+demo.queue()
+demo.launch(server_port=PORT)

patch_gradio.py

@@ -1,31 +0,0 @@
-import gradio.networking
-import gradio.queueing
-
-from auth import attach_oauth
-
-
-# 1. Patch => attach auth before starting app
-
-old_create_app = gradio.networking.App.create_app
-
-
-def patched_create_app(*args, **kwargs):
-    app = old_create_app(*args, **kwargs)
-    attach_oauth(app)
-    return app
-
-
-gradio.networking.App.create_app = patched_create_app
-
-# 2. Patch => forward session info when using websockets (i.e. when queue is enabled which is the default on Spaces)
-
-old_get_request_params = gradio.queueing.Queue.get_request_params
-
-
-def new_get_request_params(self, websocket):
-    params = old_get_request_params(self, websocket)
-    params["session"] = websocket.session  # Forward session info to the internal request
-    return params
-
-
-gradio.queueing.Queue.get_request_params = new_get_request_params