Cleanded up fastapi

app.py

@@ -35,7 +35,6 @@ BASE_URL = SPACE_URL  # For display in UI
 
 # Global state for current scene
 current_scene_id = None
-current_scene_url = None
 selected_object_id = None  # Track currently looked-at object (FPS mode)
 
 
@@ -104,29 +103,38 @@ if not IS_HF_SPACES:
     wait_for_fastapi()
 
 
+def get_viewer_html(scene_id="welcome"):
+    """Generate viewer HTML with embedded scene data."""
+    from backend.storage import storage
+
+    scene_data = storage.get(scene_id)
+    if not scene_data:
+        return '<div style="color: red;">Scene not found</div>'
+
+    # Read the viewer HTML template
+    viewer_path = os.path.join(os.path.dirname(__file__), "frontend", "game_viewer.html")
+    with open(viewer_path, 'r') as f:
+        html = f.read()
+
+    # Inject scene data before the closing </head> tag
+    scene_json = json.dumps(scene_data)
+    inject_script = f'<script>window.SCENE_DATA = {scene_json};</script>'
+    html = html.replace('</head>', f'{inject_script}</head>')
+
+    return html
+
+
 def create_default_scene():
     """Use the clean default Welcome Scene created on server startup"""
-    global current_scene_id, current_scene_url
+    global current_scene_id
 
     try:
-        # Use the pre-initialized "welcome" scene from storage
-        # (created in backend/storage.py on module load)
         current_scene_id = "welcome"
-        current_scene_url = f"{FASTAPI_URL}/view/scene/welcome"
-
-        print(f"✅ Using default Welcome Scene")
-        print(f"   Scene ID: {current_scene_id}")
-        print(f"   Viewer URL: {current_scene_url}")
-        print(f"   - Clean 10x10 FPS world with physics")
-        print(f"   - Ground plane + walls (created by viewer)")
-        print(f"   - Player starts at (0, 1, 0)")
-
-        return current_scene_url
-
+        print(f"✅ Using default Welcome Scene (ID: {current_scene_id})")
+        return get_viewer_html(current_scene_id)
     except Exception as e:
         import traceback
         print(f"❌ Error loading default scene: {e}")
-        print(f"   Full traceback:")
         traceback.print_exc()
         return None
 
@@ -145,7 +153,7 @@ def get_gpt_client():
 
 def chat_response(message, history):
     """Handle chat messages using GPT with tool calling"""
-    global current_scene_id, current_scene_url
+    global current_scene_id
 
     # Handle help command locally (no need for LLM)
     if message.lower().strip() == "help":
@@ -186,9 +194,9 @@ I'm an AI assistant that can help you build 3D scenes using natural language.
 
 # Create default scene on startup
 print("Creating default scene...")
-default_viewer_url = create_default_scene()
-print(f"Default viewer URL: {default_viewer_url}")
-if not default_viewer_url:
+default_viewer_html = create_default_scene()
+print(f"Default viewer HTML loaded: {len(default_viewer_html) if default_viewer_html else 0} bytes")
+if not default_viewer_html:
     print("⚠️  WARNING: Default scene creation failed! No viewer URL generated.")
 
 
@@ -375,12 +383,12 @@ with gr.Blocks(title="GCP - Game Context Protocol") as demo:
 
         # Right column: 3D Viewer (scale=3 = ~75% width)
         with gr.Column(elem_id="viewer-column", scale=3):
-            if default_viewer_url:
-                initial_viewer_html = f'<div id="viewer-container"><iframe src="{default_viewer_url}"></iframe></div>'
-                print(f"📊 Setting up viewer iframe with src: {default_viewer_url}")
+            if default_viewer_html:
+                initial_viewer_html = f'<div id="viewer-container"><iframe srcdoc="{default_viewer_html.replace(chr(34), "&quot;")}" style="width:100%; height:600px; border:none;"></iframe></div>'
+                print(f"📊 Setting up viewer with embedded scene data")
             else:
                 initial_viewer_html = '<div id="viewer-container" style="display: flex; align-items: center; justify-content: center; color: #666;"><p>⚠️ Scene failed to load. Check console logs.</p></div>'
-                print("⚠️  No viewer URL available - showing error message")
+                print("⚠️  No viewer HTML available - showing error message")
 
             viewer = gr.HTML(
                 value=initial_viewer_html,
@@ -506,40 +514,4 @@ with gr.Blocks(title="GCP - Game Context Protocol") as demo:
 
 if __name__ == "__main__":
     demo.queue()
-
-    if IS_HF_SPACES:
-        # On HF Spaces: Create a FastAPI app with our routes, then mount Gradio on it
-        from fastapi import FastAPI, HTTPException
-        from fastapi.responses import HTMLResponse
-        from backend.storage import storage
-
-        app = FastAPI()
-
-        @app.get("/api/scenes/{scene_id}")
-        async def get_scene_api(scene_id: str):
-            scene = storage.get(scene_id)
-            if not scene:
-                raise HTTPException(status_code=404, detail=f"Scene '{scene_id}' not found")
-            return scene
-
-        @app.get("/view/scene/{scene_id}")
-        async def view_scene(scene_id: str):
-            scene = storage.get(scene_id)
-            if not scene:
-                raise HTTPException(status_code=404, detail=f"Scene '{scene_id}' not found")
-            viewer_path = os.path.join(os.path.dirname(__file__), "frontend", "game_viewer.html")
-            with open(viewer_path, 'r') as f:
-                return HTMLResponse(content=f.read())
-
-        @app.get("/health")
-        async def health_check():
-            return {"status": "healthy", "service": "GCP", "version": "2.0.0"}
-
-        # Mount Gradio onto our FastAPI app
-        app = gr.mount_gradio_app(app, demo, path="/")
-
-        print("🚀 Starting on HF Spaces - FastAPI + Gradio on port 7860")
-        uvicorn.run(app, host="0.0.0.0", port=7860)
-    else:
-        # Local dev: FastAPI already running on 8000 (started above), just launch Gradio on 7860
-        demo.launch(server_name="0.0.0.0", server_port=7860)
+    demo.launch(server_name="0.0.0.0", server_port=7860)

frontend/game_viewer.html

@@ -239,17 +239,23 @@
 
         async function init() {
             try {
-                // Fetch scene data
-                console.log('Fetching scene data...');
-                const response = await fetch(`${baseUrl}/api/scenes/${sceneId}`);
-                console.log('Response status:', response.status);
-
-                if (!response.ok) {
-                    const errorText = await response.text();
-                    console.error('Failed to fetch scene:', errorText);
-                    throw new Error(`Scene not found (${response.status}): ${errorText}`);
+                // Check for embedded scene data first (used when served via Gradio)
+                if (window.SCENE_DATA) {
+                    console.log('Using embedded scene data');
+                    sceneData = window.SCENE_DATA;
+                } else {
+                    // Fetch scene data from API (used when served via FastAPI)
+                    console.log('Fetching scene data...');
+                    const response = await fetch(`${baseUrl}/api/scenes/${sceneId}`);
+                    console.log('Response status:', response.status);
+
+                    if (!response.ok) {
+                        const errorText = await response.text();
+                        console.error('Failed to fetch scene:', errorText);
+                        throw new Error(`Scene not found (${response.status}): ${errorText}`);
+                    }
+                    sceneData = await response.json();
                 }
-                sceneData = await response.json();
                 console.log('Scene data loaded:', sceneData);
 
                 // Apply player configuration from scene data