Merge branch 'main' of https://github.com/microsoft/Conversation-Knowledge-Mining-Solution-Accelerator into workshop-update

Author: malrose07

.devcontainer/devcontainer.json

@@ -16,7 +16,7 @@
             ]
         }
     },
-    "postStartCommand": "git pull origin main && python3 -m pip install -r infra/scripts/index_scripts/requirements.txt && curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash && chmod +x ./infra/scripts/quota_check_params.sh",
+    "postStartCommand": "bash ./.devcontainer/setup_env.sh",
     "remoteUser": "vscode",
     "hostRequirements": {
         "memory": "4gb"

.devcontainer/setup_env.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+git fetch
+git pull
+
+# provide execute permission to quotacheck script
+sudo chmod +x ./infra/scripts/checkquota_km.sh
+sudo chmod +x ./infra/scripts/quota_check_params.sh

.github/workflows/Scheduled-Dependabot-PRs-Auto-Merge.yml

@@ -1,3 +1,25 @@
+# ------------------------------------------------------------------------------
+# Scheduled Dependabot PRs Auto-Merge Workflow
+#
+# Purpose:
+#   - Automatically detect, rebase (if needed), and merge Dependabot PRs targeting
+#     the `dependabotchanges` branch, supporting different merge strategies.
+#
+# Features:
+#   ✅ Filters PRs authored by Dependabot and targets the specific base branch
+#   ✅ Rebases PRs with conflicts and auto-resolves using "prefer-theirs" strategy
+#   ✅ Attempts all three merge strategies: merge, squash, rebase (first success wins)
+#   ✅ Handles errors gracefully, logs clearly
+#
+# Triggers:
+#   - Scheduled daily run (midnight UTC)
+#   - Manual trigger (via GitHub UI)
+#
+# Required Permissions:
+#   - contents: write
+#   - pull-requests: write
+# ------------------------------------------------------------------------------
+
 name: Scheduled Dependabot PRs Auto-Merge
 
 on:
@@ -20,7 +42,6 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y gh
-
       - name: Fetch & Filter Dependabot PRs
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -41,7 +62,6 @@ jobs:
           done <<< "$pr_batch"
           echo "👉 Matched PRs:"
           cat matched_prs.txt || echo "None"
-
       - name: Rebase PR if Conflicts Exist
         if: success()
         env:
@@ -53,15 +73,31 @@ jobs:
           fi
           while IFS= read -r pr_url; do
             pr_number=$(basename "$pr_url")
-            echo "🔁 Rebasing PR #$pr_number if conflicts exist"
+            echo "🔁 Checking PR #$pr_number for conflicts..."
             mergeable=$(gh pr view "$pr_number" --json mergeable --jq '.mergeable')
             if [[ "$mergeable" == "CONFLICTING" ]]; then
-              echo "❌ Merge conflicts detected. Rebasing PR #$pr_number"
-              gh pr update-branch "$pr_url" || echo "❗ Rebase (update-branch) failed."
+              echo "⚠️ Merge conflicts detected. Performing manual rebase for PR #$pr_number..."
+              head_branch=$(gh pr view "$pr_number" --json headRefName --jq '.headRefName')
+              base_branch=$(gh pr view "$pr_number" --json baseRefName --jq '.baseRefName')
+              git fetch origin "$base_branch":"$base_branch"
+              git fetch origin "$head_branch":"$head_branch"
+              git checkout "$head_branch"
+              git config user.name "github-actions"
+              git config user.email "[email protected]"
+              # Attempt rebase with 'theirs' strategy
+              if git rebase --strategy=recursive -X theirs "$base_branch"; then
+                echo "✅ Rebase successful. Pushing..."
+                git push origin "$head_branch" --force
+              else
+                echo "❌ Rebase failed. Aborting..."
+                git rebase --abort || true
+              fi
+            else
+              echo "✅ PR #$pr_number is mergeable. Skipping rebase."
             fi
           done < matched_prs.txt
-
-      - name: Auto-Merge if Mergeable
+          
+      - name: Auto-Merge PRs using available strategy
         if: success()
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -71,30 +107,38 @@ jobs:
             exit 0
           fi
           while IFS= read -r pr_url; do
-            echo "🔍 Checking mergeability for $pr_url"
             pr_number=$(basename "$pr_url")
+            echo "🔍 Checking mergeability for PR #$pr_number"
             attempt=0
             max_attempts=8
             mergeable=""
-            sleep 5  # Initial delay to allow GitHub to compute mergeability
+            sleep 5  # Let GitHub calculate mergeable status
             while [[ $attempt -lt $max_attempts ]]; do
               mergeable=$(gh pr view "$pr_number" --json mergeable --jq '.mergeable' 2>/dev/null || echo "UNKNOWN")
               echo "🔁 Attempt $((attempt+1))/$max_attempts: mergeable=$mergeable"
               if [[ "$mergeable" == "MERGEABLE" ]]; then
-                echo "🚀 Enabling auto-merge..."
-                set -x
-                merge_output=$(gh pr merge --auto --merge "$pr_url" 2>&1)
-                merge_status=$?
-                set +x
-                echo "$merge_output"
-                if [[ $merge_status -ne 0 ]]; then
-                  echo "❗ Auto-merge failed. Output: $merge_output"
-                else
-                  echo "✅ Auto-merge succeeded!"
+                success=0
+                for strategy in rebase squash merge; do
+                  echo "🚀 Trying to auto-merge PR #$pr_number using '$strategy' strategy..."
+                  set -x
+                  merge_output=$(gh pr merge --auto --"$strategy" "$pr_url" 2>&1)
+                  merge_status=$?
+                  set +x
+                  echo "$merge_output"
+                  if [[ $merge_status -eq 0 ]]; then
+                    echo "✅ Auto-merge succeeded using '$strategy'."
+                    success=1
+                    break
+                  else
+                    echo "❌ Auto-merge failed using '$strategy'. Trying next strategy..."
+                  fi
+                done
+                if [[ $success -eq 0 ]]; then
+                  echo "❌ All merge strategies failed for PR #$pr_number"
                 fi
                 break
               elif [[ "$mergeable" == "CONFLICTING" ]]; then
-                echo "❌ Cannot merge due to conflicts. Skipping."
+                echo "❌ Cannot merge due to conflicts. Skipping PR #$pr_number"
                 break
               else
                 echo "🕒 Waiting for GitHub to determine mergeable status..."

.gitignore

@@ -11,4 +11,6 @@
 .fake
 .azure
 .idea
-/myenv
+/myenv
+scriptenv/
+__pycache__/

README.md

@@ -15,14 +15,14 @@ Analysts working with large volumes of conversational data can use this solution
 </div>
 <br/>
 
-<h2><img src="./docs/images/readme/solution-overview.png" width="48" />
+<h2><img src="./docs/Images/ReadMe/solution-overview.png" width="48" />
 Solution overview
 </h2>
 
 Leverages Azure AI Content Understanding, Azure AI Search, Azure OpenAI Service, Semantic Kernel, Azure SQL Database, and Cosmos DB to process large volumes of conversational data. Audio and text inputs are analyzed through event-driven pipelines to extract and vectorize key information, orchestrate intelligent responses, and power an interactive web front-end for exploring insights using natural language.
 
 ### Solution architecture
-|![image](./docs/images/readme/solution-architecture.png)|
+|![image](./docs/Images/ReadMe/solution-architecture.png)|
 |---|
 
 ### Additional resources
@@ -55,7 +55,7 @@ Summarized conversations, topic generation, and key phrase extraction support fa
 
 
 <br /><br />
-<h2><img src="./docs/images/readme/quick-deploy.png" width="48" />
+<h2><img src="./docs/Images/ReadMe/quick-deploy.png" width="48" />
 Quick deploy
 </h2>
 
@@ -114,12 +114,12 @@ _Note: This is not meant to outline all costs as selected SKUs, scaled use, cust
 either by deleting the resource group in the Portal or running `azd down`.
 
 <br /><br />
-<h2><img src="./docs/images/readme/business-scenario.png" width="48" />
+<h2><img src="./docs/Images/ReadMe/business-scenario.png" width="48" />
 Business scenario
 </h2>
 
 
-|![image](./docs/images/readme/ui.png)|
+|![image](./docs/Images/ReadMe/ui.png)|
 |---|
 
 <br/>
@@ -152,7 +152,7 @@ Clear, contextual insights empower employees to take meaningful action based on
 
 <br /><br />
 
-<h2><img src="./docs/images/readme/supporting-documentation.png" width="48" />
+<h2><img src="./docs/Images/ReadMe/supporting-documentation.png" width="48" />
 Supporting documentation
 </h2>
 

docs/Fabric_deployment.md

@@ -1,8 +1,10 @@
+### Fabric deployment is not currently used in this accelerator. The steps below are not applicable and can be ignored, as this functionality is still in development.
+
 ### How to customize 
 
 If you'd like to customize the solution accelerator, here are some ways you might do that:
-- Ingest your own [audio conversation files](./docs/ConversationalDataFormat.md) by uploading them into the `cu_audio_files_all` lakehouse folder and run the data pipeline
-- Deploy with Microsoft Fabric by following the steps in [Fabric_deployment.md](./docs/Fabric_deployment.md)
+- Ingest your own [audio conversation files](./ConversationalDataFormat.md) by uploading them into the `cu_audio_files_all` lakehouse folder and run the data pipeline
+- Deploy with Microsoft Fabric by following the steps in [Fabric_deployment.md](./Fabric_deployment.md)
 
 
 3.  **Create Fabric workspace**
@@ -40,7 +42,7 @@ If you'd like to customize the solution accelerator, here are some ways you migh
               3.   solutionprefix_param - prefix used to append to lakehouse upon creation
 5.  **Add App Authentication**
 
-    Follow steps in [App Authentication](./docs/AppAuthentication.md) to configure authentication in app service.
+    Follow steps in [App Authentication](./AppAuthentication.md) to configure authentication in app service.
 
 ### Upload additional files