Skip to content

Commit 23a2256

Browse files
Roopan-MicrosoftRoopan-Microsoft
committed
Merge branch 'main' into demo
2 parents 4fc9e60 + e558c65 commit 23a2256

File tree

515 files changed

+13467
-28955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

515 files changed

+13467
-28955
lines changed

‎.azdo/pipelines/azure-dev.yml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# Run when commits are pushed to mainline branch (main or master)
2+
# Set this to the mainline branch you are using
3+
trigger:
4+
- main
5+
- master
6+
- dev
7+
8+
# Azure Pipelines workflow to deploy to Azure using azd
9+
# To configure required secrets and service connection for connecting to Azure, simply run `azd pipeline config --provider azdo`
10+
# Task "Install azd" needs to install setup-azd extension for azdo - https://marketplace.visualstudio.com/items?itemName=ms-azuretools.azd
11+
# See below for alternative task to install azd if you can't install above task in your organization
12+
13+
pool:
14+
vmImage: ubuntu-latest
15+
16+
steps:
17+
- task: setup-azd@0
18+
displayName: Install azd
19+
20+
# If you can't install above task in your organization, you can comment it and uncomment below task to install azd
21+
# - task: Bash@3
22+
# displayName: Install azd
23+
# inputs:
24+
# targetType: 'inline'
25+
# script: |
26+
# curl -fsSL https://aka.ms/install-azd.sh | bash
27+
28+
# azd delegate auth to az to use service connection with AzureCLI@2
29+
- pwsh: |
30+
azd config set auth.useAzCliAuth "true"
31+
displayName: Configure AZD to Use AZ CLI Authentication.
32+
33+
- task: AzureCLI@2
34+
displayName: Provision Infrastructure
35+
inputs:
36+
azureSubscription: azconnection
37+
scriptType: bash
38+
scriptLocation: inlineScript
39+
inlineScript: |
40+
azd provision --no-prompt
41+
env:
42+
43+
AZURE_SUBSCRIPTION_ID: $(AZURE_SUBSCRIPTION_ID)
44+
AZURE_ENV_NAME: $(AZURE_ENV_NAME)
45+
AZURE_LOCATION: $(AZURE_LOCATION)
46+
# Project specific environment variables
47+
# AZURE_RESOURCE_GROUP: $(AZURE_RESOURCE_GROUP)
48+
# AZURE_AIHUB_NAME: $(AZURE_AIHUB_NAME)
49+
# AZURE_AIPROJECT_NAME: $(AZURE_AIPROJECT_NAME)
50+
# AZURE_AISERVICES_NAME: $(AZURE_AISERVICES_NAME)
51+
# AZURE_SEARCH_SERVICE_NAME: $(AZURE_SEARCH_SERVICE_NAME)
52+
# AZURE_APPLICATION_INSIGHTS_NAME: $(AZURE_APPLICATION_INSIGHTS_NAME)
53+
# AZURE_CONTAINER_REGISTRY_NAME: $(AZURE_CONTAINER_REGISTRY_NAME)
54+
# AZURE_KEYVAULT_NAME: $(AZURE_KEYVAULT_NAME)
55+
# AZURE_STORAGE_ACCOUNT_NAME: $(AZURE_STORAGE_ACCOUNT_NAME)
56+
# AZURE_LOG_ANALYTICS_WORKSPACE_NAME: $(AZURE_LOG_ANALYTICS_WORKSPACE_NAME)
57+
# USE_CONTAINER_REGISTRY: $(USE_CONTAINER_REGISTRY)
58+
# USE_APPLICATION_INSIGHTS: $(USE_APPLICATION_INSIGHTS)
59+
# USE_SEARCH_SERVICE: $(USE_SEARCH_SERVICE)
60+
# AZURE_AI_CHAT_DEPLOYMENT_NAME: $(AZURE_AI_CHAT_DEPLOYMENT_NAME)
61+
# AZURE_AI_CHAT_DEPLOYMENT_SKU: $(AZURE_AI_CHAT_DEPLOYMENT_SKU)
62+
# AZURE_AI_CHAT_DEPLOYMENT_CAPACITY: $(AZURE_AI_CHAT_DEPLOYMENT_CAPACITY)
63+
# AZURE_AI_CHAT_MODEL_FORMAT: $(AZURE_AI_CHAT_MODEL_FORMAT)
64+
# AZURE_AI_CHAT_MODEL_NAME: $(AZURE_AI_CHAT_MODEL)
65+
# AZURE_AI_CHAT_MODEL_VERSION: $(AZURE_AI_CHAT_MODEL_VERSION)
66+
# AZURE_AI_EMBED_DEPLOYMENT_NAME: $(AZURE_AI_EMBED_DEPLOYMENT_NAME)
67+
# AZURE_AI_EMBED_DEPLOYMENT_SKU: $(AZURE_AI_EMBED_DEPLOYMENT_SKU)
68+
# AZURE_AI_EMBED_DEPLOYMENT_CAPACITY: $(AZURE_AI_EMBED_DEPLOYMENT_CAPACITY)
69+
# AZURE_AI_EMBED_MODEL_FORMAT: $(AZURE_AI_EMBED_MODEL_FORMAT)
70+
# AZURE_AI_EMBED_MODEL_NAME: $(AZURE_AI_EMBED_MODEL_NAME)
71+
# AZURE_AI_EMBED_MODEL_VERSION: $(AZURE_AI_EMBED_MODEL_VERSION)
72+
# AZURE_EXISTING_AIPROJECT_CONNECTION_STRING: $(AZURE_EXISTING_AIPROJECT_CONNECTION_STRING)
73+
- task: AzureCLI@2
74+
displayName: Deploy Application
75+
inputs:
76+
azureSubscription: azconnection
77+
scriptType: bash
78+
scriptLocation: inlineScript
79+
inlineScript: |
80+
azd deploy --no-prompt
81+
env:
82+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
83+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
84+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
85+
AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }}
86+
AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
87+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.devcontainer/devcontainer.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/python
3+
{
4+
"name": "Python 3",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
7+
"features": {
8+
"ghcr.io/devcontainers/features/azure-cli:1": {
9+
"installBicep": true,
10+
"version": "latest",
11+
"bicepVersion": "latest"
12+
},
13+
"ghcr.io/jlaundry/devcontainer-features/mssql-odbc-driver:1": {
14+
"version": "18"
15+
},
16+
"ghcr.io/azure/azure-dev/azd:0": {
17+
"version": "stable"
18+
},
19+
"ghcr.io/devcontainers/features/node:1": {},
20+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
21+
"version": "latest",
22+
"installDockerBuildx": true
23+
}
24+
},
25+
"customizations": {
26+
"vscode": {
27+
"extensions": [
28+
"ms-python.python",
29+
"ms-azuretools.vscode-azcli",
30+
"ms-azuretools.vscode-bicep",
31+
"ms-azuretools.azure-dev"
32+
]
33+
}
34+
},
35+
"postCreateCommand": "sed -i 's/\\r$//' ./.devcontainer/setup_env.sh && find ./infra -type f -name \"*.sh\" -exec sed -i 's/\\r$//' {} \\; && bash ./.devcontainer/setup_env.sh",
36+
"remoteUser": "vscode",
37+
"hostRequirements": {
38+
"memory": "4gb"
39+
}
40+
}

‎.devcontainer/setup_env.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
3+
git fetch
4+
git pull
5+
6+
# provide execute permission to quotacheck script
7+
sudo chmod +x ./infra/scripts/checkquota.sh
8+
sudo chmod +x ./infra/scripts/quota_check_params.sh
9+
10+
# Add the path to ~/.bashrc for persistence
11+
if ! grep -q '/opt/mssql-tools18/bin' ~/.bashrc; then
12+
echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc
13+
fi
14+
15+
# Export the path for the current session
16+
export PATH="$PATH:/opt/mssql-tools18/bin"
17+
18+
# Verify sqlcmd is available
19+
if ! command -v sqlcmd &> /dev/null; then
20+
echo "sqlcmd is not available in the PATH. Please check the installation."
21+
exit 1
22+
fi

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@
22
# Each line is a file pattern followed by one or more owners.
33

44
# These owners will be the default owners for everything in the repo.
5-
* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
6-
7-
# Specific directory ownership
8-
/ClientAdvisor/ @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
9-
10-
/ResearchAssistant/ @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
5+
* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @Vinay-Microsoft @aniaroramsft

‎.github/dependabot.yml‎

Lines changed: 29 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,58 @@
11
version: 2
2+
23
updates:
34
# 1. React (JavaScript/TypeScript) dependencies
45
- package-ecosystem: "npm"
5-
directory: "/ClientAdvisor/App/frontend"
6-
schedule:
7-
interval: "monthly"
8-
commit-message:
9-
prefix: "build"
10-
target-branch: "dependabotchanges"
11-
open-pull-requests-limit: 100
12-
13-
- package-ecosystem: "npm"
14-
directory: "/ResearchAssistant/App/frontend"
15-
schedule:
16-
interval: "monthly"
17-
commit-message:
18-
prefix: "build"
19-
target-branch: "dependabotchanges"
20-
open-pull-requests-limit: 100
21-
22-
# 2. Python dependencies
23-
- package-ecosystem: "pip"
24-
directory: "/ClientAdvisor/App"
25-
schedule:
26-
interval: "monthly"
27-
commit-message:
28-
prefix: "build"
29-
target-branch: "dependabotchanges"
30-
open-pull-requests-limit: 100
31-
32-
- package-ecosystem: "pip"
33-
directory: "/ClientAdvisor/AzureFunction"
6+
directory: "/src/App/frontend"
347
schedule:
358
interval: "monthly"
369
commit-message:
3710
prefix: "build"
3811
target-branch: "dependabotchanges"
39-
open-pull-requests-limit: 100
12+
open-pull-requests-limit: 10
13+
groups:
14+
frontend-deps:
15+
patterns:
16+
- "*"
4017

18+
# 2. Python dependencies – App
4119
- package-ecosystem: "pip"
42-
directory: "/ClientAdvisor/Deployment/scripts/fabric_scripts"
20+
directory: "/src/App"
4321
schedule:
4422
interval: "monthly"
4523
commit-message:
4624
prefix: "build"
4725
target-branch: "dependabotchanges"
48-
open-pull-requests-limit: 100
49-
50-
- package-ecosystem: "pip"
51-
directory: "/ClientAdvisor/Deployment/scripts/index_scripts"
52-
schedule:
53-
interval: "monthly"
54-
commit-message:
55-
prefix: "build"
56-
target-branch: "dependabotchanges"
57-
open-pull-requests-limit: 100
58-
59-
- package-ecosystem: "pip"
60-
directory: "/ResearchAssistant/App"
61-
schedule:
62-
interval: "monthly"
63-
commit-message:
64-
prefix: "build"
65-
target-branch: "dependabotchanges"
66-
open-pull-requests-limit: 100
67-
68-
- package-ecosystem: "pip"
69-
directory: "/ResearchAssistant/Deployment/scripts/aihub_scripts"
70-
schedule:
71-
interval: "monthly"
72-
commit-message:
73-
prefix: "build"
74-
target-branch: "dependabotchanges"
75-
open-pull-requests-limit: 100
76-
26+
open-pull-requests-limit: 10
27+
groups:
28+
backend-deps:
29+
patterns:
30+
- "*"
31+
32+
# 3. Python dependencies – Fabric Scripts
7733
- package-ecosystem: "pip"
78-
directory: "/ResearchAssistant/Deployment/scripts/fabric_scripts"
34+
directory: "/src/infra/scripts/fabric_scripts"
7935
schedule:
8036
interval: "monthly"
8137
commit-message:
8238
prefix: "build"
8339
target-branch: "dependabotchanges"
84-
open-pull-requests-limit: 100
40+
open-pull-requests-limit: 10
41+
groups:
42+
backend-deps:
43+
patterns:
44+
- "*"
8545

46+
# 4. Python dependencies – Index Scripts
8647
- package-ecosystem: "pip"
87-
directory: "/ResearchAssistant/Deployment/scripts/index_scripts"
48+
directory: "/src/infra/scripts/index_scripts"
8849
schedule:
8950
interval: "monthly"
9051
commit-message:
9152
prefix: "build"
9253
target-branch: "dependabotchanges"
93-
open-pull-requests-limit: 16
54+
open-pull-requests-limit: 10
55+
groups:
56+
backend-deps:
57+
patterns:
58+
- "*"

0 commit comments

Comments
 (0)