refac
Some checks are pending
Deploy to HuggingFace Spaces / check-secret (push) Waiting to run
Deploy to HuggingFace Spaces / deploy (push) Blocked by required conditions
Create and publish Docker images with specific build args / build-main-image (linux/amd64) (push) Waiting to run
Create and publish Docker images with specific build args / build-main-image (linux/arm64) (push) Waiting to run
Create and publish Docker images with specific build args / build-cuda-image (linux/amd64) (push) Waiting to run
Create and publish Docker images with specific build args / build-cuda-image (linux/arm64) (push) Waiting to run
Create and publish Docker images with specific build args / build-ollama-image (linux/amd64) (push) Waiting to run
Create and publish Docker images with specific build args / build-ollama-image (linux/arm64) (push) Waiting to run
Create and publish Docker images with specific build args / merge-main-images (push) Blocked by required conditions
Create and publish Docker images with specific build args / merge-cuda-images (push) Blocked by required conditions
Create and publish Docker images with specific build args / merge-ollama-images (push) Blocked by required conditions
Python CI / Format Backend (3.11) (push) Waiting to run
Frontend Build / Format & Build Frontend (push) Waiting to run
Frontend Build / Frontend Unit Tests (push) Waiting to run
Integration Test / Run Cypress Integration Tests (push) Waiting to run
Integration Test / Run Migration Tests (push) Waiting to run

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

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,7 +154,8 @@ 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):
await get_all_models(request) if not request.app.state.MODELS:
await get_all_models(request)
models = request.app.state.MODELS models = request.app.state.MODELS
data = form_data data = form_data
@ -289,7 +290,8 @@ 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}")
await get_all_models(request) if not request.app.state.MODELS:
await get_all_models(request)
models = request.app.state.MODELS models = request.app.state.MODELS
data = form_data data = form_data

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)