fix: merging dev to main #747

Roopan-Microsoft · 2025-11-17T05:22:10Z

Purpose

This pull request introduces a new azure_custom.yaml configuration file and makes several infrastructure improvements and bug fixes to the Bicep deployment scripts and documentation. The main focus is on streamlining Azure container deployment, updating resource naming conventions, improving security, and aligning API endpoints and variables with current Azure AI Services standards.

Infrastructure automation and deployment:

Added azure_custom.yaml with comprehensive hooks for pre-package, pre-deploy, post-provision, and post-deploy steps, automating container registry setup, image build/push, web app configuration, and managed identity assignments for both Windows and POSIX environments.

Azure AI Services and resource configuration:

Updated references from azureOpenaiAPIVersion to azureAIServicesAPIVersion and replaced endpoint lookups from aiFoundryAiServices.outputs.endpoints['OpenAI Language Model Instance API'] to aiFoundryAiServices.outputs.endpoint throughout the Bicep scripts, ensuring compatibility with Azure AI Services. [1] [2] [3]
Added support for the new AZURE-AI-AGENT-ENDPOINT environment variable and its propagation through Key Vault and web app configuration. [1] [2]

Security and resource naming:

Set allowBlobPublicAccess to false for storage accounts to improve security, and standardized Key Vault naming to lowercase (kv-...). [1] [2]

Private DNS zone and scalability fixes:

Removed legacy OpenAI private DNS zone references, updated DNS zone indices, and fixed web server farm scalability to always use skuCapacity: 1 to prevent excessive agent creation during WAF deployment. [1] [2] [3] [4]

Documentation updates:

Added instructions for deploying local changes by renaming configuration and Bicep files, and clarified sample question response times. [1] [2]

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

Added a note about average response time and formatted the document. Co-authored-by: Prajwal-Microsoft <[email protected]>

…bicep

…arity

* DataRefreshLogic * pylint * pylintfix * fix

…rrect agent handling

fix: reduced the replica instance count to 1 for WAF version

fix: Updated Naming convention in Process_Sample_data file

* custom templates for developer experience * updated azure_custom.yaml * updated readme * updated template name * updated keyvault prefix to lower case * changes suggested by copilot * main.json

…for index_script

…for index_script and dev script

…file

Copilot

Pull Request Overview

This pull request migrates the codebase from direct Azure OpenAI SDK usage to the Azure AI Projects SDK, standardizes infrastructure resource naming conventions, improves deployment automation, and enhances security configurations. The changes align API endpoints, configuration variables, and test infrastructure with Azure AI Services standards while introducing a new developer-friendly custom deployment workflow.

Key changes:

Migrated from AsyncAzureOpenAI to AIProjectClient for AI service interactions across the application and test suites
Standardized API version parameter naming from azureOpenaiAPIVersion to azureAIServicesAPIVersion and updated endpoint references to use simplified outputs.endpoint instead of indexed dictionary access
Added azure_custom.yaml with comprehensive deployment automation hooks and introduced main_custom.bicep for developer-focused deployments with custom ACR configuration

Reviewed Changes

Copilot reviewed 20 out of 20 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
src/App/tests/test_app.py	Updated tests to use `init_ai_projects_client` instead of `init_openai_client` with mocked AIProjectClient
src/App/tests/backend/plugins/test_chat_with_data_plugin.py	Added test for `get_project_openai_client` method with AIProjectClient mocking
src/App/requirements.txt	Removed direct `openai` package dependency (moved to dev dependencies)
src/App/requirements-dev.txt	Added `azure-ai-projects` and `azure-ai-inference` packages for development and testing
src/App/backend/services/sqldb_service.py	Fixed data retrieval logic to re-query after sample data update
src/App/backend/plugins/chat_with_data_plugin.py	Removed deprecated `get_openai_client` method and import cleanup
src/App/backend/common/config.py	Reorganized AI Project Client configuration section to appear before AOAI settings
src/App/app.py	Refactored client initialization to use AIProjectClient with `get_openai_client()` method
infra/scripts/process_sample_data.sh	Enhanced deployment output parsing with fallback logic for multiple naming conventions
infra/scripts/index_scripts/requirements.txt	Added Azure AI Projects SDK dependencies for index creation scripts
infra/scripts/index_scripts/create_search_index.py	Migrated embedding generation to use AIProjectClient instead of direct AzureOpenAI client
infra/modules/dependencies.bicep	Removed unused OpenAI Contributor and OpenAI User role definitions
infra/main_custom.bicep	Added new developer-friendly Bicep template with custom ACR support and user permissions for local debugging
infra/main.waf.parameters.json	Renamed parameter from `deploymentType`/`azureOpenaiAPIVersion` to `gptModelDeploymentType`/`azureAIServicesAPIVersion`
infra/main.parameters.json	Updated parameter reference to use `azureAIServicesAPIVersion`
infra/main.json	Compiled ARM template reflecting parameter renames, endpoint changes, DNS zone updates, and security improvements
infra/main.bicep	Updated parameter naming, removed legacy OpenAI DNS zone, simplified endpoint references, fixed Key Vault naming, and improved storage security
docs/SampleQuestions.md	Added note about average response time of 8-30 seconds
docs/DeploymentGuide.md	Added instructions for deploying local changes using custom configuration files
azure_custom.yaml	New deployment configuration with automated hooks for ACR setup, container build/push, and web app configuration

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

src/App/tests/backend/plugins/test_chat_with_data_plugin.py

infra/main_custom.bicep

src/App/requirements-dev.txt

docs/DeploymentGuide.md

src/App/app.py

fix: Enable Key Vault while running post deployment script

…st meetings” (#751) * docs: merge from dev to main Samplequestion (#737) * Update SampleQuestions.md with response time note (#736) Added a note about average response time and formatted the document. Co-authored-by: Prajwal-Microsoft <[email protected]> * fix: update API version to 2025-04-01 and adjust skuCapacity in main.bicep * fix: rename deploymentType parameter to gptModelDeploymentType for clarity * fix: Re-query data after updating sample data to refresh rows (#739) * DataRefreshLogic * pylint * pylintfix * fix * fix: clarify skuCapacity comment in main.bicep for WAF deployment * fix: update skuCapacity configuration for WAF deployment to ensure correct agent handling --------- Co-authored-by: Prajwal-Microsoft <[email protected]> Co-authored-by: Pavan-Microsoft <[email protected]> Co-authored-by: UtkarshMishra-Microsoft <[email protected]> * Add disclaimer for AI solutions in README (#741) Added a disclaimer about AI solutions and compliance. * fix v1 * code cleanup * Remove README changes - reset to dev version --------- Co-authored-by: Prajwal-Microsoft <[email protected]> Co-authored-by: Thanusree-Microsoft <[email protected]> Co-authored-by: Pavan-Microsoft <[email protected]> Co-authored-by: UtkarshMishra-Microsoft <[email protected]>

…nd add assign_sql_roles.py script

fix: FDPO Windows SQL Server interactive auth issue

* custom templates for developer experience * updated azure_custom.yaml * updated readme * updated template name * updated keyvault prefix to lower case * changes suggested by copilot * main.json * updated the approach * updated main_custom.bicep * added comment

…ilot-Solution-Accelerator into dev

github-actions · 2025-11-25T12:04:44Z

🎉 This PR is included in version 1.10.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

NirajC-Microsoft and others added 29 commits November 4, 2025 12:03

Remove OpenAI API call from app.py

4f36121

resolve pylint issues in app.py

89b7912

update test_app.py file for init_openai method

f033e81

update app.py to pass test file

6887b78

Fix for test file

6189680

disable soft delete

c1325e8

fetch upload/download data from block storage instead of data lake

20b125b

remove unnecessary flags

ea2c82a

Remove OpenAI API call reference from chat_with_data_plugin.py file

d2e4731

Remove unuse imports

e1176ce

Update SampleQuestions.md with response time note (#736)

5a71a5f

Added a note about average response time and formatted the document. Co-authored-by: Prajwal-Microsoft <[email protected]>

remove openai from requirements.txt

7910fed

updated test file

32d2ce4

fix: update API version to 2025-04-01 and adjust skuCapacity in main.…

797ea8b

…bicep

fix: rename deploymentType parameter to gptModelDeploymentType for cl…

52e6cd6

…arity

fix: Re-query data after updating sample data to refresh rows (#739)

3cddee5

* DataRefreshLogic * pylint * pylintfix * fix

fix: clarify skuCapacity comment in main.bicep for WAF deployment

e38bdff

fix: update skuCapacity configuration for WAF deployment to ensure co…

f09167f

…rrect agent handling

Merge pull request #738 from microsoft/psl-pk-scaleinstance

9bd4885

fix: reduced the replica instance count to 1 for WAF version

Infra changes for OpenAI API call replacement

4e14e12

refactor: Replace OpenAI API call with Foundry SDK

185aa7b

revert changes

5667d76

revert changes - 1

bfe8a21

add logic for both avm and bicep deployment

fc45156

Merge pull request #734 from microsoft/psl-bug-25896

d7d7f6c

fix: Updated Naming convention in Process_Sample_data file

feat: Enhance Developer Experience Support in Client Advisor (#735)

63d756d

* custom templates for developer experience * updated azure_custom.yaml * updated readme * updated template name * updated keyvault prefix to lower case * changes suggested by copilot * main.json

Add azure-ai-projects and azure-ai-inference to requirement.txt fine …

8c73dac

…for index_script

Add azure-ai-projects and azure-ai-inference to requirement.txt fine …

c10f3ba

…for index_script and dev script

fix: Add azure-ai-projects and azure-ai-inference to requirement.txt …

ea5a2e5

…file

Copilot AI review requested due to automatic review settings November 17, 2025 05:22

Roopan-Microsoft requested review from Avijit-Microsoft, Prajwal-Microsoft, Vinay-Microsoft and aniaroramsft as code owners November 17, 2025 05:22

Copilot started reviewing on behalf of Roopan-Microsoft November 17, 2025 05:22 View session

Copilot finished reviewing on behalf of Roopan-Microsoft November 17, 2025 05:26

Copilot AI reviewed Nov 17, 2025

View reviewed changes

NirajC-Microsoft and others added 7 commits November 17, 2025 15:18

Enable Key Vault while running post deployment script

5023139

Merge pull request #749 from microsoft/psl-fixpostdeployment-script1

8d4298e

fix: Enable Key Vault while running post deployment script

feat: Centralize SQL role assignment in run_create_index_scripts.sh a…

cb66abc

…nd add assign_sql_roles.py script

Removed pre-requisite sqlcmd installation from Deployment Guide

eabb739

Merge pull request #753 from microsoft/psl-fdpobugfix

059dfa7

fix: FDPO Windows SQL Server interactive auth issue

Roopan-Microsoft requested review from nchandhi and toherman-msft as code owners November 25, 2025 07:29

Kanchan-Microsoft added 4 commits November 25, 2025 17:03

resolved conflicts (#763)

040483c

Merge branch 'main' into dev

6a0a6bb

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

f30300b

…ilot-Solution-Accelerator into dev

regenerated main.json

b0e4265

Prajwal-Microsoft approved these changes Nov 25, 2025

View reviewed changes

Prajwal-Microsoft merged commit 67204d7 into main Nov 25, 2025
13 of 14 checks passed

github-actions bot added the released label Nov 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: merging dev to main #747

fix: merging dev to main #747

Uh oh!

Roopan-Microsoft commented Nov 17, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Nov 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

fix: merging dev to main #747

fix: merging dev to main #747

Uh oh!

Conversation

Roopan-Microsoft commented Nov 17, 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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Nov 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Roopan-Microsoft commented Nov 17, 2025 •

edited

Loading