Update app.py

app.py

@@ -47,50 +47,112 @@ async def route_with_config():
     return JSONResponse(content={"one": "hello", "two": "from", "three": "Python"})
 
 
-async def proxy_to_node(request: Request):
+# async def proxy_to_node(request: Request):
     
 
-    # Preserve the full path including query parameters
+#     # Preserve the full path including query parameters
+#     full_path = request.url.path
+#     if request.url.query:
+#         full_path += f"?{request.url.query}"
+
+#     url = f"http://localhost:{NODE_PORT}{full_path}"
+
+#     headers = {
+#         k: v
+#         for k, v in request.headers.items()
+#         if k.lower() not in ["host", "content-length"]
+#     }
+
+#     print(headers)
+#     # body = await request.body()
+
+#     # async with client:
+#     #     response = await client.request(
+#     #         method=request.method, url=url, headers=headers, content=body
+#     #     )
+
+#     # return StreamingResponse(
+#     #     response.iter_bytes(),
+#     #     status_code=response.status_code,
+#     #     headers=response.headers,
+#     # )
+
+#     req = client.build_request("GET", httpx.URL(url), headers=headers)
+#     r = await client.send(req, stream=True)
+
+#     return StreamingResponse(
+#         r.aiter_raw(), headers=r.headers
+#     )
+
+async def proxy_to_node(
+        request: Request,
+        server_name: str,
+        node_port: int,
+        python_port: int,
+        scheme: str = "http",
+        mounted_path: str = "",
+) -> Response:
+    start_time = time.time()
+
     full_path = request.url.path
+    if mounted_path:
+        full_path = full_path.replace(mounted_path, "")
     if request.url.query:
         full_path += f"?{request.url.query}"
 
-    url = f"http://localhost:{NODE_PORT}{full_path}"
+    url = f"{scheme}://{server_name}:{node_port}{full_path}"
 
     headers = {
         k: v
         for k, v in request.headers.items()
-        if k.lower() not in ["host", "content-length"]
+        if k.lower() not in ["content-length"]
     }
 
-    print(headers)
-    # body = await request.body()
+    print(
+        headers,
+    )
+
+    server_url = f"{scheme}://{server_name}"
+    if python_port:
+        server_url += f":{python_port}"
+    if mounted_path:
+        server_url += mounted_path
+
+    headers["x-gradio-server"] = server_url
+    headers["x-gradio-port"] = str(python_port)
 
-    # async with client:
-    #     response = await client.request(
-    #         method=request.method, url=url, headers=headers, content=body
-    #     )
+    print(
+        f"Proxying request from {request.url.path} to {url} with server url {server_url}"
+    )
 
-    # return StreamingResponse(
-    #     response.iter_bytes(),
-    #     status_code=response.status_code,
-    #     headers=response.headers,
-    # )
+    if os.getenv("GRADIO_LOCAL_DEV_MODE"):
+        headers["x-gradio-local-dev-mode"] = "1"
 
-    req = client.build_request("GET", httpx.URL(url), headers=headers)
-    r = await client.send(req, stream=True)
+    print(f"Time to prepare request: {time.time() - start_time:.4f} seconds")
 
-    return StreamingResponse(
-        r.aiter_raw(), headers=r.headers
+    print(
+        f"Total setup time before streaming: {time.time() - start_time:.4f} seconds"
     )
 
+    req = App.client.build_request("GET", httpx.URL(url), headers=headers)
+    r = await App.client.send(req, stream=True)
+    print(f"Time to prepare request: {time.time() - start_time:.4f} seconds")
+
+    return StreamingResponse(r.aiter_raw(), headers=r.headers)
 
 
 @app.api_route(
     "/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"]
 )
 async def catch_all(request: Request, path: str):
-    return await proxy_to_node(request)
+    return await App.proxy_to_node(
+        request,
+        request.client.host,
+        4321,
+        request.url.port,
+        request.url.scheme,
+        "",
+    )
 
 
 if __name__ == "__main__":