AI/open-webui
1
0
Fork 1
mirror of https://git.mirrors.martin98.com/https://github.com/open-webui/open-webui synced 2025-08-19 05:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2024-12-21 09:59:12 -07:00
parent 271acb2e67
commit 556c75e876
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ async def generate_chat_completion(
if model_ids and filter_mode == "exclude": if model_ids and filter_mode == "exclude":
model_ids = [ model_ids = [
model["id"] model["id"]
for model in await get_all_models(request) for model in list(request.app.state.MODELS.values())
if model.get("owned_by") != "arena" and model["id"] not in model_ids if model.get("owned_by") != "arena" and model["id"] not in model_ids
] ]
@ -99,7 +99,7 @@ async def generate_chat_completion(
else: else:
model_ids = [ model_ids = [
model["id"] model["id"]
for model in await get_all_models(request) for model in list(request.app.state.MODELS.values())
if model.get("owned_by") != "arena" if model.get("owned_by") != "arena"
] ]
selected_model_id = random.choice(model_ids) selected_model_id = random.choice(model_ids)
@ -154,6 +154,7 @@ async def generate_chat_completion(
async def chat_completed(request: Request, form_data: dict, user: Any): async def chat_completed(request: Request, form_data: dict, user: Any):
if not request.app.state.MODELS:
await get_all_models(request) await get_all_models(request)
models = request.app.state.MODELS models = request.app.state.MODELS
@ -289,6 +290,7 @@ async def chat_action(request: Request, action_id: str, form_data: dict, user: A
if not action: if not action:
raise Exception(f"Action not found: {action_id}") raise Exception(f"Action not found: {action_id}")
if not request.app.state.MODELS:
await get_all_models(request) await get_all_models(request)
models = request.app.state.MODELS models = request.app.state.MODELS

1
backend/open_webui/utils/models.py
View File

@ -58,7 +58,6 @@ async def get_all_base_models(request: Request):
return models return models
@cached(ttl=3)
async def get_all_models(request): async def get_all_models(request):
models = await get_all_base_models(request) models = await get_all_base_models(request)