Skip to content

fix: merging dev changes to main branch #1786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 72 commits into from
May 5, 2025
Merged

fix: merging dev changes to main branch #1786

merged 72 commits into from
May 5, 2025

Conversation

Roopan-Microsoft
Copy link
Contributor

Purpose

This pull request introduces multiple updates across the codebase, including enhancements to document chunking strategies, workflow automation, authentication enforcement, and dependency updates. Key changes include the addition of a JSON chunking strategy, improvements to stale issue and branch management workflows, and the introduction of an API endpoint to check authentication enforcement.

Document Chunking Enhancements:

  • Added a new JSON chunking strategy (JSONDocumentChunking) to support chunking JSON documents using RecursiveJsonSplitter. Updated the ChunkingStrategy enum and get_document_chunker function to include this strategy. ([[1]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-b6201cb45257c50c6b01408f41eda8a6c98f706ecf565787e238ed9b20216021R9), [[2]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-b71e753e244fff09afe1f58fa76a8d21717a0ad7c916fa61bd19636ccd8e3ac6R1-R37), [[3]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-0dae734f2b90ee0bb0736c47ac7bb96123fd70e1d2e77bc9e713dc7d6ce19af7R6), [[4]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-0dae734f2b90ee0bb0736c47ac7bb96123fd70e1d2e77bc9e713dc7d6ce19af7R18-R19))
  • Updated the default configuration to support JSON document processing, including chunking and loading strategies. ([[1]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-b47f36670d0b4ba0cc29138fec8417b20b5f2f44b73b8e774aae986467797edcR100-R110), [[2]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-484a91ad712386342988fbcb31ad1d9be299ea8dbbdaa247bff98a7255d6b292R71), [[3]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-a4e537c25c25766f823aec9fe3610a6bb7e1e3901eeeee4a575f7d311f6bae67R181-R225), [[4]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-a4e537c25c25766f823aec9fe3610a6bb7e1e3901eeeee4a575f7d311f6bae67L423-R416))

Workflow Automation Improvements:

  • Enhanced the stale bot workflow to manage stale issues, pull requests, and unmerged branches. Added functionality to generate a CSV report of inactive branches and allow manual workflow triggering. ([.github/workflows/stale-bot.ymlL1-R82](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-7d98caa1d6d6648f3266503a806c5b7dc6214839a1a1fabd7dcaa5c54d72222eL1-R82))
  • Updated the Docker login workflow to include the dependabotchanges branch for registry login. ([.github/workflows/build-docker.ymlL59-R59](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-1d203d2dfb96ccf94b5e0961c7954e3bde73b4539ade27ccc301613e368b944fL59-R59))

Authentication Enforcement:

  • Introduced an environment variable (ENFORCE_AUTH) to enforce authentication. Added a new API endpoint (/api/checkauth) to check if authentication is enabled. Updated the frontend to use this endpoint for conditional behavior. ([[1]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-7503275e90a545dba3519622ff9d0866a73e814ddbfbb61156137721bf2a6552R365-R367), [[2]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-71b4d56ed99105547f52c23560eb912eebba767316c4642a965016c5f87b07e9R544-R548), [[3]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-658577780a19da95abc173367d230a5eda323834aa890a174276a0441baed5b9R57-R75), [[4]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-35583ffd539a8b21fc194681752040039cdbb49960ba3ad244a1d0b553cda836L12-R12), [[5]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-35583ffd539a8b21fc194681752040039cdbb49960ba3ad244a1d0b553cda836R55-R60))

Dependency Updates:

  • Updated several frontend dependencies, including @babel/traverse, @fluentui/react, and typescript, to their latest versions for improved performance and compatibility. ([[1]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-4894da3ab9a4eacce2482f27d10c37f91ae25f55cf5d4b474ca578ab58246dbdL14-R26), [[2]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-4894da3ab9a4eacce2482f27d10c37f91ae25f55cf5d4b474ca578ab58246dbdL40-R40), [[3]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-4894da3ab9a4eacce2482f27d10c37f91ae25f55cf5d4b474ca578ab58246dbdL51-R56))

Test Suite Enhancements:

  • Modified tests to validate the new JSON chunking strategy and authentication enforcement logic. Added mocks for the checkAuthEnforced API in frontend tests. ([[1]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-a4e537c25c25766f823aec9fe3610a6bb7e1e3901eeeee4a575f7d311f6bae67R181-R225), [[2]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-a4e537c25c25766f823aec9fe3610a6bb7e1e3901eeeee4a575f7d311f6bae67L423-R416), [[3]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-b28ee3accc3ddaa4cc54b13f30db8e99a3a53f2d14b40e30cdac616de0c0fd10L11-R11), [[4]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-b28ee3accc3ddaa4cc54b13f30db8e99a3a53f2d14b40e30cdac616de0c0fd10L32-R32), [[5]](https://github.com/Azure-Samples/chat-with-your-data-solution-accelerator/pull/1786/files#diff-b28ee3accc3ddaa4cc54b13f30db8e99a3a53f2d14b40e30cdac616de0c0fd10R75))

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

Roopan-Microsoft and others added 30 commits November 25, 2024 16:02
Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>
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: 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>
…nd Update Conversation flow based on template selection (#1567)

Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com>
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>
Roopan-Microsoft and others added 22 commits February 6, 2025 11:04
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>
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>
@Roopan-Microsoft Roopan-Microsoft added this pull request to the merge queue May 5, 2025
Merged via the queue into main with commit 40c890e May 5, 2025
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.