refac
This commit is contained in:
@@ -1532,6 +1532,69 @@ async def search_knowledge_files(
|
|||||||
return json.dumps({"error": str(e)})
|
return json.dumps({"error": str(e)})
|
||||||
|
|
||||||
|
|
||||||
|
async def view_file(
|
||||||
|
file_id: str,
|
||||||
|
__request__: Request = None,
|
||||||
|
__user__: dict = None,
|
||||||
|
__model_knowledge__: Optional[list[dict]] = None,
|
||||||
|
) -> str:
|
||||||
|
"""
|
||||||
|
Get the full content of a file by its ID.
|
||||||
|
|
||||||
|
:param file_id: The ID of the file to retrieve
|
||||||
|
:return: JSON with the file's id, filename, and full text content
|
||||||
|
"""
|
||||||
|
if __request__ is None:
|
||||||
|
return json.dumps({"error": "Request context not available"})
|
||||||
|
|
||||||
|
if not __user__:
|
||||||
|
return json.dumps({"error": "User context not available"})
|
||||||
|
|
||||||
|
try:
|
||||||
|
from open_webui.models.files import Files
|
||||||
|
from open_webui.routers.files import has_access_to_file
|
||||||
|
|
||||||
|
user_id = __user__.get("id")
|
||||||
|
user_role = __user__.get("role", "user")
|
||||||
|
|
||||||
|
file = Files.get_file_by_id(file_id)
|
||||||
|
if not file:
|
||||||
|
return json.dumps({"error": "File not found"})
|
||||||
|
|
||||||
|
if (
|
||||||
|
file.user_id != user_id
|
||||||
|
and user_role != "admin"
|
||||||
|
and not any(
|
||||||
|
item.get("type") == "file" and item.get("id") == file_id
|
||||||
|
for item in (__model_knowledge__ or [])
|
||||||
|
)
|
||||||
|
and not has_access_to_file(
|
||||||
|
file_id=file_id,
|
||||||
|
access_type="read",
|
||||||
|
user=UserModel(**__user__),
|
||||||
|
)
|
||||||
|
):
|
||||||
|
return json.dumps({"error": "File not found"})
|
||||||
|
|
||||||
|
content = ""
|
||||||
|
if file.data:
|
||||||
|
content = file.data.get("content", "")
|
||||||
|
|
||||||
|
return json.dumps(
|
||||||
|
{
|
||||||
|
"id": file.id,
|
||||||
|
"filename": file.filename,
|
||||||
|
"content": content,
|
||||||
|
"updated_at": file.updated_at,
|
||||||
|
"created_at": file.created_at,
|
||||||
|
},
|
||||||
|
ensure_ascii=False,
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
log.exception(f"view_file error: {e}")
|
||||||
|
return json.dumps({"error": str(e)})
|
||||||
|
|
||||||
|
|
||||||
async def view_knowledge_file(
|
async def view_knowledge_file(
|
||||||
file_id: str,
|
file_id: str,
|
||||||
__request__: Request = None,
|
__request__: Request = None,
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ from open_webui.tools.builtin import (
|
|||||||
query_knowledge_bases,
|
query_knowledge_bases,
|
||||||
search_knowledge_files,
|
search_knowledge_files,
|
||||||
query_knowledge_files,
|
query_knowledge_files,
|
||||||
|
view_file,
|
||||||
view_knowledge_file,
|
view_knowledge_file,
|
||||||
view_skill,
|
view_skill,
|
||||||
)
|
)
|
||||||
@@ -444,7 +445,15 @@ def get_builtin_tools(
|
|||||||
if is_builtin_tool_enabled("knowledge"):
|
if is_builtin_tool_enabled("knowledge"):
|
||||||
if model_knowledge:
|
if model_knowledge:
|
||||||
# Model has attached knowledge - only allow semantic search within it
|
# Model has attached knowledge - only allow semantic search within it
|
||||||
builtin_functions.extend([query_knowledge_files, view_knowledge_file])
|
builtin_functions.append(query_knowledge_files)
|
||||||
|
|
||||||
|
knowledge_types = {
|
||||||
|
item.get("type") for item in model_knowledge
|
||||||
|
}
|
||||||
|
if "file" in knowledge_types or "collection" in knowledge_types:
|
||||||
|
builtin_functions.append(view_file)
|
||||||
|
if "note" in knowledge_types:
|
||||||
|
builtin_functions.append(view_note)
|
||||||
else:
|
else:
|
||||||
# No model knowledge - allow full KB browsing
|
# No model knowledge - allow full KB browsing
|
||||||
builtin_functions.extend(
|
builtin_functions.extend(
|
||||||
|
|||||||
Reference in New Issue
Block a user