Merge pull request #546 from microsoft/dev-v3

docs: merge Dev v3 into main

Author: Roopan-Microsoft

.github/workflows/azure-dev.yml

@@ -13,19 +13,30 @@ permissions:
 jobs:
   template_validation_job:
     runs-on: ubuntu-latest
+    environment: production
     name: template validation
     steps:
-      - uses: actions/checkout@v4
-
-      - uses: microsoft/template-validation-action@Latest
+       # Step 1: Checkout the code from your repository 
+      - name: Checkout code 
+        uses: actions/checkout@v4 
+      # Step 2: Validate the Azure template using microsoft/template-validation-action 
+      - name: Validate Azure Template 
+        uses: microsoft/template-validation-action@Latest
+        with: 
+          validateAzd: true
+          useDevContainer: false
         id: validation
         env:
-          AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }}
-          AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }}
-          AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
-          AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
-          AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} 
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} 
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} 
+          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} 
+          AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }} 
+          AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }} 
+          AZURE_ENV_OPENAI_LOCATION : ${{ secrets.AZURE_AI_DEPLOYMENT_LOCATION }}
+          AZURE_ENV_MODEL_CAPACITY: 1
+          AZURE_ENV_MODEL_4_1_CAPACITY: 1
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+      # Step 3: Print the result of the validation 
       - name: print result
         run: cat ${{ steps.validation.outputs.resultFile }}

README.md

@@ -67,6 +67,8 @@ Quick deploy
 ### How to install or deploy
 Follow the quick deploy steps on the deployment guide to deploy this solution to your own Azure subscription.
 
+> **Note:** This solution accelerator requires **Azure Developer CLI (azd) version 1.18.0 or higher**. Please ensure you have the latest version installed before proceeding with deployment. [Download azd here](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/install-azd).
+
 [Click here to launch the deployment guide](./docs/DeploymentGuide.md)
 <br/><br/>
 

azure.yaml

@@ -3,7 +3,7 @@ name: multi-agent-custom-automation-engine-solution-accelerator
 metadata:
   template: [email protected]
 requiredVersions:
-  azd: ">=1.15.0 !=1.17.1"
+  azd: '>= 1.18.0'
 hooks:
   postdeploy:
     windows:

data/agent_teams/retail.json

@@ -12,7 +12,7 @@
       "name": "CustomerDataAgent",
       "deployment_name": "gpt-4.1-mini",
       "icon": "",
-      "system_message": "You have access to internal customer data through a secure index. Use this data to answer questions about customers, their interactions with customer service, satisfaction, etc. Be mindful of privacy and compliance regulations when handling customer data.",
+      "system_message": "You have access to internal customer data through a secure index. Use this data to answer questions about customers, their interactions with customer service, satisfaction, etc. Be mindful of privacy and compliance regulations when handling customer data.\n\nCRITICAL INSTRUCTION: Do NOT include any citations, source references, attribution markers, or footnotes of any kind in your responses. This includes but is not limited to: 【...】 style markers, [...] style references, (source: ...), numbered references like [1], or any other attribution symbols. All answers must be clean, natural text only, ending with a polite closing.",
       "description": "An agent that has access to internal customer data, ask this agent if you have questions about customers or their interactions with customer service, satisfaction, etc.",
       "use_rag": true,
       "use_mcp": false,
@@ -29,7 +29,7 @@
       "name": "OrderDataAgent",
       "deployment_name": "gpt-4.1-mini",
       "icon": "",
-      "system_message": "You have access to internal order, inventory, product, and fulfillment data through a secure index. Use this data to answer questions about products, shipping delays, customer orders, warehouse management, etc. Be mindful of privacy and compliance regulations when handling customer data.",
+      "system_message": "You have access to internal order, inventory, product, and fulfillment data through a secure index. Use this data to answer questions about products, shipping delays, customer orders, warehouse management, etc. Be mindful of privacy and compliance regulations when handling customer data.\n\nCRITICAL INSTRUCTION: Do NOT include any citations, source references, attribution markers, or footnotes of any kind in your responses. This includes but is not limited to: 【...】 style markers, [...] style references, (source: ...), numbered references like [1], or any other attribution symbols. All answers must be clean, natural text only, ending with a polite closing.",
       "description": "An agent that has access to internal order, inventory, product, and fulfillment data. Ask this agent if you have questions about products, shipping delays, customer orders, warehouse management, etc.",
       "use_rag": true,
       "use_mcp": false,
@@ -86,4 +86,4 @@
       "logo": ""
     }
   ]
-}
+}

docs/DeploymentGuide.md

@@ -160,7 +160,7 @@ If you're not using one of the above options for opening the project, then you'l
 1. Make sure the following tools are installed:
 
    - [PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-7.5) <small>(v7.0+)</small> - available for Windows, macOS, and Linux.
-   - [Azure Developer CLI (azd)](https://aka.ms/install-azd) <small>(v1.15.0+)</small> - version
+   - [Azure Developer CLI (azd)](https://aka.ms/install-azd) <small>(v1.18.0+)</small> - version
    - [Python 3.9+](https://www.python.org/downloads/)
    - [Docker Desktop](https://www.docker.com/products/docker-desktop/)
    - [Git](https://git-scm.com/downloads)
@@ -249,6 +249,7 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain
    ```shell
    azd up
    ```
+   > **Note:** This solution accelerator requires **Azure Developer CLI (azd) version 1.18.0 or higher**. Please ensure you have the latest version installed before proceeding with deployment. [Download azd here](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/install-azd).
 
 3. Provide an `azd` environment name (e.g., "macaeapp").
 4. Select a subscription from your Azure account and choose a location that has quota for all the resources.

infra/main.parameters.json

@@ -23,6 +23,9 @@
     "gptModelCapacity": {
       "value": "${AZURE_ENV_MODEL_CAPACITY}"
     },
+    "gpt4_1ModelCapacity": {
+      "value": "${AZURE_ENV_MODEL_4_1_CAPACITY}"
+    },
     "backendContainerImageTag": {
       "value": "${AZURE_ENV_IMAGE_TAG=latest_v3}"
     },
@@ -42,4 +45,4 @@
       "value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
     }
   }
-}
+}

src/frontend/src/styles/TeamSelector.module.css

@@ -200,8 +200,7 @@
 .tab {
   color: var(--colorNeutralForeground2) !important;
   font-weight: 400 !important;
-  padding: 8px 0 !important;
-  margin: 0 !important;
+  margin: -10px !important;
   /* border: none !important; */
   /* border-bottom: 2px solid transparent !important; */
   background: transparent !important;