From b13907b2849719418f2f387ae70d89f60082e61c Mon Sep 17 00:00:00 2001 From: Priyanka-Microsoft Date: Wed, 13 Aug 2025 11:31:42 +0530 Subject: [PATCH 1/3] updated env in readme local setup --- docs/DeploymentGuide.md | 6 +++++- docs/LocalDeployment.md | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/DeploymentGuide.md b/docs/DeploymentGuide.md index 8b30f7f0..0edb6f32 100644 --- a/docs/DeploymentGuide.md +++ b/docs/DeploymentGuide.md @@ -287,7 +287,7 @@ The files for the dev container are located in `/.devcontainer/` folder. - You can use the Bicep extension for VSCode (Right-click the `.bicep` file, then select "Show deployment plan") or use the Azure CLI: ```bash - az deployment group create -g -f deploy/macae-dev.bicep --query 'properties.outputs' + az deployment group create -g -f infra/main.bicep --query 'properties.outputs' ``` - **Note**: You will be prompted for a `principalId`, which is the ObjectID of your user in Entra ID. To find it, use the Azure Portal or run: @@ -321,6 +321,10 @@ The files for the dev container are located in `/.devcontainer/` folder. 5. **Create a `.env` file:** - Navigate to the `src\backend` folder and create a `.env` file based on the provided `.env.sample` file. + - Update the `.env` file with the required values from your Azure resource group in Azure Portal App Service environment variables. + - Alternatively, if resources were + provisioned using `azd provision` or `azd up`, a `.env` file is automatically generated in the `.azure//.env` + file. To get your `` run `azd env list` to see which env is default. 6. **Fill in the `.env` file:** diff --git a/docs/LocalDeployment.md b/docs/LocalDeployment.md index d23905b9..6e385823 100644 --- a/docs/LocalDeployment.md +++ b/docs/LocalDeployment.md @@ -74,7 +74,7 @@ The files for the dev container are located in `/.devcontainer/` folder. - You can use the Bicep extension for VSCode (Right-click the `.bicep` file, then select "Show deployment plane") or use the Azure CLI: ```bash - az deployment group create -g -f deploy/macae-dev.bicep --query 'properties.outputs' + az deployment group create -g -f infra/main.bicep --query 'properties.outputs' ``` - **Note**: You will be prompted for a `principalId`, which is the ObjectID of your user in Entra ID. To find it, use the Azure Portal or run: ```bash From 3b610a9d228b900258937f15693efc6ffc5cf391 Mon Sep 17 00:00:00 2001 From: Priyanka-Microsoft Date: Thu, 14 Aug 2025 07:50:41 +0000 Subject: [PATCH 2/3] updated readme link --- docs/DeploymentGuide.md | 17 ++++++++++++++--- docs/LocalDeployment.md | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/docs/DeploymentGuide.md b/docs/DeploymentGuide.md index 0edb6f32..165cf320 100644 --- a/docs/DeploymentGuide.md +++ b/docs/DeploymentGuide.md @@ -233,7 +233,7 @@ The easiest way to run this accelerator is in a VS Code Dev Containers, which wi ## Detailed Development Container setup instructions -The solution contains a [development container](https://code.visualstudio.com/docs/remote/containers) with all the required tooling to develop and deploy the accelerator. To deploy the Chat With Your Data accelerator using the provided development container you will also need: +The solution contains a [development container](https://code.visualstudio.com/docs/remote/containers) with all the required tooling to develop and deploy the accelerator. To deploy the Multi-Agent solutions accelerator using the provided development container you will also need: - [Visual Studio Code](https://code.visualstudio.com) - [Remote containers extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) @@ -301,7 +301,7 @@ The files for the dev container are located in `/.devcontainer/` folder. **Role Assignments in Bicep Deployment:** - The **macae-dev.bicep** deployment includes the assignment of the appropriate roles to AOAI and Cosmos services. If you want to modify an existing implementation—for example, to use resources deployed as part of the simple deployment for local debugging—you will need to add your own credentials to access the Cosmos and AOAI services. You can add these permissions using the following commands: + The **main.bicep** deployment includes the assignment of the appropriate roles to AOAI and Cosmos services. If you want to modify an existing implementation—for example, to use resources deployed as part of the simple deployment for local debugging—you will need to add your own credentials to access the Cosmos and AOAI services. You can add these permissions using the following commands: ```bash az cosmosdb sql role assignment create --resource-group --account-name --role-definition-name "Cosmos DB Built-in Data Contributor" --principal-id --scope /subscriptions//resourceGroups//providers/Microsoft.DocumentDB/databaseAccounts/ @@ -342,8 +342,19 @@ The files for the dev container are located in `/.devcontainer/` folder. ```bash pip install -r requirements.txt ``` + +9. **Build the frontend (important):** -9. **Run the application:** + - Before running the frontend server, you must build the frontend to generate the necessary `build/assets` directory. + + From the `src/frontend` directory, run: + + ```bash + npm install + npm run build + ``` + +10. **Run the application:** - From the src/backend directory: diff --git a/docs/LocalDeployment.md b/docs/LocalDeployment.md index 6e385823..e7ebe006 100644 --- a/docs/LocalDeployment.md +++ b/docs/LocalDeployment.md @@ -20,7 +20,7 @@ The easiest way to run this accelerator is in a VS Code Dev Containers, which wi ## Detailed Development Container setup instructions -The solution contains a [development container](https://code.visualstudio.com/docs/remote/containers) with all the required tooling to develop and deploy the accelerator. To deploy the Chat With Your Data accelerator using the provided development container you will also need: +The solution contains a [development container](https://code.visualstudio.com/docs/remote/containers) with all the required tooling to develop and deploy the accelerator. To deploy the Multi Agent Solution accelerator using the provided development container you will also need: * [Visual Studio Code](https://code.visualstudio.com) * [Remote containers extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) @@ -124,8 +124,19 @@ The files for the dev container are located in `/.devcontainer/` folder. ```bash pip install -r requirements.txt ``` + +9. **Build the frontend (important):** + + - Before running the frontend server, you must build the frontend to generate the necessary `build/assets` directory. + + From the `src/frontend` directory, run: + + ```bash + npm install + npm run build + ``` -10. **Run the application:** +11. **Run the application:** - From the src/backend directory: ```bash python app_kernel.py From 1f2758a3f5458e57f1416942067ffaa8e1bbb186 Mon Sep 17 00:00:00 2001 From: Priyanka-Microsoft Date: Thu, 14 Aug 2025 07:54:13 +0000 Subject: [PATCH 3/3] added APP_env variable in bicep --- infra/main.bicep | 1 + 1 file changed, 1 insertion(+) diff --git a/infra/main.bicep b/infra/main.bicep index bf96fe12..f6ea978e 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -1738,3 +1738,4 @@ output AZURE_AI_MODEL_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeploymen // output APPLICATIONINSIGHTS_CONNECTION_STRING string = applicationInsights.outputs.connectionString output AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME string = aiFoundryAiServicesModelDeployment.name output AZURE_AI_AGENT_ENDPOINT string = aiFoundryAiServices.outputs.aiProjectInfo.apiEndpoint +output APP_ENV string = 'Prod'