Update app.py

app.py

@@ -1,8 +1,7 @@
-from fastapi import FastAPI
-from fastapi.responses import HTMLResponse
+from fastapi import FastAPI, Body, Request, HTTPException
+from fastapi.responses import HTMLResponse, JSONResponse, StreamingResponse
 from fastapi.requests import Request
 from fastapi.templating import Jinja2Templates
-from fastapi import Body, FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
@@ -17,10 +16,16 @@ from datetime import datetime
 from json import dumps
 
 
-templates = Jinja2Templates(directory="templates")
+# Load OPENMANUS_ENDPOINT_URL from env or config fallback
+OPENMANUS_ENDPOINT_URL = os.getenv("OPENMANUS_ENDPOINT_URL")
+if not OPENMANUS_ENDPOINT_URL:
+    config_path = "config/config.toml"
+    if os.path.exists(config_path):
+        config = toml.load(config_path)
+        OPENMANUS_ENDPOINT_URL = config.get("OPENMANUS_ENDPOINT_URL")
 
-import toml
-import os
+if not OPENMANUS_ENDPOINT_URL:
+    raise EnvironmentError("OPENMANUS_ENDPOINT_URL must be set in env or config/config.toml")
 
 app = FastAPI()
 
@@ -88,29 +93,27 @@ async def create_task(prompt: str = Body(..., embed=True)):
     asyncio.create_task(run_task(task.id, prompt))
     return {"task_id": task.id}
 
+async def run_task(task_id: str, prompt: str):
+    try:
+        task_manager.tasks[task_id].status = "running"
 
-@app.get("/", response_class=HTMLResponse)
-async def chat(request: Request):
-    return templates.TemplateResponse("index.html", {"request": request})
+        async def call_manus(url: str, prompt: str):
+            generate_kwargs = {"prompt": prompt}
+            async with aiohttp.ClientSession() as session:
+                async with session.post(
+                    url=url,
+                    json=generate_kwargs,
+                    timeout=aiohttp.ClientTimeout(total=3600)
+                ) as response:
+                    text = await response.text()
+                    await task_manager.update_task_step(task_id, 0, text, "result")
+
+        await call_manus(OPENMANUS_ENDPOINT_URL, prompt)
+        await task_manager.complete_task(task_id)
+    except Exception as e:
+        await task_manager.fail_task(task_id, str(e))
 
-@app.get("/chat", response_class=HTMLResponse)
-async def chat(request: Request):
-    return templates.TemplateResponse("chat.html", {"request": request})
 
-@app.post("/tasks")
-async def create_task(prompt: str = Body(..., embed=True)):
-    task = task_manager.create_task(prompt)
-    asyncio.create_task(run_task(task.id, prompt))
-    return {"task_id": task.id}
 
 
-# Load OPENMANUS_ENDPOINT_URL from env or config fallback
-OPENMANUS_ENDPOINT_URL = os.getenv("OPENMANUS_ENDPOINT_URL")
-if not OPENMANUS_ENDPOINT_URL:
-    config_path = "config/config.toml"
-    if os.path.exists(config_path):
-        config = toml.load(config_path)
-        OPENMANUS_ENDPOINT_URL = config.get("OPENMANUS_ENDPOINT_URL")
 
-if not OPENMANUS_ENDPOINT_URL:
-    raise EnvironmentError("OPENMANUS_ENDPOINT_URL must be set in env or config/config.toml")