fix: merging dev changes to main branch #1629

Roopan-Microsoft · 2025-01-20T12:09:51Z

Purpose

This pull request includes changes to the GitHub Actions workflow for building Docker images and a minor update to the chat history list item component in the frontend.

Improvements to GitHub Actions workflow:

.github/workflows/build-docker.yml: Added a step to determine the tag name based on the branch, improving the tagging mechanism for Docker images.
.github/workflows/build-docker.yml: Updated the tags field to use the newly determined tag name and included the date and run number for better traceability.

Frontend component update:

code/frontend/src/pages/chat/ChatHistoryListItem.tsx: Commented out the errorMessage prop in the TextField component to prevent displaying errors when renaming chat history items, while still disabling the field if an error exists.

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

Complete sanity test

Other Information

… changes (#1509)

Co-authored-by: Roopan P M <[email protected]>

…-data-solution-accelerator into dev

Co-authored-by: Roopan P M <[email protected]>

Co-authored-by: Ajit Padhi <[email protected]>

Co-authored-by: Roopan-Microsoft <[email protected]>

Co-authored-by: Roopan-Microsoft <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: gpickett <[email protected]> Co-authored-by: Francia Riesco <[email protected]> Co-authored-by: Francia Riesco <[email protected]> Co-authored-by: Prajwal D C <[email protected]>

…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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <[email protected]>

…WYD (#1603)

…at-with-your-data-solution-accelerator into dev

Co-authored-by: Pavan-Microsoft <[email protected]>

…ple Runs (#1618)

…ze deployment (#1624)

…ges (#1623)

github-actions · 2025-01-20T12:12:03Z

Coverage Report •

File	Stmts	Miss	Cover	Missing
code
create_app.py	210	6	97%	40, 414, 435, 543–545
code/backend/batch/utilities/orchestrator
open_ai_functions.py	68	16	76%	124–126, 129, 132–133, 136, 141–143, 145–147, 150–151, 156
TOTAL	3819	857	77%

Tests	Skipped	Failures	Errors	Time
395	0 💤	0 ❌	0 🔥	53.124s ⏱️

Co-authored-by: Prashant-Microsoft <[email protected]> Co-authored-by: Rohini-Microsoft <[email protected]> Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com> Co-authored-by: AjitPadhi-Microsoft <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: Roopan-Microsoft <[email protected]> Co-authored-by: Avijit-Microsoft <[email protected]> Co-authored-by: RaviKiran-Microsoft <[email protected]> Co-authored-by: Somesh Joshi <[email protected]> Co-authored-by: Himanshi Agrawal <[email protected]> Co-authored-by: Prasanjeet-Microsoft <[email protected]> Co-authored-by: Harmanpreet-Microsoft <[email protected]> Co-authored-by: pradeepjha-microsoft <[email protected]> Co-authored-by: Harmanpreet Kaur <[email protected]> Co-authored-by: Bangarraju-Microsoft <[email protected]> Co-authored-by: Roopan P M <[email protected]>

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 <[email protected]>

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 <[email protected]>

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

e5cf4dd

Co-authored-by: Ajit Padhi <[email protected]>

fix: multiple container tag issue fix (#1552)

02d0056

Co-authored-by: Roopan-Microsoft <[email protected]>

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

90e1040

Co-authored-by: Roopan-Microsoft <[email protected]>

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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <[email protected]>

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

03f52b3

…WYD (#1603)

Pavan-Microsoft and others added 13 commits January 2, 2025 16:45

fix: Add Missing Logs (#1609)

e92eba1

commented the prompt flow in azure yaml file

b0860ee

Merge branches 'dev' and 'dev' of https://github.com/Azure-Samples/ch…

983b1f7

…at-with-your-data-solution-accelerator into dev

Add execute permissions parse_env.sh in postprovision hook

dae4043

fix: Build issue with docker

08ad207

Update build-docker.yml

c49ddfd

fix: Docker file failure issue

5994f99

fix: Response getting ']' brackets, it's inconsistent (#1611)

dc7b87c

Co-authored-by: Pavan-Microsoft <[email protected]>

fix: Fix Duplication of Flattened JSON Keys in .env File During Multi…

2d1af79

…ple Runs (#1618)

fix: Role Duplication Error in azd up Command for PostgreSQL (#1621)

c553312

Merge branch 'main' into dev

8213f0a

feat: Remove AI search service for PostgreSQL configuration to optimi…

1f22786

…ze deployment (#1624)

feat: Implement Consistent Versioning and Tagging for Accelerator Ima…

7c2391c

…ges (#1623)

Roopan-Microsoft requested review from Avijit-Microsoft, Prajwal-Microsoft and Fr4nc3 as code owners January 20, 2025 12:09

Roopan-Microsoft and others added 3 commits January 20, 2025 17:48

Merge branch 'main' into dev

8393614

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

3789d45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: merging dev changes to main branch #1629

fix: merging dev changes to main branch #1629

Roopan-Microsoft commented Jan 20, 2025 •

edited

Loading

github-actions bot commented Jan 20, 2025 •

edited

Loading

fix: merging dev changes to main branch #1629

Are you sure you want to change the base?

fix: merging dev changes to main branch #1629

Conversation

Roopan-Microsoft commented Jan 20, 2025 • edited Loading

Purpose

Does this introduce a breaking change?

How to Test

What to Check

Other Information

github-actions bot commented Jan 20, 2025 • edited Loading

Roopan-Microsoft commented Jan 20, 2025 •

edited

Loading

github-actions bot commented Jan 20, 2025 •

edited

Loading