fix: merging dev changes to main #1802

Roopan-Microsoft · 2025-05-19T07:43:06Z

Purpose

This pull request introduces several updates across multiple areas, including Docker configuration, backend enhancements for JSON document chunking, frontend improvements, and dependency updates. The most significant changes focus on adding support for JSON document chunking, refining configuration management, and updating dependencies for better performance and compatibility.

Backend Enhancements:

Added a new JSON chunking strategy to the ChunkingStrategy enum and implemented the JSONDocumentChunking class to handle JSON document chunking using a recursive splitter. (chunking_strategy.py - [1] json.py - [2]
Updated the get_document_chunker function to include the JSON strategy and added configuration support for JSON documents in default.json. (strategies.py - [1] [2]; default.json - [3]
Enhanced the ConfigHelper to include JSON as a supported document type and adjusted the configuration reset logic for consistency. (config_helper.py - [1] [2]

Frontend Improvements:

Introduced tooltip support using Fluent UI's TooltipHost for better user experience in the ChatHistoryListItemCell component. (ChatHistoryListItemCell.tsx - [1] [2] [3]
Mocked TooltipHost in tests to ensure proper testing of the updated component. (ChatHistoryListItemCell.test.tsx - code/frontend/src/components/ChatHistoryListItemCell/ChatHistoryListItemCell.test.tsxR14-R24)

Configuration and Workflow Updates:

Expanded .dockerignore to exclude additional unnecessary files and directories, improving Docker build efficiency. (.dockerignore - .dockerignoreR1-R162)
Modified the GitHub Actions workflow to allow Docker login for the dependabotchanges branch. (build-docker.yml - .github/workflows/build-docker.ymlL59-R59)

Dependency Updates:

Updated frontend dependencies, including @fluentui/react, typescript, and vite, to their latest versions for improved performance and compatibility. (package.json - [1] [2] [3]

Testing Enhancements:

Added tests for the new JSON chunking strategy and updated existing tests to validate the inclusion of JSON as a supported document type and chunking strategy. (test_config_helper.py - [1] [2] [3] [4]

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: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com> Co-authored-by: Ajit Padhi <v-padhiajit@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: 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: Prajwal D C <v-dcprajwal@microsoft.com>

…ORCE_AUTH" (#1634)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com> Co-authored-by: Prajwal-Microsoft <v-dcprajwal@microsoft.com> Co-authored-by: Ajit Padhi <v-padhiajit@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: 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: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Harsh-Microsoft <v-hbangera@microsoft.com> Co-authored-by: Kanchan-Microsoft <v-knagshetti@microsoft.com>

…4-09 from vision-preview (#1752) Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com>

Co-authored-by: Cristopher Coronado Moreira <crcorona@pichincha.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com>

…image… (#1633) Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com>

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Prajwal-Microsoft <v-dcprajwal@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: Pavan-Microsoft <v-kupavan@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: Harsh-Microsoft <v-hbangera@microsoft.com> Co-authored-by: Kanchan-Microsoft <v-knagshetti@microsoft.com>

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

…ch now closes on X button click, Submit Button Now Resets Widgets to default values by clearing config (#1793)

…d update Bicep templates (#1795) Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com>

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)

Roopan-Microsoft and others added 19 commits February 17, 2025 15:47

Merge branch 'main' into dev

c13b4e3

fix: Admin configuration issue fix (#1676)

1ed3f43

Merge branch 'main' into dev

f083af8

Merge branch 'main' into dev

2803e48

Package lock updated

b5f35ac

Merge remote-tracking branch 'origin/main' into dev

0b01abb

docs: Added migration readme file (#1668)

21b57da

Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com>

refactor: enforcing authentication based on environment variable "ENF…

6f30b3f

…ORCE_AUTH" (#1634)

chore: Update Azure OpenAI Vision Model configuration to turbo-2024-0…

f7a2ce9

…4-09 from vision-preview (#1752) Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com>

feat: json document processor (#1661)

dc763c2

Co-authored-by: Cristopher Coronado Moreira <crcorona@pichincha.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com>

fix: Resolve chunking issue during deployment when enabling advanced …

9664143

…image… (#1633) Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com>

Merge branch 'main' into dev

e8382d3

build: Add .dockerignore to optimize Docker build context (#1790)

c7f3e8d

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

fix: Updated reset configuration to use dialog instead of popover whi…

cea820d

…ch now closes on X button click, Submit Button Now Resets Widgets to default values by clearing config (#1793)

refactor: centralize Azure resource naming with abbreviations.json an…

5d79d5d

…d update Bicep templates (#1795) Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com>

fix: Changed the button label from "Reset Now" to "Reset" (#1796)

a9d8511

Roopan-Microsoft requested review from Avijit-Microsoft, Prajwal-Microsoft, Fr4nc3 and Vinay-Microsoft as code owners May 19, 2025 07:43

Roopan-Microsoft and others added 3 commits May 22, 2025 10:59

Merge branch 'main' into dev

88caa69

main json updated

5383461

fix: hardcoded abbreviations in bicep (#1805)

86ebab4

Prajwal-Microsoft approved these changes May 22, 2025

View reviewed changes

Roopan-Microsoft added this pull request to the merge queue May 22, 2025

Merged via the queue into main with commit 04d970c May 22, 2025
17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: merging dev changes to main #1802

fix: merging dev changes to main #1802

Uh oh!

Roopan-Microsoft commented May 19, 2025

Uh oh!

Uh oh!

Uh oh!