Skip to content

chore: Dev to Main merge#766

Merged
Avijit-Microsoft merged 56 commits intomainfrom
dev
Mar 16, 2026
Merged

chore: Dev to Main merge#766
Avijit-Microsoft merged 56 commits intomainfrom
dev

Conversation

@Ragini-Microsoft
Copy link
Collaborator

Purpose

This pull request updates the default image generation model throughout the codebase and documentation from gpt-image-1 to gpt-image-1-mini. The change ensures consistency across deployment scripts, environment variables, and user guides, and reflects the new recommended model for image generation. Existing references to gpt-image-1 are replaced with gpt-image-1-mini, including validation logic and quota guidance.

Deployment and environment configuration updates:

  • Changed the default value and allowed options for image_model_choice in .github/workflows/deploy-orchestrator.yml, .github/workflows/deploy-v2.yml, and .github/workflows/job-deploy.yml to use gpt-image-1-mini instead of gpt-image-1. Validation logic and environment variable assignments were also updated accordingly. [1] [2] [3] [4] [5] [6]
  • Updated content-gen/.env.sample to set AZURE_AI_IMAGE_DEPLOYMENT and AZURE_OPENAI_IMAGE_MODEL defaults to gpt-image-1-mini, and clarified supported models and settings. [1] [2]
  • Modified content-gen/README.md to reflect gpt-image-1-mini as the default image model in the configuration table.

Documentation and user guide improvements:

  • Updated deployment guides (content-gen/docs/AZD_DEPLOYMENT.md, content-gen/docs/DEPLOYMENT.md, content-gen/docs/CustomizingAzdParameters.md) to reference gpt-image-1-mini as the default and recommended image model, including quota requirements, parameter tables, and troubleshooting steps. [1] [2] [3] [4] [5] [6] [7]
  • Revised content-gen/docs/IMAGE_GENERATION.md to describe image generation with gpt-image-1-mini, update diagrams and tables, and clarify environment variable usage. [1] [2] [3] [4]

Troubleshooting and quota guidance:

  • Updated troubleshooting documentation to include gpt-image-1-mini in the list of restricted Azure OpenAI models requiring quota access requests.
  • Adjusted pricing and quota references in the main README.md to indicate the new default model.

These changes collectively ensure that gpt-image-1-mini is the default and recommended image generation model across deployment, configuration, and documentation.

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.

Copy link
Contributor

Copilot AI left a comment

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 updates the default image generation model references to gpt-image-1-mini and adjusts CI/CD + documentation paths to align with a repository structure change (moving away from content-gen/...). It also removes a large legacy/archived archive-doc-gen subtree.

Changes:

  • Switched default image model configuration/documentation from gpt-image-1 to gpt-image-1-mini.
  • Updated GitHub Actions workflows and Dependabot config to use src/, infra/, scripts/, and root-level paths instead of content-gen/....
  • Deleted the archive-doc-gen/ legacy project (code, infra, scripts, docs, and workflows).

Reviewed changes

Copilot reviewed 143 out of 509 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
archive-doc-gen/src/backend/security/ms_defender_utils.py Removed legacy archived backend security utility.
archive-doc-gen/src/backend/history/cosmosdbservice.py Removed legacy archived Cosmos DB history service.
archive-doc-gen/src/backend/helpers/azure_credential_utils.py Removed legacy archived Azure credential helper.
archive-doc-gen/src/backend/auth/sample_user.py Removed legacy archived sample auth headers/test fixture.
archive-doc-gen/src/backend/auth/auth_utils.py Removed legacy archived auth helper.
archive-doc-gen/src/backend/api/agent/template_agent_factory.py Removed legacy archived agent factory implementation.
archive-doc-gen/src/backend/api/agent/section_agent_factory.py Removed legacy archived agent factory implementation.
archive-doc-gen/src/backend/api/agent/browse_agent_factory.py Removed legacy archived agent factory implementation.
archive-doc-gen/src/backend/api/agent/agent_factory_base.py Removed legacy archived agent factory base class.
archive-doc-gen/src/WebApp.Dockerfile Removed legacy archived Dockerfile.
archive-doc-gen/src/TEST_CASE_FLOWS.md Removed legacy archived testing flow doc.
archive-doc-gen/src/SUPPORT.md Removed legacy archived support doc.
archive-doc-gen/src/.gitignore Removed legacy archived gitignore.
archive-doc-gen/src/.env.sample Removed legacy archived env sample.
archive-doc-gen/src/.dockerignore Removed legacy archived dockerignore.
archive-doc-gen/scripts/role_assignment.sh Removed legacy archived deployment helper script.
archive-doc-gen/scripts/readme.md Removed legacy archived scripts documentation.
archive-doc-gen/scripts/quota_check_params.sh Removed legacy archived quota helper script.
archive-doc-gen/scripts/prepdocs.sh Removed legacy archived ingestion script wrapper.
archive-doc-gen/scripts/prepdocs.py Removed legacy archived ingestion script.
archive-doc-gen/scripts/prepdocs.ps1 Removed legacy archived ingestion script wrapper.
archive-doc-gen/scripts/loadenv.sh Removed legacy archived env/bootstrap script.
archive-doc-gen/scripts/loadenv.ps1 Removed legacy archived env/bootstrap script.
archive-doc-gen/scripts/embed_documents.py Removed legacy archived embedding script.
archive-doc-gen/scripts/config.json Removed legacy archived sample config containing subscription-specific values.
archive-doc-gen/scripts/chunk_documents.py Removed legacy archived chunking script.
archive-doc-gen/scripts/checkquota.sh Removed legacy archived quota check script.
archive-doc-gen/scripts/auth_update.sh Removed legacy archived auth update wrapper.
archive-doc-gen/scripts/auth_update.py Removed legacy archived Graph redirect URI updater.
archive-doc-gen/scripts/auth_update.ps1 Removed legacy archived auth update wrapper.
archive-doc-gen/scripts/auth_init.sh Removed legacy archived auth init wrapper.
archive-doc-gen/scripts/auth_init.py Removed legacy archived auth init script.
archive-doc-gen/scripts/auth_init.ps1 Removed legacy archived auth init wrapper.
archive-doc-gen/scripts/SAMPLE_DATA.md Removed legacy archived sample data guide.
archive-doc-gen/infra/vscode_web/requirements.txt Removed legacy archived VS Code web infra requirements.
archive-doc-gen/infra/vscode_web/endpointCodeSample.py Removed legacy archived code sample.
archive-doc-gen/infra/vscode_web/codeSample.py Removed legacy archived code sample.
archive-doc-gen/infra/scripts/run_create_index_scripts.sh Removed legacy archived infra script.
archive-doc-gen/infra/scripts/package_webapp.sh Removed legacy archived packaging script.
archive-doc-gen/infra/scripts/package_webapp.ps1 Removed legacy archived packaging script.
archive-doc-gen/infra/scripts/index_scripts/requirements.txt Removed legacy archived index script requirements.
archive-doc-gen/infra/scripts/index_scripts/02_process_data.py Removed legacy archived index processing script.
archive-doc-gen/infra/scripts/index_scripts/01_create_search_index.py Removed legacy archived index creation script.
archive-doc-gen/infra/scripts/copy_kb_files.sh Removed legacy archived blob copy script.
archive-doc-gen/infra/scripts/add_cosmosdb_access.sh Removed legacy archived Cosmos role assignment script.
archive-doc-gen/infra/modules/web-sites.config.bicep Removed legacy archived Bicep module.
archive-doc-gen/infra/modules/role-assignment.bicep Removed legacy archived Bicep module.
archive-doc-gen/infra/modules/deploy_aifp_aisearch_connection.bicep Removed legacy archived Bicep module.
archive-doc-gen/infra/modules/ai-services-deployments.bicep Removed legacy archived Bicep module.
archive-doc-gen/infra/modules/ai-project.bicep Removed legacy archived Bicep module.
archive-doc-gen/infra/main.waf.parameters.json Removed legacy archived parameters file.
archive-doc-gen/infra/main.parameters.json Removed legacy archived parameters file.
archive-doc-gen/docs/re-use-log-analytics.md Removed legacy archived documentation.
archive-doc-gen/docs/re-use-foundry-project.md Removed legacy archived documentation.
archive-doc-gen/docs/create_new_app_registration.md Removed legacy archived documentation.
archive-doc-gen/docs/container_registry_migration.md Removed legacy archived documentation.
archive-doc-gen/docs/TRANSPARENCY_FAQ.md Removed legacy archived documentation.
archive-doc-gen/docs/SampleQuestions.md Removed legacy archived documentation.
archive-doc-gen/docs/QuotaCheck.md Removed legacy archived documentation.
archive-doc-gen/docs/PowershellSetup.md Removed legacy archived documentation.
archive-doc-gen/docs/LogAnalyticsReplicationDisable.md Removed legacy archived documentation.
archive-doc-gen/docs/DeleteResourceGroup.md Removed legacy archived documentation.
archive-doc-gen/docs/CustomizingAzdParameters.md Removed legacy archived documentation.
archive-doc-gen/docs/AzureSemanticSearchRegion.md Removed legacy archived documentation.
archive-doc-gen/docs/AzureGPTQuotaSettings.md Removed legacy archived documentation.
archive-doc-gen/docs/AzureAccountSetUp.md Removed legacy archived documentation.
archive-doc-gen/docs/AppAuthentication.md Removed legacy archived documentation.
archive-doc-gen/docs/ACRBuildAndPushGuide.md Removed legacy archived documentation.
archive-doc-gen/azure_custom.yaml Removed legacy archived AZD config.
archive-doc-gen/azure.yaml Removed legacy archived AZD config.
archive-doc-gen/app-azure.yaml Removed legacy archived AZD config.
archive-doc-gen/SUPPORT.md Removed legacy archived support doc.
archive-doc-gen/SECURITY.md Removed legacy archived security policy doc.
archive-doc-gen/LICENSE Removed legacy archived license file.
archive-doc-gen/CONTRIBUTING.md Removed legacy archived contributing guide.
archive-doc-gen/CODE_OF_CONDUCT.md Removed legacy archived code of conduct.
archive-doc-gen/.vscode/settings.json Removed legacy archived VS Code settings.
archive-doc-gen/.vscode/launch.json Removed legacy archived VS Code launch config.
archive-doc-gen/.gitignore Removed legacy archived gitignore.
archive-doc-gen/.github/workflows/tests.yml Removed legacy archived test workflow.
archive-doc-gen/.github/workflows/test-automation.yml Removed legacy archived test automation workflow.
archive-doc-gen/.github/workflows/test-automation-v2.yml Removed legacy archived test automation workflow.
archive-doc-gen/.github/workflows/telemetry-template-check.yml Removed legacy archived telemetry workflow.
archive-doc-gen/.github/workflows/stale-bot.yml Removed legacy archived stale bot workflow.
archive-doc-gen/.github/workflows/python-app.yml Removed legacy archived python workflow.
archive-doc-gen/.github/workflows/pylint.yml Removed legacy archived pylint workflow.
archive-doc-gen/.github/workflows/pr-title-checker.yml Removed legacy archived PR title checker.
archive-doc-gen/.github/workflows/node.js.yml Removed legacy archived node workflow.
archive-doc-gen/.github/workflows/job-docker-build.yml Removed legacy archived docker-build job workflow.
archive-doc-gen/.github/workflows/job-cleanup-deployment.yml Removed legacy archived cleanup job workflow.
archive-doc-gen/.github/workflows/docker-build-and-push.yml Removed legacy archived docker CI workflow.
archive-doc-gen/.github/workflows/deploy-windows.yml Removed legacy archived deploy workflow.
archive-doc-gen/.github/workflows/deploy-orchestrator.yml Removed legacy archived orchestrator workflow.
archive-doc-gen/.github/workflows/create-release.yml Removed legacy archived release workflow.
archive-doc-gen/.github/workflows/broken-links-checker.yml Removed legacy archived broken-links workflow.
archive-doc-gen/.github/workflows/azure-dev.yml Removed legacy archived template validation workflow.
archive-doc-gen/.github/workflows/Scheduled-Dependabot-PRs-Auto-Merge.yml Removed legacy archived dependabot auto-merge workflow.
archive-doc-gen/.github/pull_request_template.md Removed legacy archived PR template.
archive-doc-gen/.github/dependabot.yml Removed legacy archived dependabot config.
archive-doc-gen/.github/ISSUE_TEMPLATE/subtask.md Removed legacy archived issue template.
archive-doc-gen/.github/ISSUE_TEMPLATE/feature_request.md Removed legacy archived issue template.
archive-doc-gen/.github/ISSUE_TEMPLATE/bug_report.md Removed legacy archived issue template.
archive-doc-gen/.github/CODEOWNERS Removed legacy archived codeowners.
archive-doc-gen/.gitattributes Removed legacy archived gitattributes.
archive-doc-gen/.flake8 Removed legacy archived flake8 config.
archive-doc-gen/.devcontainer/setup_env.sh Removed legacy archived devcontainer setup script.
archive-doc-gen/.devcontainer/devcontainer.json Removed legacy archived devcontainer config.
archive-doc-gen/.azdo/pipelines/azure-dev.yml Removed legacy archived AzDO pipeline.
README.md Updated links/sections and documentation references; updated default image model mention to gpt-image-1-mini.
.github/workflows/test.yml Updated test workflow paths from content-gen/... to src/....
.github/workflows/test-automation-v2.yml Updated E2E workflow paths from content-gen/... to tests/....
.github/workflows/telemetry-template-check.yml Updated telemetry check to target root azure.yaml instead of content-gen/azure.yaml.
.github/workflows/pylint.yml Updated lint workflow paths from content-gen/... to src/....
.github/workflows/job-docker-build.yml Updated docker build contexts/files from content-gen/... to src/....
.github/workflows/job-deploy.yml Updated default image model choice to gpt-image-1-mini and adjusted quota-check script path.
.github/workflows/job-deploy-windows.yml Updated parameter file copy paths; removed content-gen directory change.
.github/workflows/job-deploy-linux.yml Updated parameter file copy paths; removed content-gen directory change.
.github/workflows/docker-build.yml Updated docker build workflow paths from content-gen/... to src/....
.github/workflows/deploy-v2.yml Updated workflow path filters and image model defaults to gpt-image-1-mini.
.github/workflows/deploy-orchestrator.yml Updated image model input description/default to gpt-image-1-mini.
.github/workflows/azure-dev.yml Added push-to-main trigger, production environment, and Azure login step; changed template validation working directory.
.github/dependabot.yml Updated Dependabot directories from content-gen/... to new root paths.
.env.sample Updated image model defaults and comments to gpt-image-1-mini.
Files not reviewed (1)
  • archive-doc-gen/package-lock.json: Language not supported

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

You can also share your feedback on Copilot code review. Take the survey.

@Avijit-Microsoft Avijit-Microsoft merged commit 4bf7bd6 into main Mar 16, 2026
17 checks passed
@github-actions
Copy link
Contributor

🎉 This PR is included in version 2.3.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants