UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-04-25 00:39:36 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refac: filters

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2025-03-04 18:04:55 -08:00
parent 53fe7c460b
commit 3b74431ea3
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,9 +328,14 @@ async def chat_completed(request: Request, form_data: dict, user: Any):
} }
try: try:
filter_functions = [
Functions.get_function_by_id(filter_id)
for filter_id in get_sorted_filter_ids(model)
]
result, _ = await process_filter_functions( result, _ = await process_filter_functions(
request=request, request=request,
filter_ids=get_sorted_filter_ids(model), filter_functions=filter_functions,
filter_type="outlet", filter_type="outlet",
form_data=data, form_data=data,
extra_params=extra_params, extra_params=extra_params,

7
backend/open_webui/utils/filter.py
View File

@ -33,12 +33,13 @@ def get_sorted_filter_ids(model: dict):
async def process_filter_functions( async def process_filter_functions(
request, filter_ids, filter_type, form_data, extra_params request, filter_functions, filter_type, form_data, extra_params
): ):
skip_files = None skip_files = None
for filter_id in filter_ids: for function in filter_functions:
filter = Functions.get_function_by_id(filter_id) filter = function
filter_id = function.id
if not filter: if not filter:
continue continue

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

@ -715,9 +715,14 @@ async def process_chat_payload(request, form_data, user, metadata, model):
raise e raise e
try: try:
filter_functions = [
Functions.get_function_by_id(filter_id)
for filter_id in get_sorted_filter_ids(model)
]
form_data, flags = await process_filter_functions( form_data, flags = await process_filter_functions(
request=request, request=request,
filter_ids=get_sorted_filter_ids(model), filter_functions=filter_functions,
filter_type="inlet", filter_type="inlet",
form_data=form_data, form_data=form_data,
extra_params=extra_params, extra_params=extra_params,
@ -1071,9 +1076,12 @@ async def process_chat_response(
"__request__": request, "__request__": request,
"__model__": model, "__model__": model,
} }
filter_ids = get_sorted_filter_ids(model) filter_functions = [
Functions.get_function_by_id(filter_id)
for filter_id in get_sorted_filter_ids(model)
]
print(f"{filter_ids=}") print(f"{filter_functions=}")
# Streaming response # Streaming response
if event_emitter and event_caller: if event_emitter and event_caller:
@ -1480,7 +1488,7 @@ async def process_chat_response(
data, _ = await process_filter_functions( data, _ = await process_filter_functions(
request=request, request=request,
filter_ids=filter_ids, filter_functions=filter_functions,
filter_type="stream", filter_type="stream",
form_data=data, form_data=data,
extra_params=extra_params, extra_params=extra_params,
@ -2077,7 +2085,7 @@ async def process_chat_response(
for event in events: for event in events:
event, _ = await process_filter_functions( event, _ = await process_filter_functions(
request=request, request=request,
filter_ids=filter_ids, filter_functions=filter_functions,
filter_type="stream", filter_type="stream",
form_data=event, form_data=event,
extra_params=extra_params, extra_params=extra_params,
@ -2089,7 +2097,7 @@ async def process_chat_response(
async for data in original_generator: async for data in original_generator:
data, _ = await process_filter_functions( data, _ = await process_filter_functions(
request=request, request=request,
filter_ids=filter_ids, filter_functions=filter_functions,
filter_type="stream", filter_type="stream",
form_data=data, form_data=data,
extra_params=extra_params, extra_params=extra_params,