chore: Dev to Main changes merge #657

NirajC-Microsoft · 2025-09-04T03:47:57Z

Purpose

This pull request introduces improvements to deployment documentation, troubleshooting guidance, and SQL prompt instructions. The most significant changes are the addition of a comprehensive troubleshooting guide for Azure deployment errors, updates to deployment documentation to reference this guide, and refinements to SQL query generation logic for asset value questions. Additionally, resource group tagging now includes the deployer's username for better traceability.

Documentation and Troubleshooting Enhancements:

Added a new docs/TroubleShootingSteps.md file detailing common Azure deployment errors, their causes, and step-by-step solutions, including links to further resources and support channels.
Updated docs/DeploymentGuide.md to reference the troubleshooting guide, making it easier for users to find help during deployment issues.

SQL Prompt Logic Updates:

Refined SQL prompt instructions in both infra/main.bicep and src/App/backend/agents/agent_factory.py to clarify how asset value queries should be handled: sum latest investments for total value questions, and return latest investments without summing for current value questions. [1] [2]

Resource Tagging Improvement:

Updated resource group tagging in infra/main.bicep to include a CreatedBy tag with the deployer's username, improving auditability and resource ownership tracking.
...

Does this introduce a breaking change?

Yes
No

Golden Path Validation

I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.

Deployment Validation

I have validated the deployment process successfully and all services are running as expected with this change.

What to Check

Verify that the following are valid

...

Other Information

…tingpr fix: model deployment when reusing existing foundry

* fixed opent telemetry issue CustomDomainInUse, FlagMustBeSetForRestore (#618) (#619) Co-authored-by: VishalS-Microsoft <v-vishshinde@microsoft.com> * directory update in dependabot template (#634) --------- Co-authored-by: NirajC-Microsoft <v-nirajcha@microsoft.com> Co-authored-by: VishalS-Microsoft <v-vishshinde@microsoft.com> Co-authored-by: Prajwal-Microsoft <v-dcprajwal@microsoft.com>

* Agent deletion handled successfully * use get azure credentials * remove unused import --------- Co-authored-by: Shreyas-Microsoft <v-swaikar@microsft.com>

…ilot-Solution-Accelerator into PSLRJ-TS-21657

… azd up

feat: Add required environment variables for local debugging in .env generated by azd up

…ur-own-copilot-Solution-Accelerator into psl-bug-21342

…ilot-Solution-Accelerator into PSLRJ-TS-21657

fix: Sample data processing script fails when using cross-subscription existing AI project resource ID

chore: Down merge from main to dev

…ilot-Solution-Accelerator into PSLRJ-TS-21657

* Added Troubleshoot.md files for BYOC-Client Advisor * fixed Check Markdown Broken Links * updated troubleshotingsteps file * Changed MACAE Github issues link with BYOC issue link --------- Co-authored-by: NirajC-Microsoft <v-nirajcha@microsoft.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…teps.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…entifier for better formatting and readability. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…y, and the total value matches the asset value displayed in the left panel. (#651)

Copilot

Pull Request Overview

This PR enhances deployment documentation and troubleshooting capabilities while refining SQL query generation logic. The main purpose is to improve the deployment experience by providing comprehensive troubleshooting guidance and clarifying asset value query handling.

Added comprehensive troubleshooting documentation with detailed error resolution steps
Enhanced SQL prompt instructions to clarify asset value query logic
Improved resource tagging with deployer information for better auditability

Reviewed Changes

Copilot reviewed 4 out of 6 changed files in this pull request and generated 3 comments.

File	Description
docs/TroubleShootingSteps.md	New comprehensive troubleshooting guide with 25+ common Azure deployment errors and solutions
docs/DeploymentGuide.md	Added reference to troubleshooting guide for deployment issues
src/App/backend/agents/agent_factory.py	Updated SQL prompt to clarify asset value query logic (sum vs individual values)
infra/main.bicep	Enhanced SQL prompt instructions and added CreatedBy tag with deployer username

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

infra/main.bicep

docs/TroubleShootingSteps.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

…to prevent validation pipeline failures caused by the deployer function in the Bicep file. (#659) * Adding a hardcoded createdBy parameter to the CAdeploy.yml file to prevent validation pipeline failures caused by the deployer function in the Bicep file. * Consolidate parameters in CAdeploy.yml

github-actions · 2025-09-08T06:42:18Z

🎉 This PR is included in version 1.8.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

* chore: Dev to Main changes merge (#657) * model deployment when reusing existing foundry * change model deployment name * removed system managed identity code * seggregated the files * fix: Updated file names * chore: down merging main into dev (#638) * fixed opent telemetry issue CustomDomainInUse, FlagMustBeSetForRestore (#618) (#619) Co-authored-by: VishalS-Microsoft <v-vishshinde@microsoft.com> * directory update in dependabot template (#634) --------- Co-authored-by: NirajC-Microsoft <v-nirajcha@microsoft.com> Co-authored-by: VishalS-Microsoft <v-vishshinde@microsoft.com> Co-authored-by: Prajwal-Microsoft <v-dcprajwal@microsoft.com> * added for cross-subscription existing AI project resource ID * update * fix: agent cleanup (#639) * Agent deletion handled successfully * use get azure credentials * remove unused import --------- Co-authored-by: Shreyas-Microsoft <v-swaikar@microsft.com> * TS( 21657) Bicep Standard code changes * Added required env variables for local debugging in .env generated by azd up * Added "Required/Optional" and changed aiProjectName suffix. * removed location tag * foundry project documentation * corrected name * updated CAdeploy.yml * update CAdeploy.yml * changed pipeline variable * updated main.json file * updated yml file * test * test * update * update * test * update CAdeploy.yml * CustomizingAzdparamMd * deploymentMdUpdate * Updated * Update infra/main.bicep Fixed typo error. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/App/backend/plugins/chat_with_data_plugin.py Updated the finally block for function "get_SQL_Response" Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update infra/main.bicep Removed Commented-out code Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert Copilot suggestion: `and project_client` is unnecessary. `project_client` is always initialized before thread creation, so `if thread:` is sufficient. * docs: Added Troubleshoot.md files for BYOC-Client Advisor (#650) * Added Troubleshoot.md files for BYOC-Client Advisor * fixed Check Markdown Broken Links * updated troubleshotingsteps file * Changed MACAE Github issues link with BYOC issue link --------- Co-authored-by: NirajC-Microsoft <v-nirajcha@microsoft.com> * added colon Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Replace 'u' with 'you' for proper grammarUpdate docs/TroubleShootingSteps.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * extra space removed Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * The command block is not properly closed Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * The command should be wrapped in a proper code block with language identifier for better formatting and readability. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * The total asset value and current asset value are responding correctly, and the total value matches the asset value displayed in the left panel. (#651) * Bicep file changes to add CreatedBy tag (#655) * Update docs/TroubleShootingSteps.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix: Adding a hardcoded createdBy parameter to the CAdeploy.yml file to prevent validation pipeline failures caused by the deployer function in the Bicep file. (#659) * Adding a hardcoded createdBy parameter to the CAdeploy.yml file to prevent validation pipeline failures caused by the deployer function in the Bicep file. * Consolidate parameters in CAdeploy.yml --------- Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Rafi-Microsoft <v-rafmd@microsoft.com> Co-authored-by: VishalS-Microsoft <v-vishshinde@microsoft.com> Co-authored-by: Kanchan Nagshetti (Persistent Systems Inc) <v-knagshetti@microsoft.com> Co-authored-by: Shreyas-Microsoft <v-swaikar@microsoft.com> Co-authored-by: Shreyas-Microsoft <v-swaikar@microsft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Prekshith-Microsoft <v-pdj@microsoft.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> * fix: merging dev to main changes (#661) * model deployment when reusing existing foundry * change model deployment name * removed system managed identity code * seggregated the files * fix: Updated file names * chore: down merging main into dev (#638) * fixed opent telemetry issue CustomDomainInUse, FlagMustBeSetForRestore (#618) (#619) Co-authored-by: VishalS-Microsoft <v-vishshinde@microsoft.com> * directory update in dependabot template (#634) --------- Co-authored-by: NirajC-Microsoft <v-nirajcha@microsoft.com> Co-authored-by: VishalS-Microsoft <v-vishshinde@microsoft.com> Co-authored-by: Prajwal-Microsoft <v-dcprajwal@microsoft.com> * added for cross-subscription existing AI project resource ID * update * fix: agent cleanup (#639) * Agent deletion handled successfully * use get azure credentials * remove unused import --------- Co-authored-by: Shreyas-Microsoft <v-swaikar@microsft.com> * TS( 21657) Bicep Standard code changes * Added required env variables for local debugging in .env generated by azd up * Added "Required/Optional" and changed aiProjectName suffix. * removed location tag * foundry project documentation * corrected name * updated CAdeploy.yml * update CAdeploy.yml * changed pipeline variable * updated main.json file * updated yml file * test * test * update * update * test * update CAdeploy.yml * CustomizingAzdparamMd * deploymentMdUpdate * Updated * Update infra/main.bicep Fixed typo error. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/App/backend/plugins/chat_with_data_plugin.py Updated the finally block for function "get_SQL_Response" Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update infra/main.bicep Removed Commented-out code Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert Copilot suggestion: `and project_client` is unnecessary. `project_client` is always initialized before thread creation, so `if thread:` is sufficient. * docs: Added Troubleshoot.md files for BYOC-Client Advisor (#650) * Added Troubleshoot.md files for BYOC-Client Advisor * fixed Check Markdown Broken Links * updated troubleshotingsteps file * Changed MACAE Github issues link with BYOC issue link --------- Co-authored-by: NirajC-Microsoft <v-nirajcha@microsoft.com> * added colon Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Replace 'u' with 'you' for proper grammarUpdate docs/TroubleShootingSteps.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * extra space removed Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * The command block is not properly closed Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * The command should be wrapped in a proper code block with language identifier for better formatting and readability. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * The total asset value and current asset value are responding correctly, and the total value matches the asset value displayed in the left panel. (#651) * Bicep file changes to add CreatedBy tag (#655) * Update docs/TroubleShootingSteps.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix: Adding a hardcoded createdBy parameter to the CAdeploy.yml file to prevent validation pipeline failures caused by the deployer function in the Bicep file. (#659) * Adding a hardcoded createdBy parameter to the CAdeploy.yml file to prevent validation pipeline failures caused by the deployer function in the Bicep file. * Consolidate parameters in CAdeploy.yml --------- Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Rafi-Microsoft <v-rafmd@microsoft.com> Co-authored-by: NirajC-Microsoft <v-nirajcha@microsoft.com> Co-authored-by: VishalS-Microsoft <v-vishshinde@microsoft.com> Co-authored-by: Kanchan Nagshetti (Persistent Systems Inc) <v-knagshetti@microsoft.com> Co-authored-by: Shreyas-Microsoft <v-swaikar@microsoft.com> Co-authored-by: Shreyas-Microsoft <v-swaikar@microsft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Prekshith-Microsoft <v-pdj@microsoft.com> * fixed vulnerabilities * removed duplicate variable --------- Co-authored-by: NirajC-Microsoft <v-nirajcha@microsoft.com> Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Rafi-Microsoft <v-rafmd@microsoft.com> Co-authored-by: VishalS-Microsoft <v-vishshinde@microsoft.com> Co-authored-by: Shreyas-Microsoft <v-swaikar@microsoft.com> Co-authored-by: Shreyas-Microsoft <v-swaikar@microsft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Prekshith-Microsoft <v-pdj@microsoft.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com>

github-actions · 2025-09-18T08:59:48Z

🎉 This PR is included in version 1.9.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Priyanka-Microsoft and others added 30 commits July 25, 2025 13:41

model deployment when reusing existing foundry

1a8347f

change model deployment name

383706b

removed system managed identity code

5ccc7c1

seggregated the files

99ad169

fix: Updated file names

e0747b2

Resolved main json commit

d604cea

Merge pull request #621 from microsoft/model-deployment-resusing-exis…

d4065d5

…tingpr fix: model deployment when reusing existing foundry

added for cross-subscription existing AI project resource ID

c509549

update

ad9ba63

fix: agent cleanup (#639)

18f3e78

* Agent deletion handled successfully * use get azure credentials * remove unused import --------- Co-authored-by: Shreyas-Microsoft <v-swaikar@microsft.com>

TS( 21657) Bicep Standard code changes

0f8ccc5

Merge branch 'dev' of https://github.com/microsoft/Build-your-own-cop…

d499936

…ilot-Solution-Accelerator into PSLRJ-TS-21657

Added required env variables for local debugging in .env generated by…

e8a113f

… azd up

Merge pull request #642 from microsoft/PSL-US-21463

12b99bb

feat: Add required environment variables for local debugging in .env generated by azd up

Added "Required/Optional" and changed aiProjectName suffix.

2c17025

removed location tag

51df269

Merge branch 'dev' into psl-bug-21342

f9dbf41

foundry project documentation

f202b60

Merge branch 'psl-bug-21342' of https://github.com/microsoft/Build-yo…

313f6e3

…ur-own-copilot-Solution-Accelerator into psl-bug-21342

corrected name

8b24bca

Merge branch 'dev' of https://github.com/microsoft/Build-your-own-cop…

b0e5161

…ilot-Solution-Accelerator into PSLRJ-TS-21657

updated CAdeploy.yml

d455118

update CAdeploy.yml

a8e25dd

Merge pull request #640 from microsoft/psl-bug-21342

2f89864

fix: Sample data processing script fails when using cross-subscription existing AI project resource ID

changed pipeline variable

1df9fc6

Merge pull request #644 from microsoft/main

1166aa8

chore: Down merge from main to dev

Merge branch 'dev' of https://github.com/microsoft/Build-your-own-cop…

d9c999d

…ilot-Solution-Accelerator into PSLRJ-TS-21657

updated main.json file

a911f20

updated yml file

d3ed0ee

VishalS-Microsoft and others added 8 commits August 26, 2025 12:39

added colon

9ed413c

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Replace 'u' with 'you' for proper grammarUpdate docs/TroubleShootingS…

f9e0c08

…teps.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

extra space removed

d31d0e8

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

The command block is not properly closed

3c2645f

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

The command should be wrapped in a proper code block with language id…

3f092e4

…entifier for better formatting and readability. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

The total asset value and current asset value are responding correctl…

ccc16de

…y, and the total value matches the asset value displayed in the left panel. (#651)

Bicep file changes to add CreatedBy tag (#655)

a0f3944

Copilot AI review requested due to automatic review settings September 4, 2025 03:47

NirajC-Microsoft requested review from Avijit-Microsoft, Prajwal-Microsoft, Roopan-Microsoft, Vinay-Microsoft and aniaroramsft as code owners September 4, 2025 03:47

Copilot AI reviewed Sep 4, 2025

View reviewed changes

infra/main.bicep Outdated Show resolved Hide resolved

docs/TroubleShootingSteps.md Outdated Show resolved Hide resolved

microsoft deleted a comment from Copilot AI Sep 4, 2025

Update docs/TroubleShootingSteps.md

c900215

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

NirajC-Microsoft temporarily deployed to production September 4, 2025 05:37 — with GitHub Actions Inactive

Roopan-Microsoft temporarily deployed to production September 5, 2025 09:35 — with GitHub Actions Inactive

Roopan-Microsoft approved these changes Sep 5, 2025

View reviewed changes

Merge branch 'main' into dev

3df581e

Roopan-Microsoft temporarily deployed to production September 5, 2025 12:31 — with GitHub Actions Inactive

Roopan-Microsoft approved these changes Sep 5, 2025

View reviewed changes

Avijit-Microsoft approved these changes Sep 5, 2025

View reviewed changes

Roopan-Microsoft merged commit 6b95b13 into main Sep 5, 2025
15 checks passed

github-actions bot added the released label Sep 8, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore: Dev to Main changes merge #657

chore: Dev to Main changes merge #657

Uh oh!

NirajC-Microsoft commented Sep 4, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Sep 8, 2025

Uh oh!

github-actions bot commented Sep 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

chore: Dev to Main changes merge #657

chore: Dev to Main changes merge #657

Uh oh!

Conversation

NirajC-Microsoft commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose

Does this introduce a breaking change?

Golden Path Validation

Deployment Validation

What to Check

Other Information

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Sep 8, 2025

Uh oh!

github-actions bot commented Sep 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

NirajC-Microsoft commented Sep 4, 2025 •

edited

Loading