|
@@ -1,5 +1,4 @@
|
|
-import json
|
|
|
|
-from typing import Optional, Union
|
|
|
|
|
|
+from typing import List, Optional
|
|
from pydantic import BaseModel
|
|
from pydantic import BaseModel
|
|
from fastapi import APIRouter, Depends, HTTPException, status, Request
|
|
from fastapi import APIRouter, Depends, HTTPException, status, Request
|
|
import logging
|
|
import logging
|
|
@@ -12,11 +11,11 @@ from open_webui.models.knowledge import (
|
|
)
|
|
)
|
|
from open_webui.models.files import Files, FileModel
|
|
from open_webui.models.files import Files, FileModel
|
|
from open_webui.retrieval.vector.connector import VECTOR_DB_CLIENT
|
|
from open_webui.retrieval.vector.connector import VECTOR_DB_CLIENT
|
|
-from open_webui.routers.retrieval import process_file, ProcessFileForm
|
|
|
|
|
|
+from open_webui.routers.retrieval import process_file, ProcessFileForm, process_files_batch, BatchProcessFilesForm
|
|
|
|
|
|
|
|
|
|
from open_webui.constants import ERROR_MESSAGES
|
|
from open_webui.constants import ERROR_MESSAGES
|
|
-from open_webui.utils.auth import get_admin_user, get_verified_user
|
|
|
|
|
|
+from open_webui.utils.auth import get_verified_user
|
|
from open_webui.utils.access_control import has_access, has_permission
|
|
from open_webui.utils.access_control import has_access, has_permission
|
|
|
|
|
|
|
|
|
|
@@ -514,3 +513,85 @@ async def reset_knowledge_by_id(id: str, user=Depends(get_verified_user)):
|
|
knowledge = Knowledges.update_knowledge_data_by_id(id=id, data={"file_ids": []})
|
|
knowledge = Knowledges.update_knowledge_data_by_id(id=id, data={"file_ids": []})
|
|
|
|
|
|
return knowledge
|
|
return knowledge
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+############################
|
|
|
|
+# AddFilesToKnowledge
|
|
|
|
+############################
|
|
|
|
+
|
|
|
|
+@router.post("/{id}/files/batch/add", response_model=Optional[KnowledgeFilesResponse])
|
|
|
|
+def add_files_to_knowledge_batch(
|
|
|
|
+ id: str,
|
|
|
|
+ form_data: list[KnowledgeFileIdForm],
|
|
|
|
+ user=Depends(get_verified_user),
|
|
|
|
+):
|
|
|
|
+ """
|
|
|
|
+ Add multiple files to a knowledge base
|
|
|
|
+ """
|
|
|
|
+ knowledge = Knowledges.get_knowledge_by_id(id=id)
|
|
|
|
+ if not knowledge:
|
|
|
|
+ raise HTTPException(
|
|
|
|
+ status_code=status.HTTP_400_BAD_REQUEST,
|
|
|
|
+ detail=ERROR_MESSAGES.NOT_FOUND,
|
|
|
|
+ )
|
|
|
|
+
|
|
|
|
+ if knowledge.user_id != user.id and user.role != "admin":
|
|
|
|
+ raise HTTPException(
|
|
|
|
+ status_code=status.HTTP_400_BAD_REQUEST,
|
|
|
|
+ detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
|
|
|
|
+ )
|
|
|
|
+
|
|
|
|
+ # Get files content
|
|
|
|
+ print(f"files/batch/add - {len(form_data)} files")
|
|
|
|
+ files: List[FileModel] = []
|
|
|
|
+ for form in form_data:
|
|
|
|
+ file = Files.get_file_by_id(form.file_id)
|
|
|
|
+ if not file:
|
|
|
|
+ raise HTTPException(
|
|
|
|
+ status_code=status.HTTP_400_BAD_REQUEST,
|
|
|
|
+ detail=f"File {form.file_id} not found",
|
|
|
|
+ )
|
|
|
|
+ files.append(file)
|
|
|
|
+
|
|
|
|
+ # Process files
|
|
|
|
+ try:
|
|
|
|
+ result = process_files_batch(BatchProcessFilesForm(
|
|
|
|
+ files=files,
|
|
|
|
+ collection_name=id
|
|
|
|
+ ))
|
|
|
|
+ except Exception as e:
|
|
|
|
+ log.error(f"add_files_to_knowledge_batch: Exception occurred: {e}", exc_info=True)
|
|
|
|
+ raise HTTPException(
|
|
|
|
+ status_code=status.HTTP_400_BAD_REQUEST,
|
|
|
|
+ detail=str(e)
|
|
|
|
+ )
|
|
|
|
+
|
|
|
|
+ # Add successful files to knowledge base
|
|
|
|
+ data = knowledge.data or {}
|
|
|
|
+ existing_file_ids = data.get("file_ids", [])
|
|
|
|
+
|
|
|
|
+ # Only add files that were successfully processed
|
|
|
|
+ successful_file_ids = [r.file_id for r in result.results if r.status == "completed"]
|
|
|
|
+ for file_id in successful_file_ids:
|
|
|
|
+ if file_id not in existing_file_ids:
|
|
|
|
+ existing_file_ids.append(file_id)
|
|
|
|
+
|
|
|
|
+ data["file_ids"] = existing_file_ids
|
|
|
|
+ knowledge = Knowledges.update_knowledge_data_by_id(id=id, data=data)
|
|
|
|
+
|
|
|
|
+ # If there were any errors, include them in the response
|
|
|
|
+ if result.errors:
|
|
|
|
+ error_details = [f"{err.file_id}: {err.error}" for err in result.errors]
|
|
|
|
+ return KnowledgeFilesResponse(
|
|
|
|
+ **knowledge.model_dump(),
|
|
|
|
+ files=Files.get_files_by_ids(existing_file_ids),
|
|
|
|
+ warnings={
|
|
|
|
+ "message": "Some files failed to process",
|
|
|
|
+ "errors": error_details
|
|
|
|
+ }
|
|
|
|
+ )
|
|
|
|
+
|
|
|
|
+ return KnowledgeFilesResponse(
|
|
|
|
+ **knowledge.model_dump(),
|
|
|
|
+ files=Files.get_files_by_ids(existing_file_ids)
|
|
|
|
+ )
|