Spaces:

thecollabagepatch
/

magenta-retry

Running

App Files Files Community

thecollabagepatch commited on Jan 25

Commit

6cd5ac5

1 Parent(s): b3e81ab

fastrtc issues solved mostly in gradio app. html web tester still better ux for the moment

Browse files

Files changed (1) hide show

app.py +12 -59

app.py CHANGED Viewed

@@ -1752,12 +1752,9 @@ async def ws_jam(websocket: WebSocket):
             pass
 # --- FastRTC Gradio Integration (only in serve mode) ---
-GRADIO_AT_ROOT = False
 if SPACE_MODE == "serve":
     try:
         from fastrtc_magenta import create_magenta_stream, FASTRTC_AVAILABLE
         if FASTRTC_AVAILABLE:
             magenta_stream = create_magenta_stream(
                 get_mrt_fn=get_mrt,
@@ -1766,92 +1763,48 @@ if SPACE_MODE == "serve":
                 concurrency_limit=1,
                 time_limit=3600,
             )
-            # FastRTC (WebRTC) endpoint
             magenta_stream.mount(app, path="/rtc")
-            # IMPORTANT: mount Gradio at root to avoid path/proxy weirdness on HF Spaces
-            app = gr.mount_gradio_app(app, magenta_stream.ui, path="/")
-            GRADIO_AT_ROOT = True
-            print("✓ FastRTC Gradio interface mounted at /", flush=True)
     except Exception as e:
-        print(f"⚠ FastRTC integration skipped: {e}", flush=True)
 @app.get("/ping")
 def ping():
     return {"ok": True}
-# Serve docs at /docs always (even when Gradio is at /)
-@app.get("/docs", response_class=Response)
-def docs():
-    """Documentation page (moved off / so Gradio can own root)."""
     try:
         html_file = Path(__file__).parent / "documentation.html"
-        html_content = html_file.read_text(encoding="utf-8")
     except FileNotFoundError:
         html_content = """
         <!DOCTYPE html>
         <html><body>
         <h1>MagentaRT Research API</h1>
-        <p>documentation.html not found.</p>
         </body></html>
         """
     return Response(content=html_content, media_type="text/html")
-# Only provide our own / route if Gradio is NOT mounted at /
-if not GRADIO_AT_ROOT:
-    @app.get("/", response_class=Response)
-    def read_root():
-        """Root endpoint that explains what this API does"""
-        try:
-            html_file = Path(__file__).parent / "documentation.html"
-            html_content = html_file.read_text(encoding="utf-8")
-        except FileNotFoundError:
-            html_content = """
-            <!DOCTYPE html>
-            <html><body>
-            <h1>MagentaRT Research API</h1>
-            <p>Documentation file not found. Please check documentation.html</p>
-            </body></html>
-            """
-        return Response(content=html_content, media_type="text/html")
-# Optional: silence browser manifest.json 404 noise (harmless, but annoying)
-@app.get("/manifest.json")
-def manifest():
-    return {
-        "name": "magenta-retry",
-        "short_name": "magenta-retry",
-        "start_url": "/",
-        "display": "standalone",
-        "icons": [],
-    }
 @app.get("/lil_demo_540p.mp4")
 def demo_video():
     return FileResponse(Path(__file__).parent / "lil_demo_540p.mp4", media_type="video/mp4")
 @app.get("/tester", response_class=HTMLResponse)
 def tester():
     html_path = Path(__file__).parent / "magentaRT_rt_tester.html"
     return HTMLResponse(
         html_path.read_text(encoding="utf-8"),
-        headers={"Cache-Control": "no-store"},
     )
 @app.get("/magenta_prompts.js")
 def magenta_prompts_js():
     js_path = Path(__file__).parent / "magenta_prompts.js"
-    return FileResponse(
-        js_path,
-        media_type="text/javascript",
-        headers={"Cache-Control": "no-store"},
-    )

             pass
 # --- FastRTC Gradio Integration (only in serve mode) ---
 if SPACE_MODE == "serve":
     try:
         from fastrtc_magenta import create_magenta_stream, FASTRTC_AVAILABLE
         if FASTRTC_AVAILABLE:
             magenta_stream = create_magenta_stream(
                 get_mrt_fn=get_mrt,
                 concurrency_limit=1,
                 time_limit=3600,
             )
             magenta_stream.mount(app, path="/rtc")
+            app = gr.mount_gradio_app(app, magenta_stream.ui, path="/gradio")
+            print("✓ FastRTC Gradio interface available at /gradio")
     except Exception as e:
+        print(f"⚠ FastRTC integration skipped: {e}")
 @app.get("/ping")
 def ping():
     return {"ok": True}
+@app.get("/", response_class=Response)
+def read_root():
+    """Root endpoint that explains what this API does"""
     try:
         html_file = Path(__file__).parent / "documentation.html"
+        html_content = html_file.read_text(encoding='utf-8')
     except FileNotFoundError:
+        # Fallback if file is missing
         html_content = """
         <!DOCTYPE html>
         <html><body>
         <h1>MagentaRT Research API</h1>
+        <p>Documentation file not found. Please check documentation.html</p>
         </body></html>
         """
     return Response(content=html_content, media_type="text/html")
 @app.get("/lil_demo_540p.mp4")
 def demo_video():
     return FileResponse(Path(__file__).parent / "lil_demo_540p.mp4", media_type="video/mp4")
 @app.get("/tester", response_class=HTMLResponse)
 def tester():
     html_path = Path(__file__).parent / "magentaRT_rt_tester.html"
     return HTMLResponse(
         html_path.read_text(encoding="utf-8"),
+        headers={"Cache-Control": "no-store"}  # avoid sticky caches while iterating
     )
 @app.get("/magenta_prompts.js")
 def magenta_prompts_js():
     js_path = Path(__file__).parent / "magenta_prompts.js"
+    return FileResponse(js_path, media_type="text/javascript",
+                        headers={"Cache-Control": "no-store"})