Skip to content

Commit 1092793

Browse files
committed
Improve app.py
1 parent 5eee1f0 commit 1092793

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

app/backend/app.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,8 @@ async def setup_clients():
420420
)
421421
AZURE_OPENAI_EMB_DEPLOYMENT = os.getenv("AZURE_OPENAI_EMB_DEPLOYMENT") if OPENAI_HOST.startswith("azure") else None
422422
AZURE_OPENAI_CUSTOM_URL = os.getenv("AZURE_OPENAI_CUSTOM_URL")
423+
# https://learn.microsoft.com/azure/ai-services/openai/api-version-deprecation#latest-ga-api-release
424+
AZURE_OPENAI_API_VERSION = os.getenv("AZURE_OPENAI_API_VERSION") or "2024-06-01"
423425
AZURE_VISION_ENDPOINT = os.getenv("AZURE_VISION_ENDPOINT", "")
424426
# Used only with non-Azure OpenAI deployments
425427
OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
@@ -547,6 +549,7 @@ async def setup_clients():
547549
openai_custom_url=AZURE_OPENAI_CUSTOM_URL,
548550
openai_deployment=AZURE_OPENAI_EMB_DEPLOYMENT,
549551
openai_dimensions=OPENAI_EMB_DIMENSIONS,
552+
openai_api_version=AZURE_OPENAI_API_VERSION,
550553
openai_key=clean_key_if_exists(OPENAI_API_KEY),
551554
openai_org=OPENAI_ORGANIZATION,
552555
disable_vectors=os.getenv("USE_VECTORS", "").lower() == "false",
@@ -573,8 +576,6 @@ async def setup_clients():
573576
current_app.config[CONFIG_CREDENTIAL] = azure_credential
574577

575578
if OPENAI_HOST.startswith("azure"):
576-
# https://learn.microsoft.com/azure/ai-services/openai/api-version-deprecation#latest-ga-api-release
577-
api_version = os.getenv("AZURE_OPENAI_API_VERSION") or "2024-06-01"
578579
if OPENAI_HOST == "azure_custom":
579580
current_app.logger.info("OPENAI_HOST is azure_custom, setting up Azure OpenAI custom client")
580581
if not AZURE_OPENAI_CUSTOM_URL:
@@ -587,12 +588,14 @@ async def setup_clients():
587588
endpoint = f"https://{AZURE_OPENAI_SERVICE}.openai.azure.com"
588589
if api_key := os.getenv("AZURE_OPENAI_API_KEY_OVERRIDE"):
589590
current_app.logger.info("AZURE_OPENAI_API_KEY_OVERRIDE found, using as api_key for Azure OpenAI client")
590-
openai_client = AsyncAzureOpenAI(api_version=api_version, azure_endpoint=endpoint, api_key=api_key)
591+
openai_client = AsyncAzureOpenAI(
592+
api_version=AZURE_OPENAI_API_VERSION, azure_endpoint=endpoint, api_key=api_key
593+
)
591594
else:
592595
current_app.logger.info("Using Azure credential (passwordless authentication) for Azure OpenAI client")
593596
token_provider = get_bearer_token_provider(azure_credential, "https://cognitiveservices.azure.com/.default")
594597
openai_client = AsyncAzureOpenAI(
595-
api_version=api_version,
598+
api_version=AZURE_OPENAI_API_VERSION,
596599
azure_endpoint=endpoint,
597600
azure_ad_token_provider=token_provider,
598601
)

0 commit comments

Comments
 (0)