Update project_controller.py

project_controller.py

@@ -1,256 +1,75 @@
-from fastapi import APIRouter, HTTPException, Request, Depends
-from config_provider import get_config, service_config
-from service_config import ServiceConfig
+from fastapi import APIRouter, Depends, HTTPException
+from config_provider import get_config, ServiceConfig
 from utils import save_service_config, log
-import datetime
-import json
 import copy
 
 router = APIRouter()
 
-def get_utc_now():
-    return datetime.datetime.utcnow().isoformat()
-
-@router.get("/list")
-def list_projects(config: ServiceConfig = Depends(get_config)):
-    return config.projects
-
-@router.get("/{project_name}/latest")
-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")
-
-    if not project.get("versions"):
-        raise HTTPException(status_code=404, detail="No versions found")
-
-    latest = max(project["versions"], key=lambda v: v["version_number"])
-
-    return {
-        "version_number": latest["version_number"],
-        "published": latest.get("published", False),
-        "intents": latest.get("intents", []),
-        "llm": latest.get("llm", {}),
-        "last_updated": project.get("last_updated", get_utc_now())
+@router.post("/project/new")
+def create_project(name: str, config: ServiceConfig = Depends(get_config)):
+    if any(p['name'] == name for p in config.data['projects']):
+        raise HTTPException(status_code=400, detail="Project already exists")
+    new_project = {
+        "name": name,
+        "versions": []
     }
-
-@router.post("/update")
-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 = config.projects.get(project_name)
+    config.data['projects'].append(new_project)
+    save_service_config(config)
+    log(f"✅ New project '{name}' created")
+    return { "status": "success" }
+
+@router.post("/project/delete")
+def delete_project(name: str, config: ServiceConfig = Depends(get_config)):
+    project = next((p for p in config.data['projects'] if p['name'] == name), None)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
+    config.data['projects'].remove(project)
+    save_service_config(config)
+    log(f"🗑️ Project '{name}' deleted")
+    return { "status": "success" }
 
-    if project.get("last_updated") != client_last_updated:
-        raise HTTPException(status_code=409, detail="Record updated by another user. Please reload.")
-
-    latest = max(project["versions"], key=lambda v: v["version_number"])
-    if latest.get("published"):
-        raise HTTPException(status_code=400, detail="Cannot edit a published version.")
-
-    latest.update(new_data)
-    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"Project {project_name} updated"}
-
-@router.post("/publish")
-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 = config.projects.get(project_name)
-    if not project:
-        raise HTTPException(status_code=404, detail="Project not found")
-
-    if project.get("last_updated") != client_last_updated:
-        raise HTTPException(status_code=409, detail="Record updated by another user. Please reload.")
-
-    latest = max(project["versions"], key=lambda v: v["version_number"])
-    if latest.get("published"):
-        raise HTTPException(status_code=400, detail="Version already published.")
-
-    llm = latest.get("llm", {})
-    if not llm.get("repo_id"):
-        raise HTTPException(status_code=400, detail="repo_id is required")
-    if llm.get("use_fine_tune") and not llm.get("fine_tune_zip"):
-        raise HTTPException(status_code=400, detail="fine_tune_zip is required when use_fine_tune is true")
-
-    latest["published"] = True
-    latest["last_updated"] = get_utc_now()
-
-    new_version_number = latest["version_number"] + 1
-    new_version = copy.deepcopy(latest)
-    new_version["version_number"] = new_version_number
-    new_version["published"] = False
-    new_version["last_updated"] = get_utc_now()
-    new_version["intents"] = []
-    new_version["llm"] = copy.deepcopy(llm)
-
-    project["versions"].append(new_version)
-    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"Project {project_name} version published and new draft version {new_version_number} created"}
-
-@router.post("/add_intent")
-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 = config.projects.get(project_name)
+@router.post("/project/new-version")
+def create_new_version(project_name: str, base_version_no: int, config: ServiceConfig = Depends(get_config)):
+    project = next((p for p in config.data['projects'] if p['name'] == project_name), None)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
-
-    latest = max(project["versions"], key=lambda v: v["version_number"])
-    if any(intent["name"] == intent_name for intent in latest.get("intents", [])):
-        raise HTTPException(status_code=400, detail="Intent with this name already exists.")
-
-    latest.setdefault("intents", []).append({
-        "name": intent_name,
-        "examples": [],
-        "parameters": [],
-        "action": "",
-        "fallback_timeout_message": "",
-        "fallback_error_message": "",
-        "humanization_prompt": ""
-    })
-    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} added to project {project_name}"}
-
-@router.post("/delete_intent")
-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 = config.projects.get(project_name)
+    base_version = next((v for v in project['versions'] if v['no'] == base_version_no), None)
+    if not base_version:
+        raise HTTPException(status_code=404, detail="Base version not found")
+    new_version_no = max((v['no'] for v in project['versions']), default=0) + 1
+    new_version = copy.deepcopy(base_version)
+    new_version['no'] = new_version_no
+    new_version['published'] = False
+    project['versions'].append(new_version)
+    save_service_config(config)
+    log(f"✅ New version {new_version_no} created for project {project_name}")
+    return { "status": "success", "new_version": new_version_no }
+
+@router.post("/project/delete-version")
+def delete_version(project_name: str, version_no: int, config: ServiceConfig = Depends(get_config)):
+    project = next((p for p in config.data['projects'] if p['name'] == project_name), None)
     if not project:
         raise HTTPException(status_code=404, detail="Project not found")
-
-    latest = max(project["versions"], key=lambda v: v["version_number"])
-    intents = latest.get("intents", [])
-    new_intents = [intent for intent in intents if intent["name"] != intent_name]
-    if len(new_intents) == len(intents):
-        raise HTTPException(status_code=404, detail="Intent not found.")
-
-    latest["intents"] = new_intents
-    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} 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)
+    version = next((v for v in project['versions'] if v['no'] == version_no), None)
+    if not version:
+        raise HTTPException(status_code=404, detail="Version not found")
+    project['versions'].remove(version)
+    save_service_config(config)
+    log(f"🗑️ Version {version_no} deleted from project {project_name}")
+    return { "status": "success" }
+
+@router.post("/project/update-api")
+def update_api(project_name: str, version_no: int, api_data: dict, config: ServiceConfig = Depends(get_config)):
+    project = next((p for p in config.data['projects'] if p['name'] == project_name), None)
     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(config: ServiceConfig = Depends(get_config)):
-    config.projects = {
-        "demo-project": {
-            "enabled": True,
-            "last_updated": get_utc_now(),
-            "versions": [
-                {
-                    "version_number": 1,
-                    "published": True,
-                    "last_updated": get_utc_now(),
-                    "intents": [{"name": "weather-intent"}, {"name": "currency-intent"}],
-                    "llm": {
-                        "repo_id": "demo/repo",
-                        "use_fine_tune": False
-                    }
-                },
-                {
-                    "version_number": 2,
-                    "published": False,
-                    "last_updated": get_utc_now(),
-                    "intents": [],
-                    "llm": {
-                        "repo_id": "demo/repo",
-                        "use_fine_tune": False
-                    }
-                }
-            ]
-        }
-    }
-    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(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("/project/new-version")
-def create_new_version(base_version_id: int, config: ServiceConfig = Depends(get_config)):
-    try:
-        project = config.get_current_project()
-        base_version = next((v for v in project['versions'] if v['no'] == base_version_id), None)
-        if not base_version:
-            raise HTTPException(status_code=404, detail="Base version not found")
-
-        new_version_no = max(v['no'] for v in project['versions']) + 1
-        new_version = copy.deepcopy(base_version)
-        new_version['no'] = new_version_no
-        new_version['published'] = False
-        project['versions'].append(new_version)
-
-        save_service_config(config)
-        log(f"✅ New version {new_version_no} created for project {project['name']}")
-        return { "status": "success", "new_version": new_version_no }
-
-    except Exception as e:
-        log(f"❌ Error creating new version: {str(e)}")
-        raise HTTPException(status_code=500, detail="Failed to create new version")
-
+    version = next((v for v in project['versions'] if v['no'] == version_no), None)
+    if not version:
+        raise HTTPException(status_code=404, detail="Version not found")
+    existing_api = next((a for a in version['apis'] if a['name'] == api_data['name']), None)
+    if existing_api:
+        version['apis'].remove(existing_api)
+    version['apis'].append(api_data)
+    save_service_config(config)
+    log(f"🔧 API '{api_data['name']}' updated in project {project_name} version {version_no}")
+    return { "status": "success" }