From 99be2f2bc8e7ef697fc4a7875893ab34c5eda99a Mon Sep 17 00:00:00 2001 From: pablonyx Date: Mon, 24 Feb 2025 15:30:39 -0800 Subject: [PATCH] quick fix --- .../ee/onyx/server/tenants/provisioning.py | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/backend/ee/onyx/server/tenants/provisioning.py b/backend/ee/onyx/server/tenants/provisioning.py index cdbef110ec93..861062a033bb 100644 --- a/backend/ee/onyx/server/tenants/provisioning.py +++ b/backend/ee/onyx/server/tenants/provisioning.py @@ -200,25 +200,6 @@ async def rollback_tenant_provisioning(tenant_id: str) -> None: def configure_default_api_keys(db_session: Session) -> None: - if OPENAI_DEFAULT_API_KEY: - open_provider = LLMProviderUpsertRequest( - name="OpenAI", - provider=OPENAI_PROVIDER_NAME, - api_key=OPENAI_DEFAULT_API_KEY, - default_model_name="gpt-4", - fast_default_model_name="gpt-4o-mini", - model_names=OPEN_AI_MODEL_NAMES, - ) - try: - full_provider = upsert_llm_provider(open_provider, db_session) - update_default_provider(full_provider.id, db_session) - except Exception as e: - logger.error(f"Failed to configure OpenAI provider: {e}") - else: - logger.error( - "OPENAI_DEFAULT_API_KEY not set, skipping OpenAI provider configuration" - ) - if ANTHROPIC_DEFAULT_API_KEY: anthropic_provider = LLMProviderUpsertRequest( name="Anthropic", @@ -227,6 +208,7 @@ def configure_default_api_keys(db_session: Session) -> None: default_model_name="claude-3-7-sonnet-20250219", fast_default_model_name="claude-3-5-sonnet-20241022", model_names=ANTHROPIC_MODEL_NAMES, + display_model_names=["claude-3-5-sonnet-20241022"], ) try: full_provider = upsert_llm_provider(anthropic_provider, db_session) @@ -238,6 +220,26 @@ def configure_default_api_keys(db_session: Session) -> None: "ANTHROPIC_DEFAULT_API_KEY not set, skipping Anthropic provider configuration" ) + if OPENAI_DEFAULT_API_KEY: + open_provider = LLMProviderUpsertRequest( + name="OpenAI", + provider=OPENAI_PROVIDER_NAME, + api_key=OPENAI_DEFAULT_API_KEY, + default_model_name="gpt-4o", + fast_default_model_name="gpt-4o-mini", + model_names=OPEN_AI_MODEL_NAMES, + display_model_names=["o1", "o3-mini", "gpt-4o", "gpt-4o-mini"], + ) + try: + full_provider = upsert_llm_provider(open_provider, db_session) + update_default_provider(full_provider.id, db_session) + except Exception as e: + logger.error(f"Failed to configure OpenAI provider: {e}") + else: + logger.error( + "OPENAI_DEFAULT_API_KEY not set, skipping OpenAI provider configuration" + ) + if COHERE_DEFAULT_API_KEY: cloud_embedding_provider = CloudEmbeddingProviderCreationRequest( provider_type=EmbeddingProvider.COHERE,