fix: Merging Dev changes to Main Branch #1702

Roopan-Microsoft · 2025-03-03T07:34:35Z

Purpose

This pull request includes several updates to dependencies and workflow configurations. The most important changes involve adding a new branch condition for Docker image builds and updating various dependencies in both JavaScript and Python projects.

Workflow Configuration Updates:

.github/workflows/build-docker-images.yml: Added dependabotchanges branch to the condition for pushing Docker images.
.github/workflows/build-docker.yml: Updated the condition for building and pushing Docker images to include the dependabotchanges branch.

JavaScript Dependency Updates:

code/frontend/package.json: Updated dependencies including @babel/traverse, @fluentui/react, @fluentui/react-icons, postcss, react, react-markdown, react-router-dom, and uuid.
code/frontend/package.json: Updated dev dependencies including @types/node, @types/react, typescript, vite, and vitest. [1] [2]
tests/integration/ui/package.json: Updated cypress and typescript versions.

Python Dependency Updates:

pyproject.toml: Updated dependencies including openai, pydantic, azure-ai-ml, black, pre-commit, pytest_httpserver, trustme, and pytest-asyncio. [1] [2] [3]

Does this introduce a breaking change?

Yes
No

How to Test

Get the code
Deploy and do complete end to end testing

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

End to End testing

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)

…ges (#1623)

Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Rohini-Microsoft <v-rwalunj@microsoft.com> Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com> Co-authored-by: AjitPadhi-Microsoft <v-padhiajit@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.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: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@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: Roopan P M <v-roopanpm@microsoft.com>

)

…`gpt-4o` (#1665)

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>

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 20 commits January 15, 2025 18:13

feat: Implement Consistent Versioning and Tagging for Accelerator Ima…

7c2391c

…ges (#1623)

Merge branch 'main' into dev

8393614

fix: Warning message displayed twice in chat history update (#1630)

3789d45

Update default.json

461779f

Update default_contract_assistant_prompt.txt

e0be943

Update open_ai_functions.py

f28ddc6

Update build-docker.yml

63ec389

Update create_app.py

e1d37f1

Update test_conversation.py

ec42447

Update test_iv_question_answer_tool.py

86dd916

Update test_response_with_search_documents_tool.py

b1f2615

Update test_conversation_flow.py

3431205

ci: update docker registry logic for main, dev, and demo branches (#1660

7025c6e

)

fix: Updates to change the Azure OpenAI model from gpt-35-turbo to …

8fca481

…`gpt-4o` (#1665)

docs: updated numerical queries section in best practices readme (#1670)

18e1dca

Merge branch 'main' into dev

c13b4e3

fix: Admin configuration issue fix (#1676)

1ed3f43

Merge branch 'main' into dev

f083af8

Roopan-Microsoft requested review from Avijit-Microsoft, Prajwal-Microsoft and Fr4nc3 as code owners March 3, 2025 07:34

Roopan-Microsoft added 2 commits March 3, 2025 13:12

Merge branch 'main' into dev

2803e48

Package lock updated

b5f35ac

Roopan-Microsoft changed the title ~~Merging Dev changes to Main Branch~~ fix: Merging Dev changes to Main Branch Mar 3, 2025

Prajwal-Microsoft approved these changes Mar 3, 2025

View reviewed changes

Roopan-Microsoft added this pull request to the merge queue Mar 3, 2025

Merged via the queue into main with commit 7b9bcfb Mar 3, 2025
14 of 16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Merging Dev changes to Main Branch #1702

fix: Merging Dev changes to Main Branch #1702

Uh oh!

Roopan-Microsoft commented Mar 3, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

fix: Merging Dev changes to Main Branch #1702

fix: Merging Dev changes to Main Branch #1702

Uh oh!

Conversation

Roopan-Microsoft commented Mar 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose

Workflow Configuration Updates:

JavaScript Dependency Updates:

Python Dependency Updates:

Does this introduce a breaking change?

How to Test

What to Check

Other Information

Uh oh!

Uh oh!

Uh oh!

Roopan-Microsoft commented Mar 3, 2025 •

edited

Loading