wip

app.py

@@ -721,14 +721,16 @@ async (currentDevices) => {
 """
 
 def load_dxl_script_js() -> str:
-    """Load the DXL script from static files."""
+    """Load the DXL script from static files via Gradio file serving."""
     import time
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    js_path = os.path.join(script_dir, "web", "dxl_webserial.js")
     timestamp = int(time.time())
     return f"""
 () => {{
     const script = document.createElement('script');
     script.type = 'module';
-    script.src = '/web/dxl_webserial.js?v={timestamp}';
+    script.src = '/file={js_path}?v={timestamp}';
     script.onerror = () => console.error("[DXL] Failed to load motor control script");
     script.onload = () => console.log("[DXL] Script loaded successfully");
     document.head.appendChild(script);
@@ -971,11 +973,6 @@ async (pose_data) => {
 
 
 def build_app() -> gr.Blocks:
-    # Get absolute paths for static directories
-    script_dir = os.path.dirname(os.path.abspath(__file__))
-    assets_dir = os.path.join(script_dir, "assets")
-    web_dir = os.path.join(script_dir, "web")
-
     with gr.Blocks(title="Gradio Visual Novel") as demo:
         gr.HTML(f"<style>{CUSTOM_CSS}</style>", elem_id="vn-styles")
         story_state = gr.State()
@@ -1438,29 +1435,21 @@ def build_app() -> gr.Blocks:
 
 
 def main() -> None:
-    """Launch the Visual Novel Gradio app with FastAPI for static file serving."""
-    # Create FastAPI app
-    fastapi_app = FastAPI()
-
+    """Launch the Visual Novel Gradio app."""
     # Get absolute paths for static directories
     script_dir = os.path.dirname(os.path.abspath(__file__))
     assets_dir = os.path.join(script_dir, "assets")
     web_dir = os.path.join(script_dir, "web")
 
-    # Mount static files with proper MIME types
-    fastapi_app.mount("/assets", StaticFilesWithMimeTypes(directory=assets_dir, html=False), name="assets")
-    fastapi_app.mount("/web", StaticFilesWithMimeTypes(directory=web_dir, html=False), name="web")
-
-    # Build and mount Gradio app
-    gradio_app = build_app()
-    fastapi_app = gr.mount_gradio_app(fastapi_app, gradio_app, path="/")
+    # Build Gradio app
+    demo = build_app()
 
-    # Launch with uvicorn
-    import uvicorn
-    uvicorn.run(
-        fastapi_app,
-        host="0.0.0.0",
-        port=7860,
+    # Launch without SSR to avoid MIME type issues
+    demo.launch(
+        server_name="0.0.0.0",
+        server_port=7860,
+        ssr_mode=False,  # Disable SSR which causes MIME type issues on HF Spaces
+        allowed_paths=[assets_dir, web_dir],
     )
 
 

engine.py

@@ -17,18 +17,24 @@ POSITION_OFFSETS = {
 
 # Asset helper functions
 def background_asset(filename: str) -> str:
-    """Get the URL to a background image in the assets directory."""
-    return f"/assets/backgrounds/{filename}"
+    """Get the Gradio file URL for a background image."""
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    filepath = os.path.join(script_dir, "assets", "backgrounds", filename)
+    return f"/file={filepath}"
 
 
 def sprite_asset(filename: str) -> str:
-    """Get the URL to a sprite image in the assets directory."""
-    return f"/assets/sprites/{filename}"
+    """Get the Gradio file URL for a sprite image."""
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    filepath = os.path.join(script_dir, "assets", "sprites", filename)
+    return f"/file={filepath}"
 
 
 def audio_asset(filename: str) -> str:
-    """Get the URL to an audio file in the assets directory."""
-    return f"/assets/audio/{filename}"
+    """Get the Gradio file URL for an audio file."""
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    filepath = os.path.join(script_dir, "assets", "audio", filename)
+    return f"/file={filepath}"
 
 
 def create_sprite_data_url(bg_color: str = "#fef3c7", border_color: str = "#ea580c") -> str: