Skip to content

Commit 7eae377

Browse files
tjbckalifurkanstahl
andcommitted
perf: lookup
Co-Authored-By: alifurkanstahl <180474740+alifurkanstahl@users.noreply.github.com>
1 parent 2376258 commit 7eae377

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

backend/open_webui/utils/filter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ def get_priority(function_id):
3434
if 'info' in model and 'meta' in model['info']:
3535
filter_ids.extend(model['info']['meta'].get('filterIds', []))
3636
filter_ids = list(set(filter_ids))
37-
active_filter_ids = [function.id for function in Functions.get_functions_by_type('filter', active_only=True)]
37+
active_filter_ids = {function.id for function in Functions.get_functions_by_type('filter', active_only=True)}
3838

3939
def get_active_status(filter_id):
4040
function_module = get_function_module(request, filter_id)
4141

4242
if getattr(function_module, 'toggle', None):
43-
return filter_id in (enabled_filter_ids or [])
43+
return filter_id in (enabled_filter_ids or set())
4444

4545
return True
4646

47-
active_filter_ids = [filter_id for filter_id in active_filter_ids if get_active_status(filter_id)]
47+
active_filter_ids = {filter_id for filter_id in active_filter_ids if get_active_status(filter_id)}
4848

4949
filter_ids = [fid for fid in filter_ids if fid in active_filter_ids]
5050
filter_ids.sort(key=lambda fid: (get_priority(fid), fid))

backend/open_webui/utils/models.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ async def get_all_models(request, refresh: bool = False, user: UserModel = None)
130130
]
131131
models = models + arena_models
132132

133-
global_action_ids = [function.id for function in Functions.get_global_action_functions()]
134-
enabled_action_ids = [function.id for function in Functions.get_functions_by_type('action', active_only=True)]
133+
global_action_ids = {function.id for function in Functions.get_global_action_functions()}
134+
enabled_action_ids = {function.id for function in Functions.get_functions_by_type('action', active_only=True)}
135135

136-
global_filter_ids = [function.id for function in Functions.get_global_filter_functions()]
137-
enabled_filter_ids = [function.id for function in Functions.get_functions_by_type('filter', active_only=True)]
136+
global_filter_ids = {function.id for function in Functions.get_global_filter_functions()}
137+
enabled_filter_ids = {function.id for function in Functions.get_functions_by_type('filter', active_only=True)}
138138

139139
custom_models = Models.get_all_models()
140140

@@ -328,14 +328,14 @@ def get_action_priority(action_id):
328328
for model in models:
329329
action_ids = [
330330
action_id
331-
for action_id in list(set(model.pop('action_ids', []) + global_action_ids))
331+
for action_id in set(model.pop('action_ids', [])) | global_action_ids
332332
if action_id in enabled_action_ids
333333
]
334334
action_ids.sort(key=lambda aid: (get_action_priority(aid), aid))
335335

336336
filter_ids = [
337337
filter_id
338-
for filter_id in list(set(model.pop('filter_ids', []) + global_filter_ids))
338+
for filter_id in set(model.pop('filter_ids', [])) | global_filter_ids
339339
if filter_id in enabled_filter_ids
340340
]
341341

0 commit comments

Comments
 (0)