mirror of
https://github.com/open-webui/open-webui
synced 2025-06-26 18:26:48 +00:00
Feature: adjusted for individual rag settings - solution to change minimal existing code and logic
This commit is contained in:
parent
c14c1fac75
commit
1235c3a37d
@ -88,7 +88,7 @@ def upload_file(
|
|||||||
user=Depends(get_verified_user),
|
user=Depends(get_verified_user),
|
||||||
file_metadata: dict = None,
|
file_metadata: dict = None,
|
||||||
process: bool = Query(True),
|
process: bool = Query(True),
|
||||||
knowledge_id: Optional[str] = Form(...),
|
knowledge_id: Optional[str] = Form(None)
|
||||||
):
|
):
|
||||||
log.info(f"file.content_type: {file.content_type}")
|
log.info(f"file.content_type: {file.content_type}")
|
||||||
|
|
||||||
@ -138,8 +138,7 @@ def upload_file(
|
|||||||
|
|
||||||
process_file(
|
process_file(
|
||||||
request,
|
request,
|
||||||
ProcessFileForm(file_id=id, content=result.get("text", "")),
|
ProcessFileForm(file_id=id, content=result.get("text", ""), knowledge_id=knowledge_id),
|
||||||
knowledge_id= knowledge_id,
|
|
||||||
user=user,
|
user=user,
|
||||||
)
|
)
|
||||||
elif file.content_type not in [
|
elif file.content_type not in [
|
||||||
@ -151,7 +150,7 @@ def upload_file(
|
|||||||
"video/quicktime",
|
"video/quicktime",
|
||||||
"video/webm",
|
"video/webm",
|
||||||
]:
|
]:
|
||||||
process_file(request, ProcessFileForm(file_id=id), knowledge_id=knowledge_id, user=user)
|
process_file(request, ProcessFileForm(file_id=id, knowledge_id=knowledge_id), user=user)
|
||||||
|
|
||||||
file_item = Files.get_file_by_id(id=id)
|
file_item = Files.get_file_by_id(id=id)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
@ -8,7 +8,6 @@ from open_webui.models.knowledge import (
|
|||||||
KnowledgeForm,
|
KnowledgeForm,
|
||||||
KnowledgeResponse,
|
KnowledgeResponse,
|
||||||
KnowledgeUserResponse,
|
KnowledgeUserResponse,
|
||||||
RAGConfigForm
|
|
||||||
)
|
)
|
||||||
from open_webui.models.files import Files, FileModel, FileMetadataResponse
|
from open_webui.models.files import Files, FileModel, FileMetadataResponse
|
||||||
from open_webui.retrieval.vector.connector import VECTOR_DB_CLIENT
|
from open_webui.retrieval.vector.connector import VECTOR_DB_CLIENT
|
||||||
@ -141,7 +140,7 @@ async def get_knowledge_list(user=Depends(get_verified_user)):
|
|||||||
|
|
||||||
@router.post("/create", response_model=Optional[KnowledgeResponse])
|
@router.post("/create", response_model=Optional[KnowledgeResponse])
|
||||||
async def create_new_knowledge(
|
async def create_new_knowledge(
|
||||||
request: Request, form_data: KnowledgeForm, rag_data: RAGConfigForm, user=Depends(get_verified_user)
|
request: Request, form_data: KnowledgeForm, user=Depends(get_verified_user)
|
||||||
):
|
):
|
||||||
if user.role != "admin" and not has_permission(
|
if user.role != "admin" and not has_permission(
|
||||||
user.id, "workspace.knowledge", request.app.state.config.USER_PERMISSIONS
|
user.id, "workspace.knowledge", request.app.state.config.USER_PERMISSIONS
|
||||||
@ -151,7 +150,7 @@ async def create_new_knowledge(
|
|||||||
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
detail=ERROR_MESSAGES.UNAUTHORIZED,
|
||||||
)
|
)
|
||||||
|
|
||||||
knowledge = Knowledges.insert_new_knowledge(user.id, form_data, rag_data)
|
knowledge = Knowledges.insert_new_knowledge(user.id, form_data)
|
||||||
|
|
||||||
if knowledge:
|
if knowledge:
|
||||||
return knowledge
|
return knowledge
|
||||||
|
Loading…
Reference in New Issue
Block a user