Update spark_controller.py

spark_controller.py

@@ -1,61 +1,77 @@
-from fastapi import APIRouter, Request, HTTPException
-import requests
-from service_config import ServiceConfig
+from fastapi import APIRouter, HTTPException, Depends, Request
+from app import get_config, ServiceConfig
+import random
+import json
 
 router = APIRouter()
-service_config = ServiceConfig()
-service_config.load()
-
-@router.post("/startup")
-async def spark_startup(request: Request):
-    data = await request.json()
-    spark_url = service_config.spark_endpoint + "/startup"
-    try:
-        response = requests.post(spark_url, json=data, timeout=30)
-        response.raise_for_status()
-        return response.json()
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Spark startup error: {e}")
 
 @router.get("/project_list")
-def spark_project_list():
-    spark_url = service_config.spark_endpoint + "/project/list"
-    try:
-        response = requests.get(spark_url, timeout=30)
-        response.raise_for_status()
-        return response.json()
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Spark project list error: {e}")
+def get_spark_project_list(config: ServiceConfig = Depends(get_config)):
+    if not config.projects:
+        raise HTTPException(status_code=404, detail="No projects found")
+
+    project_list = []
+    for project_name, project_data in config.projects.items():
+        latest_version = max(project_data["versions"], key=lambda v: v["version_number"])
+        project_list.append({
+            "project_name": project_name,
+            "version": latest_version["version_number"],
+            "enabled": project_data.get("enabled", False),
+            "status": random.choice(["loading", "ready", "error"]),  # mock status
+            "last_accessed": project_data.get("last_updated")
+        })
+
+    return {"projects": project_list}
 
 @router.post("/enable")
-async def spark_enable_project(request: Request):
+async def enable_project(request: Request, config: ServiceConfig = Depends(get_config)):
     data = await request.json()
-    spark_url = service_config.spark_endpoint + "/project/enable"
-    try:
-        response = requests.post(spark_url, json=data, timeout=30)
-        response.raise_for_status()
-        return response.json()
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Spark enable error: {e}")
+    project_name = data.get("project_name")
+    if not project_name:
+        raise HTTPException(status_code=400, detail="project_name is required")
+
+    project = config.projects.get(project_name)
+    if not project:
+        raise HTTPException(status_code=404, detail="Project not found")
+
+    project["enabled"] = True
+
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
+
+    return {"message": f"Project {project_name} enabled"}
 
 @router.post("/disable")
-async def spark_disable_project(request: Request):
+async def disable_project(request: Request, config: ServiceConfig = Depends(get_config)):
     data = await request.json()
-    spark_url = service_config.spark_endpoint + "/project/disable"
-    try:
-        response = requests.post(spark_url, json=data, timeout=30)
-        response.raise_for_status()
-        return response.json()
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Spark disable error: {e}")
-
-@router.delete("/delete")
-async def spark_delete_project(request: Request):
+    project_name = data.get("project_name")
+    if not project_name:
+        raise HTTPException(status_code=400, detail="project_name is required")
+
+    project = config.projects.get(project_name)
+    if not project:
+        raise HTTPException(status_code=404, detail="Project not found")
+
+    project["enabled"] = False
+
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
+
+    return {"message": f"Project {project_name} disabled"}
+
+@router.post("/delete")
+async def delete_project(request: Request, config: ServiceConfig = Depends(get_config)):
     data = await request.json()
-    spark_url = service_config.spark_endpoint + "/project"
-    try:
-        response = requests.delete(spark_url, json=data, timeout=30)
-        response.raise_for_status()
-        return response.json()
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Spark delete error: {e}")
+    project_name = data.get("project_name")
+    if not project_name:
+        raise HTTPException(status_code=400, detail="project_name is required")
+
+    if project_name not in config.projects:
+        raise HTTPException(status_code=404, detail="Project not found")
+
+    del config.projects[project_name]
+
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
+
+    return {"message": f"Project {project_name} deleted"}