Merge branch 'main' into psl-waf-macaev3

Author: Roopan-Microsoft

.github/workflows/deploy.yml

@@ -134,9 +134,11 @@ jobs:
               gptModelDeploymentType="GlobalStandard" \
               gptModelName="gpt-4o" \
               gptModelVersion="2024-08-06" \
-              imageTag="${IMAGE_TAG}" \
+              backendContainerImageTag="${IMAGE_TAG}" \
+              frontendContainerImageTag="${IMAGE_TAG}" \
               azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
               gptModelCapacity=150 \
+              createdBy="Pipeline" \
             --output json
 
       - name: Extract Web App and API App URLs

docs/DeploymentGuide.md

@@ -374,7 +374,6 @@ The files for the dev container are located in `/.devcontainer/` folder.
 
    - To install the requirement for backend -
      Open a terminal in the `src/backend` folder and run:
-
      ```bash
      pip install uv
      uv sync
@@ -399,7 +398,7 @@ The files for the dev container are located in `/.devcontainer/` folder.
 
 10. **Run the application:**
 
-- From the src/backend directory activate the virtual environment created through step 8:
+- From the `src/backend` directory activate the virtual environment created through step 8 and Run:
 
 ```bash
 python app_kernel.py
@@ -411,10 +410,15 @@ python app_kernel.py
  python frontend_server.py
 ```
 
+or Run 
+
+  ```bash
+  npm run dev
+  ```
+
 11. Open a browser and navigate to `http://localhost:3000`
 12. To see swagger API documentation, you can navigate to `http://localhost:8000/docs`
 
-
 ## Deploy Your local changes
 To Deploy your local changes rename the below files.
    1. Rename `azure.yaml` to `azure_custom2.yaml` and `azure_custom.yaml` to `azure.yaml`.

infra/main.bicep

@@ -196,6 +196,28 @@ var replicaLocation = replicaRegionPairs[location]
 // Resources      //
 // ============== //
 
+
+var allTags = union(
+  {
+    'azd-env-name': solutionName
+  },
+  tags
+)
+@description('Optional created by user name')
+param createdBy string = empty(deployer().userPrincipalName) ? '' : split(deployer().userPrincipalName, '@')[0] 
+
+resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
+  name: 'default'
+  properties: {
+    tags: {
+      ...allTags
+      TemplateName: 'MACAE'
+      CreatedBy: createdBy
+    }
+  }
+}
+
+
 #disable-next-line no-deployments-resources
 resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
   name: '46d3xbcp.ptn.sa-multiagentcustauteng.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'