From 6ed86d9d254a94f34afd427e2954317610b9314e Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 3 Oct 2024 06:32:30 +1000
Subject: [PATCH 01/23] Update deploy_features.md

---
 docs/deploy_features.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/deploy_features.md b/docs/deploy_features.md
index 3fe3d62605..9fbde3a509 100644
--- a/docs/deploy_features.md
+++ b/docs/deploy_features.md
@@ -58,6 +58,12 @@ Execute the following commands inside your terminal:
     azd env set AZURE_OPENAI_CHATGPT_MODEL gpt-4o-mini
     ```
 
+1. To set the Azure OpenAI deployment Sku name, run this command with the desired Sku name.
+
+    ```bash
+    azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME GlobalStandard
+    ```
+
 1. To set the Azure OpenAI deployment capacity, run this command with the desired capacity.
 
     ```bash
@@ -96,6 +102,7 @@ Execute the following commands inside your terminal:
 > * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT chat` to set the name of your old GPT 3.5 deployment.
 > * `azd env set AZURE_OPENAI_CHATGPT_MODEL gpt-35-turbo` to set the name of your old GPT 3.5 model.
 > * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY 30` to set the capacity of your old GPT 3.5 deployment.
+> * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME Standard` to set the Sku name back to Standard.
 > * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION 0613` to set the version number of your old GPT 3.5.
 > * `azd up` to update the provisioned resources.
 >

From d25a1bc82a8efbbf00cc7930eb52988023e36f97 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 3 Oct 2024 06:33:54 +1000
Subject: [PATCH 02/23] Update azure-dev.yml

---
 .azdo/pipelines/azure-dev.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azdo/pipelines/azure-dev.yml b/.azdo/pipelines/azure-dev.yml
index 3498c25dc7..974ffe16f0 100644
--- a/.azdo/pipelines/azure-dev.yml
+++ b/.azdo/pipelines/azure-dev.yml
@@ -66,6 +66,7 @@ steps:
       AZURE_OPENAI_CHATGPT_DEPLOYMENT: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT)
       AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY)
       AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION)
+      AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME)
       AZURE_OPENAI_EMB_MODEL_NAME: $(AZURE_OPENAI_EMB_MODEL_NAME)
       AZURE_OPENAI_EMB_DEPLOYMENT: $(AZURE_OPENAI_EMB_DEPLOYMENT)
       AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY: $(AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY)

From fade752a0bc97e2d607f518a604308784f412d73 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 3 Oct 2024 06:34:52 +1000
Subject: [PATCH 03/23] Update azure.yaml

---
 azure.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure.yaml b/azure.yaml
index 685789c41d..f5dac9f73b 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -64,6 +64,7 @@ pipeline:
       - AZURE_OPENAI_CHATGPT_DEPLOYMENT
       - AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY
       - AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION
+      - AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME
       - AZURE_OPENAI_EMB_MODEL_NAME
       - AZURE_OPENAI_EMB_DEPLOYMENT
       - AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY

From 10c5a2acd793eb752dbca25926be4a73b9e79e15 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 3 Oct 2024 06:35:45 +1000
Subject: [PATCH 04/23] Update main.parameters.json

---
 infra/main.parameters.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index a807b9abde..436905b1e5 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -98,6 +98,9 @@
     "chatGptDeploymentVersion":{
       "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION}"
     },
+    "chatGptDeploymentSkuName":{
+      "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME}"
+    },
     "chatGptDeploymentCapacity":{
       "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY}"
     },

From 7298f825be170e924d7ff0ae03a5440995df9d1c Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 3 Oct 2024 06:36:41 +1000
Subject: [PATCH 05/23] Update main.bicep

---
 infra/main.bicep | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/infra/main.bicep b/infra/main.bicep
index 04c4832c10..cc125d173a 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -109,13 +109,16 @@ param computerVisionSkuName string // Set in main.parameters.json
 param chatGptModelName string = ''
 param chatGptDeploymentName string = ''
 param chatGptDeploymentVersion string = ''
+param chatGptDeploymentSkuName string = ''
 param chatGptDeploymentCapacity int = 0
+
 var chatGpt = {
   modelName: !empty(chatGptModelName)
     ? chatGptModelName
     : startsWith(openAiHost, 'azure') ? 'gpt-35-turbo' : 'gpt-3.5-turbo'
   deploymentName: !empty(chatGptDeploymentName) ? chatGptDeploymentName : 'chat'
   deploymentVersion: !empty(chatGptDeploymentVersion) ? chatGptDeploymentVersion : '0613'
+  deploymentSkuName: !empty(chatGptDeploymentSkuName) ? chatGptDeploymentSkuName : 'Standard'
   deploymentCapacity: chatGptDeploymentCapacity != 0 ? chatGptDeploymentCapacity : 30
 }
 
@@ -450,7 +453,7 @@ var defaultOpenAiDeployments = [
       version: chatGpt.deploymentVersion
     }
     sku: {
-      name: 'Standard'
+      name: chatGpt.deploymentSkuName
       capacity: chatGpt.deploymentCapacity
     }
   }

From 2151390998f77e25ae9622f1630794fc39299279 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:30:06 +1000
Subject: [PATCH 06/23] Update azure-dev.yml

---
 .azdo/pipelines/azure-dev.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azdo/pipelines/azure-dev.yml b/.azdo/pipelines/azure-dev.yml
index 974ffe16f0..ba5b242e8a 100644
--- a/.azdo/pipelines/azure-dev.yml
+++ b/.azdo/pipelines/azure-dev.yml
@@ -71,6 +71,7 @@ steps:
       AZURE_OPENAI_EMB_DEPLOYMENT: $(AZURE_OPENAI_EMB_DEPLOYMENT)
       AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY: $(AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY)
       AZURE_OPENAI_EMB_DEPLOYMENT_VERSION: $(AZURE_OPENAI_EMB_DEPLOYMENT_VERSION)
+      AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME: $(AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME)
       AZURE_OPENAI_EMB_DIMENSIONS: $(AZURE_OPENAI_EMB_DIMENSIONS)
       OPENAI_HOST: $(OPENAI_HOST)
       OPENAI_API_KEY: $(OPENAI_API_KEY)

From 443826681c6d3becb25e9cc2e90cd6b99fd4548a Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:31:12 +1000
Subject: [PATCH 07/23] Update azure.yaml

---
 azure.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure.yaml b/azure.yaml
index f5dac9f73b..43183796d5 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -69,6 +69,7 @@ pipeline:
       - AZURE_OPENAI_EMB_DEPLOYMENT
       - AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY
       - AZURE_OPENAI_EMB_DEPLOYMENT_VERSION
+      - AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME
       - AZURE_OPENAI_EMB_DIMENSIONS
       - OPENAI_HOST
       - OPENAI_API_KEY

From ba1815320fd1ab1b6dd9b4ac6fc6d7931640bf34 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:31:56 +1000
Subject: [PATCH 08/23] Update main.parameters.json

---
 infra/main.parameters.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 436905b1e5..d8722fad1f 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -113,6 +113,9 @@
     "embeddingDeploymentVersion":{
       "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_VERSION}"
     },
+    "cembeddingDeploymentSkuName":{
+      "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME}"
+    },
     "embeddingDeploymentCapacity":{
       "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY}"
     },

From a8f0e3bba1ab47dbc45bdabfe4c14044ac07c367 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:32:54 +1000
Subject: [PATCH 09/23] Update main.bicep

---
 infra/main.bicep | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/infra/main.bicep b/infra/main.bicep
index cc125d173a..6071932eb8 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -125,12 +125,14 @@ var chatGpt = {
 param embeddingModelName string = ''
 param embeddingDeploymentName string = ''
 param embeddingDeploymentVersion string = ''
+param embeddingDeploymentSkuName string = ''
 param embeddingDeploymentCapacity int = 0
 param embeddingDimensions int = 0
 var embedding = {
   modelName: !empty(embeddingModelName) ? embeddingModelName : 'text-embedding-ada-002'
   deploymentName: !empty(embeddingDeploymentName) ? embeddingDeploymentName : 'embedding'
   deploymentVersion: !empty(embeddingDeploymentVersion) ? embeddingDeploymentVersion : '2'
+  deploymentSkuName: !empty(embeddingDeploymentSkuName) ? embeddingDeploymentSkuName : 'Standard'
   deploymentCapacity: embeddingDeploymentCapacity != 0 ? embeddingDeploymentCapacity : 30
   dimensions: embeddingDimensions != 0 ? embeddingDimensions : 1536
 }
@@ -465,7 +467,7 @@ var defaultOpenAiDeployments = [
       version: embedding.deploymentVersion
     }
     sku: {
-      name: 'Standard'
+      name: embedding.deploymentSkuName
       capacity: embedding.deploymentCapacity
     }
   }

From c4f70c7b6bf56647655fa76a21cfda8e98de87e5 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:33:43 +1000
Subject: [PATCH 10/23] Update deploy_features.md

---
 docs/deploy_features.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/deploy_features.md b/docs/deploy_features.md
index 9fbde3a509..c1482d40f2 100644
--- a/docs/deploy_features.md
+++ b/docs/deploy_features.md
@@ -134,7 +134,13 @@ By default, the deployed Azure web app uses the `text-embedding-ada-002` embeddi
     azd env set AZURE_OPENAI_EMB_DEPLOYMENT_VERSION 1
     ```
 
-4. When prompted during `azd up`, make sure to select a region for the OpenAI resource group location that supports the text-embedding-3 models. There are [limited regions available](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#embeddings-models).
+4. Set the deployment Sku name to "GlobalStandard" :
+
+    ```shell
+    azd env set AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME GlobalStandard
+    ```
+
+5. When prompted during `azd up`, make sure to select a region for the OpenAI resource group location that supports the text-embedding-3 models. There are [limited regions available](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#embeddings-models).
 
 If you have already deployed:
 

From 5763559e02038441165595a5c1911ce6a27f3fa8 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 08:02:40 +1100
Subject: [PATCH 11/23] Update docs/deploy_features.md

Co-authored-by: Pamela Fox <pamela.fox@gmail.com>
---
 docs/deploy_features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deploy_features.md b/docs/deploy_features.md
index 01177dfd82..8a2adcd0a4 100644
--- a/docs/deploy_features.md
+++ b/docs/deploy_features.md
@@ -59,7 +59,7 @@ Execute the following commands inside your terminal:
     azd env set AZURE_OPENAI_CHATGPT_MODEL gpt-4o-mini
     ```
 
-1. To set the Azure OpenAI deployment Sku name, run this command with the desired Sku name.
+1. To set the Azure OpenAI deployment SKU name, run this command with [the desired SKU name](https://learn.microsoft.com/azure/ai-services/openai/how-to/deployment-types#deployment-types).
 
     ```bash
     azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME GlobalStandard

From 4990076d4c129d9168d1d8ccb1384ba5e7189609 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 08:02:57 +1100
Subject: [PATCH 12/23] Update docs/deploy_features.md

Co-authored-by: Pamela Fox <pamela.fox@gmail.com>
---
 docs/deploy_features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deploy_features.md b/docs/deploy_features.md
index 8a2adcd0a4..80524e149c 100644
--- a/docs/deploy_features.md
+++ b/docs/deploy_features.md
@@ -62,7 +62,7 @@ Execute the following commands inside your terminal:
 1. To set the Azure OpenAI deployment SKU name, run this command with [the desired SKU name](https://learn.microsoft.com/azure/ai-services/openai/how-to/deployment-types#deployment-types).
 
     ```bash
-    azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME GlobalStandard
+    azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU GlobalStandard
     ```
 
 1. To set the Azure OpenAI deployment capacity, run this command with the desired capacity.

From 12a94aa52962c001fa45fbd40f27d1e7316667aa Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 08:03:31 +1100
Subject: [PATCH 13/23] Update docs/deploy_features.md

Co-authored-by: Pamela Fox <pamela.fox@gmail.com>
---
 docs/deploy_features.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deploy_features.md b/docs/deploy_features.md
index 80524e149c..f421528b5b 100644
--- a/docs/deploy_features.md
+++ b/docs/deploy_features.md
@@ -103,7 +103,7 @@ Execute the following commands inside your terminal:
 > * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT chat` to set the name of your old GPT 3.5 deployment.
 > * `azd env set AZURE_OPENAI_CHATGPT_MODEL gpt-35-turbo` to set the name of your old GPT 3.5 model.
 > * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY 30` to set the capacity of your old GPT 3.5 deployment.
-> * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME Standard` to set the Sku name back to Standard.
+> * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU Standard` to set the Sku name back to Standard.
 > * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION 0613` to set the version number of your old GPT 3.5.
 > * `azd up` to update the provisioned resources.
 >

From b07258dcf91ef15048fe9d207f1a3a2cf352a03b Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 08:05:31 +1100
Subject: [PATCH 14/23] Update infra/main.parameters.json

Co-authored-by: Pamela Fox <pamela.fox@gmail.com>
---
 infra/main.parameters.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 1e5f5a245a..4ec364b9f9 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -99,7 +99,7 @@
       "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION}"
     },
     "chatGptDeploymentSkuName":{
-      "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME}"
+      "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU}"
     },
     "chatGptDeploymentCapacity":{
       "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY}"

From 601d4a77c6956260bfd5c10b824a54c010f7ee94 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 08:06:56 +1100
Subject: [PATCH 15/23] Update infra/main.parameters.json

Co-authored-by: Pamela Fox <pamela.fox@gmail.com>
---
 infra/main.parameters.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 4ec364b9f9..555aedc86b 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -114,7 +114,7 @@
       "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_VERSION}"
     },
     "cembeddingDeploymentSkuName":{
-      "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME}"
+      "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_SKU}"
     },
     "embeddingDeploymentCapacity":{
       "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY}"

From 0d9494be35c3e53f14d03cead49d313d6ddbabb1 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 08:07:24 +1100
Subject: [PATCH 16/23] Update infra/main.parameters.json

Co-authored-by: Pamela Fox <pamela.fox@gmail.com>
---
 infra/main.parameters.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 555aedc86b..aada6b05fc 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -113,7 +113,7 @@
     "embeddingDeploymentVersion":{
       "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_VERSION}"
     },
-    "cembeddingDeploymentSkuName":{
+    "embeddingDeploymentSkuName":{
       "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_SKU}"
     },
     "embeddingDeploymentCapacity":{

From 4d7c4aed5e665df5704b4b5bccae6c7087cb10af Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 08:19:42 +1100
Subject: [PATCH 17/23] Update azure-dev.yml

---
 .azdo/pipelines/azure-dev.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azdo/pipelines/azure-dev.yml b/.azdo/pipelines/azure-dev.yml
index f188e05ad1..b18285824d 100644
--- a/.azdo/pipelines/azure-dev.yml
+++ b/.azdo/pipelines/azure-dev.yml
@@ -66,12 +66,12 @@ steps:
       AZURE_OPENAI_CHATGPT_DEPLOYMENT: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT)
       AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY)
       AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION)
-      AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME)
+      AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU)
       AZURE_OPENAI_EMB_MODEL_NAME: $(AZURE_OPENAI_EMB_MODEL_NAME)
       AZURE_OPENAI_EMB_DEPLOYMENT: $(AZURE_OPENAI_EMB_DEPLOYMENT)
       AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY: $(AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY)
       AZURE_OPENAI_EMB_DEPLOYMENT_VERSION: $(AZURE_OPENAI_EMB_DEPLOYMENT_VERSION)
-      AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME: $(AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME)
+      AZURE_OPENAI_EMB_DEPLOYMENT_SKU: $(AZURE_OPENAI_EMB_DEPLOYMENT_SKU)
       AZURE_OPENAI_EMB_DIMENSIONS: $(AZURE_OPENAI_EMB_DIMENSIONS)
       OPENAI_HOST: $(OPENAI_HOST)
       OPENAI_API_KEY: $(OPENAI_API_KEY)

From 2c853406922520500174e08e5643c283e4bda2b8 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 08:20:50 +1100
Subject: [PATCH 18/23] Update azure.yaml

---
 azure.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure.yaml b/azure.yaml
index 8c9f04db3e..7a65edb890 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -64,12 +64,12 @@ pipeline:
       - AZURE_OPENAI_CHATGPT_DEPLOYMENT
       - AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY
       - AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION
-      - AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKUNAME
+      - AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU
       - AZURE_OPENAI_EMB_MODEL_NAME
       - AZURE_OPENAI_EMB_DEPLOYMENT
       - AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY
       - AZURE_OPENAI_EMB_DEPLOYMENT_VERSION
-      - AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME
+      - AZURE_OPENAI_EMB_DEPLOYMENT_SKU
       - AZURE_OPENAI_EMB_DIMENSIONS
       - OPENAI_HOST
       - OPENAI_API_KEY

From 8485002adcce13e4bd5a4c8e9f6e24fb60b81cb0 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 09:08:20 +1100
Subject: [PATCH 19/23] Update deploy_features.md

---
 docs/deploy_features.md | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/docs/deploy_features.md b/docs/deploy_features.md
index f421528b5b..47463f7a15 100644
--- a/docs/deploy_features.md
+++ b/docs/deploy_features.md
@@ -135,13 +135,7 @@ By default, the deployed Azure web app uses the `text-embedding-ada-002` embeddi
     azd env set AZURE_OPENAI_EMB_DEPLOYMENT_VERSION 1
     ```
 
-4. Set the deployment Sku name to "GlobalStandard" :
-
-    ```shell
-    azd env set AZURE_OPENAI_EMB_DEPLOYMENT_SKUNAME GlobalStandard
-    ```
-
-5. When prompted during `azd up`, make sure to select a region for the OpenAI resource group location that supports the text-embedding-3 models. There are [limited regions available](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#embeddings-models).
+4. When prompted during `azd up`, make sure to select a region for the OpenAI resource group location that supports the text-embedding-3 models. There are [limited regions available](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#embeddings-models).
 
 If you have already deployed:
 

From 1bcf5d52e391cc6a2a9d2f97aadfbcea6499b239 Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 09:18:13 +1100
Subject: [PATCH 20/23] Update main.bicep

---
 infra/main.bicep | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/infra/main.bicep b/infra/main.bicep
index b8e2458a4a..7bb7502dc5 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -140,6 +140,7 @@ var embedding = {
 param gpt4vModelName string = 'gpt-4o'
 param gpt4vDeploymentName string = 'gpt-4o'
 param gpt4vModelVersion string = '2024-05-13'
+param gpt4vDeploymentSkuName string = 'Standard'
 param gpt4vDeploymentCapacity int = 10
 
 param tenantId string = tenant().tenantId
@@ -488,7 +489,7 @@ var openAiDeployments = concat(
             version: gpt4vModelVersion
           }
           sku: {
-            name: 'Standard'
+            name: gpt4vDeploymentSkuName
             capacity: gpt4vDeploymentCapacity
           }
         }

From 1e910dc0c50b50a4c9f0170752e20c239dea4e49 Mon Sep 17 00:00:00 2001
From: Zed Haque <zed@zedhaque.com>
Date: Thu, 10 Oct 2024 11:27:56 +1100
Subject: [PATCH 21/23] added params for gpt4v

---
 infra/main.bicep           | 33 ++++++++++++++++++++-------------
 infra/main.parameters.json | 14 +++++++++++++-
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/infra/main.bicep b/infra/main.bicep
index 7bb7502dc5..fcd94f413d 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -137,11 +137,18 @@ var embedding = {
   dimensions: embeddingDimensions != 0 ? embeddingDimensions : 1536
 }
 
-param gpt4vModelName string = 'gpt-4o'
-param gpt4vDeploymentName string = 'gpt-4o'
-param gpt4vModelVersion string = '2024-05-13'
-param gpt4vDeploymentSkuName string = 'Standard'
+param gpt4vModelName string = ''
+param gpt4vDeploymentName string = ''
+param gpt4vModelVersion string = ''
+param gpt4vDeploymentSkuName string = ''
 param gpt4vDeploymentCapacity int = 10
+var gpt4v = {
+  modelName: !empty(gpt4vModelName) ? gpt4vModelName : 'gpt-4o'
+  deploymentName: !empty(gpt4vDeploymentName) ? gpt4vDeploymentName : 'gpt-4o'
+  deploymentVersion: !empty(gpt4vModelVersion) ? gpt4vModelVersion : '2024-05-13'
+  deploymentSkuName: !empty(gpt4vDeploymentSkuName) ? gpt4vDeploymentSkuName : 'Standard'
+  deploymentCapacity: gpt4vDeploymentCapacity != 0 ? gpt4vDeploymentCapacity : 10
+}
 
 param tenantId string = tenant().tenantId
 param authTenantId string = ''
@@ -328,12 +335,12 @@ var appEnvVariables = {
   AZURE_OPENAI_EMB_MODEL_NAME: embedding.modelName
   AZURE_OPENAI_EMB_DIMENSIONS: embedding.dimensions
   AZURE_OPENAI_CHATGPT_MODEL: chatGpt.modelName
-  AZURE_OPENAI_GPT4V_MODEL: gpt4vModelName
+  AZURE_OPENAI_GPT4V_MODEL: gpt4v.modelName
   // Specific to Azure OpenAI
   AZURE_OPENAI_SERVICE: isAzureOpenAiHost && deployAzureOpenAi ? openAi.outputs.name : ''
   AZURE_OPENAI_CHATGPT_DEPLOYMENT: chatGpt.deploymentName
   AZURE_OPENAI_EMB_DEPLOYMENT: embedding.deploymentName
-  AZURE_OPENAI_GPT4V_DEPLOYMENT: useGPT4V ? gpt4vDeploymentName : ''
+  AZURE_OPENAI_GPT4V_DEPLOYMENT: useGPT4V ? gpt4v.deploymentName : ''
   AZURE_OPENAI_API_VERSION: azureOpenAiApiVersion
   AZURE_OPENAI_API_KEY_OVERRIDE: azureOpenAiApiKey
   AZURE_OPENAI_CUSTOM_URL: azureOpenAiCustomUrl
@@ -482,15 +489,15 @@ var openAiDeployments = concat(
   useGPT4V
     ? [
         {
-          name: gpt4vDeploymentName
+          name: gpt4v.deploymentName
           model: {
             format: 'OpenAI'
-            name: gpt4vModelName
-            version: gpt4vModelVersion
+            name: gpt4v.modelName
+            version: gpt4v.deploymentVersion
           }
           sku: {
-            name: gpt4vDeploymentSkuName
-            capacity: gpt4vDeploymentCapacity
+            name: gpt4v.deploymentSkuName
+            capacity: gpt4v.deploymentCapacity
           }
         }
       ]
@@ -966,7 +973,7 @@ output AZURE_RESOURCE_GROUP string = resourceGroup.name
 output OPENAI_HOST string = openAiHost
 output AZURE_OPENAI_EMB_MODEL_NAME string = embedding.modelName
 output AZURE_OPENAI_CHATGPT_MODEL string = chatGpt.modelName
-output AZURE_OPENAI_GPT4V_MODEL string = gpt4vModelName
+output AZURE_OPENAI_GPT4V_MODEL string = gpt4v.modelName
 
 // Specific to Azure OpenAI
 output AZURE_OPENAI_SERVICE string = isAzureOpenAiHost && deployAzureOpenAi ? openAi.outputs.name : ''
@@ -974,7 +981,7 @@ output AZURE_OPENAI_API_VERSION string = isAzureOpenAiHost ? azureOpenAiApiVersi
 output AZURE_OPENAI_RESOURCE_GROUP string = isAzureOpenAiHost ? openAiResourceGroup.name : ''
 output AZURE_OPENAI_CHATGPT_DEPLOYMENT string = isAzureOpenAiHost ? chatGpt.deploymentName : ''
 output AZURE_OPENAI_EMB_DEPLOYMENT string = isAzureOpenAiHost ? embedding.deploymentName : ''
-output AZURE_OPENAI_GPT4V_DEPLOYMENT string = isAzureOpenAiHost ? gpt4vDeploymentName : ''
+output AZURE_OPENAI_GPT4V_DEPLOYMENT string = isAzureOpenAiHost ? gpt4v.deploymentName : ''
 
 output AZURE_SPEECH_SERVICE_ID string = useSpeechOutputAzure ? speech.outputs.resourceId : ''
 output AZURE_SPEECH_SERVICE_LOCATION string = useSpeechOutputAzure ? speech.outputs.location : ''
diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index aada6b05fc..a42ae22e8c 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -122,8 +122,20 @@
     "embeddingDimensions": {
       "value": "${AZURE_OPENAI_EMB_DIMENSIONS}"
     },
+    "gpt4vModelName":{
+      "value": "${AZURE_OPENAI_GPT4V_MODEL}"
+    },
+    "gpt4vDeploymentName": {
+      "value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT}"
+    },
+    "gpt4vDeploymentVersion":{
+      "value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_VERSION}"
+    },
+    "gpt4vDeploymentSkuName":{
+      "value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_SKU}"
+    },
     "gpt4vDeploymentCapacity":{
-      "value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY=10}"
+      "value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY}"
     },
     "openAiHost": {
       "value": "${OPENAI_HOST=azure}"

From 7d2e131283684702906792737bbd2a156c0dbc73 Mon Sep 17 00:00:00 2001
From: Zed Haque <team@zedhaque.com>
Date: Thu, 10 Oct 2024 14:23:57 +1100
Subject: [PATCH 22/23] Update azure.yml and azure-dev.yml

---
 .azdo/pipelines/azure-dev.yml | 5 +++++
 azure.yaml                    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.azdo/pipelines/azure-dev.yml b/.azdo/pipelines/azure-dev.yml
index b18285824d..d8b2bdf233 100644
--- a/.azdo/pipelines/azure-dev.yml
+++ b/.azdo/pipelines/azure-dev.yml
@@ -73,6 +73,11 @@ steps:
       AZURE_OPENAI_EMB_DEPLOYMENT_VERSION: $(AZURE_OPENAI_EMB_DEPLOYMENT_VERSION)
       AZURE_OPENAI_EMB_DEPLOYMENT_SKU: $(AZURE_OPENAI_EMB_DEPLOYMENT_SKU)
       AZURE_OPENAI_EMB_DIMENSIONS: $(AZURE_OPENAI_EMB_DIMENSIONS)
+      AZURE_OPENAI_GPT4V_MODEL: $(AZURE_OPENAI_GPT4V_MODEL)
+      AZURE_OPENAI_GPT4V_DEPLOYMENT: $(AZURE_OPENAI_GPT4V_DEPLOYMENT)
+      AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY: $(AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY)
+      AZURE_OPENAI_GPT4V_DEPLOYMENT_VERSION: $(AZURE_OPENAI_GPT4V_DEPLOYMENT_VERSION)
+      AZURE_OPENAI_GPT4V_DEPLOYMENT_SKU: $(AZURE_OPENAI_GPT4V_DEPLOYMENT_SKU)
       OPENAI_HOST: $(OPENAI_HOST)
       OPENAI_API_KEY: $(OPENAI_API_KEY)
       OPENAI_ORGANIZATION: $(OPENAI_ORGANIZATION)
diff --git a/azure.yaml b/azure.yaml
index 7a65edb890..48c3fd09a6 100644
--- a/azure.yaml
+++ b/azure.yaml
@@ -71,6 +71,11 @@ pipeline:
       - AZURE_OPENAI_EMB_DEPLOYMENT_VERSION
       - AZURE_OPENAI_EMB_DEPLOYMENT_SKU
       - AZURE_OPENAI_EMB_DIMENSIONS
+      - AZURE_OPENAI_GPT4V_MODEL
+      - AZURE_OPENAI_GPT4V_DEPLOYMENT
+      - AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY
+      - AZURE_OPENAI_GPT4V_DEPLOYMENT_VERSION
+      - AZURE_OPENAI_GPT4V_DEPLOYMENT_SKU
       - OPENAI_HOST
       - OPENAI_API_KEY
       - OPENAI_ORGANIZATION

From 7462d49dad9e56feb1b2be94f315a9fd934ce32b Mon Sep 17 00:00:00 2001
From: Zed Haque <129348240+zedhaque@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:18:48 +1100
Subject: [PATCH 23/23] Update main.bicep

---
 infra/main.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra/main.bicep b/infra/main.bicep
index fcd94f413d..676787be6a 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -141,7 +141,7 @@ param gpt4vModelName string = ''
 param gpt4vDeploymentName string = ''
 param gpt4vModelVersion string = ''
 param gpt4vDeploymentSkuName string = ''
-param gpt4vDeploymentCapacity int = 10
+param gpt4vDeploymentCapacity int = 0
 var gpt4v = {
   modelName: !empty(gpt4vModelName) ? gpt4vModelName : 'gpt-4o'
   deploymentName: !empty(gpt4vDeploymentName) ? gpt4vDeploymentName : 'gpt-4o'