Update admin_routes.py

admin_routes.py

@@ -236,14 +236,80 @@ def add_activity_log(config: dict, username: str, action: str,
     if len(config["activity_log"]) > 1000:
         config["activity_log"] = config["activity_log"][-1000:]
 
-async def notify_spark(project: dict, version: dict, global_config: dict):
-    """Notify Spark about published version"""
+async def _spark_project_control(action: str, project_name: str, username: str):
+    """Common function for Spark project control"""
+    if not project_name:
+        raise HTTPException(status_code=400, detail="project_name is required")
+    
+    config = load_config()
+    spark_endpoint = config.get("config", {}).get("spark_endpoint", "").rstrip("/")
+    spark_token = _get_spark_token()
+    
+    if not spark_endpoint:
+        raise HTTPException(status_code=400, detail="Spark endpoint not configured")
+    
+    if not spark_token:
+        raise HTTPException(status_code=400, detail="Spark token not configured")
+    
+    headers = {
+        "Authorization": f"Bearer {spark_token}",
+        "Content-Type": "application/json"
+    }
+    
+    try:
+        async with httpx.AsyncClient(timeout=30) as client:
+            if action == "delete":
+                response = await client.delete(
+                    f"{spark_endpoint}/project/delete",
+                    json={"project_name": project_name},
+                    headers=headers
+                )
+            else:
+                response = await client.post(
+                    f"{spark_endpoint}/project/{action}",
+                    json={"project_name": project_name},
+                    headers=headers
+                )
+            
+            response.raise_for_status()
+            return response.json()
+            
+    except httpx.HTTPStatusError as e:
+        error_detail = e.response.json() if e.response.text else {"error": str(e)}
+        raise HTTPException(status_code=e.response.status_code, detail=error_detail)
+    except Exception as e:
+        log(f"❌ Spark {action} failed: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+def _get_spark_token() -> Optional[str]:
+    """Get Spark token based on work_mode"""
+    config = load_config()
+    work_mode = config.get("config", {}).get("work_mode", "on-premise")
+    
+    if work_mode in ("hfcloud", "cloud"):
+        # Cloud mode - use HuggingFace Secrets
+        token = os.getenv("SPARK_TOKEN")
+        if not token:
+            log("❌ SPARK_TOKEN not found in HuggingFace Secrets!")
+        return token
+    else:
+        # On-premise mode - use .env file
+        from dotenv import load_dotenv
+        load_dotenv()
+        return os.getenv("SPARK_TOKEN")
+
+async def notify_spark_manual(project: dict, version: dict, global_config: dict):
+    """Manual Spark notification (similar to notify_spark but returns response)"""
     import httpx
     
     spark_endpoint = global_config.get("spark_endpoint", "").rstrip("/")
+    spark_token = _get_spark_token()
+    
     if not spark_endpoint:
-        log("⚠️ Spark endpoint not configured")
-        return
+        raise ValueError("Spark endpoint not configured")
+    
+    if not spark_token:
+        raise ValueError("Spark token not configured")
     
     work_mode = global_config.get("work_mode", "hfcloud")
     cloud_token = global_config.get("cloud_token", "")
@@ -264,17 +330,19 @@ async def notify_spark(project: dict, version: dict, global_config: dict):
         "fine_tune_zip": version["llm"]["fine_tune_zip"] if version["llm"]["use_fine_tune"] else None
     }
     
-    log(f"🚀 Notifying Spark about {project['name']} v{version['id']}")
+    headers = {
+        "Authorization": f"Bearer {spark_token}",
+        "Content-Type": "application/json"
+    }
+    
+    log(f"🚀 Manually notifying Spark about {project['name']} v{version['id']}")
     
     async with httpx.AsyncClient(timeout=30) as client:
-        try:
-            response = await client.post(spark_endpoint + "/startup", json=payload)
-            response.raise_for_status()
-            result = response.json()
-            log(f"✅ Spark notification successful: {result.get('message', 'OK')}")
-        except Exception as e:
-            log(f"❌ Spark notification failed: {e}")
-            raise
+        response = await client.post(spark_endpoint + "/startup", json=payload, headers=headers)
+        response.raise_for_status()
+        result = response.json()
+        log(f"✅ Spark manual notification successful: {result.get('message', 'OK')}")
+        return result
 
 # ===================== Auth Endpoints =====================
 @router.post("/login", response_model=LoginResponse)
@@ -791,7 +859,7 @@ async def publish_version(
     # Notify Spark if project is enabled
     if project.get("enabled", False):
         try:
-            await notify_spark(project, version, config.get("config", {}))
+            await notify_spark_manual(project, version, config.get("config", {}))
         except Exception as e:
             log(f"⚠️ Failed to notify Spark: {e}")
             # Don't fail the publish 
@@ -959,6 +1027,75 @@ async def delete_api(api_name: str, username: str = Depends(verify_token)):
     log(f"✅ API '{api_name}' deleted by {username}")
     return {"success": True}
 
+# ===================== Spark Integration Endpoints =====================
+@router.post("/spark/startup")
+async def spark_startup(request: dict = Body(...), username: str = Depends(verify_token)):
+    """Trigger Spark startup for a project"""
+    project_name = request.get("project_name")
+    if not project_name:
+        raise HTTPException(status_code=400, detail="project_name is required")
+    
+    config = load_config()
+    
+    # Find project
+    project = next((p for p in config.get("projects", []) if p["name"] == project_name), None)
+    if not project:
+        raise HTTPException(status_code=404, detail=f"Project not found: {project_name}")
+    
+    # Find published version
+    version = next((v for v in project.get("versions", []) if v.get("published", False)), None)
+    if not version:
+        raise HTTPException(status_code=400, detail=f"No published version found for project: {project_name}")
+    
+    # Notify Spark
+    try:
+        result = await notify_spark_manual(project, version, config.get("config", {}))
+        return {"message": result.get("message", "Spark startup initiated")}
+    except Exception as e:
+        log(f"❌ Spark startup failed: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.get("/spark/projects")
+async def spark_get_projects(username: str = Depends(verify_token)):
+    """Get Spark project list"""
+    config = load_config()
+    spark_endpoint = config.get("config", {}).get("spark_endpoint", "").rstrip("/")
+    spark_token = _get_spark_token()
+    
+    if not spark_endpoint:
+        raise HTTPException(status_code=400, detail="Spark endpoint not configured")
+    
+    if not spark_token:
+        raise HTTPException(status_code=400, detail="Spark token not configured")
+    
+    headers = {
+        "Authorization": f"Bearer {spark_token}"
+    }
+    
+    try:
+        async with httpx.AsyncClient(timeout=30) as client:
+            response = await client.get(spark_endpoint + "/project/list", headers=headers)
+            response.raise_for_status()
+            return response.json()
+    except Exception as e:
+        log(f"❌ Failed to get Spark projects: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+@router.post("/spark/project/enable")
+async def spark_enable_project(request: dict = Body(...), username: str = Depends(verify_token)):
+    """Enable project in Spark"""
+    return await _spark_project_control("enable", request.get("project_name"), username)
+
+@router.post("/spark/project/disable") 
+async def spark_disable_project(request: dict = Body(...), username: str = Depends(verify_token)):
+    """Disable project in Spark"""
+    return await _spark_project_control("disable", request.get("project_name"), username)
+
+@router.delete("/spark/project/{project_name}")
+async def spark_delete_project(project_name: str, username: str = Depends(verify_token)):
+    """Delete project from Spark"""
+    return await _spark_project_control("delete", project_name, username)
+
 # ===================== Test Endpoints =====================
 @router.post("/apis/test")
 async def test_api(api: APICreate, username: str = Depends(verify_token)):