Revert "Enhance proxy functionality and add health check endpoints; update Gradio version in requirements"

This reverts commit 3b496050a7f0e5bad3a87a582755fa196cf676a0.

app.py

@@ -58,14 +58,6 @@ async def proxy_http_request(request: Request, target_port: int):
         path = path[8:]  # Remove "/model1/"
     elif path.startswith("/model2/"):
         path = path[8:]  # Remove "/model2/"
-    elif path == "/model1" or path == "/model2":
-        path = ""
-
-    # Ensure path starts with / or is empty
-    if path and not path.startswith("/"):
-        path = "/" + path
-    elif not path:
-        path = "/"
 
     target_url = f"http://localhost:{target_port}{path}"
 
@@ -109,14 +101,6 @@ async def proxy_websocket(websocket: WebSocket, target_port: int):
         path = path[8:]
     elif path.startswith("/model2/"):
         path = path[8:]
-    elif path == "/model1" or path == "/model2":
-        path = ""
-
-    # Ensure path starts with / or is empty
-    if path and not path.startswith("/"):
-        path = "/" + path
-    elif not path:
-        path = "/"
 
     target_url = f"ws://localhost:{target_port}{path}"
 
@@ -204,9 +188,6 @@ def start_moshi_server(model_repo: str, port: int, model_name: str):
 def create_gradio_interface() -> gr.Blocks:
     """Create the Gradio tabbed interface"""
 
-    # Get the Space name from environment for proper URL construction
-    space_id = os.environ.get("SPACE_ID", "")
-
     with gr.Blocks(
         title="Dual Moshi Model Interface",
         theme=gr.themes.Soft(),
@@ -311,33 +292,7 @@ def main():
     # Add proxy routes to the underlying FastAPI app
     logger.info("Setting up reverse proxy routes...")
 
-    # Health check endpoints
-    @demo.app.get("/health")
-    async def health_check():
-        return {"status": "ok", "message": "Main app is running"}
-
-    @demo.app.get("/model1/health")
-    async def model1_health():
-        try:
-            response = await http_client.get("http://localhost:8998/")
-            return {"status": "ok", "model": "model1", "backend_status": response.status_code}
-        except Exception as e:
-            return {"status": "error", "model": "model1", "error": str(e)}
-
-    @demo.app.get("/model2/health")
-    async def model2_health():
-        try:
-            response = await http_client.get("http://localhost:8999/")
-            return {"status": "ok", "model": "model2", "backend_status": response.status_code}
-        except Exception as e:
-            return {"status": "error", "model": "model2", "error": str(e)}
-
     # Proxy routes for model 1 (port 8998)
-    # Handle both /model1 and /model1/ and /model1/path
-    @demo.app.api_route("/model1", methods=["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"])
-    async def proxy_model1_root(request: Request):
-        return await proxy_http_request(request, 8998)
-
     @demo.app.api_route("/model1/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"])
     async def proxy_model1_http(request: Request, path: str):
         return await proxy_http_request(request, 8998)
@@ -347,10 +302,6 @@ def main():
         await proxy_websocket(websocket, 8998)
 
     # Proxy routes for model 2 (port 8999)
-    @demo.app.api_route("/model2", methods=["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"])
-    async def proxy_model2_root(request: Request):
-        return await proxy_http_request(request, 8999)
-
     @demo.app.api_route("/model2/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"])
     async def proxy_model2_http(request: Request, path: str):
         return await proxy_http_request(request, 8999)
@@ -360,30 +311,18 @@ def main():
         await proxy_websocket(websocket, 8999)
 
     logger.info("Proxy routes registered:")
-    logger.info("  /health -> Health check endpoint")
-    logger.info("  /model1/health -> Model 1 health check")
-    logger.info("  /model2/health -> Model 2 health check")
-    logger.info("  /model1, /model1/* -> http://localhost:8998")
-    logger.info("  /model2, /model2/* -> http://localhost:8999")
+    logger.info("  /model1/* -> http://localhost:8998")
+    logger.info("  /model2/* -> http://localhost:8999")
 
     # Launch on a different port (main interface)
     main_port = 7860
     logger.info(f"Launching main interface on port {main_port}...")
 
-    # Detect if running in HF Spaces
-    is_hf_space = "SPACE_ID" in os.environ
-    logger.info(f"Running in HF Spaces: {is_hf_space}")
-    if is_hf_space:
-        logger.info(f"Space ID: {os.environ.get('SPACE_ID')}")
-
     try:
         demo.launch(
             server_name="0.0.0.0",
             server_port=main_port,
-            share=False,
-            show_api=False,
-            # Don't try to auto-detect root path in HF Spaces
-            root_path=os.environ.get("GRADIO_ROOT_PATH", None)
+            share=False
         )
     except KeyboardInterrupt:
         logger.info("Shutting down...")

requirements.txt

@@ -1,5 +1,4 @@
 moshi>=0.2.0,<=0.2.2
-gradio>=5.0.0,<6.0.0
+gradio>=4.0.0
 httpx>=0.27.0
 websockets>=12.0
-fastapi>=0.104.0