Update app.py

app.py

@@ -17,18 +17,22 @@ from config_provider import ConfigProvider
 
 # ===================== Environment Setup =====================
 def setup_environment():
-    """Setup environment based on work_mode"""
+    """Setup environment based on deployment"""
     cfg = ConfigProvider.get()
     
     log("=" * 60)
-    log(f"🚀 Flare Starting in {cfg.global_config.work_mode.upper()} mode")
+    log(f"🚀 Flare Starting")
+    log(f"🤖 LLM Provider: {cfg.global_config.llm_provider.name}")
+    log(f"🔊 TTS Provider: {cfg.global_config.tts_provider.name}")
+    log(f"🎤 STT Provider: {cfg.global_config.stt_provider.name}")
     log("=" * 60)
     
-    if cfg.global_config.is_cloud_mode():
-        log("☁️  Cloud Mode: Using HuggingFace Secrets")
-        log("📌 Required secrets: JWT_SECRET, FLARE_TOKEN_KEY, SPARK_TOKEN")
+    # Check if running in HuggingFace Space
+    if os.environ.get("SPACE_ID"):
+        log("☁️  Running in HuggingFace Space")
+        log("📌 Using environment secrets for API keys")
     else:
-        log("🏢 On-Premise Mode: Using .env file")
+        log("🏢 Local/On-Premise deployment")
         if not Path(".env").exists():
             log("⚠️  WARNING: .env file not found!")
             log("📌 Copy .env.example to .env and configure it")
@@ -43,7 +47,7 @@ mimetypes.add_type("text/css", ".css")
 app = FastAPI(
     title="Flare Orchestration Service",
     version="0.1.0",
-    description="LLM-driven intent & API flow engine (bootstrap)",
+    description="LLM-driven intent & API flow engine",
 )
 
 # CORS for development
@@ -59,6 +63,7 @@ if os.getenv("ENVIRONMENT") == "development":
     
 run_in_thread()
 start_cleanup_task()  # Activity log cleanup
+start_session_cleanup()  # Session cleanup
 
 # ---------------- Core chat/session routes --------------------------
 app.include_router(chat_router, prefix="/api")
@@ -67,78 +72,36 @@ app.include_router(chat_router, prefix="/api")
 app.include_router(admin_router)
 
 # ---------------- Serve Angular UI if exists ------------------------
-static_path = Path("static")
-log(f"🔍 Checking for static directory at: {static_path.absolute()}")
-log(f"🔍 Static directory exists: {static_path.exists()}")
+ui_path = Path(__file__).parent / "ui" / "dist" / "flare-ui"
 
-if static_path.exists() and static_path.is_dir():
-    # List files in static directory
-    files = list(static_path.iterdir())
-    log(f"📁 Files in static directory: {[f.name for f in files]}")
+if ui_path.exists():
+    log(f"📁 Serving UI from: {ui_path}")
     
-    # Check for index.html
-    index_path = static_path / "index.html"
-    log(f"🔍 index.html exists: {index_path.exists()}")
+    # Serve static files
+    app.mount("/assets", StaticFiles(directory=ui_path / "assets"), name="assets")
     
-    # Mount entire static directory
-    app.mount("/static", StaticFiles(directory="static"), name="static")
-    
-    # Serve static files (Angular assets) - only if assets directory exists
-    assets_path = static_path / "assets"
-    if assets_path.exists() and assets_path.is_dir():
-        app.mount("/assets", StaticFiles(directory=str(assets_path)), name="assets")
-    
-    # Root path - serve index.html
-    @app.get("/")
-    async def serve_root():
-        index_path = static_path / "index.html"
-        if index_path.exists():
-            log("📄 Serving index.html")
-            return FileResponse(str(index_path), media_type="text/html")
-        log("⚠️ index.html not found, returning health check")
-        return {"status": "ok", "sessions": len(session_store._sessions)}  # Fallback to health check
-    
-    # Serve JS files with correct MIME type
-    @app.get("/{filename:path}.js")
-    async def serve_js(filename: str):
-        js_path = static_path / f"{filename}.js"
-        if js_path.exists():
-            return FileResponse(str(js_path), media_type="application/javascript")
-        return {"error": "JS file not found"}, 404
-    
-    # Serve CSS files with correct MIME type
-    @app.get("/{filename:path}.css")
-    async def serve_css(filename: str):
-        css_path = static_path / f"{filename}.css"
-        if css_path.exists():
-            return FileResponse(str(css_path), media_type="text/css")
-        return {"error": "CSS file not found"}, 404
-    
-
-    # Catch-all route for Angular routing (must be last!)
+    # Catch-all route for Angular routing
     @app.get("/{full_path:path}")
     async def serve_angular(full_path: str):
-        # Don't catch API routes
-        if full_path.startswith("api/") or full_path.startswith("health"):
-            from fastapi import HTTPException
-            raise HTTPException(status_code=404, detail="Not found")
+        """Serve Angular app for all non-API routes"""
+        # Skip API routes
+        if full_path.startswith("api/"):
+            return {"error": "API endpoint not found"}
         
-        # For Angular routes, always return index.html
-        index_path = static_path / "index.html"
-        if index_path.exists():
-            log(f"🔀 Serving index.html for Angular route: /{full_path}")
-            return FileResponse(str(index_path), media_type="text/html")
-        
-        # If no index.html, return 404
-        from fastapi import HTTPException
-        raise HTTPException(status_code=404, detail="UI not found")
+        # Serve index.html for all routes (Angular will handle routing)
+        return FileResponse(ui_path / "index.html")
 else:
-    log("⚠️ Static directory not found")
-    # No UI built, just health endpoint
+    log("⚠️  UI not found - only API endpoints available")
+    
     @app.get("/")
-    def health_check():
-        return {"status": "ok", "message": "UI not found. Build Angular app first."}
+    def root():
+        return {
+            "service": "Flare Orchestration Service",
+            "version": "0.1.0",
+            "status": "running",
+            "ui": "not available - build Angular UI first"
+        }
 
 if __name__ == "__main__":
-    log("🌐 Starting Flare backend …")
+    log("🌐 Starting Flare backend on port 7860...")
     uvicorn.run(app, host="0.0.0.0", port=7860)