OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-06-26 18:26:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refac: reserved __user__ param format

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2025-06-04 15:53:07 +04:00
parent dcb71c2292
commit bbafeca495
3 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/open_webui/functions.py
View File

@ -25,6 +25,7 @@ from open_webui.socket.main import (
) )
from open_webui.models.users import UserModel
from open_webui.models.functions import Functions from open_webui.models.functions import Functions
from open_webui.models.models import Models from open_webui.models.models import Models
@ -227,12 +228,7 @@ async def generate_function_chat_completion(
"__task__": __task__, "__task__": __task__,
"__task_body__": __task_body__, "__task_body__": __task_body__,
"__files__": files, "__files__": files,
"__user__": { "__user__": user.model_dump() if isinstance(user, UserModel) else {},
"id": user.id,
"email": user.email,
"name": user.name,
"role": user.role,
},
"__metadata__": metadata, "__metadata__": metadata,
"__request__": request, "__request__": request,
} }

14
backend/open_webui/utils/chat.py
View File

@ -320,12 +320,7 @@ async def chat_completed(request: Request, form_data: dict, user: Any):
extra_params = { extra_params = {
"__event_emitter__": get_event_emitter(metadata), "__event_emitter__": get_event_emitter(metadata),
"__event_call__": get_event_call(metadata), "__event_call__": get_event_call(metadata),
"__user__": { "__user__": user.model_dump() if isinstance(user, UserModel) else {},
"id": user.id,
"email": user.email,
"name": user.name,
"role": user.role,
},
"__metadata__": metadata, "__metadata__": metadata,
"__request__": request, "__request__": request,
"__model__": model, "__model__": model,
@ -424,12 +419,7 @@ async def chat_action(request: Request, action_id: str, form_data: dict, user: A
params[key] = value params[key] = value
if "__user__" in sig.parameters: if "__user__" in sig.parameters:
__user__ = { __user__ = (user.model_dump() if isinstance(user, UserModel) else {},)
"id": user.id,
"email": user.email,
"name": user.name,
"role": user.role,
}
try: try:
if hasattr(function_module, "UserValves"): if hasattr(function_module, "UserValves"):

14
backend/open_webui/utils/middleware.py
View File

@ -727,12 +727,7 @@ async def process_chat_payload(request, form_data, user, metadata, model):
extra_params = { extra_params = {
"__event_emitter__": event_emitter, "__event_emitter__": event_emitter,
"__event_call__": event_call, "__event_call__": event_call,
"__user__": { "__user__": user.model_dump() if isinstance(user, UserModel) else {},
"id": user.id,
"email": user.email,
"name": user.name,
"role": user.role,
},
"__metadata__": metadata, "__metadata__": metadata,
"__request__": request, "__request__": request,
"__model__": model, "__model__": model,
@ -1327,12 +1322,7 @@ async def process_chat_response(
extra_params = { extra_params = {
"__event_emitter__": event_emitter, "__event_emitter__": event_emitter,
"__event_call__": event_caller, "__event_call__": event_caller,
"__user__": { "__user__": user.model_dump() if isinstance(user, UserModel) else {},
"id": user.id,
"email": user.email,
"name": user.name,
"role": user.role,
},
"__metadata__": metadata, "__metadata__": metadata,
"__request__": request, "__request__": request,
"__model__": model, "__model__": model,