Merge pull request #164 from Fr4nc3/main

fix: conflict from main repo main branch

Author: Fr4nc3

.github/workflows/azure-dev.yml

@@ -5,7 +5,7 @@ on:
       - dev
       - main
       - feature/azd-semantickernel
-  workflow_dispatch: 
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -16,13 +16,36 @@ jobs:
   template_validation_job:
     runs-on: ubuntu-latest
     name: Template validation
-
     steps:
       # 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
+      # Step 2: Set up Python
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+
+      # Step 3: Create and populate the virtual environment
+      - name: Create virtual environment and install dependencies
+        run: |
+          python -m venv .venv
+          source .venv/bin/activate
+          python -m pip install --upgrade pip
+          pip install azure-mgmt-resource azure-identity azure-core azure-mgmt-subscription azure-cli-core
+          # Install any other dependencies that might be needed
+          pip freeze > requirements-installed.txt
+          echo "Virtual environment created with these packages:"
+          cat requirements-installed.txt
+
+      # Step 4: Create azd directory if it doesn't exist
+      - name: Create azd directory
+        run: |
+          mkdir -p ./.azd || true
+          touch ./.azd/.env || true
+
+      # Step 5: Validate the Azure template
       - name: Validate Azure Template
         uses: microsoft/[email protected]
         id: validation
@@ -34,7 +57,27 @@ jobs:
           AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      # Step 6: Debug output in case of failure
+      - name: Debug on failure
+        if: failure()
+        run: |
+          echo "Validation failed. Checking environment:"
+          ls -la
+          if [ -d ".venv" ]; then
+            echo ".venv directory exists"
+            ls -la .venv/bin/
+          else
+            echo ".venv directory does not exist"
+          fi
+          if [ -d "tva_*" ]; then
+            echo "TVA directory exists:"
+            find . -name "tva_*" -type d
+            ls -la $(find . -name "tva_*" -type d)
+          else
+            echo "No TVA directory found"
+          fi
 
-      # Step 3: Print the result of the validation
+      # Step 7: Print the result of the validation
       - name: Print result
+        if: success()
         run: cat ${{ steps.validation.outputs.resultFile }}

azure.yaml

@@ -1,2 +1,3 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
-name: multi-agent-custom-automation-engine-solution-accelerator
+name: multi-agent-custom-automation-engine-solution-accelerator
+

documentation/ManualAzureDeployment.md

@@ -1,22 +1,26 @@
 # Manual Azure Deployment
-Manual Deployment differs from the ‘Quick Deploy’ option in that it will install an Azure Container Registry (ACR) service, and relies on the installer to build and push the necessary containers to this ACR.  This allows you to build and push your own code changes and provides a sample solution you can customize based on your requirements.
+
+Manual Deployment differs from the ‘Quick Deploy’ option in that it will install an Azure Container Registry (ACR) service, and relies on the installer to build and push the necessary containers to this ACR. This allows you to build and push your own code changes and provides a sample solution you can customize based on your requirements.
 
 ## Prerequisites
 
 - Current Azure CLI installed
-  You can update to the latest version using ```az upgrade```
+  You can update to the latest version using `az upgrade`
 - Azure account with appropriate permissions
 - Docker installed
 
 ## Deploy the Azure Services
-All of the necessary Azure services can be deployed using the /deploy/macae.bicep script.  This script will require the following parameters:
+
+All of the necessary Azure services can be deployed using the /deploy/macae.bicep script. This script will require the following parameters:
 
 ```
 az login
 az account set --subscription <SUBSCRIPTION_ID>
 az group create --name <RG_NAME> --location <RG_LOCATION>
 ```
+
 To deploy the script you can use the Azure CLI.
+
 ```
 az deployment group create \
   --resource-group <RG_NAME> \
@@ -26,9 +30,10 @@ az deployment group create \
 
 Note: if you are using windows with PowerShell, the continuation character (currently ‘\’) should change to the tick mark (‘`’).
 
-The template will require you fill in locations for Cosmos and OpenAI services.  This is to avoid the possibility of regional quota errors for either of these resources.
+The template will require you fill in locations for Cosmos and OpenAI services. This is to avoid the possibility of regional quota errors for either of these resources.
 
 ## Create the Containers
+
 - Get admin credentials from ACR
 
 Retrieve the admin credentials for your Azure Container Registry (ACR):
@@ -49,7 +54,7 @@ az acr login --name <e.g. macaeacr2t62qyozi76bs>
 
 ## Build and push the image
 
-Build the frontend and backend Docker images and push them  to your Azure Container Registry. Run the following from the src/backend and the src/frontend directory contexts:
+Build the frontend and backend Docker images and push them to your Azure Container Registry. Run the following from the src/backend and the src/frontend directory contexts:
 
 ```sh
 az acr build \
@@ -60,12 +65,13 @@ az acr build \
 
 ## Add images to the Container APP and Web App services
 
-To add your newly created backend image: 
+To add your newly created backend image:
+
 - Navigate to the Container App Service in the Azure portal
 - Click on Application/Containers in the left pane
 - Click on the "Edit and deploy" button in the upper left of the containers pane
-- In the "Create and deploy new revision" page, click on your container image 'backend'.  This will give you the option of reconfiguring the container image, and also has an Environment variables tab
-- Change the properties page to 
+- In the "Create and deploy new revision" page, click on your container image 'backend'. This will give you the option of reconfiguring the container image, and also has an Environment variables tab
+- Change the properties page to
   - point to your Azure Container registry with a private image type and your image name (e.g. backendmacae:latest)
   - under "Authentication type" select "Managed Identity" and choose the 'mace-containerapp-pull'... identity setup in the bicep template
 - In the environment variables section add the following (each with a 'Manual entry' source):
@@ -75,8 +81,8 @@ To add your newly created backend image:
 
         name: 'COSMOSDB_DATABASE'
         value: 'macae'
-	    Note: To change the default, you will need to create the database in Cosmos
-			  
+      Note: To change the default, you will need to create the database in Cosmos
+
         name: 'COSMOSDB_CONTAINER'
         value: 'memory'
 
@@ -88,7 +94,7 @@ To add your newly created backend image:
 
         name: 'AZURE_OPENAI_API_VERSION'
         value: '2024-08-01-preview'
-		Note: Version should be updated based on latest available
+      Note: Version should be updated based on latest available
 
         name: 'FRONTEND_SITE_NAME'
         value: 'https://<website Name>.azurewebsites.net'
@@ -106,4 +112,3 @@ az webapp config container set --resource-group <resource_group_name> \
 --container-image-name <e.g. macaeacr2t62qyozi76bs.azurecr.io/frontendmacae:latest>  \
 --container-registry-url <e.g. https://macaeacr2t62qyozi76bs.azurecr.io>
 ```
-