fix: merging dev fixes into main branch #1622

Roopan-Microsoft · 2025-01-10T11:09:52Z

Purpose

Merging the dev branch fixes into main branch

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)

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

Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com>

…ple Runs (#1618)

github-actions · 2025-01-10T11:17:00Z

Coverage Report •

File	Stmts	Miss	Cover	Missing
code/backend/batch/utilities/orchestrator
orchestrator_base.py	51	1	98%	34
code/backend/batch/utilities/parser
output_parser_tool.py	44	0	100%
scripts/data_scripts
create_postgres_tables.py	56	56	0%	1–3, 5–11, 14, 26, 31–32, 35, 42–43, 49, 52, 55, 64–65, 68, 71–72, 75–76, 78, 87–88, 91–92, 94, 105–106, 110–111, 113–114, 116, 129–130, 133, 136, 138–139, 141–142, 144–145, 147–150, 152–153
TOTAL	3819	857	77%

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

…ze deployment (#1624)

github-actions · 2025-01-14T10:35:02Z

🎉 This PR is included in version 1.13.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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 10 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 <v-kupavan@microsoft.com>

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

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

Merge branch 'main' into dev

8213f0a

Roopan-Microsoft changed the title ~~Dev~~ fix: merging dev fixes into main branch Jan 10, 2025

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

1f22786

…ze deployment (#1624)

Avijit-Microsoft approved these changes Jan 14, 2025

View reviewed changes

Prasanjeet-Microsoft added this pull request to the merge queue Jan 14, 2025

Merged via the queue into main with commit 9edc403 Jan 14, 2025
16 checks passed

github-actions bot added the released label Jan 14, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: merging dev fixes into main branch #1622

fix: merging dev fixes into main branch #1622

Roopan-Microsoft commented Jan 10, 2025 •

edited

Loading

github-actions bot commented Jan 10, 2025 •

edited

Loading

github-actions bot commented Jan 14, 2025

fix: merging dev fixes into main branch #1622

fix: merging dev fixes into main branch #1622

Conversation

Roopan-Microsoft commented Jan 10, 2025 • edited Loading

Purpose

Does this introduce a breaking change?

How to Test

What to Check

Other Information

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

github-actions bot commented Jan 14, 2025

Roopan-Microsoft commented Jan 10, 2025 •

edited

Loading

github-actions bot commented Jan 10, 2025 •

edited

Loading