Upload 2 files

app.py

@@ -1,9 +1,9 @@
 import os
 import time
 
-from fastapi import FastAPI, Request
-from fastapi.responses import JSONResponse, Response
 import gradio as gr
+from starlette.requests import Request
+from starlette.responses import JSONResponse, Response
 
 DOWNLOAD_SIZE_BYTES = 10 * 1024 * 1024
 _RANDOM_BLOB = os.urandom(DOWNLOAD_SIZE_BYTES)
@@ -14,33 +14,42 @@ NO_CACHE_HEADERS = {
     "Expires": "0",
 }
 
-fastapi_app = FastAPI()
 
+def register_backend_routes(blocks: gr.Blocks) -> None:
+    """Attach REST endpoints to the underlying Gradio server once it exists."""
+    server_app = getattr(blocks, "server_app", None)
+    if server_app is None:
+        return
 
-@fastapi_app.get("/ping_test")
-async def ping_test() -> Response:
-    headers = {**NO_CACHE_HEADERS, "Content-Length": "4", "X-Server-Timestamp": str(time.time())}
-    return Response(content="pong", media_type="text/plain", headers=headers)
+    if getattr(server_app.state, "speedtest_routes_installed", False):
+        return
 
+    server_app.state.speedtest_routes_installed = True
 
-@fastapi_app.get("/download_test")
-async def download_test() -> Response:
-    headers = {
-        **NO_CACHE_HEADERS,
-        "Content-Length": str(DOWNLOAD_SIZE_BYTES),
-        "Content-Disposition": f'attachment; filename="speedtest_{DOWNLOAD_SIZE_BYTES}.bin"',
-    }
-    return Response(content=_RANDOM_BLOB, media_type="application/octet-stream", headers=headers)
+    async def ping_test() -> Response:
+        headers = {**NO_CACHE_HEADERS, "Content-Length": "4", "X-Server-Timestamp": str(time.time())}
+        return Response(content="pong", media_type="text/plain", headers=headers)
+
+    async def download_test() -> Response:
+        headers = {
+            **NO_CACHE_HEADERS,
+            "Content-Length": str(DOWNLOAD_SIZE_BYTES),
+            "Content-Disposition": f'attachment; filename="speedtest_{DOWNLOAD_SIZE_BYTES}.bin"',
+        }
+        return Response(content=_RANDOM_BLOB, media_type="application/octet-stream", headers=headers)
 
+    async def upload_test(request: Request) -> JSONResponse:
+        payload = await request.body()
+        headers = dict(NO_CACHE_HEADERS)
+        return JSONResponse({"received_bytes": len(payload)}, headers=headers)
 
-@fastapi_app.post("/upload_test")
-async def upload_test(request: Request) -> JSONResponse:
-    payload = await request.body()
-    headers = dict(NO_CACHE_HEADERS)
-    return JSONResponse({"received_bytes": len(payload)}, headers=headers)
+    server_app.add_api_route("/ping_test", ping_test, methods=["GET"])
+    server_app.add_api_route("/download_test", download_test, methods=["GET"])
+    server_app.add_api_route("/upload_test", upload_test, methods=["POST"])
 
 
-LIBRESPEED_HTML = """
+with gr.Blocks(fill_height=True) as demo:
+    gr.HTML(value="""
 <style>
   .speedtest-container {
     font-family: 'Segoe UI', Arial, sans-serif;
@@ -105,17 +114,17 @@ LIBRESPEED_HTML = """
     <div class="speedtest-grid">
       <div class="metric-card">
         <span class="metric-label">Download</span>
-        <span id="dlSpeed" class="metric-value">–</span>
+        <span id="dlSpeed" class="metric-value">-</span>
         <div class="metric-subtext">Average throughput in Mbps</div>
       </div>
       <div class="metric-card">
         <span class="metric-label">Upload</span>
-        <span id="ulSpeed" class="metric-value">–</span>
+        <span id="ulSpeed" class="metric-value">-</span>
         <div class="metric-subtext">Average throughput in Mbps</div>
       </div>
       <div class="metric-card">
         <span class="metric-label">Ping</span>
-        <span id="ping" class="metric-value">–</span>
+        <span id="ping" class="metric-value">-</span>
         <div class="metric-subtext">Round-trip latency in ms</div>
       </div>
     </div>
@@ -132,7 +141,8 @@ LIBRESPEED_HTML = """
 
   function log(message) {
     const timestamp = new Date().toLocaleTimeString();
-    logView.textContent += '[' + timestamp + '] ' + message + '\n';
+    logView.textContent += '[' + timestamp + '] ' + message + '
+';
     logView.scrollTop = logView.scrollHeight;
   }
 
@@ -197,25 +207,25 @@ LIBRESPEED_HTML = """
   startBtn.addEventListener('click', async () => {
     startBtn.disabled = true;
     resultsDiv.style.display = 'block';
-    dlSpan.textContent = 'Testing…';
-    ulSpan.textContent = 'Testing…';
-    pingSpan.textContent = 'Testing…';
+    dlSpan.textContent = 'Testing...';
+    ulSpan.textContent = 'Testing...';
+    pingSpan.textContent = 'Testing...';
     logView.textContent = '';
 
     try {
-      log('Measuring ping…');
+      log('Measuring ping...');
       const pingMs = await measurePing();
       pingSpan.textContent = pingMs.toFixed(2) + ' ms';
       log('Average ping: ' + pingSpan.textContent);
 
-      log('Running download test (10 MiB)…');
+      log('Running download test (10 MiB)...');
       const downloadResult = await measureDownload();
       const downloadBps = downloadResult.bitsTransferred / downloadResult.durationSeconds;
       dlSpan.textContent = formatMbps(downloadBps);
       log('Download duration: ' + downloadResult.durationSeconds.toFixed(2) + ' s');
       log('Download speed: ' + dlSpan.textContent);
 
-      log('Running upload test (10 MiB)…');
+      log('Running upload test (10 MiB)...');
       const uploadResult = await measureUpload(downloadResult.bitsTransferred / 8);
       const uploadBps = uploadResult.bitsTransferred / uploadResult.durationSeconds;
       ulSpan.textContent = formatMbps(uploadBps);
@@ -235,14 +245,23 @@ LIBRESPEED_HTML = """
     }
   });
 </script>
-"""
+""")
 
-with gr.Blocks(fill_height=True) as demo:
-    gr.HTML(value=LIBRESPEED_HTML)
 
-app = gr.mount_gradio_app(fastapi_app, demo, path="/")
+def _ensure_routes() -> None:
+    register_backend_routes(demo)
 
-if __name__ == "__main__":
-    import uvicorn
 
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+demo.load(fn=_ensure_routes, inputs=None, outputs=None)
+
+
+def build_app() -> gr.Blocks:
+    register_backend_routes(demo)
+    return demo
+
+
+app = build_app()
+
+
+if __name__ == "__main__":
+    app.queue(concurrency_count=10).launch(server_name="0.0.0.0", server_port=7860)

requirements.txt

@@ -1,3 +1,2 @@
 # requirements.txt
 gradio==5.33.0
-uvicorn[standard]==0.30.1