Update api.py

api.py

@@ -1,13 +1,18 @@
+from fastapi import FastAPI, Query, Form, Header, HTTPException
+from fastapi.responses import PlainTextResponse, HTMLResponse
+from fastapi.staticfiles import StaticFiles
 
-from fastapi import FastAPI, Query
-from fastapi.responses import PlainTextResponse
 from agent import run_agent
 from goal_manager import save_goal, list_goals
 from feedback import list_feedback
-import uvicorn
+from session import log_interaction, create_session
+from auth import authorize
+from webhook import router as webhook_router
+from storage import save_goal
 
 app = FastAPI()
 
+# === API Routes ===
 @app.get("/run_task", response_class=PlainTextResponse)
 def run_task(task: str = Query(..., description="Task for the AI to perform")):
     return run_agent(task)
@@ -25,20 +30,18 @@ def show_goals():
 def show_feedback():
     return list_feedback()
 
-if __name__ == "__main__":
-    uvicorn.run("api:app", host="0.0.0.0", port=7861)
-
-from webhook import router as webhook_router
-app.include_router(webhook_router)
-
-from fastapi import Form
-from fastapi.responses import HTMLResponse
-from fastapi.staticfiles import StaticFiles
-from storage import save_goal
-from agent import run_agent
-
-app.mount("/static", StaticFiles(directory="."), name="static")
+@app.post("/session_task")
+def session_task(goal: str, x_api_key: str = Header(...), session_id: str = ""):
+    user = authorize(x_api_key)
+    if not user:
+        raise HTTPException(status_code=401, detail="Invalid API key")
+    if not session_id:
+        session_id = create_session(user)
+    output = run_agent(goal)
+    log_interaction(session_id, goal, output)
+    return {"session_id": session_id, "output": output}
 
+# === Web + HTML Routes ===
 @app.get("/portal", response_class=HTMLResponse)
 async def client_portal():
     with open("client_portal.html") as f:
@@ -54,18 +57,11 @@ async def dashboard():
     with open("dashboard.html") as f:
         return f.read()
 
+# === Static & External Routers ===
+app.mount("/static", StaticFiles(directory="static"), name="static")
+app.include_router(webhook_router)
 
-from fastapi import Header, HTTPException
-from auth import authorize
-from session import log_interaction, create_session
-
-@app.post("/session_task")
-def session_task(goal: str, x_api_key: str = Header(...), session_id: str = ""):
-    user = authorize(x_api_key)
-    if not user:
-        raise HTTPException(status_code=401, detail="Invalid API key")
-    if not session_id:
-        session_id = create_session(user)
-    output = run_agent(goal)
-    log_interaction(session_id, goal, output)
-    return {"session_id": session_id, "output": output}
+# === Dev server (for local testing) ===
+if __name__ == "__main__":
+    import uvicorn
+    uvicorn.run("api:app", host="0.0.0.0", port=7861, reload=True)