From 9683505d253ddf5d1b443dedccc3046676e49673 Mon Sep 17 00:00:00 2001 From: Roopan P M Date: Wed, 12 Feb 2025 20:43:33 +0530 Subject: [PATCH 1/3] Updated default gpt model to gpt 4o --- .env.sample | 4 +- README.md | 6 +- .../batch/utilities/helpers/env_helper.py | 4 +- .../backend_api/default/test_conversation.py | 2 +- .../test_iv_question_answer_tool.py | 2 +- docs/LOCAL_DEPLOYMENT.md | 4 +- docs/TEAMS_LOCAL_DEPLOYMENT.md | 2 +- docs/model_configuration.md | 6 +- infra/main.bicep | 6 +- infra/main.bicepparam | 6 +- infra/main.json | 360 +++++++++--------- 11 files changed, 201 insertions(+), 201 deletions(-) diff --git a/.env.sample b/.env.sample index 11766f449..36abb1ee1 100644 --- a/.env.sample +++ b/.env.sample @@ -22,8 +22,8 @@ AZURE_SEARCH_DATASOURCE_NAME= # Azure OpenAI for generating the answer and computing the embedding of the documents AZURE_OPENAI_RESOURCE= AZURE_OPENAI_API_KEY= -AZURE_OPENAI_MODEL=gpt-35-turbo -AZURE_OPENAI_MODEL_NAME=gpt-35-turbo +AZURE_OPENAI_MODEL=gpt-4o +AZURE_OPENAI_MODEL_NAME=gpt-4o AZURE_OPENAI_EMBEDDING_MODEL=text-embedding-ada-002 AZURE_OPENAI_TEMPERATURE=0 AZURE_OPENAI_TOP_P=1.0 diff --git a/README.md b/README.md index 9a43108c9..f42126bce 100644 --- a/README.md +++ b/README.md @@ -194,10 +194,10 @@ Select either "PostgreSQL" or "Cosmos DB": When Deployment is complete, follow steps in [Set Up Authentication in Azure App Service](./docs/azure_app_service_auth_setup.md) to add app authentication to your web app running on Azure App Service -**Note**: The default configuration deploys an OpenAI Model "gpt-35-turbo" with version 0613. However, not all -locations support this version. If you're deploying to a location that doesn't support version 0613, you'll need to +**Note**: The default configuration deploys an OpenAI Model "gpt-4o" with version 2024-05-13. However, not all +locations support this version. If you're deploying to a location that doesn't support version 2024-05-13, you'll need to switch to a lower version. To find out which versions are supported in different regions, visit the -[GPT-35 Turbo Model Availability](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models#gpt-35-turbo-model-availability) page. +[GPT-4oModel Availability](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models?tabs=global-standard%2Cstandard-chat-completions#global-standard-model-availability) page. ### Testing the deployment 1. Navigate to the admin site, where you can upload documents. It will be located at: diff --git a/code/backend/batch/utilities/helpers/env_helper.py b/code/backend/batch/utilities/helpers/env_helper.py index 3d3aaff3c..6163d19d9 100644 --- a/code/backend/batch/utilities/helpers/env_helper.py +++ b/code/backend/batch/utilities/helpers/env_helper.py @@ -174,10 +174,10 @@ def __load_config(self, **kwargs) -> None: else: # Otherwise, fallback to individual environment variables self.AZURE_OPENAI_MODEL = os.getenv( - "AZURE_OPENAI_MODEL", "gpt-35-turbo-16k" + "AZURE_OPENAI_MODEL", "gpt-4o" ) self.AZURE_OPENAI_MODEL_NAME = os.getenv( - "AZURE_OPENAI_MODEL_NAME", "gpt-35-turbo-16k" + "AZURE_OPENAI_MODEL_NAME", "gpt-4o" ) self.AZURE_OPENAI_VISION_MODEL = os.getenv("AZURE_OPENAI_VISION_MODEL", "gpt-4") diff --git a/code/tests/functional/tests/backend_api/default/test_conversation.py b/code/tests/functional/tests/backend_api/default/test_conversation.py index 34e90cf7b..f70237963 100644 --- a/code/tests/functional/tests/backend_api/default/test_conversation.py +++ b/code/tests/functional/tests/backend_api/default/test_conversation.py @@ -65,7 +65,7 @@ def completions_mocking(httpserver: HTTPServer, app_config: AppConfig): "id": "chatcmpl-6v7mkQj980V1yBec6ETrKPRqFjNw9", "object": "chat.completion", "created": 1679072642, - "model": "gpt-35-turbo", + "model": "gpt-4o", "usage": { "prompt_tokens": 40, "completion_tokens": 50, diff --git a/code/tests/functional/tests/backend_api/integrated_vectorization_custom_conversation/test_iv_question_answer_tool.py b/code/tests/functional/tests/backend_api/integrated_vectorization_custom_conversation/test_iv_question_answer_tool.py index 875c8363c..8097b24cf 100644 --- a/code/tests/functional/tests/backend_api/integrated_vectorization_custom_conversation/test_iv_question_answer_tool.py +++ b/code/tests/functional/tests/backend_api/integrated_vectorization_custom_conversation/test_iv_question_answer_tool.py @@ -63,7 +63,7 @@ def completions_mocking(httpserver: HTTPServer, app_config: AppConfig): "id": "chatcmpl-6v7mkQj980V1yBec6ETrKPRqFjNw9", "object": "chat.completion", "created": 1679072642, - "model": "gpt-35-turbo", + "model": "gpt-4o", "usage": { "prompt_tokens": 40, "completion_tokens": 50, diff --git a/docs/LOCAL_DEPLOYMENT.md b/docs/LOCAL_DEPLOYMENT.md index b10e2eed8..0247a58c8 100644 --- a/docs/LOCAL_DEPLOYMENT.md +++ b/docs/LOCAL_DEPLOYMENT.md @@ -191,8 +191,8 @@ Execute the above [shell command](#L81) to run the function locally. You may nee |AZURE_SEARCH_USE_INTEGRATED_VECTORIZATION ||Whether to use [Integrated Vectorization](https://learn.microsoft.com/en-us/azure/search/vector-search-integrated-vectorization)| |AZURE_OPENAI_RESOURCE||the name of your Azure OpenAI resource| |AZURE_OPENAI_MODEL||The name of your model deployment| -|AZURE_OPENAI_MODEL_NAME|gpt-35-turbo|The name of the model| -|AZURE_OPENAI_MODEL_VERSION|0613|The version of the model to use| +|AZURE_OPENAI_MODEL_NAME|gpt-4o|The name of the model| +|AZURE_OPENAI_MODEL_VERSION|2024-05-13|The version of the model to use| |AZURE_OPENAI_API_KEY||One of the API keys of your Azure OpenAI resource| |AZURE_OPENAI_EMBEDDING_MODEL|text-embedding-ada-002|The name of your Azure OpenAI embeddings model deployment| |AZURE_OPENAI_EMBEDDING_MODEL_NAME|text-embedding-ada-002|The name of the embeddings model (can be found in Azure AI Studio)| diff --git a/docs/TEAMS_LOCAL_DEPLOYMENT.md b/docs/TEAMS_LOCAL_DEPLOYMENT.md index e712fddd7..981befad8 100644 --- a/docs/TEAMS_LOCAL_DEPLOYMENT.md +++ b/docs/TEAMS_LOCAL_DEPLOYMENT.md @@ -65,7 +65,7 @@ Or use the [Azure Functions VS Code extension](https://marketplace.visualstudio. |AZURE_SEARCH_FILTER||Filter to apply to search queries.| |AZURE_OPENAI_RESOURCE||the name of your Azure OpenAI resource| |AZURE_OPENAI_MODEL||The name of your model deployment| -|AZURE_OPENAI_MODEL_NAME|gpt-35-turbo|The name of the model| +|AZURE_OPENAI_MODEL_NAME|gpt-4o|The name of the model| |AZURE_OPENAI_API_KEY||One of the API keys of your Azure OpenAI resource| |AZURE_OPENAI_EMBEDDING_MODEL|text-embedding-ada-002|The name of you Azure OpenAI embeddings model deployment| |AZURE_OPENAI_TEMPERATURE|0|What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic. A value of 0 is recommended when using your data.| diff --git a/docs/model_configuration.md b/docs/model_configuration.md index a91c5885b..f94dd1c65 100644 --- a/docs/model_configuration.md +++ b/docs/model_configuration.md @@ -15,11 +15,11 @@ This document outlines the necessary steps and configurations required for setti ### LLM - `AZURE_OPENAI_MODEL`: The Azure OpenAI Model Deployment Name - - example: `my-gpt-35-turbo-16k` + - example: `my-gpt-4o` - `AZURE_OPENAI_MODEL_NAME`: The Azure OpenAI Model Name - - example: `gpt-35-turbo-16k` + - example: `gpt-4o` - `AZURE_OPENAI_MODEL_VERSION`: The Azure OpenAI Model Version - - example: `0613` + - example: `2024-05-13` - `AZURE_OPENAI_MODEL_CAPACITY`: The Tokens per Minute Rate Limit (thousands) - example: `30` diff --git a/infra/main.bicep b/infra/main.bicep index a2231b854..134537df8 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -125,13 +125,13 @@ param azureOpenAIResourceName string = 'openai-${resourceToken}' param azureOpenAISkuName string = 'S0' @description('Azure OpenAI Model Deployment Name') -param azureOpenAIModel string = 'gpt-35-turbo-16k' +param azureOpenAIModel string = 'gpt-4o' @description('Azure OpenAI Model Name') -param azureOpenAIModelName string = 'gpt-35-turbo-16k' +param azureOpenAIModelName string = 'gpt-4o' @description('Azure OpenAI Model Version') -param azureOpenAIModelVersion string = '0613' +param azureOpenAIModelVersion string = '2024-05-13' @description('Azure OpenAI Model Capacity - See here for more info https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/quota') param azureOpenAIModelCapacity int = 30 diff --git a/infra/main.bicepparam b/infra/main.bicepparam index f02c02297..907fe272a 100644 --- a/infra/main.bicepparam +++ b/infra/main.bicepparam @@ -32,9 +32,9 @@ param azureSearchOffsetColumn = readEnvironmentVariable('AZURE_SEARCH_OFFSET_COL // OpenAI parameters param azureOpenAIApiVersion = readEnvironmentVariable('AZURE_OPENAI_API_VERSION', '2024-02-01') -param azureOpenAIModel = readEnvironmentVariable('AZURE_OPENAI_MODEL', 'gpt-35-turbo-16k') -param azureOpenAIModelName = readEnvironmentVariable('AZURE_OPENAI_MODEL_NAME', 'gpt-35-turbo-16k') -param azureOpenAIModelVersion = readEnvironmentVariable('AZURE_OPENAI_MODEL_VERSION', '0613') +param azureOpenAIModel = readEnvironmentVariable('AZURE_OPENAI_MODEL', 'gpt-4o') +param azureOpenAIModelName = readEnvironmentVariable('AZURE_OPENAI_MODEL_NAME', 'gpt-4o') +param azureOpenAIModelVersion = readEnvironmentVariable('AZURE_OPENAI_MODEL_VERSION', '2024-05-13') param azureOpenAIModelCapacity = int(readEnvironmentVariable('AZURE_OPENAI_MODEL_CAPACITY', '30')) param useAdvancedImageProcessing = bool(readEnvironmentVariable('USE_ADVANCED_IMAGE_PROCESSING', 'false')) param advancedImageProcessingMaxImages = int(readEnvironmentVariable('ADVANCED_IMAGE_PROCESSING_MAX_IMAGES', '1')) diff --git a/infra/main.json b/infra/main.json index 43030b830..36746546c 100644 --- a/infra/main.json +++ b/infra/main.json @@ -4,8 +4,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "10393431399891556417" + "version": "0.33.93.31351", + "templateHash": "4812595955475306561" } }, "parameters": { @@ -259,21 +259,21 @@ }, "azureOpenAIModel": { "type": "string", - "defaultValue": "gpt-35-turbo-16k", + "defaultValue": "gpt-4o", "metadata": { "description": "Azure OpenAI Model Deployment Name" } }, "azureOpenAIModelName": { "type": "string", - "defaultValue": "gpt-35-turbo-16k", + "defaultValue": "gpt-4o", "metadata": { "description": "Azure OpenAI Model Name" } }, "azureOpenAIModelVersion": { "type": "string", - "defaultValue": "0613", + "defaultValue": "2024-05-13", "metadata": { "description": "Azure OpenAI Model Version" } @@ -712,8 +712,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "9540019694218374629" + "version": "0.33.93.31351", + "templateHash": "4123789684929590981" } }, "parameters": { @@ -805,8 +805,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "11302375145443237554" + "version": "0.33.93.31351", + "templateHash": "5089868221901042429" } }, "parameters": { @@ -861,7 +861,7 @@ "resources": [ { "copy": { - "name": "list", + "name": "database::list", "count": "[length(parameters('containers'))]" }, "type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers", @@ -977,8 +977,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "1604911639919456619" + "version": "0.33.93.31351", + "templateHash": "14942871278920228012" } }, "parameters": { @@ -1207,8 +1207,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "8917459410228534148" + "version": "0.33.93.31351", + "templateHash": "1116543872808851986" }, "description": "Creates an Azure Key Vault." }, @@ -1309,8 +1309,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "5038087255133909729" + "version": "0.33.93.31351", + "templateHash": "9634764889912970665" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -1468,8 +1468,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "5038087255133909729" + "version": "0.33.93.31351", + "templateHash": "9634764889912970665" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -1621,8 +1621,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -1692,8 +1692,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -1763,8 +1763,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -1834,8 +1834,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -1909,8 +1909,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "5038087255133909729" + "version": "0.33.93.31351", + "templateHash": "9634764889912970665" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -2080,8 +2080,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "6130134452583191094" + "version": "0.33.93.31351", + "templateHash": "6944231435221231958" } }, "parameters": { @@ -2347,8 +2347,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "11105223970664406813" + "version": "0.33.93.31351", + "templateHash": "16240688746253852024" }, "description": "Creates an Azure AI Search instance." }, @@ -2516,8 +2516,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "18435750249773494638" + "version": "0.33.93.31351", + "templateHash": "1471615099672306200" }, "description": "Creates an Azure App Service plan." }, @@ -2656,8 +2656,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "8866643072129787581" + "version": "0.33.93.31351", + "templateHash": "13665537217807187090" } }, "parameters": { @@ -2845,8 +2845,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "1710823743041736936" + "version": "0.33.93.31351", + "templateHash": "384304581071538113" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -3072,8 +3072,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "3479291286349558867" + "version": "0.33.93.31351", + "templateHash": "5462989833378560251" }, "description": "Updates app settings for an Azure App Service." }, @@ -3150,8 +3150,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -3219,8 +3219,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -3288,8 +3288,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -3357,8 +3357,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -3423,8 +3423,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "17848638157182929130" + "version": "0.33.93.31351", + "templateHash": "1623829276601313671" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -3498,8 +3498,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2813064152180428298" + "version": "0.33.93.31351", + "templateHash": "8674928823795121669" }, "description": "Creates a SQL role assignment under an Azure Cosmos DB account." }, @@ -3645,8 +3645,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "8866643072129787581" + "version": "0.33.93.31351", + "templateHash": "13665537217807187090" } }, "parameters": { @@ -3834,8 +3834,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "1710823743041736936" + "version": "0.33.93.31351", + "templateHash": "384304581071538113" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -4061,8 +4061,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "3479291286349558867" + "version": "0.33.93.31351", + "templateHash": "5462989833378560251" }, "description": "Updates app settings for an Azure App Service." }, @@ -4139,8 +4139,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -4208,8 +4208,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -4277,8 +4277,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -4346,8 +4346,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -4412,8 +4412,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "17848638157182929130" + "version": "0.33.93.31351", + "templateHash": "1623829276601313671" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -4487,8 +4487,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2813064152180428298" + "version": "0.33.93.31351", + "templateHash": "8674928823795121669" }, "description": "Creates a SQL role assignment under an Azure Cosmos DB account." }, @@ -4633,8 +4633,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "17209349484826861096" + "version": "0.33.93.31351", + "templateHash": "2162671039827759720" } }, "parameters": { @@ -4811,8 +4811,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "1710823743041736936" + "version": "0.33.93.31351", + "templateHash": "384304581071538113" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -5038,8 +5038,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "3479291286349558867" + "version": "0.33.93.31351", + "templateHash": "5462989833378560251" }, "description": "Updates app settings for an Azure App Service." }, @@ -5116,8 +5116,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -5185,8 +5185,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -5254,8 +5254,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -5323,8 +5323,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -5389,8 +5389,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "17848638157182929130" + "version": "0.33.93.31351", + "templateHash": "1623829276601313671" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -5544,8 +5544,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "17209349484826861096" + "version": "0.33.93.31351", + "templateHash": "2162671039827759720" } }, "parameters": { @@ -5722,8 +5722,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "1710823743041736936" + "version": "0.33.93.31351", + "templateHash": "384304581071538113" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -5949,8 +5949,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "3479291286349558867" + "version": "0.33.93.31351", + "templateHash": "5462989833378560251" }, "description": "Updates app settings for an Azure App Service." }, @@ -6027,8 +6027,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -6096,8 +6096,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -6165,8 +6165,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -6234,8 +6234,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -6300,8 +6300,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "17848638157182929130" + "version": "0.33.93.31351", + "templateHash": "1623829276601313671" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -6416,8 +6416,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "10190065828144265343" + "version": "0.33.93.31351", + "templateHash": "12832972210376598390" }, "description": "Creates an Application Insights instance and a Log Analytics workspace." }, @@ -6468,8 +6468,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "9506675660522824519" + "version": "0.33.93.31351", + "templateHash": "10891050604045084701" }, "description": "Creates a Log Analytics workspace." }, @@ -6549,8 +6549,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "1166184924473734792" + "version": "0.33.93.31351", + "templateHash": "17647084807420005997" }, "description": "Creates an Application Insights instance based on an existing Log Analytics workspace." }, @@ -6614,8 +6614,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "12126236527601344203" + "version": "0.33.93.31351", + "templateHash": "7959658909084813949" }, "description": "Creates a dashboard for an Application Insights instance." }, @@ -7951,8 +7951,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "9194393038824315813" + "version": "0.33.93.31351", + "templateHash": "7069178488699226924" } }, "parameters": { @@ -8034,8 +8034,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "12403631824314710916" + "version": "0.33.93.31351", + "templateHash": "12641278395153191012" } }, "parameters": { @@ -8200,8 +8200,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2146292503987744873" + "version": "0.33.93.31351", + "templateHash": "17566196178602938584" } }, "parameters": { @@ -8398,8 +8398,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "5188081085127808194" + "version": "0.33.93.31351", + "templateHash": "4314155724729016127" }, "description": "Creates an Azure Function in an existing Azure App Service plan." }, @@ -8609,8 +8609,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "1710823743041736936" + "version": "0.33.93.31351", + "templateHash": "384304581071538113" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -8836,8 +8836,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "3479291286349558867" + "version": "0.33.93.31351", + "templateHash": "5462989833378560251" }, "description": "Updates app settings for an Azure App Service." }, @@ -8913,8 +8913,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -9000,8 +9000,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -9069,8 +9069,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -9138,8 +9138,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -9207,8 +9207,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -9276,8 +9276,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -9342,8 +9342,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "17848638157182929130" + "version": "0.33.93.31351", + "templateHash": "1623829276601313671" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -9496,8 +9496,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2146292503987744873" + "version": "0.33.93.31351", + "templateHash": "17566196178602938584" } }, "parameters": { @@ -9694,8 +9694,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "5188081085127808194" + "version": "0.33.93.31351", + "templateHash": "4314155724729016127" }, "description": "Creates an Azure Function in an existing Azure App Service plan." }, @@ -9905,8 +9905,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "1710823743041736936" + "version": "0.33.93.31351", + "templateHash": "384304581071538113" }, "description": "Creates an Azure App Service in an existing Azure App Service plan." }, @@ -10132,8 +10132,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "3479291286349558867" + "version": "0.33.93.31351", + "templateHash": "5462989833378560251" }, "description": "Updates app settings for an Azure App Service." }, @@ -10209,8 +10209,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -10296,8 +10296,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -10365,8 +10365,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -10434,8 +10434,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -10503,8 +10503,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -10572,8 +10572,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -10638,8 +10638,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "17848638157182929130" + "version": "0.33.93.31351", + "templateHash": "1623829276601313671" }, "description": "Assigns an Azure Key Vault access policy." }, @@ -10745,8 +10745,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "5038087255133909729" + "version": "0.33.93.31351", + "templateHash": "9634764889912970665" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -10900,8 +10900,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "5038087255133909729" + "version": "0.33.93.31351", + "templateHash": "9634764889912970665" }, "description": "Creates an Azure Cognitive Services instance." }, @@ -11058,8 +11058,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "12571494031452225082" + "version": "0.33.93.31351", + "templateHash": "10232967785136705383" } }, "parameters": { @@ -11191,8 +11191,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "16347867757057954703" + "version": "0.33.93.31351", + "templateHash": "6183879701409750332" }, "description": "Creates an Azure storage account." }, @@ -11293,7 +11293,7 @@ "resources": [ { "copy": { - "name": "container", + "name": "storage::blobServices::container", "count": "[length(parameters('containers'))]" }, "condition": "[not(empty(parameters('containers')))]", @@ -11309,7 +11309,7 @@ }, { "copy": { - "name": "queue", + "name": "storage::queueServices::queue", "count": "[length(parameters('queues'))]" }, "condition": "[not(empty(parameters('queues')))]", @@ -11419,8 +11419,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -11489,8 +11489,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -11559,8 +11559,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -11629,8 +11629,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "2541084448726511572" + "version": "0.33.93.31351", + "templateHash": "504651423117869656" }, "description": "Creates a role assignment for a service principal." }, @@ -11711,8 +11711,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "5901520197470511152" + "version": "0.33.93.31351", + "templateHash": "1461154996408236022" } }, "parameters": { @@ -11857,8 +11857,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.32.4.45862", - "templateHash": "6726225974980028819" + "version": "0.33.93.31351", + "templateHash": "5763445265025292857" } }, "parameters": { From d4667f889301e2b68eb12b65134caf357fcbda39 Mon Sep 17 00:00:00 2001 From: Roopan P M Date: Thu, 13 Feb 2025 10:16:08 +0530 Subject: [PATCH 2/3] spelling updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f42126bce..c4017eb9d 100644 --- a/README.md +++ b/README.md @@ -197,7 +197,7 @@ When Deployment is complete, follow steps in [Set Up Authentication in Azure App **Note**: The default configuration deploys an OpenAI Model "gpt-4o" with version 2024-05-13. However, not all locations support this version. If you're deploying to a location that doesn't support version 2024-05-13, you'll need to switch to a lower version. To find out which versions are supported in different regions, visit the -[GPT-4oModel Availability](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models?tabs=global-standard%2Cstandard-chat-completions#global-standard-model-availability) page. +[GPT-4o Model Availability](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models?tabs=global-standard%2Cstandard-chat-completions#global-standard-model-availability) page. ### Testing the deployment 1. Navigate to the admin site, where you can upload documents. It will be located at: From 57578069d9ff1d409f7a40f3a206182dad87af34 Mon Sep 17 00:00:00 2001 From: Roopan P M Date: Thu, 13 Feb 2025 10:18:05 +0530 Subject: [PATCH 3/3] Updated gpt model to gpt4o --- .../tests/backend_api/default/test_post_prompt_tool.py | 8 ++++---- infra/prompt-flow/cwyd/flow.dag.template.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/tests/functional/tests/backend_api/default/test_post_prompt_tool.py b/code/tests/functional/tests/backend_api/default/test_post_prompt_tool.py index e0f378a70..6a8e6615e 100644 --- a/code/tests/functional/tests/backend_api/default/test_post_prompt_tool.py +++ b/code/tests/functional/tests/backend_api/default/test_post_prompt_tool.py @@ -100,7 +100,7 @@ def completions_mocking(httpserver: HTTPServer, app_config: AppConfig): "id": "chatcmpl-6v7mkQj980V1yBec6ETrKPRqFjNw9", "object": "chat.completion", "created": 1679072642, - "model": "gpt-35-turbo", + "model": "gpt-4o", "usage": { "prompt_tokens": 40, "completion_tokens": 50, @@ -132,7 +132,7 @@ def test_post_responds_successfully_when_not_filtered( "id": "chatcmpl-6v7mkQj980V1yBec6ETrKPRqFjNw9", "object": "chat.completion", "created": 1679072642, - "model": "gpt-35-turbo", + "model": "gpt-4o", "usage": { "prompt_tokens": 40, "completion_tokens": 50, @@ -193,7 +193,7 @@ def test_post_responds_successfully_when_filtered( "id": "chatcmpl-6v7mkQj980V1yBec6ETrKPRqFjNw9", "object": "chat.completion", "created": 1679072642, - "model": "gpt-35-turbo", + "model": "gpt-4o", "usage": { "prompt_tokens": 40, "completion_tokens": 50, @@ -254,7 +254,7 @@ def test_post_makes_correct_call_to_openai_from_post_prompt_tool( "id": "chatcmpl-6v7mkQj980V1yBec6ETrKPRqFjNw9", "object": "chat.completion", "created": 1679072642, - "model": "gpt-35-turbo", + "model": "gpt-4o", "usage": { "prompt_tokens": 40, "completion_tokens": 50, diff --git a/infra/prompt-flow/cwyd/flow.dag.template.yaml b/infra/prompt-flow/cwyd/flow.dag.template.yaml index 2fce37536..801afa9b2 100755 --- a/infra/prompt-flow/cwyd/flow.dag.template.yaml +++ b/infra/prompt-flow/cwyd/flow.dag.template.yaml @@ -83,7 +83,7 @@ nodes: type: code path: chat_with_context.jinja2 inputs: - deployment_name: gpt-35-turbo-16k + deployment_name: gpt-4o temperature: 0 top_p: 1 max_tokens: 1000