Update project_controller.py

project_controller.py

@@ -1,23 +1,21 @@
-from fastapi import APIRouter, Request, HTTPException
-from service_config import ServiceConfig
+from fastapi import APIRouter, Request, HTTPException, Depends
+from app import get_config, ServiceConfig
 import datetime
 import json
 import copy
 
 router = APIRouter()
-service_config = ServiceConfig()
-service_config.load()
 
 def get_utc_now():
     return datetime.datetime.utcnow().isoformat()
 
 @router.get("/list")
-def list_projects():
-    return service_config.projects
+def list_projects(config: ServiceConfig = Depends(get_config)):
+    return config.projects
 
 @router.get("/{project_name}/latest")
-def get_latest_project_version(project_name: str):
-    project = service_config.projects.get(project_name)
+def get_latest_project_version(project_name: str, config: ServiceConfig = Depends(get_config)):
+    project = config.projects.get(project_name)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
 
@@ -35,13 +33,13 @@ def get_latest_project_version(project_name: str):
     }
 
 @router.post("/update")
-async def update_project(request: Request):
+async def update_project(request: Request, config: ServiceConfig = Depends(get_config)):
     data = await request.json()
     project_name = data.get("project_name")
     client_last_updated = data.get("client_last_updated")
     new_data = data.get("new_data")
 
-    project = service_config.projects.get(project_name)
+    project = config.projects.get(project_name)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
 
@@ -55,18 +53,18 @@ async def update_project(request: Request):
     latest.update(new_data)
     project["last_updated"] = get_utc_now()
 
-    with open(service_config.config_path, "w", encoding="utf-8") as f:
-        json.dump(service_config, f, indent=2)
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
 
     return {"message": f"Project {project_name} updated"}
 
 @router.post("/publish")
-async def publish_project(request: Request):
+async def publish_project(request: Request, config: ServiceConfig = Depends(get_config)):
     data = await request.json()
     project_name = data.get("project_name")
     client_last_updated = data.get("client_last_updated")
 
-    project = service_config.projects.get(project_name)
+    project = config.projects.get(project_name)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
 
@@ -97,18 +95,18 @@ async def publish_project(request: Request):
     project["versions"].append(new_version)
     project["last_updated"] = get_utc_now()
 
-    with open(service_config.config_path, "w", encoding="utf-8") as f:
-        json.dump(service_config, f, indent=2)
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
 
     return {"message": f"Project {project_name} version published and new draft version {new_version_number} created"}
 
 @router.post("/add_intent")
-async def add_intent(request: Request):
+async def add_intent(request: Request, config: ServiceConfig = Depends(get_config)):
     data = await request.json()
     project_name = data.get("project_name")
     intent_name = data.get("intent_name")
 
-    project = service_config.projects.get(project_name)
+    project = config.projects.get(project_name)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
 
@@ -127,18 +125,18 @@ async def add_intent(request: Request):
     })
     project["last_updated"] = get_utc_now()
 
-    with open(service_config.config_path, "w", encoding="utf-8") as f:
-        json.dump(service_config, f, indent=2)
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
 
     return {"message": f"Intent {intent_name} added to project {project_name}"}
 
 @router.post("/delete_intent")
-async def delete_intent(request: Request):
+async def delete_intent(request: Request, config: ServiceConfig = Depends(get_config)):
     data = await request.json()
     project_name = data.get("project_name")
     intent_name = data.get("intent_name")
 
-    project = service_config.projects.get(project_name)
+    project = config.projects.get(project_name)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
 
@@ -151,14 +149,47 @@ async def delete_intent(request: Request):
     latest["intents"] = new_intents
     project["last_updated"] = get_utc_now()
 
-    with open(service_config.config_path, "w", encoding="utf-8") as f:
-        json.dump(service_config, f, indent=2)
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
 
     return {"message": f"Intent {intent_name} deleted from project {project_name}"}
 
+@router.post("/update_intent")
+async def update_intent(request: Request, config: ServiceConfig = Depends(get_config)):
+    data = await request.json()
+    project_name = data.get("project_name")
+    intent_name = data.get("intent_name")
+    intent_data = data.get("intent_data")
+
+    if not project_name or not intent_name or not intent_data:
+        raise HTTPException(status_code=400, detail="project_name, intent_name, and intent_data are required")
+
+    project = config.projects.get(project_name)
+    if not project:
+        raise HTTPException(status_code=404, detail="Project not found")
+
+    latest = max(project["versions"], key=lambda v: v["version_number"])
+
+    updated = False
+    for intent in latest.get("intents", []):
+        if intent.get("name") == intent_name:
+            intent.update(intent_data)
+            updated = True
+            break
+
+    if not updated:
+        raise HTTPException(status_code=404, detail="Intent not found in project")
+
+    project["last_updated"] = get_utc_now()
+
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
+
+    return {"message": f"Intent {intent_name} updated in project {project_name}"}
+
 @router.post("/seed/test_data")
-def seed_test_data():
-    service_config.projects = {
+def seed_test_data(config: ServiceConfig = Depends(get_config)):
+    config.projects = {
         "demo-project": {
             "enabled": True,
             "last_updated": get_utc_now(),
@@ -186,49 +217,15 @@ def seed_test_data():
             ]
         }
     }
-    with open(service_config.config_path, "w", encoding="utf-8") as f:
-        json.dump(service_config, f, indent=2)
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
 
     return {"message": "Test data seeded"}
 
 @router.post("/clear/all")
-def clear_all():
-    service_config.projects = {}
-    with open(service_config.config_path, "w", encoding="utf-8") as f:
-        json.dump(service_config, f, indent=2)
+def clear_all(config: ServiceConfig = Depends(get_config)):
+    config.projects = {}
+    with open(config.config_path, "w", encoding="utf-8") as f:
+        json.dump(config, f, indent=2)
 
     return {"message": "All projects cleared"}
-
-@router.post("/update_intent")
-async def update_intent(request: Request):
-    data = await request.json()
-    project_name = data.get("project_name")
-    intent_name = data.get("intent_name")
-    intent_data = data.get("intent_data")
-
-    if not project_name or not intent_name or not intent_data:
-        raise HTTPException(status_code=400, detail="project_name, intent_name, and intent_data are required")
-
-    project = service_config.projects.get(project_name)
-    if not project:
-        raise HTTPException(status_code=404, detail="Project not found")
-
-    latest = max(project["versions"], key=lambda v: v["version_number"])
-
-    updated = False
-    for intent in latest.get("intents", []):
-        if intent.get("name") == intent_name:
-            intent.update(intent_data)
-            updated = True
-            break
-
-    if not updated:
-        raise HTTPException(status_code=404, detail="Intent not found in project")
-
-    project["last_updated"] = get_utc_now()
-
-    with open(service_config.config_path, "w", encoding="utf-8") as f:
-        json.dump(service_config, f, indent=2)
-
-    return {"message": f"Intent {intent_name} updated in project {project_name}"}
-