Merge branch 'features/found-main' of https://github.com/microsoft/Modernize-your-code-solution-accelerator into features/found-main-refactor

Author: marktayl1

README.md

@@ -107,11 +107,11 @@ When you start the deployment, most parameters will have **default values**, but
 | **Azure Region** | The region where resources will be created. | East US| 
 | **Resource Prefix** | Prefix for all resources created by this template. This prefix will be used to create unique names for all resources. The prefix must be unique within the resource group. | None |
 | **AI Location** | Location for all AI services resources. This location can be different from the resource group location | None |
-| **Capacity** | Configure capacity for **GPT models**. |  5k |
+| **Capacity** | Configure capacity for **gpt-4o**. |  5k |
 
 ### [Optional] Quota Recommendations  
 By default, the **GPT model capacity** in deployment is set to **5k tokens**.  
-> **We recommend increasing the capacity to 30k tokens for optimal performance.** 
+> **We recommend increasing the capacity to 200k tokens for optimal performance.** 
 
 To adjust quota settings, follow these [steps](./docs/AzureGPTQuotaSettings.md)  
 
@@ -262,7 +262,7 @@ You can try the [Azure pricing calculator](https://azure.microsoft.com/en-us/pri
 * Azure AI Foundry: Free tier. [Pricing](https://azure.microsoft.com/pricing/details/ai-studio/)
 * Azure Storage Account: Standard tier, LRS. Pricing is based on storage and operations. [Pricing](https://azure.microsoft.com/pricing/details/storage/blobs/)
 * Azure Key Vault: Standard tier. Pricing is based on the number of operations. [Pricing](https://azure.microsoft.com/pricing/details/key-vault/)
-* Azure AI Services: S0 tier, defaults to gpt-4o-mini and text-embedding-ada-002 models. Pricing is based on token count. [Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/)
+* Azure AI Services: S0 tier, defaults to gpt-4o-mini. Pricing is based on token count. [Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/)
 * Azure Container App: Consumption tier with 0.5 CPU, 1GiB memory/storage. Pricing is based on resource allocation, and each month allows for a certain amount of free usage. [Pricing](https://azure.microsoft.com/pricing/details/container-apps/)
 * Azure Container Registry: Basic tier. [Pricing](https://azure.microsoft.com/pricing/details/container-registry/)
 * Log analytics: Pay-as-you-go tier. Costs based on data ingested. [Pricing](https://azure.microsoft.com/pricing/details/monitor/)

docs/CustomizingAzdParameters.md

@@ -3,23 +3,16 @@ By default this template will use the environment name as the prefix to prevent
 
 > To override any of the parameters, run `azd env set <key> <value>` before running `azd up`. On the first azd command, it will prompt you for the environment name. Be sure to choose 3-20 charaters alphanumeric unique name. 
 
-
-Change the Secondary Location (example: eastus2, westus2, etc.)
-
-```shell
-azd env set AZURE_ENV_SECONDARY_LOCATION eastus2
-```
-
 Change the Model Deployment Type (allowed values: Standard, GlobalStandard)
 
 ```shell
 azd env set AZURE_ENV_MODEL_DEPLOYMENT_TYPE Standard
 ```
 
-Set the Model Name (allowed values: gpt-4, gpt-4o)
+Set the Model Name (allowed values: gpt-4)
 
 ```shell
-azd env set AZURE_ENV_MODEL_NAME gpt-4o
+azd env set AZURE_ENV_MODEL_NAME gpt-4
 ```
 
 Change the Model Capacity (choose a number based on available GPT model capacity in your subscription)
@@ -28,13 +21,3 @@ Change the Model Capacity (choose a number based on available GPT model capacity
 azd env set AZURE_ENV_MODEL_CAPACITY 30
 ```
 
-Change the Embedding Model 
-
-```shell
-azd env set AZURE_ENV_EMBEDDING_MODEL_NAME text-embedding-ada-002
-```
-
-Change the Embedding Deployment Capacity (choose a number based on available embedding model capacity in your subscription)
-
-```shell
-azd env set AZURE_ENV_EMBEDDING_MODEL_CAPACITY 80

docs/EXAMPLE-CustomizingAzdParameters.md

@@ -11,12 +11,6 @@ Change the Content Understanding Location (allowed values: Sweden Central, Austr
 azd env set AZURE_ENV_CU_LOCATION 'swedencentral'
 ```
 
-Change the Secondary Location (example: eastus2, westus2, etc.)
-
-```shell
-azd env set AZURE_ENV_SECONDARY_LOCATION eastus2
-```
-
 Change the Model Deployment Type (allowed values: Standard, GlobalStandard)
 
 ```shell
@@ -34,15 +28,3 @@ Change the Model Capacity (choose a number based on available GPT model capacity
 ```shell
 azd env set AZURE_ENV_MODEL_CAPACITY 30
 ```
-
-Change the Embedding Model 
-
-```shell
-azd env set AZURE_ENV_EMBEDDING_MODEL_NAME text-embedding-ada-002
-```
-
-Change the Embedding Deployment Capacity (choose a number based on available embedding model capacity in your subscription)
-
-```shell
-azd env set AZURE_ENV_EMBEDDING_MODEL_CAPACITY 80
-```

docs/quota_check.md

@@ -4,7 +4,7 @@ Before deploying the accelerator, **ensure sufficient quota availability** for t
 
 ### 📌 Default Models & Capacities:
 ```
-gpt-4o:30, text-embedding-ada-002:80, gpt-4:30
+gpt-4o:30, gpt-4:30
 ```
 ### 📌 Default Regions:
 ```
@@ -27,7 +27,7 @@ eastus, uksouth, eastus2, northcentralus, swedencentral, westus, westus2, southc
   ```
 ✔️ Multiple models can be passed, separated by commas:
   ```
-  ./quota_check_params.sh gpt-4o:30,text-embedding-ada-002:80
+  ./quota_check_params.sh gpt-4o:30,gpt-4:80
   ```
 ✔️ Passing Both models and regions:  
   ```

scripts/quota_check_params.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Default Models and Capacities (Comma-separated in "model:capacity" format)
-DEFAULT_MODEL_CAPACITY="gpt-4o:30,text-embedding-ada-002:80,gpt-4:30"
+DEFAULT_MODEL_CAPACITY="gpt-4o:30,gpt-4:30"
 
 # Convert the comma-separated string into an array
 IFS=',' read -r -a MODEL_CAPACITY_PAIRS <<< "$DEFAULT_MODEL_CAPACITY"