From 508950d13cb3f76b960591d94b53645fd02c1643 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 21 Jan 2025 19:31:13 +0000 Subject: [PATCH 1/2] Separate config for AOAI Model and Deployment Name --- src/backend/config.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/backend/config.py b/src/backend/config.py index bf126094c..92d27d4e9 100644 --- a/src/backend/config.py +++ b/src/backend/config.py @@ -36,6 +36,7 @@ class Config: COSMOSDB_CONTAINER = GetRequiredConfig("COSMOSDB_CONTAINER") AZURE_OPENAI_DEPLOYMENT_NAME = GetRequiredConfig("AZURE_OPENAI_DEPLOYMENT_NAME") + AZURE_OPENAI_MODEL_NAME = GetRequiredConfig("AZURE_OPENAI_MODEL_NAME") AZURE_OPENAI_API_VERSION = GetRequiredConfig("AZURE_OPENAI_API_VERSION") AZURE_OPENAI_ENDPOINT = GetRequiredConfig("AZURE_OPENAI_ENDPOINT") AZURE_OPENAI_API_KEY = GetOptionalConfig("AZURE_OPENAI_API_KEY") @@ -87,7 +88,8 @@ def GetAzureOpenAIChatCompletionClient(model_capabilities): if Config.AZURE_OPENAI_API_KEY == "": # Use DefaultAzureCredential for auth Config.__aoai_chatCompletionClient = AzureOpenAIChatCompletionClient( - model=Config.AZURE_OPENAI_DEPLOYMENT_NAME, + model=Config.AZURE_OPENAI_MODEL_NAME, + azure_deployment=Config.AZURE_OPENAI_DEPLOYMENT_NAME, api_version=Config.AZURE_OPENAI_API_VERSION, azure_endpoint=Config.AZURE_OPENAI_ENDPOINT, azure_ad_token_provider=Config.GetTokenProvider( @@ -99,7 +101,8 @@ def GetAzureOpenAIChatCompletionClient(model_capabilities): else: # Fallback behavior to use API key Config.__aoai_chatCompletionClient = AzureOpenAIChatCompletionClient( - model=Config.AZURE_OPENAI_DEPLOYMENT_NAME, + model=Config.AZURE_OPENAI_MODEL_NAME, + azure_deployment=Config.AZURE_OPENAI_DEPLOYMENT_NAME, api_version=Config.AZURE_OPENAI_API_VERSION, azure_endpoint=Config.AZURE_OPENAI_ENDPOINT, api_key=Config.AZURE_OPENAI_API_KEY, From 7d905bec83b496e7985507e9e17af4074d9359d3 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 21 Jan 2025 19:33:43 +0000 Subject: [PATCH 2/2] Move model name to optional config and use deployment name if not present. --- src/backend/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/config.py b/src/backend/config.py index 92d27d4e9..523cf9f22 100644 --- a/src/backend/config.py +++ b/src/backend/config.py @@ -36,7 +36,7 @@ class Config: COSMOSDB_CONTAINER = GetRequiredConfig("COSMOSDB_CONTAINER") AZURE_OPENAI_DEPLOYMENT_NAME = GetRequiredConfig("AZURE_OPENAI_DEPLOYMENT_NAME") - AZURE_OPENAI_MODEL_NAME = GetRequiredConfig("AZURE_OPENAI_MODEL_NAME") + AZURE_OPENAI_MODEL_NAME = GetOptionalConfig("AZURE_OPENAI_MODEL_NAME", default=AZURE_OPENAI_DEPLOYMENT_NAME) AZURE_OPENAI_API_VERSION = GetRequiredConfig("AZURE_OPENAI_API_VERSION") AZURE_OPENAI_ENDPOINT = GetRequiredConfig("AZURE_OPENAI_ENDPOINT") AZURE_OPENAI_API_KEY = GetOptionalConfig("AZURE_OPENAI_API_KEY")