refactor: Directory structure update for Client Advisor and Researcher

.devcontainer/devcontainer.json

@@ -0,0 +1,41 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+	"name": "Python 3",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/azure-cli:1": {
+			"installBicep": true,
+			"version": "latest",
+			"bicepVersion": "latest"
+		},
+		"ghcr.io/jlaundry/devcontainer-features/mssql-odbc-driver:1": {
+			"version": "18"
+		},
+		"ghcr.io/azure/azure-dev/azd:0": {
+			"version": "stable"
+		},
+		"ghcr.io/devcontainers/features/node:1": {},
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {
+			"version": "latest",
+			"installDockerBuildx": true
+		}
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-python.python",
+				"ms-azuretools.vscode-azcli",
+				"ms-azuretools.vscode-bicep",
+				"ms-azuretools.azure-dev",
+				"ms-azuretools.vscode-azurefunctions"
+			]
+		}
+	},
+	"postCreateCommand": "bash ./.devcontainer/setup_env.sh",
+	"remoteUser": "vscode",
+	"hostRequirements": {
+		"memory": "4gb"
+	}
+}

.devcontainer/setup_env.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+git fetch
+git pull
+
+# provide execute permission to quotacheck script
+chmod +x ./infra/scripts/checkquota.sh
+
+# Add the path to ~/.bashrc for persistence
+if ! grep -q '/opt/mssql-tools18/bin' ~/.bashrc; then
+    echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc
+fi
+
+# Export the path for the current session
+export PATH="$PATH:/opt/mssql-tools18/bin"
+
+# Verify sqlcmd is available
+if ! command -v sqlcmd &> /dev/null; then
+    echo "sqlcmd is not available in the PATH. Please check the installation."
+    exit 1
+fi
+
+# Install Azure function core tool
+wget -q https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
+sudo dpkg -i packages-microsoft-prod.deb
+
+sudo apt-get update
+sudo apt-get install azure-functions-core-tools-4

.github/CODEOWNERS

@@ -2,9 +2,4 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in the repo.
-* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
-
-# Specific directory ownership
-/ClientAdvisor/ @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
-
-/ResearchAssistant/ @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
+* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @Vinay-Microsoft @aniaroramsft

.github/dependabot.yml

@@ -2,16 +2,7 @@ version: 2
 updates:
   # 1. React (JavaScript/TypeScript) dependencies
   - package-ecosystem: "npm"
-    directory: "/ClientAdvisor/App/frontend"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      prefix: "build"
-    target-branch: "dependabotchanges"
-    open-pull-requests-limit: 100
-
-  - package-ecosystem: "npm"
-    directory: "/ResearchAssistant/App/frontend"
+    directory: "/src/App/frontend"
     schedule:
       interval: "monthly"
     commit-message:
@@ -21,43 +12,7 @@ updates:
 
   # 2. Python dependencies
   - package-ecosystem: "pip"
-    directory: "/ClientAdvisor/App"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      prefix: "build"
-    target-branch: "dependabotchanges"
-    open-pull-requests-limit: 100
-
-  - package-ecosystem: "pip"
-    directory: "/ClientAdvisor/AzureFunction"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      prefix: "build"
-    target-branch: "dependabotchanges"
-    open-pull-requests-limit: 100
-
-  - package-ecosystem: "pip"
-    directory: "/ClientAdvisor/Deployment/scripts/fabric_scripts"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      prefix: "build"
-    target-branch: "dependabotchanges"
-    open-pull-requests-limit: 100
-
-  - package-ecosystem: "pip"
-    directory: "/ClientAdvisor/Deployment/scripts/index_scripts"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      prefix: "build"
-    target-branch: "dependabotchanges"
-    open-pull-requests-limit: 100
-
-  - package-ecosystem: "pip"
-    directory: "/ResearchAssistant/App"
+    directory: "/src/App"
     schedule:
       interval: "monthly"
     commit-message:
@@ -66,7 +21,7 @@ updates:
     open-pull-requests-limit: 100
 
   - package-ecosystem: "pip"
-    directory: "/ResearchAssistant/Deployment/scripts/aihub_scripts"
+    directory: "/src/AzureFunction"
     schedule:
       interval: "monthly"
     commit-message:
@@ -75,7 +30,7 @@ updates:
     open-pull-requests-limit: 100
 
   - package-ecosystem: "pip"
-    directory: "/ResearchAssistant/Deployment/scripts/fabric_scripts"
+    directory: "/src/infra/scripts/fabric_scripts"
     schedule:
       interval: "monthly"
     commit-message:
@@ -84,10 +39,10 @@ updates:
     open-pull-requests-limit: 100
 
   - package-ecosystem: "pip"
-    directory: "/ResearchAssistant/Deployment/scripts/index_scripts"
+    directory: "/src/infra/scripts/index_scripts"
     schedule:
       interval: "monthly"
     commit-message:
       prefix: "build"
     target-branch: "dependabotchanges"
-    open-pull-requests-limit: 16
+    open-pull-requests-limit: 100

.github/workflows/CAdeploy.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - main
-    paths:
-      - 'ClientAdvisor/**'
   schedule:
     - cron: '0 6,18 * * *'  # Runs at 6:00 AM and 6:00 PM GMT
 
@@ -28,10 +26,10 @@ jobs:
           export TEXT_EMBEDDING_MIN_CAPACITY="45"
           export AZURE_REGIONS="${{ vars.AZURE_REGIONS_CA }}"
 
-          chmod +x ClientAdvisor/Deployment/scripts/checkquota.sh
-          if ! ClientAdvisor/Deployment/scripts/checkquota.sh; then
+          chmod +x scripts/checkquota.sh
+          if ! scripts/checkquota.sh; then
             # If quota check fails due to insufficient quota, set the flag
-            if grep -q "No region with sufficient quota found" ClientAdvisor/Deployment/scripts/checkquota.sh; then
+            if grep -q "No region with sufficient quota found" scripts/checkquota.sh; then
               echo "QUOTA_FAILED=true" >> $GITHUB_ENV
             fi
             exit 1  # Fail the pipeline if any other failure occurs
@@ -116,7 +114,7 @@ jobs:
           set -e
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
-            --template-file ClientAdvisor/Deployment/bicep/main.bicep \
+            --template-file infra/main.bicep \
             --parameters solutionPrefix=${{ env.SOLUTION_PREFIX }} cosmosLocation=${{ env.AZURE_LOCATION }}
 
       - name: List KeyVaults and Store in Array

.github/workflows/Create-Release.yml

@@ -0,0 +1,65 @@
+on:
+    push:
+     branches:
+       - main
+
+permissions:
+  contents: write
+  pull-requests: write
+
+name: Create-Release
+
+jobs:
+   create-release:
+     runs-on: ubuntu-latest
+     steps:
+       - name: Checkout
+         uses: actions/checkout@v4
+         with:
+           ref: ${{ github.event.workflow_run.head_sha }}
+
+       - uses: codfish/semantic-release-action@v3
+         id: semantic
+         with:
+           tag-format: 'v${version}'
+           additional-packages: |
+             ['conventional-changelog-conventionalcommits@7']
+           plugins: |
+             [
+               [
+                 "@semantic-release/commit-analyzer",
+                 {
+                   "preset": "conventionalcommits"
+                 }
+               ],
+               [
+                 "@semantic-release/release-notes-generator",
+                 {
+                   "preset": "conventionalcommits",
+                   "presetConfig": {
+                     "types": [
+                       { type: 'feat', section: 'Features', hidden: false },
+                       { type: 'fix', section: 'Bug Fixes', hidden: false },
+                       { type: 'perf', section: 'Performance Improvements', hidden: false },
+                       { type: 'revert', section: 'Reverts', hidden: false },
+                       { type: 'docs', section: 'Other Updates', hidden: false },
+                       { type: 'style', section: 'Other Updates', hidden: false },
+                       { type: 'chore', section: 'Other Updates', hidden: false },
+                       { type: 'refactor', section: 'Other Updates', hidden: false },
+                       { type: 'test', section: 'Other Updates', hidden: false },
+                       { type: 'build', section: 'Other Updates', hidden: false },
+                       { type: 'ci', section: 'Other Updates', hidden: false }
+                     ]
+                   }
+                 }
+               ],
+               '@semantic-release/github'
+             ]
+         env:
+             GITHUB_TOKEN: ${{ secrets.TOKEN }}
+       - run: echo ${{ steps.semantic.outputs.release-version }}
+
+       - run: echo "$OUTPUTS"
+         env:
+           OUTPUTS: ${{ toJson(steps.semantic.outputs) }}
+