fix app when queued

app.py

@@ -1,10 +1,10 @@
+
 import gradio as gr
-import gradio.blocks
-import gradio.networking
 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:
@@ -23,14 +23,14 @@ You can manage your connected applications in your [settings](https://huggingfac
 
 
 def show_profile(request: gr.Request) -> str:
-    print("request", request)
-    print("request.request", request.request)
-    print("request.kwargs", request.kwargs)
-    print("dir(request)", dir(request))
-    fastapi_request = request.request
-    if fastapi_request is None or "user" not in request.request.session:
+    # 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(**request.request.session["user"])
+    return TEMPLATE.format(**session["user"])
 
 
 def js_open(url: str) -> str:
@@ -64,4 +64,5 @@ gradio.networking.App.create_app = patched_create_app
 
 print(URL)
 
+demo.queue()
 demo.launch(server_port=PORT)

auth.py

@@ -6,6 +6,7 @@ from fastapi.requests import Request
 from fastapi.responses import HTMLResponse
 from starlette.middleware.sessions import SessionMiddleware
 
+
 OAUTH_CLIENT_ID = os.environ.get("OAUTH_CLIENT_ID")
 OAUTH_CLIENT_SECRET = os.environ.get("OAUTH_CLIENT_SECRET")
 OAUTH_SCOPES = os.environ.get("OAUTH_SCOPES")

patch_gradio.py

@@ -0,0 +1,31 @@
+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