Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
788 commits
Select commit Hold shift + click to select a range
a49782a
feat: Use Existing AI Project Resource & Test Automation Workflow Imp…
Avijit-Microsoft Jun 20, 2025
e89485c
roleassignment fix
Pavan-Microsoft Jun 20, 2025
b268f52
fix bicep
Pavan-Microsoft Jun 20, 2025
3a7bb25
use aisearch connection
Pavan-Microsoft Jun 23, 2025
55349fb
Update deploy-KMGeneric.yml
Harmanpreet-Microsoft Jun 23, 2025
7c52703
ci: Fixed deployment pipeline
Avijit-Microsoft Jun 23, 2025
da5ff8b
integrate AI Searchtool
Pavan-Microsoft Jun 23, 2025
080b41f
citation changes
Pavan-Microsoft Jun 25, 2025
e88ce8c
use project client
Pavan-Microsoft Jun 25, 2025
b6c74be
Add files via upload
Atulku-Microsoft Jun 25, 2025
0d69783
Create test.md
Atulku-Microsoft Jun 25, 2025
ccd59c1
Delete documents/Images/re_use_log /re_use_log/test.md
Atulku-Microsoft Jun 25, 2025
33d94c7
Create exp.md
Atulku-Microsoft Jun 25, 2025
ee52b03
Add files via upload
Atulku-Microsoft Jun 25, 2025
b567095
Delete documents/Images/re_use_log/exp.md
Atulku-Microsoft Jun 25, 2025
36b2777
update image and links
Atulku-Microsoft Jun 25, 2025
5776f70
Update CustomizingAzdParameters.md
Atulku-Microsoft Jun 25, 2025
e56f6d9
search index reader role fix
Pavan-Microsoft Jun 25, 2025
290885f
feat: Check available Quota before azd deployment
Vamshi-Microsoft Jun 25, 2025
597c650
Role assignment for existing foundry
Pavan-Microsoft Jun 26, 2025
260df3d
fix cu roleassignment issue
Pavan-Microsoft Jun 26, 2025
3386afb
feat: Update parameters in main.parameters.json and comment out prepr…
Vamshi-Microsoft Jun 26, 2025
274c131
fix: Remove preprovision hooks from azure.yaml and update main.parame…
Vamshi-Microsoft Jun 26, 2025
1f74d34
refactor: Removed outdated post-deployment steps for container publis…
Vamshi-Microsoft Jun 26, 2025
52f8a9b
Merge pull request #499 from microsoft/Quota-Azd
Roopan-Microsoft Jun 26, 2025
452f660
single agent for aisearch tool
Pavan-Microsoft Jun 26, 2025
0f16544
fix deployment issue
Pavan-Microsoft Jun 26, 2025
a2dee7e
fix pylint issue
Pavan-Microsoft Jun 26, 2025
fcef012
Merge branch 'dev' of https://github.com/microsoft/Conversation-Knowl…
Pavan-Microsoft Jun 26, 2025
04f2002
Merge pull request #501 from microsoft/dev
Roopan-Microsoft Jun 26, 2025
71bfd28
fix unittescase and deployment issue
Pavan-Microsoft Jun 27, 2025
eeef63f
updated main.json
Pavan-Microsoft Jun 27, 2025
0f623db
fix pylint issue
Pavan-Microsoft Jun 27, 2025
63b4c17
feat: Use agent operations with the Azure AI Search tool for ChatWit…
Avijit-Microsoft Jun 27, 2025
b17047d
feat: Use agent operations with the Azure AI Search tool for ChatWith…
Avijit-Microsoft Jun 27, 2025
16618ac
Update docker-build.yml
Pavan-Microsoft Jun 27, 2025
d3332f0
Merge pull request #505 from microsoft/latest_fdp_pk
Prajwal-Microsoft Jun 27, 2025
6d6c27f
feat: Add aiDeploymentsLocation parameter to Bicep deployment in depl…
Abdul-Microsoft Jun 30, 2025
1feb88c
dynamic project_index specific to search
Pavan-Microsoft Jul 1, 2025
36c2ece
Merge branch 'main' of https://github.com/microsoft/Conversation-Know…
Pavan-Microsoft Jul 1, 2025
53f4408
fix unit testcase failure
Pavan-Microsoft Jul 1, 2025
411a26a
fix: Refactor agent names and index identifiers for KM alignment and …
Avijit-Microsoft Jul 1, 2025
5d69f0e
Update DeploymentGuide.md
Atulku-Microsoft Jul 1, 2025
a1fefc0
Update re-use-log-analytics.md
Atulku-Microsoft Jul 1, 2025
bb3fff7
Update re-use-log-analytics.md
Atulku-Microsoft Jul 1, 2025
54f0f43
dynamic agent name for different RG
Pavan-Microsoft Jul 1, 2025
d52ef6c
dynamic project_index name
Pavan-Microsoft Jul 1, 2025
fc5ebcc
project_index dynamic name
Pavan-Microsoft Jul 1, 2025
92f45d6
build: bump the backend-deps group in /src/api with 4 updates
dependabot[bot] Jul 1, 2025
1a49716
build: bump the frontend-deps group in /src/App with 11 updates
dependabot[bot] Jul 1, 2025
6465128
build: bump microsoft/template-validation-action
dependabot[bot] Jul 1, 2025
5e250fa
fix pylint issue
Pavan-Microsoft Jul 2, 2025
25bf29f
fix: Dynamic Agent Naming and Thread-Safe Deletion for Agent Factories
Avijit-Microsoft Jul 2, 2025
e4a7bc0
fix: Dynamic Resource Naming and Agent Management
Avijit-Microsoft Jul 2, 2025
60076cc
Merge pull request #512 from microsoft/psl-fixdeploypipeline
Roopan-Microsoft Jul 2, 2025
4c7e5fe
Merge branch 'main' into psl-re-use-log-update
Avijit-Microsoft Jul 3, 2025
883cef7
docs: Added file, images and update the links
Avijit-Microsoft Jul 3, 2025
31ef984
Use agent for sql kernel function
Pavan-Microsoft Jul 3, 2025
53f8e7f
correct sql kernel function method name
Pavan-Microsoft Jul 3, 2025
9e61c8c
unittestcase changes for sqlagent
Pavan-Microsoft Jul 3, 2025
0ec3f88
fix unit issue
Pavan-Microsoft Jul 4, 2025
58fdd82
feat: Agent Factory Refactor + SQL Agent Integration
Avijit-Microsoft Jul 4, 2025
b3aa60e
Update re-use-log-analytics.md
Thanusree-Microsoft Jul 4, 2025
7246bf4
Merge pull request #514 from microsoft/psl-updatelink
Roopan-Microsoft Jul 4, 2025
d280a93
added Broken-links-checker-final.yml
Rohini-Microsoft Jul 7, 2025
f758d2e
Merge pull request #515 from microsoft/psl-githubaction
Roopan-Microsoft Jul 7, 2025
4d886d0
added proper path of all files
Rohini-Microsoft Jul 7, 2025
6f60e46
Merge pull request #516 from microsoft/psl-githubaction
Roopan-Microsoft Jul 7, 2025
23a8d9c
fix thread history usage issue for followup questions.
Pavan-Microsoft Jul 8, 2025
3275ddd
Merge branch 'main' of https://github.com/microsoft/Conversation-Know…
Pavan-Microsoft Jul 8, 2025
ccc7e37
fix: Update Conversation Agent and Truncation Strategy for Better Con…
Avijit-Microsoft Jul 8, 2025
9eefb24
rename the file name
Rohini-Microsoft Jul 9, 2025
2ba902e
Merge pull request #519 from microsoft/psl-githubaction
Roopan-Microsoft Jul 9, 2025
e08033a
feat: Use AI Agent in SQL Kernel function
Avijit-Microsoft Jul 9, 2025
d5ea027
updated docs and azure.yml file
VishalS-Microsoft Jul 10, 2025
1b4272b
enabled system managed identity
Priyanka-Microsoft Jul 10, 2025
59cbc1f
Merge pull request #522 from microsoft/psl-us-20283-km-gen
Roopan-Microsoft Jul 10, 2025
f10f3c1
fix: enabled system managed identity
Avijit-Microsoft Jul 10, 2025
bf86f03
updated main json
Priyanka-Microsoft Jul 11, 2025
ba018cf
Merge branch 'dev' into fix-update-main-json
Priyanka-Microsoft Jul 11, 2025
30b9f84
updated main json
Priyanka-Microsoft Jul 11, 2025
2ebfde0
in bicep 150 and 80 mentioned
Priyanka-Microsoft Jul 11, 2025
f173294
Added templateName tag on rg
Ragini-Microsoft Jul 11, 2025
e1d8439
use deployment script instead container app
Pavan-Microsoft Jul 11, 2025
d8a448b
Merge pull request #525 from microsoft/dev
Roopan-Microsoft Jul 11, 2025
76bb671
Updated tag name typo
Ragini-Microsoft Jul 11, 2025
5b2143b
use latest LTS version of powershell
Pavan-Microsoft Jul 11, 2025
b4e40ed
added workflow for telemetry template check in azure.yaml file while …
Dhruvkumar-Microsoft Jul 11, 2025
2d0a05d
fix parameter issue
Pavan-Microsoft Jul 11, 2025
5262287
Merge pull request #526 from microsoft/rc-templatetag-km-main
Roopan-Microsoft Jul 11, 2025
e3c9d0a
Merge pull request #527 from microsoft/psl-us-20458
Roopan-Microsoft Jul 11, 2025
092e354
fix managedIdentityClientId
Pavan-Microsoft Jul 11, 2025
5c568c8
updated parameters
Pavan-Microsoft Jul 11, 2025
bc0e236
updated invokesql
Pavan-Microsoft Jul 11, 2025
b2642e0
sql role assignment
Pavan-Microsoft Jul 13, 2025
a9b062a
Merge pull request #524 from microsoft/fix-update-main-json
Avijit-Microsoft Jul 14, 2025
5c4e7cb
powershell version 7.4
Pavan-Microsoft Jul 14, 2025
6062d2e
Merge branch 'main' into dev
Roopan-Microsoft Jul 14, 2025
cb82035
Downgraded to match Azure support
Pavan-Microsoft Jul 14, 2025
12f619d
main json updated
Roopan-Microsoft Jul 14, 2025
3b14454
updated model capacity
Priyanka-Microsoft Jul 14, 2025
eb8811d
sql role assignment fix
Pavan-Microsoft Jul 14, 2025
0ea7407
Merge branch 'dev' of https://github.com/microsoft/Conversation-Knowl…
Pavan-Microsoft Jul 14, 2025
36ab95a
Merge pull request #529 from microsoft/update-model-capacity-similar-…
Roopan-Microsoft Jul 14, 2025
5b5d308
fix as per copilot suggestion
Pavan-Microsoft Jul 15, 2025
2288363
updated main.json
Pavan-Microsoft Jul 15, 2025
405de67
Changed roleassignment logic
Pavan-Microsoft Jul 15, 2025
5f74394
fix variable name
Pavan-Microsoft Jul 15, 2025
1800994
use proper naming for managedIdentityResourceId
Pavan-Microsoft Jul 15, 2025
b54457b
Merge branch 'dev' of https://github.com/microsoft/Conversation-Knowl…
Pavan-Microsoft Jul 15, 2025
e963341
refactor: Replace Container App with Deployment Scripts for SQL and P…
Avijit-Microsoft Jul 15, 2025
44f5884
deploy model for existing foundry if not exists
Pavan-Microsoft Jul 16, 2025
7f8fac3
agent sdk into chart generation
Kanchan-Microsoft Jul 16, 2025
2aab5da
pylint fixes
Kanchan-Microsoft Jul 16, 2025
258de84
pylint fixes
Kanchan-Microsoft Jul 16, 2025
b4d509c
fixed unit test cases
Kanchan-Microsoft Jul 17, 2025
32fa238
fixed unit test case
Kanchan-Microsoft Jul 17, 2025
4d0b6b0
Avoid running deploy_foundry_role_assignment in parallel
Pavan-Microsoft Jul 17, 2025
bd9681b
Fix deployment error
Pavan-Microsoft Jul 17, 2025
13aa4cc
refactor: Replace Container App with Deployment Scripts for SQL and P…
Avijit-Microsoft Jul 17, 2025
5434a60
build: bump microsoft/template-validation-action
AjitPadhi-Microsoft Jul 17, 2025
312e149
Merge branch 'dependabotchanges' of https://github.com/microsoft/Conv…
AjitPadhi-Microsoft Jul 17, 2025
cf1e9d2
Fix output
Pavan-Microsoft Jul 17, 2025
1cb4de5
updated main.json
Pavan-Microsoft Jul 17, 2025
a279612
fix: Model Deployment When Reusing Existing Foundry Projects
Avijit-Microsoft Jul 17, 2025
087c317
Merge remote-tracking branch 'origin/dev' into dependabotchanges
AjitPadhi-Microsoft Jul 17, 2025
d7e82c3
updated openapi version
AjitPadhi-Microsoft Jul 17, 2025
9a1f4ba
added package lock file
AjitPadhi-Microsoft Jul 17, 2025
69d38ae
fixed nmp install
AjitPadhi-Microsoft Jul 17, 2025
fbe2cb9
fix: Model Deployment When Reusing Existing Foundry Projects
Avijit-Microsoft Jul 17, 2025
3b398ee
Updated package file
AjitPadhi-Microsoft Jul 17, 2025
3f9a19c
added lock file
AjitPadhi-Microsoft Jul 17, 2025
0d35b12
reverted docker changes
AjitPadhi-Microsoft Jul 17, 2025
c186019
updated FE package
AjitPadhi-Microsoft Jul 17, 2025
7d0bb1e
add reuse foundry project documentation
Pavan-Microsoft Jul 17, 2025
dbf7b1a
Update image path in re-use-foundry-project.md
Pavan-Microsoft Jul 17, 2025
65a6f45
correct env variable name AZURE_EXISTING_AI_PROJECT_RESOURCE_ID
Pavan-Microsoft Jul 17, 2025
b2d2c91
docs: Added documentation for Support for Reusing Existing Azure AI F…
Avijit-Microsoft Jul 17, 2025
8ae0e41
update architecture
malrose07 Jul 17, 2025
6dd8f12
docs: update architecture
Avijit-Microsoft Jul 17, 2025
dcbecf3
updated main.json
Pavan-Microsoft Jul 18, 2025
46fe5c5
fix: updated main.json - to update base url
Avijit-Microsoft Jul 18, 2025
b8c94e8
migrate model type to global standard
Priyanka-Microsoft Jul 18, 2025
21dfc79
updated chart agent factory
Kanchan-Microsoft Jul 18, 2025
817397c
pylint fixes
Kanchan-Microsoft Jul 18, 2025
8d97e3d
pylint fix
Kanchan-Microsoft Jul 18, 2025
0351918
Merge branch 'dev' into psl-agentsdk
Kanchan-Microsoft Jul 18, 2025
8ab83c1
fix: add principalType 'ServicePrincipal' to role assignments in Bice…
Abdul-Microsoft Jul 18, 2025
4f65ae6
fix: Integrate the Agent SDK into the chart generation
Avijit-Microsoft Jul 18, 2025
aba039b
fixed dependent bot changes
AjitPadhi-Microsoft Jul 18, 2025
a1c804b
fixed test case issue
AjitPadhi-Microsoft Jul 19, 2025
552fc0e
Merge pull request #543 from microsoft/dependabotchanges
Roopan-Microsoft Jul 21, 2025
d9204e0
feat: Integrate the Agent SDK into chart generation and dependabot
Avijit-Microsoft Jul 21, 2025
1588421
Merge pull request #541 from microsoft/migrate-model-type-to-global-s…
Roopan-Microsoft Jul 22, 2025
439b67f
Merge pull request #542 from microsoft/psl-fixPrincipalTypeIssue
Prajwal-Microsoft Jul 22, 2025
10cda78
fixed opent telemetry issue CustomDomainInUse, FlagMustBeSetForRestore
VishalS-Microsoft Jul 23, 2025
96b4999
Merge pull request #545 from microsoft/psl-solutionprefix-kmgen
Roopan-Microsoft Jul 23, 2025
92054d5
Merge pull request #546 from microsoft/dev
Roopan-Microsoft Jul 24, 2025
121cf6c
Use ManagedIdentityCredential
Pavan-Microsoft Jul 24, 2025
ba80922
MANAGED_IDENTITY_CLIENT_ID to client_id
Pavan-Microsoft Jul 24, 2025
f8ddbf2
fix: Replacing DefaultAzureCredential with ManagedIdentityCredential
Avijit-Microsoft Jul 24, 2025
70fe75b
use managed identity
Pavan-Microsoft Jul 24, 2025
a19f7a7
fix pylint issue
Pavan-Microsoft Jul 24, 2025
9e19c55
Merge pull request #549 from microsoft/psl-pk-managedidentity
Pavan-Microsoft Jul 24, 2025
1d0fea5
fixed the api fetchChartDataWithFilters
Rafi-Microsoft Jul 24, 2025
e15fb4e
backend streaming response changes for chart
Pavan-Microsoft Jul 25, 2025
eae7ddd
enhanced the response sanitization
Rafi-Microsoft Jul 25, 2025
b03cdc8
local debugging support for auth
Pavan-Microsoft Jul 27, 2025
2a6e5a5
common method for Retrieves the appropriate Azure credential
Pavan-Microsoft Jul 28, 2025
169491a
fix unittestcase issue
Pavan-Microsoft Jul 28, 2025
0fb82b6
suppress alert for development
Pavan-Microsoft Jul 28, 2025
ae08281
fix pylint issue
Pavan-Microsoft Jul 28, 2025
b4cade7
fix copilot suggestion
Pavan-Microsoft Jul 28, 2025
fd15f66
updated the api test case
Rafi-Microsoft Jul 28, 2025
dbb4dad
add managedIdentityResourceId for process_data_scripts.bicep
Pavan-Microsoft Jul 28, 2025
dcec0b0
correct base url path
Pavan-Microsoft Jul 28, 2025
387931b
Update src/tests/api/api/test_api_routes.py
Rafi-Microsoft Jul 28, 2025
787e8d3
Update src/api/common/database/sqldb_service.py
Rafi-Microsoft Jul 28, 2025
dd0aefe
Update src/tests/api/api/test_api_routes.py
Rafi-Microsoft Jul 28, 2025
d7386d7
fix copilot comment
Pavan-Microsoft Jul 28, 2025
caf0091
rename env name from local to dev
Pavan-Microsoft Jul 28, 2025
bb0cec0
read env from os.getenv instead config.
Pavan-Microsoft Jul 28, 2025
3f3a548
fix: No Results Error Handling
Avijit-Microsoft Jul 28, 2025
41bf085
fix unittestcase
Pavan-Microsoft Jul 28, 2025
a1dfb29
fix unittestcase
Pavan-Microsoft Jul 28, 2025
1f184b4
fix defaultcred unittestcase
Pavan-Microsoft Jul 28, 2025
0797935
fix APP_ENV environment variable in testcase
Pavan-Microsoft Jul 28, 2025
de999cd
Merge pull request #555 from microsoft/psl-pk-miSFI-if
Pavan-Microsoft Jul 28, 2025
7161685
handled streaming chart response
Rohini-Microsoft Jul 28, 2025
a3e2725
Merge branch 'dev' of https://github.com/microsoft/Conversation-Knowl…
Pavan-Microsoft Jul 29, 2025
44cccd1
fix: Use DefaultAzureCredential in dev, Managed Identity in prod
Avijit-Microsoft Jul 30, 2025
0e9345e
fix to the prompt
Pavan-Microsoft Aug 1, 2025
1cf03d3
optimize prompt
Pavan-Microsoft Aug 1, 2025
4be7047
correct description
Pavan-Microsoft Aug 1, 2025
fb55ce2
fix prompt for chart for non quantative data
Pavan-Microsoft Aug 1, 2025
8a294f8
fix prompt for conversational agent
Pavan-Microsoft Aug 1, 2025
823fdea
update prompt
Pavan-Microsoft Aug 2, 2025
47bc1b0
exception handling added for chart
Rohini-Microsoft Aug 3, 2025
1c911a0
fix response issue
Pavan-Microsoft Aug 4, 2025
28762be
fix testcase for test_get_chart_data plugin
Pavan-Microsoft Aug 4, 2025
5480585
removed console
Rohini-Microsoft Aug 4, 2025
530ee68
Merge pull request #560 from microsoft/psl-pk-chartkernel
Pavan-Microsoft Aug 4, 2025
baa0b3b
Update DeploymentGuide.md
Atulku-Microsoft Aug 7, 2025
68aab61
Local debugging steps-initial
Pavan-Microsoft Aug 7, 2025
76d18e5
updated path
Pavan-Microsoft Aug 7, 2025
da59f94
refered local debugging md file from deployment guide
Pavan-Microsoft Aug 7, 2025
abc2dd9
removed duplicate steps
Pavan-Microsoft Aug 7, 2025
0178f88
updated Environment Variables section
Pavan-Microsoft Aug 7, 2025
c2ba04b
add jq for filepath
Pavan-Microsoft Aug 7, 2025
7598ed7
fix file path check
Pavan-Microsoft Aug 7, 2025
c551d15
LocalDebuggingSetup updated
Pavan-Microsoft Aug 7, 2025
e97e7b0
correct file name
Pavan-Microsoft Aug 7, 2025
7d194d1
fixed issue on command run
Pavan-Microsoft Aug 8, 2025
e30201a
added note
Pavan-Microsoft Aug 8, 2025
f6a43da
updated conditions in script
Pavan-Microsoft Aug 8, 2025
a53eee4
updated readme
Pavan-Microsoft Aug 8, 2025
2408d1f
reorder document
Pavan-Microsoft Aug 8, 2025
64a0a52
docs: Add LocalDebuggingSetup.md and Update Deployment Guide
Avijit-Microsoft Aug 8, 2025
b2f8582
refactor: Move the chart generation logic to a Semantic Kernel functi…
Avijit-Microsoft Aug 11, 2025
bf9045f
Update DeploymentGuide.md for local development & debugging instructions
Prajwal-Microsoft Aug 11, 2025
58f2f27
Update DeploymentGuide.md for local development & debugging instructions
Prajwal-Microsoft Aug 11, 2025
5f1d4ab
Merge pull request #561 from microsoft/psl-update-readme-sfi-ckm
Roopan-Microsoft Aug 11, 2025
eea6d8c
Merge pull request #565 from microsoft/main
Prajwal-Microsoft Aug 12, 2025
26ed536
Remove Publish Local Build Container to Azure Container Registry code
Pavan-Microsoft Aug 12, 2025
5245151
update readme
Pavan-Microsoft Aug 12, 2025
54d0673
Merge pull request #566 from microsoft/removeuselocalbuildpush
Pavan-Microsoft Aug 12, 2025
26c99fb
Bicep Changes
Kingshuk-Microsoft Aug 13, 2025
952821e
appservice
Kingshuk-Microsoft Aug 13, 2025
9a78401
Merge pull request #568 from microsoft/dev
Roopan-Microsoft Aug 18, 2025
4701d35
additional changes
Kingshuk-Microsoft Aug 19, 2025
53b07a2
Merge remote-tracking branch 'origin/dev' into kings-kmgen-dev
Kingshuk-Microsoft Aug 20, 2025
5c1dcd8
merge changes with dev origin
Kingshuk-Microsoft Aug 20, 2025
6e7cffa
changes
Kingshuk-Microsoft Aug 20, 2025
1db265a
bicep tags changes
Kingshuk-Microsoft Aug 21, 2025
03b17bd
Updated kernel function name
Pavan-Microsoft Aug 21, 2025
de8470e
removed print statement
Pavan-Microsoft Aug 21, 2025
c27f703
solution maxLength changed to 16
Kingshuk-Microsoft Aug 21, 2025
89a34e1
feat: KMGenric Bicep Standard Changes
Avijit-Microsoft Aug 21, 2025
8a0b811
fix testcase issues
Pavan-Microsoft Aug 21, 2025
44b0586
fix: Kernel Function Method Renaming for Clarity
Avijit-Microsoft Aug 22, 2025
bb500de
fix security issue
Pavan-Microsoft Aug 22, 2025
dd1ad66
fix testcase failure issue
Pavan-Microsoft Aug 22, 2025
db63917
refactor: Credential Handling: Replace DefaultAzureCredential with Az…
Avijit-Microsoft Aug 22, 2025
97852fe
output variable name revert
Pavan-Microsoft Aug 22, 2025
ebcaa9a
feat: Bicep Standard Changes (output vars changed to caps)
Avijit-Microsoft Aug 22, 2025
cda3d26
updated env sample
Pavan-Microsoft Aug 22, 2025
47cbe72
fix: updates the sample environment configuration
Avijit-Microsoft Aug 22, 2025
03984e1
fix: Kernel Function Method Renaming for Clarity and Bicep Standard C…
Avijit-Microsoft Aug 25, 2025
acba442
remove unused files from setup_env.sh
Pavan-Microsoft Aug 25, 2025
c771cef
fix: remove unused files from setup_env.sh
Avijit-Microsoft Aug 25, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
"forwardPorts": [50505],
"features": {
"ghcr.io/azure/azure-dev/azd:latest": {}
"ghcr.io/azure/azure-dev/azd:latest": {},
"ghcr.io/devcontainers/features/azure-cli:1": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
"customizations": {
"vscode": {
Expand All @@ -16,7 +18,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"
Expand Down
9 changes: 9 additions & 0 deletions .devcontainer/setup_env.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/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
sudo chmod +x ./infra/scripts/run_process_data_scripts.sh
77 changes: 46 additions & 31 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,52 @@
version: 2

updates:
# GitHub Actions dependencies
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
commit-message:
prefix: "build"
target-branch: "dependabotchanges"
open-pull-requests-limit: 100
# GitHub Actions - grouped
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
target-branch: "dependabotchanges"
commit-message:
prefix: "build"
open-pull-requests-limit: 10
groups:
github-actions:
patterns:
- "*"

- package-ecosystem: "pip"
directory: "/src/api"
schedule:
interval: "monthly"
commit-message:
prefix: "build"
target-branch: "dependabotchanges"
open-pull-requests-limit: 100
# Python backend dependencies - grouped
- package-ecosystem: "pip"
directory: "/src/api"
schedule:
interval: "monthly"
target-branch: "dependabotchanges"
commit-message:
prefix: "build"
open-pull-requests-limit: 10
groups:
backend-deps:
patterns:
- "*"

- package-ecosystem: "npm"
directory: "/src/App"
schedule:
interval: "monthly"
commit-message:
prefix: "build"
target-branch: "dependabotchanges"
open-pull-requests-limit: 100
registries:
- npm_public_registry # Only use public npm registry
# Frontend npm dependencies - grouped
- package-ecosystem: "npm"
directory: "/src/App"
schedule:
interval: "monthly"
target-branch: "dependabotchanges"
commit-message:
prefix: "build"
open-pull-requests-limit: 10
registries:
- npm_public_registry
groups:
frontend-deps:
patterns:
- "*"

registries:
npm_public_registry:
type: "npm-registry"
url: "https://registry.npmjs.org/"
token: ${{ secrets.TOKEN }}
npm_public_registry:
type: "npm-registry"
url: "https://registry.npmjs.org/"
token: ${{ secrets.TOKEN }}
152 changes: 152 additions & 0 deletions .github/workflows/Scheduled-Dependabot-PRs-Auto-Merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
# ------------------------------------------------------------------------------
# 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:
schedule:
- cron: '0 0 * * *' # Runs once a day at midnight UTC
workflow_dispatch:

permissions:
contents: write
pull-requests: write

jobs:
merge-dependabot:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install GitHub CLI
run: |
sudo apt update
sudo apt install -y gh
- name: Fetch & Filter Dependabot PRs
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo "🔍 Fetching all Dependabot PRs targeting 'dependabotchanges'..."
> matched_prs.txt
pr_batch=$(gh pr list --state open --json number,title,author,baseRefName,url \
--jq '.[] | "\(.number)|\(.title)|\(.author.login)|\(.baseRefName)|\(.url)"')
while IFS='|' read -r number title author base url; do
author=$(echo "$author" | xargs)
base=$(echo "$base" | xargs)
if [[ "$author" == "app/dependabot" && "$base" == "dependabotchanges" ]]; then
echo "$url" >> matched_prs.txt
echo "✅ Matched PR #$number - $title"
else
echo "❌ Skipped PR #$number - $title (Author: $author, Base: $base)"
fi
done <<< "$pr_batch"
echo "👉 Matched PRs:"
cat matched_prs.txt || echo "None"
- name: Rebase PR if Conflicts Exist
if: success()
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
if [[ ! -s matched_prs.txt ]]; then
echo "⚠️ No matching PRs to process."
exit 0
fi
while IFS= read -r pr_url; do
pr_number=$(basename "$pr_url")
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. 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 "action@github.com"
# 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 PRs using available strategy
if: success()
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
if [[ ! -s matched_prs.txt ]]; then
echo "⚠️ No matching PRs to process."
exit 0
fi
while IFS= read -r pr_url; do
pr_number=$(basename "$pr_url")
echo "🔍 Checking mergeability for PR #$pr_number"
attempt=0
max_attempts=8
mergeable=""
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
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 PR #$pr_number"
break
else
echo "🕒 Waiting for GitHub to determine mergeable status..."
sleep 15
fi
((attempt++))
done
if [[ "$mergeable" != "MERGEABLE" && "$mergeable" != "CONFLICTING" ]]; then
echo "❌ Mergeability undetermined after $max_attempts attempts. Skipping PR #$pr_number"
fi
done < matched_prs.txt || echo "⚠️ Completed loop with some errors, but continuing gracefully."
2 changes: 1 addition & 1 deletion .github/workflows/azure-dev-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

# Step 2: Validate the Azure template using microsoft/template-validation-action
- name: Validate Azure Template
uses: microsoft/template-validation-action@v0.3.5
uses: microsoft/template-validation-action@v0.4.3
id: validation
env:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bicep_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Run Quota Check
id: quota-check
Expand Down
57 changes: 57 additions & 0 deletions .github/workflows/broken-links-checker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Broken Link Checker

on:
pull_request:
paths:
- '**/*.md'
workflow_dispatch:

permissions:
contents: read

jobs:
markdown-link-check:
name: Check Markdown Broken Links
runs-on: ubuntu-latest

steps:
- name: Checkout Repo
uses: actions/checkout@v4
with:
fetch-depth: 0

# For PR : Get only changed markdown files
- name: Get changed markdown files (PR only)
id: changed-markdown-files
if: github.event_name == 'pull_request'
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
with:
files: |
**/*.md


# For PR: Check broken links only in changed files
- name: Check Broken Links in Changed Markdown Files
id: lychee-check-pr
if: github.event_name == 'pull_request' && steps.changed-markdown-files.outputs.any_changed == 'true'
uses: lycheeverse/lychee-action@v2.4.1
with:
args: >
--verbose --exclude-mail --no-progress --exclude ^https?://
${{ steps.changed-markdown-files.outputs.all_changed_files }}
failIfEmpty: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# For manual trigger: Check all markdown files in repo
- name: Check Broken Links in All Markdown Files in Entire Repo (Manual Trigger)
id: lychee-check-manual
if: github.event_name == 'workflow_dispatch'
uses: lycheeverse/lychee-action@v2.4.1
with:
args: >
--verbose --exclude-mail --no-progress --exclude ^https?://
'**/*.md'
failIfEmpty: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10 changes: 5 additions & 5 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Installing DotNet version
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup dotnet ${{ matrix.dotnet-version }}
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet-version }}
# You can test your matrix by printing the current dotnet version
Expand All @@ -61,7 +61,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -88,6 +88,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
Loading
Loading