Skip to content

Commit dad2615

Browse files
Kanchan-MicrosoftKanchan-Microsoft
committed
Merge branch 'dev' into psl-bug-36267
2 parents 997ac56 + 721884f commit dad2615

37 files changed

+2788
-1781
lines changed

‎.env.sample‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ USE_FOUNDRY=false
1616
# Format: https://<project-name>.services.ai.azure.com
1717
AZURE_AI_PROJECT_ENDPOINT=
1818

19-
# Image model deployment name in Foundry (e.g., gpt-image-1)
20-
AZURE_AI_IMAGE_DEPLOYMENT=gpt-image-1
19+
# Image model deployment name in Foundry (e.g., gpt-image-1-mini)
20+
AZURE_AI_IMAGE_DEPLOYMENT=gpt-image-1-mini
2121

2222
# =============================================================================
2323
# Azure OpenAI Configuration
@@ -31,14 +31,14 @@ AZURE_OPENAI_ENDPOINT=https://your-openai.openai.azure.com/
3131
AZURE_OPENAI_GPT_MODEL=gpt-5.1
3232

3333
# Image Generation Model Configuration
34-
# Supported models: gpt-image-1 or gpt-image-1.5
35-
AZURE_OPENAI_IMAGE_MODEL=gpt-image-1
34+
# Supported models: gpt-image-1-mini or gpt-image-1.5
35+
AZURE_OPENAI_IMAGE_MODEL=gpt-image-1-mini
3636

37-
# For gpt-image-1 or gpt-image-1.5, the endpoint is the same as the main OpenAI endpoint, but you can specify a different one if needed
37+
# For gpt-image-1-mini or gpt-image-1.5, the endpoint is the same as the main OpenAI endpoint, but you can specify a different one if needed
3838
AZURE_OPENAI_GPT_IMAGE_ENDPOINT=https://your-openai.openai.azure.com
3939

4040
# Image generation settings
41-
# For gpt-image-1/1.5: sizes are 1024x1024, 1536x1024, 1024x1536, auto; quality is low, medium, high, auto
41+
# For gpt-image-1-mini/1.5: sizes are 1024x1024, 1536x1024, 1024x1536, auto; quality is low, medium, high, auto
4242
AZURE_OPENAI_IMAGE_SIZE=1024x1024
4343
AZURE_OPENAI_IMAGE_QUALITY=medium
4444

‎.github/workflows/deploy-orchestrator.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ on:
6262
required: true
6363
type: string
6464
image_model_choice:
65-
description: 'Image model to deploy (gpt-image-1, gpt-image-1.5, none)'
65+
description: 'Image model to deploy (gpt-image-1-mini, gpt-image-1.5, none)'
6666
required: false
67-
default: 'gpt-image-1'
67+
default: 'gpt-image-1-mini'
6868
type: string
6969

7070
env:

‎.github/workflows/deploy-v2.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ on:
103103
image_model_choice:
104104
description: 'Image Model to Deploy'
105105
required: false
106-
default: 'gpt-image-1'
106+
default: 'gpt-image-1-mini'
107107
type: choice
108108
options:
109-
- 'gpt-image-1'
109+
- 'gpt-image-1-mini'
110110
- 'gpt-image-1.5'
111111
- 'none'
112112

@@ -307,8 +307,8 @@ jobs:
307307
echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
308308
309309
# Validate and output image_model_choice
310-
IMAGE_MODEL="${INPUT_IMAGE_MODEL_CHOICE:-gpt-image-1}"
311-
ALLOWED_MODELS=("gpt-image-1" "gpt-image-1.5" "none")
310+
IMAGE_MODEL="${INPUT_IMAGE_MODEL_CHOICE:-gpt-image-1-mini}"
311+
ALLOWED_MODELS=("gpt-image-1-mini" "gpt-image-1.5" "none")
312312
if [[ ! " ${ALLOWED_MODELS[@]} " =~ " ${IMAGE_MODEL} " ]]; then
313313
echo "❌ ERROR: image_model_choice '$IMAGE_MODEL' is invalid. Allowed: ${ALLOWED_MODELS[*]}"
314314
exit 1
@@ -333,5 +333,5 @@ jobs:
333333
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_ai_project_resource_id || '' }}
334334
existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
335335
trigger_type: ${{ github.event_name }}
336-
image_model_choice: ${{ needs.validate-inputs.outputs.image_model_choice || 'gpt-image-1' }}
336+
image_model_choice: ${{ needs.validate-inputs.outputs.image_model_choice || 'gpt-image-1-mini' }}
337337
secrets: inherit

‎.github/workflows/job-deploy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ on:
6767
default: ''
6868
type: string
6969
image_model_choice:
70-
description: 'Image model to deploy (gpt-image-1, gpt-image-1.5, none)'
70+
description: 'Image model to deploy (gpt-image-1-mini, gpt-image-1.5, none)'
7171
required: false
72-
default: 'gpt-image-1'
72+
default: 'gpt-image-1-mini'
7373
type: string
7474
outputs:
7575
RESOURCE_GROUP_NAME:
@@ -334,7 +334,7 @@ jobs:
334334
env:
335335
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
336336
GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
337-
IMAGE_MODEL_CHOICE: ${{ inputs.image_model_choice || 'gpt-image-1' }}
337+
IMAGE_MODEL_CHOICE: ${{ inputs.image_model_choice || 'gpt-image-1-mini' }}
338338
IMAGE_MODEL_MIN_CAPACITY: ${{ env.IMAGE_MODEL_MIN_CAPACITY }}
339339
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
340340
run: |

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ _Note: This is not meant to outline all costs as selected SKUs, scaled use, cust
111111
|---|---|---|
112112
| [Azure AI Foundry](https://learn.microsoft.com/en-us/azure/ai-foundry/) | Free tier. Build generative AI applications on an enterprise-grade platform. | [Pricing](https://azure.microsoft.com/pricing/details/ai-studio/) |
113113
| [Azure Storage Account](https://learn.microsoft.com/en-us/azure/storage/blobs/) | Standard tier, LRS. Pricing is based on storage and operations. Blob storage for product images and generated content. | [Pricing](https://azure.microsoft.com/pricing/details/storage/blobs/) |
114-
| [Azure AI Services](https://learn.microsoft.com/en-us/azure/ai-services/) | S0 tier, defaults to gpt-5.1 (GPT) and gpt-image-1 models. Pricing is based on token count. | [Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/) |
114+
| [Azure AI Services](https://learn.microsoft.com/en-us/azure/ai-services/) | S0 tier, defaults to gpt-5.1 (GPT) and gpt-image-1-mini models. Pricing is based on token count. | [Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/) |
115115
| [Azure Container Instance](https://learn.microsoft.com/en-us/azure/container-instances/) | Backend API hosting with private VNet integration. Pricing is based on resource allocation. | [Pricing](https://azure.microsoft.com/pricing/details/container-instances/) |
116116
| [Azure App Service](https://learn.microsoft.com/en-us/azure/app-service/) | B1 tier. Frontend hosting with Node.js proxy server. | [Pricing](https://azure.microsoft.com/pricing/details/app-service/) |
117117
| [Azure Container Registry](https://learn.microsoft.com/en-us/azure/container-registry/) | Basic tier. Build, store, and manage container images and artifacts in a private registry for all types of container deployments | [Pricing](https://azure.microsoft.com/pricing/details/container-registry/) |

‎docs/AZD_DEPLOYMENT.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ This guide covers deploying the Content Generation Solution Accelerator using Az
3838

3939
- An Azure subscription with the following permissions:
4040
- Create Resource Groups
41-
- Deploy Azure AI Services (GPT-5.1, GPT-Image-1)
41+
- Deploy Azure AI Services (GPT-5.1, GPT-Image-1-mini)
4242
- Create Container Registry, Container Instances, App Service
4343
- Create Cosmos DB, Storage Account, AI Search
4444
- Assign RBAC roles
4545

4646
- **Quota**: Ensure you have sufficient quota for:
4747
- GPT-5.1 (or your chosen model)
48-
- GPT-Image-1 (or GPT-Image-1.5 - for image generation)
48+
- GPT-Image-1-mini (or GPT-Image-1.5 - for image generation)
4949

5050
## Quick Start
5151

@@ -299,7 +299,7 @@ When `enablePrivateNetworking` is enabled:
299299
│ │ │
300300
│ ┌───────▼──────────┐ ┌───────────────────────────────┐ │
301301
│ │ Storage Account │ │ Azure AI Services │ │
302-
│ └──────────────────┘ │ (GPT-5.1, GPT-Image-1) │ │
302+
│ └──────────────────┘ │ (GPT-5.1, GPT-Image-1-mini) │ │
303303
│ └───────────────────────────────┘ │
304304
└─────────────────────────────────────────────────────────────────┘
305305
```

‎docs/CustomizingAzdParameters.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ By default this template will use the environment name as the prefix to prevent
1515
| `gptModelVersion` | string | `2025-11-13` | Sets the GPT model version. |
1616
| `gptModelDeploymentType` | string | `GlobalStandard` | Defines the model deployment type (allowed: `Standard`, `GlobalStandard`). |
1717
| `gptModelCapacity` | integer | `150` | Sets the GPT model token capacity (minimum: `10`). |
18-
| `imageModelChoice` | string | `gpt-image-1` | Image model to deploy (allowed: `gpt-image-1`, `gpt-image-1.5`, `none`). |
18+
| `imageModelChoice` | string | `gpt-image-1-mini` | Image model to deploy (allowed: `gpt-image-1-mini`, `gpt-image-1.5`, `none`). |
1919
| `imageModelCapacity` | integer | `1` | Sets the image model deployment capacity in RPM (minimum: `1`). |
2020
| `azureOpenaiAPIVersion` | string | `2025-01-01-preview` | Specifies the API version for Azure OpenAI service. |
2121
| `AZURE_ENV_OPENAI_LOCATION` | string | `<User selects during deployment>` | Sets the Azure region for OpenAI resource deployment. |
@@ -38,6 +38,6 @@ azd env set <PARAMETER_NAME> <VALUE>
3838
azd env set AZURE_LOCATION westus2
3939
azd env set gptModelName gpt-5.1
4040
azd env set gptModelDeploymentType Standard
41-
azd env set imageModelChoice gpt-image-1
41+
azd env set imageModelChoice gpt-image-1-mini
4242
azd env set ACR_NAME contentgencontainerreg
4343
```

‎docs/DEPLOYMENT.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ When you start the deployment, most parameters will have **default values**, but
137137
| **GPT Model Version** | The version of the selected GPT model. | 2025-11-13 |
138138
| **OpenAI API Version** | The Azure OpenAI API version to use. | 2025-01-01-preview |
139139
| **GPT Model Deployment Capacity** | Configure capacity for **GPT models** (in thousands). | 150k |
140-
| **Image Model** | Choose from **gpt-image-1, gpt-image-1.5** | gpt-image-1 |
140+
| **Image Model** | Choose from **gpt-image-1-mini, gpt-image-1.5** | gpt-image-1-mini |
141141
| **Image Tag** | Docker image tag to deploy. Common values: `latest`, `dev`, `hotfix`. | latest |
142142
| **Existing Log Analytics Workspace** | To reuse an existing Log Analytics Workspace ID. | *(empty)* |
143143
| **Existing Azure AI Foundry Project** | To reuse an existing Azure AI Foundry Project ID instead of creating a new one. | *(empty)* |
@@ -151,7 +151,7 @@ By default, the **GPT-5.1 model capacity** in deployment is set to **150k tokens
151151

152152
> **For GPT-5.1 - increase the capacity post-deployment for optimal performance if required.**
153153

154-
> **For GPT-Image-1 - ensure you have sufficient capacity for image generation requests.**
154+
> **For GPT-Image-1-mini - ensure you have sufficient capacity for image generation requests.**
155155

156156
Depending on your subscription quota and capacity, you can adjust quota settings to better meet your specific needs.
157157

@@ -217,7 +217,7 @@ az webapp config set -g $RESOURCE_GROUP -n <app-name> --http20-enabled false
217217
**Cause**: Missing GPT-Image model deployment or incorrect endpoint
218218
219219
**Solution**:
220-
1. Verify GPT-Image-1 or GPT-Image-1.5 deployment exists in Azure OpenAI resource
220+
1. Verify GPT-Image-1-mini or GPT-Image-1.5 deployment exists in Azure OpenAI resource
221221
2. Check `AZURE_OPENAI_IMAGE_MODEL` and `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` environment variables
222222
223223
</details>

‎docs/IMAGE_GENERATION.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Image Generation (gpt-image-1 / gpt-image-1.5)
1+
# Image Generation (gpt-image-1-mini / gpt-image-1.5)
22

33
## Overview
44

55
The accelerator supports image generation through Azure OpenAI image models:
66

7-
- `gpt-image-1`
7+
- `gpt-image-1-mini`
88
- `gpt-image-1.5`
99

1010
Both models are used through `images.generate()` in the backend image agent. The selected model is controlled by `AZURE_OPENAI_IMAGE_MODEL`.
@@ -15,7 +15,7 @@ Both models are used through `images.generate()` in the backend image agent. The
1515

1616
| Model | Status | Primary Use |
1717
|-------|--------|-------------|
18-
| `gpt-image-1` | Supported | General marketing image generation |
18+
| `gpt-image-1-mini` | Supported | General marketing image generation |
1919
| `gpt-image-1.5` | Supported | Higher-quality marketing image generation |
2020

2121
### Prompting Strategy
@@ -39,7 +39,7 @@ The agent enforces no-text-in-image constraints and color fidelity requirements
3939
│
4040
▼
4141
┌─────────────────┐ ┌─────────────────┐ ┌─────────────────┐
42-
│ Marketing Image │◀────│ gpt-image-1/1.5 │◀────│ Combined Prompt │
42+
│ Marketing Image │◀────│ gpt-image-1-mini/1.5 │◀────│ Combined Prompt │
4343
│ (Output) │ │ (Generate) │ │ (Desc + Brief) │
4444
└─────────────────┘ └─────────────────┘ └─────────────────┘
4545
```
@@ -140,7 +140,7 @@ async def generate_marketing_image(
140140

141141
- `AZURE_OPENAI_ENDPOINT`
142142
- `AZURE_OPENAI_GPT_MODEL`
143-
- `AZURE_OPENAI_IMAGE_MODEL` (`gpt-image-1`, `gpt-image-1.5`, or `none`)
143+
- `AZURE_OPENAI_IMAGE_MODEL` (`gpt-image-1-mini`, `gpt-image-1.5`, or `none`)
144144
- `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` (optional if same as main endpoint)
145145
- `AZURE_OPENAI_API_VERSION`
146146
- `AZURE_OPENAI_IMAGE_API_VERSION`
@@ -183,7 +183,7 @@ The backend image generator calls Azure OpenAI with:
183183

184184
### Model Availability Notes
185185

186-
1. Deploy either `gpt-image-1` or `gpt-image-1.5` based on quota and regional availability.
186+
1. Deploy either `gpt-image-1-mini` or `gpt-image-1.5` based on quota and regional availability.
187187
2. Set `AZURE_OPENAI_IMAGE_MODEL` to the deployed model name.
188188
3. If using a separate image endpoint, set `AZURE_OPENAI_GPT_IMAGE_ENDPOINT`.
189189
4. Keep `AZURE_OPENAI_IMAGE_API_VERSION` aligned with the image model API version required by your deployment.

‎docs/LOCAL_DEPLOYMENT.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ Changes to source files will automatically trigger a reload.
148148
|----------|----------|-------------|
149149
| `AZURE_OPENAI_ENDPOINT` | Yes | Azure OpenAI endpoint URL (e.g., `https://your-resource.openai.azure.com/`) |
150150
| `AZURE_OPENAI_GPT_MODEL` | Yes | GPT model deployment name (e.g., `gpt-4o`, `gpt-5.1`) |
151-
| `AZURE_OPENAI_IMAGE_MODEL` | Yes | Image generation model (`gpt-image-1` or `gpt-image-1.5`) |
152-
| `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` | No | Separate endpoint for gpt-image-1 (if different from main endpoint) |
151+
| `AZURE_OPENAI_IMAGE_MODEL` | Yes | Image generation model (`gpt-image-1-mini` or `gpt-image-1.5`) |
152+
| `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` | No | Separate endpoint for gpt-image-1-mini (if different from main endpoint) |
153153
| `AZURE_OPENAI_API_VERSION` | Yes | API version (e.g., `2024-06-01`) |
154154
| `AZURE_OPENAI_TEMPERATURE` | No | Generation temperature (default: `0.7`) |
155155
| `AZURE_OPENAI_MAX_TOKENS` | No | Max tokens for generation (default: `2000`) |
@@ -161,7 +161,7 @@ Changes to source files will automatically trigger a reload.
161161
| `AZURE_OPENAI_IMAGE_SIZE` | `1024x1024` | Image dimensions |
162162
| `AZURE_OPENAI_IMAGE_QUALITY` | `medium` | Image quality setting |
163163

164-
**GPT-Image-1/1.5 Options:**
164+
**GPT-Image-1-mini/1.5 Options:**
165165
- Sizes: `1024x1024`, `1536x1024`, `1024x1536`, `auto`
166166
- Quality: `low`, `medium`, `high`, `auto`
167167

@@ -229,7 +229,7 @@ Changes to source files will automatically trigger a reload.
229229
# Azure OpenAI
230230
AZURE_OPENAI_ENDPOINT=https://my-openai.openai.azure.com/
231231
AZURE_OPENAI_GPT_MODEL=gpt-4o
232-
AZURE_OPENAI_IMAGE_MODEL=gpt-image-1
232+
AZURE_OPENAI_IMAGE_MODEL=gpt-image-1-mini
233233
AZURE_OPENAI_GPT_IMAGE_ENDPOINT=https://my-openai.openai.azure.com
234234
AZURE_OPENAI_IMAGE_SIZE=1024x1024
235235
AZURE_OPENAI_IMAGE_QUALITY=medium

0 commit comments

Comments
 (0)