Update app/main.py

app/main.py

@@ -1,8 +1,8 @@
 """
-Sentinel Arbitrage Engine - v17.0 FINAL (Flat Structure)
+Sentinel Arbitrage Engine - v16.0 FINAL (Correct Object Naming)
 
-This definitive version uses a flat project structure and direct imports
-to conform to the environment's startup command, ensuring a successful launch.
+This is the definitive version with the correct object names to match
+the startup script, ensuring a successful launch.
 """
 import asyncio
 import os
@@ -16,9 +16,8 @@ import socketio
 from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 
-# --- DIRECT IMPORTS FOR FLAT STRUCTURE ---
-from price_fetcher import PriceFetcher
-from arbitrage_analyzer import ArbitrageAnalyzer
+from .price_fetcher import PriceFetcher
+from .arbitrage_analyzer import ArbitrageAnalyzer
 
 OPPORTUNITY_THRESHOLD = 0.0015
 
@@ -52,39 +51,37 @@ async def run_arbitrage_detector(price_fetcher, analyzer):
             print(f"❌ ERROR in engine loop: {e}")
         await asyncio.sleep(15)
 
-# --- FastAPI App & Lifespan ---
-# We now define the main 'app' object first.
-app = FastAPI()
+# --- FastAPI Lifespan (for background task) ---
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    print("🚀 Initializing Sentinel Arbitrage Engine v16.0...")
+    async with httpx.AsyncClient() as client:
+        price_fetcher = PriceFetcher(client)
+        arbitrage_analyzer = ArbitrageAnalyzer(client)
+        sio.background_task = sio.start_background_task(run_arbitrage_detector, price_fetcher, arbitrage_analyzer)
+        print("✅ Engine is online and hunting for opportunities.")
+        yield
+        print("⏳ Shutting down engine...")
+        sio.background_task.cancel()
+        try: await sio.background_task
+        except asyncio.CancelledError: print("Engine shut down gracefully.")
 
-@app.on_event("startup")
-async def startup_event():
-    print("🚀 Initializing Sentinel Arbitrage Engine v17.0...")
-    # Using the older startup event which is more compatible with some environments
-    app.state.client = httpx.AsyncClient()
-    price_fetcher = PriceFetcher(app.state.client)
-    arbitrage_analyzer = ArbitrageAnalyzer(app.state.client)
-    # Start the background task
-    sio.background_task = sio.start_background_task(run_arbitrage_detector, price_fetcher, arbitrage_analyzer)
-    print("✅ Engine is online and hunting for opportunities.")
+# --- FastAPI App & Socket.IO Mount ---
+# THE FIX: We name the main FastAPI instance 'app' to match the startup script.
+app = FastAPI(lifespan=lifespan)
+
+# The primary app is the Socket.IO server, which wraps our FastAPI app.
+# The startup script should point to THIS object.
+app = socketio.ASGIApp(sio, other_asgi_app=app)
+
+# Serve the static files. This route is now handled by the wrapped app.
+sio.mount("/", StaticFiles(directory="static", html=True), name="static")
 
-@app.on_event("shutdown")
-async def shutdown_event():
-    print("⏳ Shutting down engine...")
-    sio.background_task.cancel()
-    await app.state.client.aclose()
-    print("Engine shut down gracefully.")
 
-# --- Socket.IO Event Handlers ---
 @sio.event
 async def connect(sid, environ):
     print(f"✅ Client connected: {sid}")
 
 @sio.event
 async def disconnect(sid):
-    print(f"🔥 Client disconnected: {sid}")
-
-# --- Mount the apps ---
-# The primary app is the Socket.IO server, which wraps our FastAPI app.
-app = socketio.ASGIApp(sio, other_asgi_app=app)
-# Serve the static files.
-sio.mount("/", StaticFiles(directory="static", html=True), name="static")
+    print(f"🔥 Client disconnected: {sid}")