refac

backend/open_webui/apps/webui/models/files.py

@@ -106,6 +106,13 @@ class FilesTable:
         with get_db() as db:
             return [FileModel.model_validate(file) for file in db.query(File).all()]
 
+    def get_files_by_ids(self, ids: list[str]) -> list[FileModel]:
+        with get_db() as db:
+            return [
+                FileModel.model_validate(file)
+                for file in db.query(File).filter(File.id.in_(ids)).all()
+            ]
+
     def get_files_by_user_id(self, user_id: str) -> list[FileModel]:
         with get_db() as db:
             return [

backend/open_webui/apps/webui/models/knowledge.py

@@ -71,6 +71,12 @@ class KnowledgeForm(BaseModel):
     data: Optional[dict] = None
 
 
+class KnowledgeUpdateForm(BaseModel):
+    name: Optional[str] = None
+    description: Optional[str] = None
+    data: Optional[dict] = None
+
+
 class KnowledgeTable:
     def insert_new_knowledge(
         self, user_id: str, form_data: KnowledgeForm
@@ -116,18 +122,37 @@ class KnowledgeTable:
             return None
 
     def update_knowledge_by_id(
-        self, id: str, form_data: KnowledgeForm
+        self, id: str, form_data: KnowledgeUpdateForm, overwrite: bool = False
     ) -> Optional[KnowledgeModel]:
         try:
             with get_db() as db:
                 db.query(Knowledge).filter_by(id=id).update(
                     {
-                        "name": form_data.name,
-                        "updated_id": int(time.time()),
+                        **({"name": form_data.name} if form_data.name else {}),
+                        **(
+                            {"description": form_data.description}
+                            if form_data.description
+                            else {}
+                        ),
+                        **(
+                            {
+                                "data": (
+                                    form_data.data
+                                    if overwrite
+                                    else {
+                                        **(self.get_knowledge_by_id(id=id)).data,
+                                        **form_data.data,
+                                    }
+                                )
+                            }
+                            if form_data.data
+                            else {}
+                        ),
+                        "updated_at": int(time.time()),
                     }
                 )
                 db.commit()
-                return self.get_knowledge_by_id(id=form_data.id)
+                return self.get_knowledge_by_id(id=id)
         except Exception as e:
             log.exception(e)
             return None

backend/open_webui/apps/webui/routers/files.py

@@ -6,9 +6,12 @@ from pathlib import Path
 from typing import Optional
 
 from open_webui.apps.webui.models.files import FileForm, FileModel, Files
+from open_webui.apps.webui.models.knowledge import Knowledges
 from open_webui.config import UPLOAD_DIR
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.env import SRC_LOG_LEVELS
+
+
 from fastapi import APIRouter, Depends, File, HTTPException, UploadFile, status
 from fastapi.responses import FileResponse, StreamingResponse
 from open_webui.utils.utils import get_admin_user, get_verified_user

backend/open_webui/apps/webui/routers/knowledge.py

@@ -6,10 +6,12 @@ from fastapi import APIRouter, Depends, HTTPException, status
 
 from open_webui.apps.webui.models.knowledge import (
     Knowledges,
-    KnowledgeModel,
+    KnowledgeUpdateForm,
     KnowledgeForm,
     KnowledgeResponse,
 )
+from open_webui.apps.webui.models.files import Files, FileModel
+
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.utils.utils import get_admin_user, get_verified_user
 
@@ -66,12 +68,22 @@ async def create_new_knowledge(form_data: KnowledgeForm, user=Depends(get_admin_
 ############################
 
 
-@router.get("/{id}", response_model=Optional[KnowledgeResponse])
+class KnowledgeFilesResponse(KnowledgeResponse):
+    files: list[FileModel]
+
+
+@router.get("/{id}", response_model=Optional[KnowledgeFilesResponse])
 async def get_knowledge_by_id(id: str, user=Depends(get_verified_user)):
     knowledge = Knowledges.get_knowledge_by_id(id=id)
 
     if knowledge:
-        return knowledge
+        file_ids = knowledge.data.get("file_ids", []) if knowledge.data else []
+        files = Files.get_files_by_ids(file_ids)
+
+        return KnowledgeFilesResponse(
+            **knowledge.model_dump(),
+            files=files,
+        )
     else:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
@@ -87,7 +99,7 @@ async def get_knowledge_by_id(id: str, user=Depends(get_verified_user)):
 @router.post("/{id}/update", response_model=Optional[KnowledgeResponse])
 async def update_knowledge_by_id(
     id: str,
-    form_data: KnowledgeForm,
+    form_data: KnowledgeUpdateForm,
     user=Depends(get_admin_user),
 ):
     knowledge = Knowledges.update_knowledge_by_id(id=id, form_data=form_data)