Update api/server.py

api/server.py

@@ -1,15 +1,145 @@
 
 
+# import uuid
+# import asyncio
+# from fastapi import FastAPI, HTTPException, APIRouter
+# from pydantic import BaseModel
+# from services import queue_manager  # ✅ import your actual queue module
+# import logging
+# from fastapi.middleware.cors import CORSMiddleware
+
+
+# router = APIRouter()
+# # -------------------------------
+# # Setup logging
+# # -------------------------------
+# logging.basicConfig(
+#     level=logging.INFO,
+#     format="%(asctime)s [%(levelname)s] %(message)s"
+# )
+
+# # -------------------------------
+# # FastAPI app
+# # -------------------------------
+# app = FastAPI(title="AI ADD Generator Server", version="1.0")
+
+# # Enable CORS for local testing
+# app.add_middleware(
+#     CORSMiddleware,
+#     allow_origins=["*"],
+#     allow_credentials=True,
+#     allow_methods=["*"],
+#     allow_headers=["*"],
+# )
+
+# # -------------------------------
+# # Pydantic models
+# # -------------------------------
+# class IdeaRequest(BaseModel):
+#     idea: str
+
+# class ConfirmationRequest(BaseModel):
+#     task_id: str
+#     confirm: bool
+
+# # -------------------------------
+# # In-memory confirmation tracker
+# # -------------------------------
+# pending_confirmations = {}  # task_id -> asyncio.Event
+# script_results = {}         # task_id -> generated script for confirmation
+
+# # -------------------------------
+# # API Endpoints
+# # -------------------------------
+# @app.post("/submit_idea")
+# async def submit_idea(request: IdeaRequest):
+#     """Receives a new ad idea and enqueues it."""
+#     task_id = await queue_manager.add_task(request.idea)
+#     logging.info(f"💡 New idea received | Task ID: {task_id}")
+
+#     # Start worker listener
+#     asyncio.create_task(queue_manager.wait_for_script(task_id, script_results))
+
+#     return {
+#         "status": "submitted",
+#         "task_id": task_id,
+#         "message": "Idea received. Script will be generated shortly.",
+#     }
+
+# @app.post("/confirm")
+# async def confirm_task(request: ConfirmationRequest):
+#     """Confirms a paused task, generates story, and returns full JSON."""
+#     task_id = request.task_id
+#     task = queue_manager.get_task_status(task_id)
+#     if not task:
+#         raise HTTPException(status_code=404, detail="Task not found.")
+
+#     if task["status"] != queue_manager.TaskStatus.WAITING_CONFIRMATION:
+#         raise HTTPException(status_code=400, detail="Task not waiting for confirmation.")
+
+#     if request.confirm:
+#         # Confirm task
+#         await queue_manager.confirm_task(task_id)
+#         logging.info(f"✅ Task {task_id} confirmed by user.")
+
+#         # Generate story immediately
+#         script_result = task["result"]["script"]
+#         story_result = await queue_manager.generate_story_after_confirm(script_result)
+#         task["result"]["story_script"] = story_result
+#         task["status"] = queue_manager.TaskStatus.COMPLETED
+
+#         logging.info(f"🎬 Task {task_id} story generated and task completed.")
+#         return {"status": "completed", "task": task}
+
+#     else:
+#         task["status"] = queue_manager.TaskStatus.FAILED
+#         return {"status": "rejected", "task_id": task_id}
+
+
+# @app.get("/status/{task_id}")
+# async def get_status(task_id: str):
+#     """Check the current status of a task."""
+#     task = queue_manager.get_task_status(task_id)
+#     if not task:
+#         raise HTTPException(status_code=404, detail="Task not found.")
+
+#     # If waiting confirmation, return script only
+#     if task["status"] == queue_manager.TaskStatus.WAITING_CONFIRMATION:
+#         return {"status": task["status"], "script": task["result"]["script"]}
+
+#     return task
+
+
+# @app.get("/")
+# async def health_check():
+#     return {"status": "running", "message": "AI ADD Generator is live."}
+
+
+# # -------------------------------
+# # Startup / Shutdown events
+# # -------------------------------
+# @app.on_event("startup")
+# async def startup_event():
+#     logging.info("🚀 Server starting up...")
+#     queue_manager.start_worker()
+
+# @app.on_event("shutdown")
+# async def shutdown_event():
+#     logging.info("🛑 Server shutting down...")
+
+
+# app.include_router(router)
+
+
+
 import uuid
 import asyncio
-from fastapi import FastAPI, HTTPException, APIRouter
+from fastapi import FastAPI, HTTPException
 from pydantic import BaseModel
-from services import queue_manager  # ✅ import your actual queue module
+from services import queue_manager  # your updated queue_manager
 import logging
 from fastapi.middleware.cors import CORSMiddleware
 
-
-router = APIRouter()
 # -------------------------------
 # Setup logging
 # -------------------------------
@@ -23,7 +153,6 @@ logging.basicConfig(
 # -------------------------------
 app = FastAPI(title="AI ADD Generator Server", version="1.0")
 
-# Enable CORS for local testing
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
@@ -43,21 +172,19 @@ class ConfirmationRequest(BaseModel):
     confirm: bool
 
 # -------------------------------
-# In-memory confirmation tracker
+# In-memory tracker for scripts
 # -------------------------------
-pending_confirmations = {}  # task_id -> asyncio.Event
-script_results = {}         # task_id -> generated script for confirmation
+script_results = {}  # task_id -> script string
 
 # -------------------------------
 # API Endpoints
 # -------------------------------
 @app.post("/submit_idea")
 async def submit_idea(request: IdeaRequest):
-    """Receives a new ad idea and enqueues it."""
     task_id = await queue_manager.add_task(request.idea)
     logging.info(f"💡 New idea received | Task ID: {task_id}")
 
-    # Start worker listener
+    # Start worker for this task (generates script first)
     asyncio.create_task(queue_manager.wait_for_script(task_id, script_results))
 
     return {
@@ -68,7 +195,6 @@ async def submit_idea(request: IdeaRequest):
 
 @app.post("/confirm")
 async def confirm_task(request: ConfirmationRequest):
-    """Confirms a paused task, generates story, and returns full JSON."""
     task_id = request.task_id
     task = queue_manager.get_task_status(task_id)
     if not task:
@@ -78,18 +204,11 @@ async def confirm_task(request: ConfirmationRequest):
         raise HTTPException(status_code=400, detail="Task not waiting for confirmation.")
 
     if request.confirm:
-        # Confirm task
+        # ✅ Confirm the task, resume pipeline
         await queue_manager.confirm_task(task_id)
-        logging.info(f"✅ Task {task_id} confirmed by user.")
-
-        # Generate story immediately
-        script_result = task["result"]["script"]
-        story_result = await queue_manager.generate_story_after_confirm(script_result)
-        task["result"]["story_script"] = story_result
-        task["status"] = queue_manager.TaskStatus.COMPLETED
+        logging.info(f"✅ Task {task_id} confirmed by user. Pipeline will continue automatically.")
 
-        logging.info(f"🎬 Task {task_id} story generated and task completed.")
-        return {"status": "completed", "task": task}
+        return {"status": "confirmed", "message": "Task confirmed. Story, images, and other stages will be generated automatically."}
 
     else:
         task["status"] = queue_manager.TaskStatus.FAILED
@@ -98,12 +217,10 @@ async def confirm_task(request: ConfirmationRequest):
 
 @app.get("/status/{task_id}")
 async def get_status(task_id: str):
-    """Check the current status of a task."""
     task = queue_manager.get_task_status(task_id)
     if not task:
         raise HTTPException(status_code=404, detail="Task not found.")
 
-    # If waiting confirmation, return script only
     if task["status"] == queue_manager.TaskStatus.WAITING_CONFIRMATION:
         return {"status": task["status"], "script": task["result"]["script"]}
 
@@ -126,6 +243,3 @@ async def startup_event():
 @app.on_event("shutdown")
 async def shutdown_event():
     logging.info("🛑 Server shutting down...")
-
-
-app.include_router(router)