Update app.py

app.py

@@ -15,8 +15,10 @@ from pydantic import BaseModel
 import requests
 
 print("=" * 60)
-print("🚀 STARTING STATUS TRACKER (with Gradio wrapper)")
+print("🚀 STARTING STATUS TRACKER (Gradio 6.9.0)")
 print("=" * 60)
+print(f"Python version: {sys.version}")
+print(f"Gradio version: {gr.__version__}")
 
 # =============================================
 # CREATE FASTAPI APP
@@ -50,7 +52,7 @@ class RegisterRequest(BaseModel):
 class StatusUpdate(BaseModel):
     project_id: str
     service_type: str
-    status: str
+    status: str  # 'processing', 'completed', 'failed'
     file_urls: Optional[List[str]] = None
     error: Optional[str] = None
 
@@ -77,7 +79,8 @@ def load_service_configs():
         for config in configs:
             services_config[config["type"]] = ServiceConfig(**config)
         print(f"✅ Loaded {len(configs)} service configurations")
-    except:
+    except Exception as e:
+        print(f"⚠️ Using default configs: {e}")
         services_config["tts"] = ServiceConfig(name="TTS", type="tts", timeout_minutes=30)
         services_config["image"] = ServiceConfig(name="Image", type="image", timeout_minutes=30)
         print("✅ Using default service configurations")
@@ -90,18 +93,37 @@ load_service_configs()
 
 @app.get("/health")
 async def health():
-    return {"status": "healthy", "active_projects": len(projects), "timestamp": datetime.now().isoformat()}
+    return {
+        "status": "healthy", 
+        "active_projects": len(projects), 
+        "timestamp": datetime.now().isoformat()
+    }
 
 @app.get("/test")
 async def test():
-    return {"message": "API is working!"}
+    return {"message": "API is working!", "timestamp": datetime.now().isoformat()}
 
 @app.post("/api/register")
 async def register_project(request: RegisterRequest):
     try:
         project_id = request.project_id or str(uuid.uuid4())[:8]
+        
+        # Validate services
+        for service in request.services:
+            if service not in services_config:
+                return JSONResponse(
+                    status_code=400,
+                    content={"error": f"Unknown service: {service}", "available": list(services_config.keys())}
+                )
+        
         projects[project_id] = Project(project_id, request.n8n_webhook, request.services)
-        return {"status": "registered", "project_id": project_id, "webhook": request.n8n_webhook, "services": request.services}
+        
+        return {
+            "status": "registered", 
+            "project_id": project_id, 
+            "webhook": request.n8n_webhook, 
+            "services": request.services
+        }
     except Exception as e:
         return JSONResponse(status_code=500, content={"error": str(e)})
 
@@ -112,32 +134,52 @@ async def update_status(update: StatusUpdate):
             return JSONResponse(status_code=404, content={"error": "Project not found"})
         
         project = projects[update.project_id]
+        
+        if update.service_type not in project.services:
+            return JSONResponse(status_code=400, content={"error": f"Service {update.service_type} not in project"})
+        
+        # Update service status
         project.services[update.service_type]["status"] = update.status
         if update.file_urls:
             project.services[update.service_type]["file_urls"] = update.file_urls
         
+        # Check if all services are complete
         all_completed = all(s["status"] == "completed" for s in project.services.values())
         
         if all_completed and not project.completed_at:
             project.completed_at = datetime.now()
+            
+            # Prepare final data
             final_data = {
                 "project_id": update.project_id,
                 "status": "completed",
                 "completed_at": project.completed_at.isoformat(),
                 "services": {}
             }
+            
             for s_type, s_data in project.services.items():
                 final_data["services"][s_type] = {
                     "file_urls": s_data.get("file_urls", []),
                     "file_count": len(s_data.get("file_urls", []))
                 }
             
+            # Send webhook to n8n
             try:
-                requests.post(project.n8n_webhook, json=final_data, timeout=10)
-            except:
-                pass
+                response = requests.post(
+                    project.n8n_webhook, 
+                    json=final_data, 
+                    timeout=10,
+                    headers={"Content-Type": "application/json"}
+                )
+                print(f"📤 Webhook sent: {response.status_code}")
+            except Exception as e:
+                print(f"⚠️ Webhook failed: {e}")
         
-        return {"status": "updated", "all_completed": all_completed}
+        return {
+            "status": "updated", 
+            "all_completed": all_completed,
+            "project_id": update.project_id
+        }
     except Exception as e:
         return JSONResponse(status_code=500, content={"error": str(e)})
 
@@ -145,6 +187,7 @@ async def update_status(update: StatusUpdate):
 async def get_status(project_id: str):
     if project_id not in projects:
         raise HTTPException(status_code=404, detail="Project not found")
+    
     project = projects[project_id]
     return {
         "project_id": project_id,
@@ -158,7 +201,9 @@ async def get_status(project_id: str):
 async def root():
     return {
         "name": "Status Tracker API",
+        "version": "1.0.0",
         "status": "running",
+        "gradio_version": gr.__version__,
         "endpoints": {
             "health": "GET /health",
             "test": "GET /test",
@@ -166,47 +211,116 @@ async def root():
             "update": "POST /api/update",
             "status": "GET /api/status/{project_id}"
         },
-        "active_projects": len(projects)
+        "active_projects": len(projects),
+        "configured_services": list(services_config.keys()),
+        "timestamp": datetime.now().isoformat()
     }
 
 # =============================================
-# GRADIO WRAPPER (REQUIRED FOR HUGGING FACE)
+# GRADIO INTERFACE (for Gradio 6.9.0)
 # =============================================
 
-def create_gradio_interface():
-    with gr.Blocks(title="Status Tracker") as demo:
-        gr.Markdown("# 🔄 Status Tracker API")
-        gr.Markdown("This space provides API endpoints for tracking generation status across multiple services.")
+# Simple function to get project count
+def get_project_count():
+    return len(projects)
+
+def get_service_list():
+    return ", ".join(services_config.keys())
+
+# Create Gradio interface
+with gr.Blocks(title="Status Tracker", theme=gr.themes.Soft()) as demo:
+    gr.Markdown("# 🔄 Status Tracker API")
+    gr.Markdown("Centralized service for tracking generation status across multiple Hugging Face Spaces.")
+    
+    with gr.Row():
+        with gr.Column(scale=1):
+            gr.Markdown("### 📊 Current Status")
+            project_count = gr.Number(label="Active Projects", value=get_project_count, every=5)
+            services_display = gr.Textbox(label="Configured Services", value=get_service_list, interactive=False)
+            refresh_btn = gr.Button("🔄 Refresh")
         
-        with gr.Row():
-            with gr.Column():
-                gr.Markdown("### 📊 Current Status")
-                project_count = gr.Number(label="Active Projects", value=len(projects))
-                refresh_btn = gr.Button("Refresh")
-            
-            with gr.Column():
-                gr.Markdown("### 📚 API Endpoints")
-                gr.Markdown("""
-                - `GET /health` - Health check
-                - `GET /test` - Test endpoint
-                - `POST /api/register` - Register project
-                - `POST /api/update` - Update status
-                - `GET /api/status/{{project_id}}` - Get project status
-                """)
+        with gr.Column(scale=2):
+            gr.Markdown("### 📚 API Documentation")
+            gr.Markdown("""
+            | Endpoint | Method | Description |
+            |----------|--------|-------------|
+            | `/health` | GET | Health check |
+            | `/test` | GET | Test endpoint |
+            | `/api/register` | POST | Register a new project |
+            | `/api/update` | POST | Update service status |
+            | `/api/status/{project_id}` | GET | Get project status |
+            """)
+    
+    with gr.Row():
+        gr.Markdown("### 🚀 Quick Test")
+        
+        with gr.Column():
+            test_project_id = gr.Textbox(label="Project ID", placeholder="test-123")
+            test_service = gr.Dropdown(label="Service Type", choices=list(services_config.keys()), value="tts")
+            test_status = gr.Dropdown(label="Status", choices=["processing", "completed", "failed"], value="completed")
+            test_btn = gr.Button("Test Status Update")
+            test_output = gr.JSON(label="Response")
+        
+        def test_update(project_id, service, status):
+            test_data = {
+                "project_id": project_id,
+                "service_type": service,
+                "status": status,
+                "file_urls": ["https://example.com/test.mp3"] if service == "tts" else ["https://example.com/test.png"]
+            }
+            try:
+                response = requests.post(
+                    f"https://{os.environ.get('SPACE_ID', 'localhost')}.hf.space/api/update",
+                    json=test_data,
+                    timeout=5
+                )
+                return response.json()
+            except:
+                return {"error": "Could not send test update"}
         
-        refresh_btn.click(
-            fn=lambda: len(projects),
-            outputs=[project_count]
+        test_btn.click(
+            fn=test_update,
+            inputs=[test_project_id, test_service, test_status],
+            outputs=[test_output]
         )
     
-    return demo
-
-# Create Gradio interface
-demo = create_gradio_interface()
+    gr.Markdown("---")
+    gr.Markdown("### 🔧 Configuration")
+    gr.Markdown(f"**Services configured:** {', '.join(services_config.keys())}")
+    
+    refresh_btn.click(
+        fn=lambda: (len(projects), ", ".join(services_config.keys())),
+        outputs=[project_count, services_display]
+    )
 
-# Mount FastAPI app to Gradio
+# Mount FastAPI app to Gradio (for Gradio 6.9.0)
 app = gr.mount_gradio_app(app, demo, path="/")
 
+# =============================================
+# BACKGROUND CLEANUP TASK
+# =============================================
+
+def cleanup_old_projects():
+    while True:
+        time.sleep(300)  # Every 5 minutes
+        now = datetime.now()
+        to_delete = []
+        
+        for pid, project in projects.items():
+            # Remove completed projects after 1 hour
+            if project.completed_at and (now - project.completed_at).total_seconds() > 3600:
+                to_delete.append(pid)
+            # Remove stuck projects after 2 hours
+            elif (now - project.created_at).total_seconds() > 7200:
+                to_delete.append(pid)
+        
+        for pid in to_delete:
+            del projects[pid]
+            print(f"🧹 Cleaned up project: {pid}")
+
+cleanup_thread = threading.Thread(target=cleanup_old_projects, daemon=True)
+cleanup_thread.start()
+
 # =============================================
 # RUN
 # =============================================
@@ -214,9 +328,8 @@ if __name__ == "__main__":
     print("\n" + "=" * 60)
     print("✅ Status Tracker ready!")
     print(f"📊 Active projects: {len(projects)}")
+    print(f"🔧 Services: {list(services_config.keys())}")
     print("🌐 Server running on port 7860")
     print("=" * 60)
     
-    # Import uvicorn here to avoid circular imports
-    import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)