Skip to content

chore: merge dev into main (features, bug fixes, infra updates) #1820

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 86 commits into from
Jun 4, 2025

Conversation

Prasanjeet-Microsoft
Copy link
Contributor

@Prasanjeet-Microsoft Prasanjeet-Microsoft commented Jun 3, 2025

Purpose

  • This PR merges the latest development work from dev into main. The changes include major enhancements to test automation, infrastructure, naming conventions, CI/CD improvements, and user experience tweaks across the accelerator.

Summary of Changes

1. Test Automation & E2E (End-to-End) Coverage

  • Introduced a new folder tests/e2e-test with Playwright + pytest-based automation scripts.
  • Added a GitHub Actions workflow (test-automation.yml) to run E2E tests weekly and on pushes to main/dev.
  • Supporting files: requirements.txt, pytest.ini, sample .env, and test data for robust testing and documentation.

2. Infrastructure & Naming Consistency

  • Added infra/abbreviations.json and updated Bicep/JSON infra templates to use consistent Azure resource abbreviations (e.g., oai- for OpenAI, kv- for Key Vault, etc.).
  • Output and parameter naming is now uniform and easier to follow.
  • Improved main.bicep with new variables, outputs, and resource naming logic.

3. CI/CD Improvements

  • Updated .github/workflows/ci.yml and tests.yml to improve coverage and reliability.
  • Made sure tests run from the correct directory and artifacts are always uploaded.

4. Application/UI Improvements

  • Backend: Improved error handling (e.g., for invalid URLs in data ingestion).
  • Frontend: Enhanced ChatHistoryListItemCell with tooltips, more robust testing, and better accessibility.

5. Documentation

Added/updated README files for new test automation features.
Provided clear instructions for running and customizing tests and infrastructure.

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

End-to-End Test Automation

  • E2E tests in tests/e2e-test run successfully via the new test-automation.yml workflow (GitHub Actions).
  • Test results are uploaded as artifacts and notifications (if configured) are working.
  • Local test setup instructions in the new README work as described.

Infrastructure Changes

  • Azure resource naming conventions (as per infra/abbreviations.json) are applied consistently across all Bicep/JSON templates.
  • Deployments using updated Bicep files (main.bicep, etc.) complete successfully and resources are named as expected.
  • All new parameters and outputs are present and correctly documented.

CI/CD Workflows

  • CI workflows (ci.yml, tests.yml) run without errors on pushes to main and dev.
  • Artifacts (test results, logs) are correctly generated and accessible.

Application/UI Updates

  • Backend: Error handling improvements (e.g., invalid URLs in ingestion script) work as expected; app does not crash on bad input.
  • Frontend: Tooltips in ChatHistoryListItemCell display correctly and improve accessibility.
  • All new/updated tests for UI components pass.

Documentation

  • New and updated README files are clear, accurate, and provide complete instructions for test automation and infrastructure deployment.
  • Sample .env and test data files are present and usable as per documentation.

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>
Harsh-Microsoft and others added 19 commits March 24, 2025 15:39
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 Roopan-Microsoft added this pull request to the merge queue Jun 4, 2025
Merged via the queue into main with commit dfff049 Jun 4, 2025
18 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.