Merge pull request #307 from microsoft/psl-model-update

ci: model back to gpt4o due to more availability regions

Author: Roopan-Microsoft

.github/workflows/deploy.yml

@@ -115,8 +115,8 @@ jobs:
             --parameters \
                 environmentName="${{ env.SOLUTION_PREFIX }}" \
                 secondaryLocation="eastus2" \
-                deploymentType="Standard" \
-                gptModelName="gpt-4" \
+                deploymentType="GlobalStandard" \
+                gptModelName="gpt-4o" \
                 azureOpenaiAPIVersion="2024-05-01-preview" \
                 gptDeploymentCapacity="10" \
                 embeddingModel="text-embedding-ada-002" \

README.md

@@ -73,19 +73,21 @@ When you start the deployment, most parameters will have **default values**, but
 
 | **Setting** | **Description** |  **Default value** |
 |------------|----------------|  ------------|
-| **Azure Region** | The region where resources will be created. | East US| 
+| **Azure Region** | The region where resources will be created. | eastus | 
 | **Environment Name** | A **3-20 character alphanumeric value** used to generate a unique ID to prefix the resources. |  byctemplate |
 | **Secondary Location** | A **less busy** region for **Azure SQL and CosmosDB**, useful in case of availability constraints. |  eastus2 |
-| **Deployment Type** | Select from a drop-down list. |  Standard |
-| **GPT Model** | Choose from **gpt-4, gpt-4o** | gpt-4 |  
+| **Deployment Type** | Select from a drop-down list. |  Global Standard |
+| **GPT Model** | Choose from **gpt-4, gpt-4o** | gpt-4o |  
 | **GPT Model Deployment Capacity** | Configure capacity for **GPT models**. | 30k |
 | **Embedding Model** | Default: **text-embedding-ada-002**. |  text-embedding-ada-002 |
 | **Embedding Model Capacity** | Set the capacity for **embedding models**. |  80k |
 
 
 ### [Optional] Quota Recommendations  
-By default, the **GPT model capacity** in deployment is set to **30k tokens**.  
-> **We recommend increasing the capacity to 100k tokens for optimal performance.** 
+By default, the **Gpt-4o model capacity** in deployment is set to **30k tokens**, so we recommend
+> **For GPT-4o, the capacity to at least 150k tokens post-deployment for optimal performance.**
+
+> **For GPT-4, ensure a minimum of 30k–40k tokens for best results.**
 
 To adjust quota settings, follow these [steps](./docs/AzureGPTQuotaSettings.md)  
 

docs/CustomizingAzdParameters.md

@@ -21,7 +21,7 @@ azd env set AZURE_ENV_MODEL_DEPLOYMENT_TYPE Standard
 Set the Model Name (allowed values: gpt-4, gpt-4o)
 
 ```shell
-azd env set AZURE_ENV_MODEL_NAME gpt-4
+azd env set AZURE_ENV_MODEL_NAME gpt-4o
 ```
 
 Change the Model Capacity (choose a number based on available GPT model capacity in your subscription)

infra/main.bicep

@@ -25,15 +25,15 @@ param secondaryLocation string
   'Standard'
   'GlobalStandard'
 ])
-param deploymentType string = 'Standard'
+param deploymentType string = 'GlobalStandard'
 
 @minLength(1)
 @description('Name of the GPT model to deploy:')
 @allowed([
   'gpt-4o'
   'gpt-4'
 ])
-param gptModelName string = 'gpt-4'
+param gptModelName string = 'gpt-4o'
 
 param azureOpenaiAPIVersion string = '2024-05-01-preview'
 

infra/main.json

@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.33.93.31351",
-      "templateHash": "15906054451527240113"
+      "version": "0.34.1.11899",
+      "templateHash": "498892376344234261"
     }
   },
   "parameters": {
@@ -29,7 +29,7 @@
     },
     "deploymentType": {
       "type": "string",
-      "defaultValue": "Standard",
+      "defaultValue": "GlobalStandard",
       "allowedValues": [
         "Standard",
         "GlobalStandard"
@@ -41,7 +41,7 @@
     },
     "gptModelName": {
       "type": "string",
-      "defaultValue": "gpt-4",
+      "defaultValue": "gpt-4o",
       "allowedValues": [
         "gpt-4o",
         "gpt-4"
@@ -150,8 +150,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "15599520231829365667"
+              "version": "0.34.1.11899",
+              "templateHash": "5321954130579291970"
             }
           },
           "parameters": {
@@ -243,8 +243,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "4317523167912536944"
+              "version": "0.34.1.11899",
+              "templateHash": "15644309813710584263"
             }
           },
           "parameters": {
@@ -383,8 +383,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "14521272418759600301"
+              "version": "0.34.1.11899",
+              "templateHash": "6241332452423283350"
             }
           },
           "parameters": {
@@ -981,8 +981,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "6827407487603246290"
+              "version": "0.34.1.11899",
+              "templateHash": "5169332991642386736"
             }
           },
           "parameters": {
@@ -1210,8 +1210,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "15057452249812707948"
+              "version": "0.34.1.11899",
+              "templateHash": "12565043404933150402"
             }
           },
           "parameters": {
@@ -1696,8 +1696,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "3309828108890144070"
+              "version": "0.34.1.11899",
+              "templateHash": "8749313878807873763"
             }
           },
           "parameters": {
@@ -1919,8 +1919,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "1089111242708527718"
+              "version": "0.34.1.11899",
+              "templateHash": "16100001477502640669"
             }
           },
           "parameters": {