Skip to content

fix: Merge the changes from dev to main - #322

Merged
Prajwal-Microsoft merged 13 commits into
mainfrom
dev
Aug 2, 2026
Merged

Prajwal-Microsoft merged 13 commits into
mainfrom
dev

Conversation

@gpickett

Copy link
Copy Markdown
Contributor

Purpose

  • ...

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

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR primarily standardizes product/service naming across the solution accelerator to reflect current Azure branding (e.g., Azure AI Foundry, Azure OpenAI, Azure Cosmos DB, Microsoft Entra ID), alongside a small dependency update and some infra/script/documentation adjustments.

Changes:

  • Update docs, comments, and log messages across chat/scenario apps and infra to use Azure AI Foundry / Azure OpenAI / Azure Cosmos DB / Microsoft Entra ID terminology.
  • Bump pydantic-settings to 2.14.2 in both backends.
  • Add/update deployment and post-provision scripts/templates and Docker ignore rules; remove two legacy planning docs.

Reviewed changes

Copilot reviewed 72 out of 74 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
scenario-app/frontend/src/lib/api.ts Updates voice-message API docstring wording to “Azure Cosmos DB”.
scenario-app/frontend/LOCAL_AUTH_SETUP.md Updates portal navigation wording to “Microsoft Entra ID”.
scenario-app/backend/requirements.txt Bumps pydantic-settings patch version.
scenario-app/backend/README.md Rebrands Cosmos DB references and related wording throughout backend README.
scenario-app/backend/app/utils/voice_utils.py Clarifies “Azure OpenAI realtime voice names” in comment.
scenario-app/backend/app/simple_foundry_orchestrator.py Rebrands “OpenAI client” wording to “Azure OpenAI client”.
scenario-app/backend/app/routers/chat.py Rebrands Cosmos DB mentions in docstrings/comments.
scenario-app/backend/app/plugins/product_plugin.py Rebrands Cosmos/AI Search mentions in docstrings and descriptions.
scenario-app/backend/app/plugins/orders_plugin.py Rebrands Cosmos DB mention in class docstring.
scenario-app/backend/app/list_assistants.py Rebrands “OpenAI client” log/comment wording.
scenario-app/backend/app/database.py Rebrands Cosmos DB fallback log message.
scenario-app/backend/app/create_assistants.py Rebrands “OpenAI client” log/comment wording.
scenario-app/backend/app/cosmos_service.py Rebrands Cosmos DB references in docstrings/logs/error messages.
scenario-app/backend/app/config.py Rebrands comment about Cosmos DB configuration.
scenario-app/backend/app/agent_instructions.py Rebrands tool descriptions mentioning AI Search/Cosmos DB.
scenario-app/backend/.dockerignore Expands ignore list (env files, caches, venvs, markdown).
README.md Rebrands solution overview text to “Azure AI Foundry” and related wording.
infra/scripts/post-provision/data_scripts/run_upload_data_scripts.sh Rebrands console output/messages for Cosmos DB/AI Foundry/AI Search.
infra/scripts/post-provision/data_scripts/run_upload_data_scripts.ps1 Rebrands console output/messages for Cosmos DB/AI Foundry/AI Search.
infra/scripts/post-provision/data_scripts/03_write_products_to_cosmos.py Rebrands print statements/comments for Azure Cosmos DB.
infra/scripts/post-provision/agent_scripts/run_create_agents_scripts.sh Rebrands console output/messages for Azure AI Foundry/OpenAI/Search.
infra/scripts/post-provision/agent_scripts/run_create_agents_scripts.ps1 Rebrands console output/messages for Azure AI Foundry.
infra/scripts/post-provision/agent_scripts/01_create_agents.py Rebrands exception message for Azure AI Search connection.
infra/main.json Updates generated ARM template metadata and various descriptions/strings.
infra/main.bicep Rebrands parameter/output descriptions; minor formatting change to tags.
infra/bicep/modules/identity/role-assignments.bicep Rebrands comments/descriptions around roles/services.
infra/bicep/modules/data/postgresql-flexible-server.bicep Rebrands “Azure AD administrators” to “Microsoft Entra ID administrators”.
infra/bicep/modules/data/cosmos-db-nosql.bicep Rebrands module descriptions; strongly-types containers parameter.
infra/bicep/modules/data/cosmos-db-mongo.bicep Rebrands module descriptions and output descriptions.
infra/bicep/modules/ai/existing-project-setup.bicep Rebrands module descriptions/output descriptions.
infra/bicep/modules/ai/ai-search.bicep Rebrands module descriptions/output descriptions.
infra/bicep/modules/ai/ai-search-identity.bicep Rebrands module descriptions/output descriptions.
infra/bicep/modules/ai/ai-foundry-project.bicep Rebrands module descriptions/output descriptions.
infra/bicep/modules/ai/ai-foundry-connection.bicep Rebrands module descriptions/parameter descriptions.
infra/bicep/main.json Updates generated template strings/descriptions (includes project endpoint access).
infra/bicep/main.bicep Rebrands parameter/output descriptions.
infra/avm/modules/identity/role-assignments.bicep Rebrands comments/descriptions around roles/services.
infra/avm/modules/identity/cross-scope-role-assignment.bicep Rebrands parameter description for Azure AI Foundry account name.
infra/avm/modules/data/postgresql-flexible-server.bicep Rebrands “Azure AD administrators” to “Microsoft Entra ID administrators”.
infra/avm/modules/data/cosmos-db-nosql.bicep Rebrands module descriptions; types containers; defaults privateEndpoints; adjusts module input typing.
infra/avm/modules/data/cosmos-db-mongo.bicep Rebrands module descriptions and output descriptions.
infra/avm/modules/compute/container-registry.bicep Rebrands “Azure AD authentication…” to “Microsoft Entra ID authentication…”.
infra/avm/modules/ai/existing-project-setup.bicep Rebrands module/output descriptions; rebrands project endpoint description.
infra/avm/modules/ai/ai-search.bicep Rebrands module descriptions/output descriptions.
infra/avm/modules/ai/ai-foundry-project.bicep Rebrands module descriptions/output descriptions.
infra/avm/modules/ai/ai-foundry-connection.bicep Rebrands module descriptions/parameter descriptions.
infra/avm/main.bicep Rebrands parameter/output descriptions.
documents/TroubleShootingSteps.md Rebrands Azure AD → Microsoft Entra ID and other related wording.
documents/TechnicalArchitecture.md Minor formatting tweak (heading spacing).
documents/LocalDevelopmentSetup.md Rebrands referenced services for local dev setup guidance.
documents/DeploymentGuide.md Rebrands references to AI Foundry and Microsoft Entra ID in deployment guide.
documents/customer-chatbot-product-roadmap.md Removes legacy roadmap doc.
documents/embeddable-chat-widget-technical-plan.md Removes legacy technical plan doc.
documents/AVMPostDeploymentGuide.md Rebrands “Create AI Foundry Agents” wording.
documents/AppAuthentication.md Fixes “Microsoft Entra ID” capitalization in instructions.
chat-app/frontend/src/lib/api.ts Reorders import and rebrands voice-message docstring wording.
chat-app/frontend/LOCAL_AUTH_SETUP.md Updates portal navigation wording to “Microsoft Entra ID”.
chat-app/backend/requirements.txt Bumps pydantic-settings patch version.
chat-app/backend/README.md Rebrands AI Search/Azure AD/Cosmos DB mentions.
chat-app/backend/app/utils/voice_utils.py Clarifies “Azure OpenAI realtime voice names” in comment.
chat-app/backend/app/simple_foundry_orchestrator.py Rebrands “OpenAI client” wording to “Azure OpenAI client”.
chat-app/backend/app/routers/chat.py Rebrands Cosmos DB mention in docstring.
chat-app/backend/app/routers/auth.py Rebrands Cosmos DB mention in log/comment.
chat-app/backend/app/plugins/orders_plugin.py Rebrands Cosmos DB mention in class docstring.
chat-app/backend/app/list_assistants.py Rebrands “OpenAI client” log/comment wording.
chat-app/backend/app/database.py Rebrands Cosmos DB error strings/comments.
chat-app/backend/app/create_assistants.py Rebrands “OpenAI client” log/comment wording.
chat-app/backend/app/cosmos_service.py Rebrands Cosmos DB references in docstrings/logs/error messages.
chat-app/backend/app/agent_instructions.py Rebrands tool descriptions mentioning AI Search/Cosmos DB.
chat-app/backend/.dockerignore Adds ignore rules for env files, caches, venvs, markdown.
azure.yaml Rebrands post-provision instructions for Azure AI Foundry.
.github/workflows/job-post-deploy.yml Rebrands workflow log output for Azure Cosmos DB / Azure AI Foundry.
.github/workflows/deploy.yml Rebrands workflow log output for Azure OpenAI / Azure AI Search.
Comments suppressed due to low confidence (1)

infra/bicep/main.json:924

  • Same endpoint-key issue as above: this reference uses endpoints['Azure AI Foundry API'] but other templates/modules in the repo use endpoints['AI Foundry API']. If the runtime property map doesn't contain the renamed key, deployments will fail when evaluating outputs.

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

Comment thread infra/bicep/main.json
Comment thread chat-app/backend/app/cosmos_service.py
chore: Reverted unwanted change & regenerated main.json file
Copilot AI review requested due to automatic review settings August 2, 2026 06:11
@Prajwal-Microsoft Prajwal-Microsoft changed the title Dev fix: Merge the changes from dev to main Aug 2, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 73 out of 74 changed files in this pull request and generated no new comments.

Suppressed comments (4)

infra/bicep/main.json:804

  • projectEndpoint is now reading endpoints['Azure AI Foundry API'], but the Bicep modules and other generated templates in this repo still reference endpoints['AI Foundry API']. If the endpoint key remains AI Foundry API in the ARM payload, this will cause deployment output evaluation to fail with a missing key.
    infra/bicep/main.json:924
  • Same issue as above: projectEndpoint is using endpoints['Azure AI Foundry API'] here, but the rest of the repo expects endpoints['AI Foundry API']. This mismatch is likely to break deployments when projectEndpoint is consumed.
    infra/main.bicep:124
  • The parameter name is azureOpenaiAPIVersion and the rest of the template uses AZURE_OPENAI_API_VERSION, but the description was changed to "OpenAI API version". That wording is ambiguous (could be interpreted as non-Azure OpenAI) and is inconsistent with the rest of the template naming.
    infra/bicep/main.bicep:117
  • Same ambiguity as in infra/main.bicep: the azureOpenaiAPIVersion parameter description now says "OpenAI API version" even though the template wiring uses Azure OpenAI settings. Keeping "Azure OpenAI" in the description avoids confusion for deployers.

@Prajwal-Microsoft
Prajwal-Microsoft merged commit 6de470d into main Aug 2, 2026
12 of 14 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.

6 participants