Skip to content

Commit 2cc70f7

Browse files
VishalS-MicrosoftVishalS-Microsoft
committed
Merge branch 'dev-v4' into psl-fixexpsfiissues-macae
2 parents c7a5649 + 55bcdaa commit 2cc70f7

15 files changed

Lines changed: 136 additions & 42 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Follow the quick deploy steps on the deployment guide to deploy this solution to
7272

7373
> **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).
7474
75+
> **Note:** If deploying from a **local environment** (Option D in the deployment guide), this solution accelerator requires **Bicep CLI version 0.33.0 or higher** to compile infrastructure templates. [Install Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/install).
76+
7577
[Click here to launch the deployment guide](./docs/DeploymentGuide.md)
7678
<br/><br/>
7779

‎docs/AVMPostDeploymentGuide.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Before starting the post-deployment process, ensure you have the following:
2929
3. **[Python](https://www.python.org/downloads/)** <small>(v4.9+ recommended)</small> - Required for data processing scripts
3030

3131
4. **[Git](https://git-scm.com/downloads/)** - Version control system for cloning the repository
32+
5. **[Bicep CLI](https://learn.microsoft.com/azure/azure-resource-manager/bicep/install)** <small>(v0.33.0+)</small> - Required for compiling infrastructure templates
3233

3334
### Azure Requirements
3435

‎docs/DeploymentGuide.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ Select one of the following options to deploy the Multi Agent Custom Automation
153153
**Required Tools:**
154154
- [PowerShell 7.0+](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell)
155155
- [Azure Developer CLI (azd) 1.18.0+](https://aka.ms/install-azd)
156+
- [Bicep CLI 0.33.0+](https://learn.microsoft.com/azure/azure-resource-manager/bicep/install) - command-line Bicep compiler required for deployments (separate from the VS Code Bicep extension)
156157
- [Python 3.9+](https://www.python.org/downloads/)
157158
- [Docker Desktop](https://www.docker.com/products/docker-desktop/)
158159
- [Git](https://git-scm.com/downloads)

‎docs/LocalDevelopmentSetup.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ az cosmosdb sql role assignment create --resource-group <solution-accelerator-rg
273273
**Assign the required roles:**
274274

275275
```bash
276-
# Azure AI User role
277-
az role assignment create --assignee <aad-user-upn> --role "Azure AI User" --scope /subscriptions/<subscription-id>/resourceGroups/<solution-accelerator-rg>/providers/Microsoft.CognitiveServices/accounts/<foundry-account-name>/projects/<foundry-project-name>
276+
# Foundry User role
277+
az role assignment create --assignee <aad-user-upn> --role "Foundry User" --scope /subscriptions/<subscription-id>/resourceGroups/<solution-accelerator-rg>/providers/Microsoft.CognitiveServices/accounts/<foundry-account-name>/projects/<foundry-project-name>
278278
```
279279

280280
```bash

‎docs/re-use-foundry-project.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ Replace `<Existing Foundry Project Resource ID>` with the value obtained from St
4444
Proceed with the next steps in the [deployment guide](DeploymentGuide.md#deployment-steps).
4545

4646
> **Note:**
47-
> After deployment, if you want to access agents created by the accelerator via the Azure AI Foundry Portal, or if you plan to debug or run the application locally, you must assign yourself either the **Azure AI User** or **Azure AI Developer** role for the Foundry resource.
47+
> After deployment, if you want to access agents created by the accelerator via the Azure AI Foundry Portal, or if you plan to debug or run the application locally, you must assign yourself either the **Foundry User** or **Azure AI Developer** role for the Foundry resource.
4848
> You can do this in the Azure Portal under the Foundry resource's "Access control (IAM)" section,
4949
> **or** run the following command in your terminal (replace `<aad-user-upn>` with your Azure AD user principal name and `<resource-id>` with the Resource ID you copied in Step 5):
5050
> ```bash
51-
> az role assignment create --assignee <aad-user-upn> --role "Azure AI User" --scope <resource-id>
51+
> az role assignment create --assignee <aad-user-upn> --role "Foundry User" --scope <resource-id>
5252
> ```

‎infra/main.bicep‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
855855
]
856856
roleAssignments: [
857857
{
858-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
858+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
859859
principalId: userAssignedIdentity.outputs.principalId
860860
principalType: 'ServicePrincipal'
861861
}
@@ -936,7 +936,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
936936
managedIdentities: { userAssignedResourceIds: [userAssignedIdentity!.outputs.resourceId] } //To create accounts or projects, you must enable a managed identity on your resource
937937
roleAssignments: [
938938
{
939-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
939+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
940940
principalId: userAssignedIdentity.outputs.principalId
941941
principalType: 'ServicePrincipal'
942942
}
@@ -951,7 +951,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
951951
principalType: 'ServicePrincipal'
952952
}
953953
{
954-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
954+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
955955
principalId: deployingUserPrincipalId
956956
principalType: deployerPrincipalType
957957
}

‎infra/main.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"templateHash": "11424525558363523540"
1010
},
1111
"name": "Multi-Agent Custom Automation Engine",
12-
"description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\r\n\r\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\r\n"
12+
"description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\n\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\n"
1313
},
1414
"parameters": {
1515
"solutionName": {

‎infra/main_custom.bicep‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ module existingAiFoundryAiServicesDeployments 'modules/ai-services-deployments.b
854854
]
855855
roleAssignments: [
856856
{
857-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
857+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
858858
principalId: userAssignedIdentity.outputs.principalId
859859
principalType: 'ServicePrincipal'
860860
}
@@ -935,7 +935,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
935935
managedIdentities: { userAssignedResourceIds: [userAssignedIdentity!.outputs.resourceId] } //To create accounts or projects, you must enable a managed identity on your resource
936936
roleAssignments: [
937937
{
938-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
938+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
939939
principalId: userAssignedIdentity.outputs.principalId
940940
principalType: 'ServicePrincipal'
941941
}
@@ -950,7 +950,7 @@ module aiFoundryAiServices 'br:mcr.microsoft.com/bicep/avm/res/cognitive-service
950950
principalType: 'ServicePrincipal'
951951
}
952952
{
953-
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Azure AI User
953+
roleDefinitionIdOrName: '53ca6127-db72-4b80-b1b0-d745d6d5456d' // Foundry User
954954
principalId: deployingUserPrincipalId
955955
principalType: deployerPrincipalType
956956
}

‎infra/scripts/assign_azure_ai_user_role.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ fi
2525

2626
IFS=',' read -r -a principal_ids_array <<< $principal_ids
2727

28-
echo "Assigning Azure AI User role role to users"
28+
echo "Assigning Foundry User role to users"
2929

3030
echo "Using provided Azure AI resource id: $aif_resource_id"
3131

3232
for principal_id in "${principal_ids_array[@]}"; do
3333

34-
# Check if the user has the Azure AI User role
35-
echo "Checking if user - ${principal_id} has the Azure AI User role"
34+
# Check if the user has the Foundry User role
35+
echo "Checking if user - ${principal_id} has the Foundry User role"
3636
role_assignment=$(MSYS_NO_PATHCONV=1 az role assignment list --role 53ca6127-db72-4b80-b1b0-d745d6d5456d --scope $aif_resource_id --assignee $principal_id --query "[].roleDefinitionId" -o tsv)
3737
if [ -z "$role_assignment" ]; then
38-
echo "User - ${principal_id} does not have the Azure AI User role. Assigning the role."
38+
echo "User - ${principal_id} does not have the Foundry User role. Assigning the role."
3939
MSYS_NO_PATHCONV=1 az role assignment create --assignee $principal_id --role 53ca6127-db72-4b80-b1b0-d745d6d5456d --scope $aif_resource_id --output none
4040
if [ $? -eq 0 ]; then
41-
echo "Azure AI User role assigned successfully."
41+
echo "Foundry User role assigned successfully."
4242
else
43-
echo "Failed to assign Azure AI User role."
43+
echo "Failed to assign Foundry User role."
4444
exit 1
4545
fi
4646
else
47-
echo "User - ${principal_id} already has the Azure AI User role."
47+
echo "User - ${principal_id} already has the Foundry User role."
4848
fi
4949
done

‎src/App/src/components/content/streaming/StreamingAgentMessage.tsx‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,13 @@ const renderAgentMessages = (
176176
<Body1 className={styles.agentName}>
177177
{getAgentDisplayName(msg.agent)}
178178
</Body1>
179-
<Tag
180-
appearance="brand"
181-
>
182-
AI Agent
183-
</Tag>
179+
{msg.agent_type !== AgentMessageType.SYSTEM_AGENT && msg.agent?.toLowerCase() !== 'system' && (
180+
<Tag
181+
appearance="brand"
182+
>
183+
AI Agent
184+
</Tag>
185+
)}
184186
</div>
185187
)}
186188

0 commit comments

Comments
 (0)