Merge branch 'dev' into psl-US-41954

Author: Kanchan-Microsoft

.github/workflows/deploy-KMGeneric.yml

@@ -130,7 +130,7 @@ jobs:
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
-            --parameters solutionName=${{env.SOLUTION_PREFIX}} location="${{ env.AZURE_LOCATION }}" contentUnderstandingLocation="swedencentral" secondaryLocation="${{ env.AZURE_LOCATION }}" gptDeploymentCapacity=150 aiServiceLocation="${{ env.AZURE_LOCATION }}" createdBy="Pipeline" tags="{'Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
+            --parameters solutionName=${{env.SOLUTION_PREFIX}} location="${{ env.AZURE_LOCATION }}" secondaryLocation="${{ env.AZURE_LOCATION }}" gptDeploymentCapacity=150 aiServiceLocation="${{ env.AZURE_LOCATION }}" createdBy="Pipeline" tags="{'Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
 
      
 

.github/workflows/deploy-v2.yml

@@ -39,7 +39,6 @@ on:
           - 'australiaeast'
           - 'eastus'
           - 'eastus2'
-          - 'francecentral'
           - 'japaneast'
           - 'swedencentral'
           - 'uksouth'

documents/AVMPostDeploymentGuide.md

@@ -211,7 +211,7 @@ bash ./infra/scripts/process_custom_data.sh \
   <Storage-Account-Name> <Storage-Container-Name> \
   <SQL-Server-Name> <SQL-Database-Name> <Backend-User-MID-Client-ID> <Backend-User-MID-Display-Name> \
   <AI-Search-Name> <Search-Endpoint> \
-  <AI-Foundry-Resource-ID> <CU-Foundry-Resource-ID> \
+  <AI-Foundry-Resource-ID> \
   <OpenAI-Endpoint> <Embedding-Model> <Deployment-Model> \
   <CU-Endpoint> <CU-API-Version> <AI-Agent-Endpoint> <Solution-Name>
 ```

documents/CustomizeData.md

@@ -29,7 +29,7 @@ If you would like to update the solution to leverage your own data please follow
       <Storage-Account-Name> <Storage-Container-Name> \
       <SQL-Server-Name> <SQL-Database-Name> <Backend-User-MID-Client-ID> <Backend-User-MID-Display-Name> \
       <AI-Search-Name> <Search-Endpoint> \
-      <AI-Foundry-Resource-ID> <CU-Foundry-Resource-ID> \
+      <AI-Foundry-Resource-ID> \
       <OpenAI-Endpoint> <Embedding-Model> <Deployment-Model> \
       <CU-Endpoint> <CU-API-Version> <AI-Agent-Endpoint> <Solution-Name>
     ```

documents/CustomizingAzdParameters.md

@@ -11,12 +11,11 @@ By default this template will use the environment name as the prefix to prevent
 | ----------------------------------------- | ------- | ------------------------ | -------------------------------------------------------------------------- |
 | `AZURE_LOCATION`                          | string  | ` `            | Sets the Azure region for resource deployment.                             |
 | `AZURE_ENV_NAME`                          | string  | `env_name`               | Sets the environment name prefix for all Azure resources.                  |
-| `AZURE_ENV_CU_LOCATION`    | string  | `swedencentral`          | Specifies the region for content understanding resources.                  |
 | `AZURE_ENV_AI_SERVICE_LOCATION`                | string  | `eastus2`                | Specifies the Azure AI service location.                                        |
 | `AZURE_ENV_SECONDARY_LOCATION`                | string  | `eastus2`                | Specifies a secondary Azure region.                                        |
-| `AZURE_ENV_MODEL_DEPLOYMENT_TYPE`     | string  | `GlobalStandard`         | Defines the model deployment type (allowed: `Standard`, `GlobalStandard`). |
-| `AZURE_ENV_GPT_MODEL_NAME`          | string  | `gpt-4o-mini`            | Specifies the GPT model name (e.g., `gpt-4`, `gpt-4o-mini`).               |
-| `AZURE_ENV_GPT_MODEL_VERSION`                 | string  | `2024-07-18`             | Sets the Azure model version (allowed: `2024-08-06`, etc.).                |
+| `AZURE_ENV_MODEL_DEPLOYMENT_TYPE`     | string  | `GlobalStandard`         | Defines the model deployment type (allowed: `Standard`, `GlobalStandard`). **Note:** The `azd` location-picker filters regions using the `usageName` metadata on `aiServiceLocation` in `infra/main.bicep` (currently `OpenAI.GlobalStandard.gpt-4o-mini,150`). If you set this to `Standard`, also edit that metadata to `OpenAI.Standard.gpt-4o-mini,150` so the picker shows the correct subset of regions, since `gpt-4o-mini` Standard (regional) availability differs from Global Standard. |
+| `AZURE_ENV_GPT_MODEL_NAME`          | string  | `gpt-4o-mini`            | Specifies the GPT model name (e.g., `gpt-4o-mini`, `gpt-4.1`, etc.).               |
+| `AZURE_ENV_GPT_MODEL_VERSION`                 | string  | `2024-07-18`             | Sets the Azure model version (e.g., `2024-07-18`, etc.).                |
 | `AZURE_ENV_GPT_MODEL_CAPACITY` | integer | `30`                     | Sets the GPT model capacity.                                               |
 | `AZURE_ENV_EMBEDDING_MODEL_NAME`            | string  | `text-embedding-3-small` | Sets the name of the embedding model to use.                               |
 | `AZURE_ENV_IMAGE_TAG`                      | string  | `latest_afv2`        | Sets the image tag (`latest_afv2`, `dev`, `hotfix`, etc.).   |

documents/DeploymentGuide.md

@@ -394,7 +394,7 @@ bash ./infra/scripts/process_sample_data.sh \
   <Storage-Account-Name> <Storage-Container-Name> \
   <SQL-Server-Name> <SQL-Database-Name> <Backend-User-MID-Client-ID> <Backend-User-MID-Display-Name> \
   <AI-Search-Name> <Search-Endpoint> \
-  <AI-Foundry-Resource-ID> <CU-Foundry-Resource-ID> \
+  <AI-Foundry-Resource-ID> \
   <OpenAI-Endpoint> <Embedding-Model> <Deployment-Model> \
   <CU-Endpoint> <CU-API-Version> <AI-Agent-Endpoint> <Use-Case> <Solution-Name>
 ```
@@ -404,9 +404,9 @@ bash ./infra/scripts/process_sample_data.sh \
 - **Storage Parameters:** Storage account name and container name
 - **SQL Parameters:** SQL server name, database name, backend user managed identity client ID and display name
 - **Search Parameters:** AI Search service name and endpoint
-- **AI Foundry Parameters:** AI Foundry resource ID and Content Understanding Foundry resource ID
+- **AI Foundry Parameters:** AI Foundry resource ID
 - **OpenAI Parameters:** OpenAI endpoint, embedding model name, and deployment model name
-- **Content Understanding Parameters:** CU endpoint, AI agent endpoint, CU API version
+- **Content Understanding Parameters:** CU endpoint, CU API version, AI agent endpoint
 - **Use Case:** Either `telecom` or `IT_helpdesk`
 - **Solution Parameters:** Solution deployment name
 

documents/Images/AddDetails.png

@@ -18,7 +18,7 @@ gpt-4o:150, gpt-4o-mini:150, gpt-4:150, text-embedding-3-small:80
 ```
 ### 📌 Default Regions:
 ```
-eastus, uksouth, eastus2, northcentralus, swedencentral, westus, westus2, southcentralus, canadacentral
+eastus, eastus2, australiaeast, uksouth, swedencentral, westus, westus3, japaneast, southcentralus, westeurope
 ```
 ### Usage Scenarios:
 - No parameters passed → Default models and capacities will be checked in default regions.