fix: Dev to main merge by Dhruvkumar-Microsoft · Pull Request #1941 · Azure-Samples/chat-with-your-data-solution-accelerator

Dhruvkumar-Microsoft · 2025-10-20T05:18:59Z

Purpose

This pull request introduces improvements to the citation URL rewriting logic in the frontend, adds a comprehensive post-deployment guide for AVM users, and enhances the quota checking script for better error handling. The changes focus on user experience, documentation, and deployment reliability.

Frontend improvements:

Improved citation URL handling in CitationPanel.tsx: URLs pointing to Azure Blob Storage are now rewritten to use local API endpoints, while external URLs remain unchanged, ensuring correct linking behavior in the UI.

Documentation updates:

Added AVMPostDeploymentGuide.md: Provides a step-by-step post-deployment guide for users of the AVM solution accelerator, covering authentication setup, admin site usage, chat application access, and links to advanced configuration options.

Deployment and reliability enhancements:

Updated quota check script (checkquota.sh): Now sets INSUFFICIENT_QUOTA=true when model quota information is missing, improving error handling during deployment checks.

Does this introduce a breaking change?

Yes
No

How to Test

Get the code

git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install

Test the code

What to Check

Verify that the following are valid

...

Other Information

… changes (#1509)

Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>

…-data-solution-accelerator into dev

Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>

Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com>

Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com>

Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com>

…1569)

…nd Update Conversation flow based on template selection (#1567) Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com>

…1572)

…1574)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com>

…WYD (#1603)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kiran-Siluveru-Microsoft <v-ksiluveru@microsoft.com> Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Rohini-Microsoft <v-rwalunj@microsoft.com> Co-authored-by: Avijit-Microsoft <v-aghorui@microsoft.com> Co-authored-by: RaviKiran-Microsoft <v-ravikirans@microsoft.com> Co-authored-by: Somesh Joshi <v-somejoshi@microsoft.com> Co-authored-by: Himanshi Agrawal <v-himagrawal@microsoft.com> Co-authored-by: pradeepjha-microsoft <v-pradeepjha@microsoft.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Harsh-Microsoft <v-hbangera@microsoft.com> Co-authored-by: Kanchan-Microsoft <v-knagshetti@microsoft.com> Co-authored-by: Cristopher Coronado <cristofima@hotmail.com> Co-authored-by: Cristopher Coronado Moreira <crcorona@pichincha.com> Co-authored-by: Vamshi-Microsoft <v-vamolla@microsoft.com> Co-authored-by: Thanusree-Microsoft <168087422+Thanusree-Microsoft@users.noreply.github.com> Co-authored-by: Niraj Chaudhari (Persistent Systems Inc) <v-nirajcha@microsoft.com> Co-authored-by: Rohini-Microsoft <168007985+Rohini-Microsoft@users.noreply.github.com>

…yments (#1917)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kiran-Siluveru-Microsoft <v-ksiluveru@microsoft.com> Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Rohini-Microsoft <v-rwalunj@microsoft.com> Co-authored-by: Avijit-Microsoft <v-aghorui@microsoft.com> Co-authored-by: RaviKiran-Microsoft <v-ravikirans@microsoft.com> Co-authored-by: Somesh Joshi <v-somejoshi@microsoft.com> Co-authored-by: Himanshi Agrawal <v-himagrawal@microsoft.com> Co-authored-by: pradeepjha-microsoft <v-pradeepjha@microsoft.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Harsh-Microsoft <v-hbangera@microsoft.com> Co-authored-by: Kanchan-Microsoft <v-knagshetti@microsoft.com> Co-authored-by: Cristopher Coronado <cristofima@hotmail.com> Co-authored-by: Cristopher Coronado Moreira <crcorona@pichincha.com> Co-authored-by: Vamshi-Microsoft <v-vamolla@microsoft.com> Co-authored-by: Thanusree-Microsoft <168087422+Thanusree-Microsoft@users.noreply.github.com> Co-authored-by: Niraj Chaudhari (Persistent Systems Inc) <v-nirajcha@microsoft.com> Co-authored-by: Rohini-Microsoft <168007985+Rohini-Microsoft@users.noreply.github.com>

#1923)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kiran-Siluveru-Microsoft <v-ksiluveru@microsoft.com> Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Rohini-Microsoft <v-rwalunj@microsoft.com> Co-authored-by: Avijit-Microsoft <v-aghorui@microsoft.com> Co-authored-by: RaviKiran-Microsoft <v-ravikirans@microsoft.com> Co-authored-by: Somesh Joshi <v-somejoshi@microsoft.com> Co-authored-by: Himanshi Agrawal <v-himagrawal@microsoft.com> Co-authored-by: pradeepjha-microsoft <v-pradeepjha@microsoft.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Harsh-Microsoft <v-hbangera@microsoft.com> Co-authored-by: Kanchan-Microsoft <v-knagshetti@microsoft.com> Co-authored-by: Cristopher Coronado <cristofima@hotmail.com> Co-authored-by: Cristopher Coronado Moreira <crcorona@pichincha.com> Co-authored-by: Vamshi-Microsoft <v-vamolla@microsoft.com> Co-authored-by: Thanusree-Microsoft <168087422+Thanusree-Microsoft@users.noreply.github.com> Co-authored-by: Niraj Chaudhari (Persistent Systems Inc) <v-nirajcha@microsoft.com> Co-authored-by: Rohini-Microsoft <168007985+Rohini-Microsoft@users.noreply.github.com>

…, and enhance local Teams dev setup (#1925) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kiran-Siluveru-Microsoft <v-ksiluveru@microsoft.com> Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Rohini-Microsoft <v-rwalunj@microsoft.com> Co-authored-by: Avijit-Microsoft <v-aghorui@microsoft.com> Co-authored-by: RaviKiran-Microsoft <v-ravikirans@microsoft.com> Co-authored-by: Somesh Joshi <v-somejoshi@microsoft.com> Co-authored-by: Himanshi Agrawal <v-himagrawal@microsoft.com> Co-authored-by: pradeepjha-microsoft <v-pradeepjha@microsoft.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Harsh-Microsoft <v-hbangera@microsoft.com> Co-authored-by: Kanchan-Microsoft <v-knagshetti@microsoft.com> Co-authored-by: Cristopher Coronado <cristofima@hotmail.com> Co-authored-by: Cristopher Coronado Moreira <crcorona@pichincha.com> Co-authored-by: Vamshi-Microsoft <v-vamolla@microsoft.com> Co-authored-by: Thanusree-Microsoft <168087422+Thanusree-Microsoft@users.noreply.github.com> Co-authored-by: Niraj Chaudhari (Persistent Systems Inc) <v-nirajcha@microsoft.com> Co-authored-by: Rohini-Microsoft <168007985+Rohini-Microsoft@users.noreply.github.com>

…nt (#1926) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kiran-Siluveru-Microsoft <v-ksiluveru@microsoft.com> Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Rohini-Microsoft <v-rwalunj@microsoft.com> Co-authored-by: Avijit-Microsoft <v-aghorui@microsoft.com> Co-authored-by: RaviKiran-Microsoft <v-ravikirans@microsoft.com> Co-authored-by: Somesh Joshi <v-somejoshi@microsoft.com> Co-authored-by: Himanshi Agrawal <v-himagrawal@microsoft.com> Co-authored-by: pradeepjha-microsoft <v-pradeepjha@microsoft.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Harsh-Microsoft <v-hbangera@microsoft.com> Co-authored-by: Kanchan-Microsoft <v-knagshetti@microsoft.com> Co-authored-by: Cristopher Coronado <cristofima@hotmail.com> Co-authored-by: Cristopher Coronado Moreira <crcorona@pichincha.com> Co-authored-by: Vamshi-Microsoft <v-vamolla@microsoft.com> Co-authored-by: Thanusree-Microsoft <168087422+Thanusree-Microsoft@users.noreply.github.com> Co-authored-by: Niraj Chaudhari (Persistent Systems Inc) <v-nirajcha@microsoft.com> Co-authored-by: Rohini-Microsoft <168007985+Rohini-Microsoft@users.noreply.github.com>

…yod flow (#1905)

…umentation Alignment (#1928)

…ing the AVM template (#1936)

Roopan-Microsoft and others added 30 commits November 25, 2024 16:02

ci: Updated workflow to handle main, dev and demo branch | Dependabot…

2dbb0b1

… changes (#1509)

fix: SFI Fixes & scope reverted to subscription (#1513)

97ced9f

ci: workflow updated for build docker (#1514)

903c259

ci: build docker updated for dev (#1522)

4cf2972

ci: workflow branch code updated (#1525)

9158819

updated comment

4545a48

updated workflow

84a33b5

updated workflow

f8c1c8f

updated workflow

e31a661

updated bicep for registry

847ce7e

fixed bicep

8f8cc98

fix: bicep updated (#1527)

15b948c

Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>

Merge branch 'main' into dev

1645e43

Merge branch 'dev' of https://github.com/Azure-Samples/chat-with-your…

8df387a

…-data-solution-accelerator into dev

fix: Container issue fix for multiple branch (#1539)

e4dd5f2

fix: Updated workflow (#1540)

88d06dc

Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>

ci: Psl container fix for checkout code from head branch (#1541)

e5cf4dd

Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com>

fix: multiple container tag issue fix (#1552)

02d0056

Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com>

fix: Workflow issue fix on docker image (#1554)

90e1040

Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com>

fix: CWYD Citation Links to Documents Break After Specific Timeframe (#…

131c323

…1569)

fix: Commit changes bug (#1568)

93b84ed

fix: Post-Deployment Script for Managing Bicep Outputs in .env File a…

0875b92

…nd Update Conversation flow based on template selection (#1567) Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com>

fix: import error in env_helper.py (#1571)

76190b3

fix: add conversation flow in environment variable for adminweb app (#…

c65bf01

…1572)

fix: Update Hosting Model Configuration in ARM/Bicep Template (#1570)

1f326d9

fix: Update main.json for changes conversation flow changes in bicep (#…

fc688c2

…1574)

Merge branch 'main' into dev

56adb59

build: Dependabotchanges merge to Dev branch (#1602)

afaabdc

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com>

feat: Configurable System Prompts for Flexibility and Maintenance - C…

03f52b3

…WYD (#1603)

Pavan-Microsoft and others added 21 commits September 24, 2025 12:08

ci: update image tags to use 'latest_waf' for Docker builds and deplo…

4925b3b

…yments (#1917)

fix: Updated accelerator name

de608a2

fix: Updated the default token limit

da653ef

fix: Simplify allowed values for hosting plan SKU in Bicep and JSON t… (

c069f0c

#1923)

Merge branch 'main' into dev

f4dbbcb

resolved conflicts and main.json regenerated

04cd9c4

removed duplicated lines

baf6c6d

fix: fix byod flow and update integrated vectorization to work with b…

28e0a1e

…yod flow (#1905)

docs: Azure Region Restrictions, Model Capacity Enhancements, and Doc…

4a2a12e

…umentation Alignment (#1928)

fix: Add 'CreatedBy' tag when creating resource group (#1922)

cd02b5b

docs: Updated README, azure.yml for minimum azd version 1.18.0 (#1930)

1c967f7

Increase GPT_MIN_CAPACITY from 30 to 150

d7e02e1

Merge branch 'main' into dev

6c36355

docs: adds a new post-deployment guide for users who have deployed us…

f45aae8

…ing the AVM template (#1936)

fix: citation link issue resolved (#1937)

f2976be

fix: quota unavailability for handling in quotacheck pipeline (#1938)

a84950e

Dhruvkumar-Microsoft requested review from Avijit-Microsoft, Fr4nc3, Prajwal-Microsoft, Roopan-Microsoft, Vinay-Microsoft and aniaroramsft as code owners October 20, 2025 05:19

Roopan-Microsoft approved these changes Oct 20, 2025

View reviewed changes

Merge branch 'main' into dev

333a8c1

Roopan-Microsoft closed this Oct 20, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Dev to main merge#1941

fix: Dev to main merge#1941
Dhruvkumar-Microsoft wants to merge 135 commits into
mainfrom
dev

Dhruvkumar-Microsoft commented Oct 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants