[#78] Refactor patch set-default route into patch update KB & link into MCP server

Author: wayangalihpratama

backend/app/api/api_v1/apps.py

@@ -27,6 +27,7 @@
     KnowledgeBaseItem,
     KnowledgeBaseCreateRequest,
     KnowledgeBaseResponse,
+    KnowledgeBaseUpdateRequest,
 )
 from mcp_clients.kb_mcp_endpoint_service import KnowledgeBaseMCPEndpointService
 
@@ -189,7 +190,7 @@ def rotate_tokens(
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST,
                 detail=(
-                    "new_callback_token is required when rotate_callback_token is true"
+                    "new_callback_token is required when rotate_callback_token is true"  # noqa
                 ),
             )
         AppService.rotate_callback_token(
@@ -409,7 +410,7 @@ async def create_knowledge_base(
 
 
 @router.patch(
-    "/knowledge-bases/{kb_id}/default",
+    "/knowledge-bases/{kb_id}",
     response_model=KnowledgeBaseResponse,
     status_code=status.HTTP_200_OK,
     responses={
@@ -424,45 +425,34 @@ async def create_knowledge_base(
         500: {"model": ErrorResponse, "description": "Internal server error"},
     },
 )
-async def set_default_knowledge_base(
+async def update_knowledge_base(
     *,
     kb_id: int,
     db: Session = Depends(get_db),
+    request_data: KnowledgeBaseUpdateRequest,
     current_app: App = Depends(get_current_app),
 ) -> Any:
     """
     Set a specific KB as the default for the authenticated app.
     - Automatically unsets the previous default KB.
     - Returns the updated KB record.
     """
-    if current_app.status != "active":
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="App must be active to change default KB.",
-        )
-
     try:
-        app_kb = AppService.set_default_knowledge_base(
-            db=db, app=current_app, kb_id=kb_id
-        )
-
-        # get KB detail from MCP service
-        kb_mcp_service = KnowledgeBaseMCPEndpointService()
-        kb_result = await kb_mcp_service.get_kb(kb_id=kb_id)
-
-        return KnowledgeBaseResponse(
-            id=app_kb.id,
-            knowledge_base_id=app_kb.knowledge_base_id,
-            name=kb_result.get("name", ""),
-            description=kb_result.get("description", ""),
-            is_default=app_kb.is_default,
+        update_result = await AppService.update_knowledge_base(
+            db=db,
+            app=current_app,
+            kb_id=kb_id,
+            name=request_data.name,
+            description=request_data.description,
+            is_default=request_data.is_default,
         )
+        return update_result
     except HTTPException:
         raise
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail=f"Failed to set default KB: {str(e)}",
+            detail=f"Failed to update KB: {str(e)}",
         )
 
 
@@ -519,7 +509,7 @@ async def delete_knowledge_base(
     if app_kb.is_default:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
-            detail="Cannot delete the default knowledge base. Set another KB as default first.",
+            detail="Cannot delete the default knowledge base. Set another KB as default first.",  # noqa
         )
 
     try:

backend/app/api/api_v1/jobs.py

@@ -46,15 +46,15 @@ async def create_job(
                     ],
                     "callback_params": {"reply_to": "wa:+1234"},
                     "trace_id": "trace_abc_123",
-                    "knowledge_base_ids": [1, 2]  // Optional, defaults to app default KB
+                    "knowledge_base_ids": [1, 2]  // Optional, default app KB
                 }
 
                 Example upload job:
                 {
                     "job": "upload",
                     "metadata": {"title": "Chlorination SOP"},
                     "callback_params": {"ui_upload_id": "up_456"},
-                    "knowledge_base_id": 1  // Optional, defaults to app default KB
+                    "knowledge_base_id": 1  // Optional, default app KB
                 }
                 """
             ),
@@ -94,6 +94,7 @@ async def create_job(
     # 🚀 Handle CHAT jobs
     if job_type == "chat":
         kb_ids = data.get("knowledge_base_ids", [])
+        kb_ids = [int(kbid) for kbid in kb_ids]
         valid_app_kb_ids = [
             kb.knowledge_base_id
             for kb in current_app.knowledge_bases
@@ -104,7 +105,7 @@ async def create_job(
         if kb_ids and not valid_app_kb_ids:
             raise HTTPException(
                 status_code=404,
-                detail="Provided knowledge_base_ids are invalid or not linked to this app",
+                detail="Provided knowledge_base_ids are invalid or not linked to this app",  # noqa
             )
 
         # If no kb_ids provided, fallback to default KB
@@ -132,6 +133,7 @@ async def create_job(
     # 🚀 Handle UPLOAD jobs
     elif job_type == "upload":
         kb_id = data.get("knowledge_base_id")
+        kb_id = int(kb_id) if kb_id else None
         app_kb = None
         if kb_id:
             app_kb = next(
@@ -145,7 +147,7 @@ async def create_job(
             if not app_kb:
                 raise HTTPException(
                     status_code=404,
-                    detail=f"Knowledge base {kb_id} not found or not associated with this app",
+                    detail=f"Knowledge base {kb_id} not found or not associated with this app",  # noqa
                 )
 
         # Default fallback

backend/app/schemas/app.py

@@ -128,6 +128,16 @@ class KnowledgeBaseCreateRequest(BaseModel):
     )
 
 
+class KnowledgeBaseUpdateRequest(BaseModel):
+    name: Optional[str] = Field(None, description="Name of the knowledge base")
+    description: Optional[str] = Field(
+        None, description="Description of the KB"
+    )
+    is_default: Optional[bool] = Field(
+        None, description="Whether this KB is the default for the app"
+    )
+
+
 class KnowledgeBaseResponse(BaseModel):
     id: int
     knowledge_base_id: int

backend/app/services/app_service.py

@@ -4,7 +4,11 @@
 from fastapi import HTTPException
 
 from app.models.app import App, AppStatus, AppKnowledgeBase
-from app.schemas.app import AppRegisterRequest, AppUpdateRequest
+from app.schemas.app import (
+    AppRegisterRequest,
+    AppUpdateRequest,
+    KnowledgeBaseResponse,
+)
 from mcp_clients.kb_mcp_endpoint_service import (
     KnowledgeBaseMCPEndpointService,
 )
@@ -201,11 +205,16 @@ async def create_knowledge_base(
         return app_kb
 
     @staticmethod
-    def set_default_knowledge_base(
-        db: Session, app: App, kb_id: int
-    ) -> AppKnowledgeBase:
+    async def update_knowledge_base(
+        db: Session,
+        app: App,
+        kb_id: int,
+        name: str | None = None,
+        description: str | None = None,
+        is_default: bool | None = None,
+    ) -> KnowledgeBaseResponse:
         """
-        Set the specified KB as the default for the given app.
+        Update knowledge base detail
         """
         app_kb = (
             db.query(AppKnowledgeBase)
@@ -217,14 +226,36 @@ def set_default_knowledge_base(
                 status_code=404, detail="Knowledge base not found for this app"
             )
 
-        # Unset existing default
-        AppService._unset_existing_default(db, app)
+        kb_mcp_service = KnowledgeBaseMCPEndpointService()
+
+        data = {}
+        if name is not None:
+            data["name"] = name
+        if description is not None:
+            data["description"] = description
+
+        kb_result = await kb_mcp_service.update_kb(
+            kb_id=kb_id,
+            data=data,
+        )
+        if not kb_result:
+            raise HTTPException(
+                status_code=500, detail="Failed to update KB from MCP service"
+            )
+
+        if is_default is not None:
+            # Update  default
+            app_kb.is_default = is_default
 
-        # Set new default
-        app_kb.is_default = True
         db.commit()
         db.refresh(app_kb)
-        return app_kb
+        return KnowledgeBaseResponse(
+            id=app_kb.id,
+            knowledge_base_id=app_kb.knowledge_base_id,
+            name=kb_result.get("name"),
+            description=kb_result.get("description"),
+            is_default=app_kb.is_default,
+        )
 
     @staticmethod
     def delete_knowledge_base(db: Session, app: App, kb_id: int):

backend/mcp_clients/kb_mcp_endpoint_service.py

@@ -192,7 +192,14 @@ async def upload_and_process_documents(
                 filename = os.path.basename(f)
                 content_type, _ = mimetypes.guess_type(filename)
                 file_payload.append(
-                    ("files", (filename, content, content_type or "application/octet-stream"))
+                    (
+                        "files",
+                        (
+                            filename,
+                            content,
+                            content_type or "application/octet-stream",
+                        ),
+                    )
                 )
             else:
                 raise ValueError(f"Invalid file input: {f!r}")