Merge branch 'microsoft:main' into main

Author: Rafi-Microsoft

.github/workflows/CI.yml

@@ -5,9 +5,19 @@ on:
       - main # Adjust this to the branch you want to trigger the deployment on
       - dev
       - demo
+    paths:
+      - 'infra/**'
+      - 'App/**'
+      - 'Deployment/**'
+      - 'azure.yaml'
+      - '.github/workflows/CI.yml'
+      - '.github/workflows/test-automation.yml'
+      - 'tests/**'
   schedule:
     - cron: "0 10,22 * * *" # Runs at 10:00 AM and 10:00 PM GMT
-
+permissions:
+  contents: read
+  actions: read
 env:
   GPT_CAPACITY: 150
   TEXT_EMBEDDING_CAPACITY: 200
@@ -27,12 +37,6 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v5 # Checks out your repository
 
-      - name: Install Azure CLI
-        shell: bash
-        run: |
-          curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
-          az --version  # Verify installation
-
       - name: Install Kubernetes CLI (kubectl)
         shell: bash
         run: |
@@ -136,10 +140,8 @@ jobs:
       - name: Install Bicep CLI
         run: az bicep install
 
-      - name: Install Azure Developer CLI
-        run: |
-          curl -fsSL https://aka.ms/install-azd.sh | bash
-        shell: bash
+      - name: Install azd
+        uses: Azure/setup-azd@v2
 
       - name: Set Deployment Region
         run: |
@@ -215,7 +217,7 @@ jobs:
                 enableRedundancy=false \
                 enableScalability=false \
                 createdBy="Pipeline" \
-                tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
+                tags="{'Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
 
       - name: Get Deployment Output and extract Values
         id: get_output
@@ -348,6 +350,7 @@ jobs:
 
       - name: Run Post Deployment Script
         shell: pwsh
+        continue-on-error: true
         run: |
           Write-Host "Running post deployment script to upload files..."
           cd Deployment
@@ -398,12 +401,6 @@ jobs:
       VALID_REGION: ${{ needs.deploy.outputs.VALID_REGION }}
 
     steps:
-      - name: Install Azure CLI
-        shell: bash
-        run: |
-          curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
-          az --version  # Verify installation
-          
       - name: Login to Azure
         shell: bash
         run: |

.github/workflows/codeql.yml

@@ -3,8 +3,26 @@ name: "CodeQL Advanced"
 on:
   push:
     branches: [ "main", "dev", "demo" ]
+    paths:
+      - 'App/backend-api/**'
+      - 'App/frontend-app/**'
+      - 'App/kernel-memory/**'
+      - '.github/workflows/codeql.yml'
+    paths-ignore:
+      - '**/.gitignore'
+      - '**/Dockerfile'
+      - '**/.dockerignore'
   pull_request:
     branches: [ "main", "dev", "demo" ]
+    paths:
+      - 'App/backend-api/**'
+      - 'App/frontend-app/**'
+      - 'App/kernel-memory/**'
+      - '.github/workflows/codeql.yml'
+    paths-ignore:
+      - '**/.gitignore'
+      - '**/Dockerfile'
+      - '**/.dockerignore'
   schedule:
     - cron: '37 2 * * 5'
 

.github/workflows/test-automation.yml

@@ -15,7 +15,9 @@ on:
 env:
     url: ${{ inputs.DKM_URL }}
     accelerator_name: "DKM"
-
+permissions:
+  contents: read
+  actions: read
 jobs:
   test:
     runs-on: ubuntu-latest

Deployment/appconfig/kernelmemory/appsettings.Development.json.template

@@ -117,47 +117,32 @@
         "BucketName": ""
       },
       "AzureAISearch": {
-        "Auth": "ApiKey",
-        "Endpoint": "",
-        "APIKey": "",
+        // Auth and Endpoint are configured in Azure App Configuration
         "UseHybridSearch": true
       },
       "AzureAIDocIntel": {
-        "Auth": "ApiKey",
-        "APIKey": "",
-        "Endpoint": ""
+        // Auth and Endpoint are configured in Azure App Configuration
       },
       "AzureBlobs": {
-        "Auth": "AzureIdentity",
-        "Account": "",
-        "Container": "",
-        "ConnectionString": "",
+        // Auth, Account, and Container are configured in Azure App Configuration
         "EndpointSuffix": "core.windows.net"
       },
       "AzureOpenAIEmbedding": {
-        "Auth": "ApiKey",
-        "Endpoint": "",
-        "APIKey": "",
-        "Deployment": "",
+        // Auth, Endpoint, and Deployment are configured in Azure App Configuration
         "MaxTokenTotal": 8191,
         "EmbeddingDimensions": null,
         "MaxEmbeddingBatchSize": 1,
         "MaxRetries": 10,
         "APIType": "EmbeddingGeneration"
       },
       "AzureOpenAIText": {
-        "Auth": "ApiKey",
-        "Endpoint": "",
-        "APIKey": "",
-        "Deployment": "",
+        // Auth, Endpoint, and Deployment are configured in Azure App Configuration
         "MaxTokenTotal": 128000,
         "APIType": "ChatCompletion",
         "MaxRetries": 10
       },
       "AzureQueues": {
-        "Auth": "AzureIdentity",
-        "Account": "",
-        "ConnectionString": "",
+        // Auth and Account are configured in Azure App Configuration
         "EndpointSuffix": "core.windows.net",
         "PollDelayMsecs": 100,
         "FetchBatchSize": 3,

azure.yaml

@@ -5,6 +5,6 @@ name: document-knowledge-mining-solution-accelerator
 requiredVersions:
   azd: '>= 1.18.0'
 
-metadata:
-  template: document-knowledge-mining-solution-accelerator@1.0
-  name: document-knowledge-mining-solution-accelerator@1.0
+# metadata:
+#   template: document-knowledge-mining-solution-accelerator@1.0
+#   name: document-knowledge-mining-solution-accelerator@1.0

docs/AzureAIModelQuotaSettings.md

@@ -0,0 +1,9 @@
+# How to Check & Update AI Model Quota
+
+Please follow [quota check instructions guide](./QuotaCheck.md) to check quota availability by region.
+
+1. **Navigate** to the [Azure AI Foundry portal](https://ai.azure.com/).
+2. **Select** the AI Project associated with this accelerator.
+3. **Go to** the `Management Center` from the bottom-left navigation menu.
+4. Select `Request Quota`
+5. Request More Quota with fill up the form for 'Request for Quota Increase' or delete any unused model deployments as needed.

docs/DeleteResourceGroup.md

@@ -0,0 +1,56 @@
+# Deleting Resources After a Failed Deployment in Azure Portal
+
+If your deployment fails and you need to clean up the resources manually, follow these steps in the Azure Portal.
+
+---
+
+## **1. Navigate to the Azure Portal**
+
+1. Open [Azure Portal](https://portal.azure.com/).
+2. Sign in with your Azure account.
+
+---
+
+## **2. Find the Resource Group**
+
+1. In the search bar at the top, type **"Resource groups"** and select it.
+2. Locate the **resource group** associated with the failed deployment.
+
+![Resource Groups](./images/readme/portal_services_resource_groups.png)
+
+![Resource Groups](./images/readme/portal_resource_groups_search.png)
+
+---
+
+## **3. Delete the Resource Group**
+
+1. Click on the **resource group name** to open it.
+2. Click the **Delete resource group** button at the top.
+
+![Delete Resource Group](./images/readme/portal_resource_group_delete.png)
+
+3. Type the resource group name in the confirmation box and click **Delete**.
+
+📌 **Note:** Deleting a resource group will remove all resources inside it.
+
+---
+
+## **4. Delete Individual Resources (If Needed)**
+
+If you don't want to delete the entire resource group, follow these steps:
+
+1. Open **Azure Portal** and go to the **Resource groups** section.
+2. Click on the specific **resource group**.
+3. Select the **resource** you want to delete (e.g., App Service, Storage Account).
+4. Click **Delete** at the top.
+
+![Delete Individual Resource](./images/readme/portal_web_app_delete.png)
+
+---
+
+## **5. Verify Deletion**
+
+- After a few minutes, refresh the **Resource groups** page.
+- Ensure the deleted resource or group no longer appears.
+
+📌 **Tip:** If a resource fails to delete, check if it's **locked** under the **Locks** section and remove the lock.