Skip to content

Commit 31e3263

Browse files
fix: removal of dall-e-3 model
2 parents afc881e + f98235f commit 31e3263

28 files changed

+209
-264
lines changed

.github/workflows/deploy-ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ on:
109109
options:
110110
- 'gpt-image-1'
111111
- 'gpt-image-1.5'
112-
- 'dall-e-3'
113112
- 'none'
114113

115114
schedule:
@@ -311,7 +310,7 @@ jobs:
311310
312311
# Validate and output image_model_choice
313312
IMAGE_MODEL="${INPUT_IMAGE_MODEL_CHOICE:-gpt-image-1}"
314-
ALLOWED_MODELS=("gpt-image-1" "gpt-image-1.5" "dall-e-3" "none")
313+
ALLOWED_MODELS=("gpt-image-1" "gpt-image-1.5" "none")
315314
if [[ ! " ${ALLOWED_MODELS[@]} " =~ " ${IMAGE_MODEL} " ]]; then
316315
echo "❌ ERROR: image_model_choice '$IMAGE_MODEL' is invalid. Allowed: ${ALLOWED_MODELS[*]}"
317316
exit 1

.github/workflows/deploy-orchestrator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ on:
6262
required: true
6363
type: string
6464
image_model_choice:
65-
description: 'Image model to deploy (gpt-image-1, gpt-image-1.5, dall-e-3, none)'
65+
description: 'Image model to deploy (gpt-image-1, gpt-image-1.5, none)'
6666
required: false
6767
default: 'gpt-image-1'
6868
type: string

.github/workflows/job-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ on:
6767
default: ''
6868
type: string
6969
image_model_choice:
70-
description: 'Image model to deploy (gpt-image-1, gpt-image-1.5, dall-e-3, none)'
70+
description: 'Image model to deploy (gpt-image-1, gpt-image-1.5, none)'
7171
required: false
7272
default: 'gpt-image-1'
7373
type: string

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The sample data includes synthetic product catalogs and brand guidelines. The da
4949
Parse free-text creative briefs into structured fields (overview, objectives, target audience, key message, tone/style, deliverable, timelines, visual guidelines, CTA).
5050

5151
- **Multimodal Content Generation** <br/>
52-
Generate marketing copy and images using GPT models and DALL-E 3 grounded in enterprise product data.
52+
Generate marketing copy and images using GPT models grounded in enterprise product data.
5353

5454
- **Brand Compliance Validation** <br/>
5555
Validate all generated content against brand guidelines with severity-categorized feedback (Error, Warning, Info).
@@ -102,7 +102,7 @@ _Note: This is not meant to outline all costs as selected SKUs, scaled use, cust
102102
|---|---|---|
103103
| [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/) |
104104
| [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/) |
105-
| [Azure AI Services](https://learn.microsoft.com/en-us/azure/ai-services/) | S0 tier, defaults to gpt-5.1 (GPT) and gpt-image-1 (DALL-E 3) models. Pricing is based on token count. | [Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/) |
105+
| [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/) |
106106
| [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/) |
107107
| [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/) |
108108
| [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/) |
@@ -140,7 +140,7 @@ Accelerate your marketing content creation by leveraging AI to interpret creativ
140140
Parse unstructured creative briefs into structured fields automatically, ensuring all campaign requirements are captured.
141141

142142
- **Generate multimodal content** <br/>
143-
Create marketing copy and images that align with your brand voice and product catalog using GPT and DALL-E 3.
143+
Create marketing copy and images that align with your brand voice and product catalog using GPT models (text and image generation models).
144144

145145
- **Ensure brand compliance** <br/>
146146
Validate all generated content against brand guidelines with severity-categorized feedback before publication.

content-gen/.env.sample

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +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: dall-e-3 or gpt-image-1
34+
# Supported models: gpt-image-1 or gpt-image-1.5
3535
AZURE_OPENAI_IMAGE_MODEL=gpt-image-1
3636

37-
# For gpt-image-1 (if using a different endpoint than DALL-E)
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
3838
AZURE_OPENAI_GPT_IMAGE_ENDPOINT=https://your-openai.openai.azure.com
3939

4040
# Image generation settings
41-
# For dall-e-3: sizes are 1024x1024, 1024x1792, 1792x1024; quality is standard or hd
42-
# For gpt-image-1: sizes are 1024x1024, 1536x1024, 1024x1536, auto; quality is low, medium, high, auto
41+
# For gpt-image-1/1.5: sizes are 1024x1024, 1536x1024, 1024x1536, auto; quality is low, medium, high, auto
4342
AZURE_OPENAI_IMAGE_SIZE=1024x1024
4443
AZURE_OPENAI_IMAGE_QUALITY=medium
4544

content-gen/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A multimodal content generation solution for retail marketing campaigns using Mi
77
This accelerator provides an internal chatbot that can:
88

99
- **Interpret Creative Briefs**: Parse free-text creative briefs into structured fields (overview, objectives, target audience, key message, tone/style, deliverable, timelines, visual guidelines, CTA)
10-
- **Generate Multimodal Content**: Create marketing copy and images using GPT models and DALL-E 3
10+
- **Generate Multimodal Content**: Create marketing copy and images using GPT models (text and image generation models)
1111
- **Ensure Brand Compliance**: Validate all content against brand guidelines with severity-categorized warnings
1212
- **Ground in Enterprise Data**: Leverage product information, product images, and brand guidelines stored in Azure services
1313

@@ -33,7 +33,7 @@ The solution uses **HandoffBuilder** orchestration with 6 specialized agents:
3333
| **PlanningAgent** | Parses creative briefs, develops content strategy, returns for user confirmation |
3434
| **ResearchAgent** | Retrieves products from CosmosDB, fetches brand guidelines, assembles grounding data |
3535
| **TextContentAgent** | Generates marketing copy (headlines, body, CTAs) using GPT |
36-
| **ImageContentAgent** | Creates marketing images via DALL-E 3 with product context |
36+
| **ImageContentAgent** | Creates marketing images via GPT image models with product context |
3737
| **ComplianceAgent** | Validates content against brand guidelines, categorizes violations |
3838

3939
### Compliance Severity Levels
@@ -49,7 +49,7 @@ The solution uses **HandoffBuilder** orchestration with 6 specialized agents:
4949
| Service | Purpose |
5050
|---------|---------|
5151
| Azure OpenAI (GPT) | Text generation and content creation |
52-
| Azure OpenAI (DALL-E 3) | Image generation (can be separate resource) |
52+
| Azure OpenAI (GPT Image) | Image generation (can be separate resource) |
5353
| Azure Cosmos DB | Products catalog, chat conversations |
5454
| Azure Blob Storage | Product images, generated images |
5555
| Azure Container Instance | Backend API hosting |
@@ -92,7 +92,7 @@ The system extracts the following fields from free-text creative briefs:
9292

9393
- Azure subscription with access to:
9494
- Azure OpenAI (GPT model - GPT-4 or higher recommended)
95-
- Azure OpenAI (DALL-E 3 - can be same or different resource)
95+
- Azure OpenAI (GPT Image model - can be same or different resource)
9696
- Azure Cosmos DB
9797
- Azure Blob Storage
9898
- Azure Container Instance
@@ -156,9 +156,9 @@ See `src/backend/settings.py` for all configuration options. Key settings:
156156
| Variable | Description |
157157
|----------|-------------|
158158
| `AZURE_OPENAI_ENDPOINT` | Azure OpenAI endpoint for GPT model |
159-
| `AZURE_OPENAI_DEPLOYMENT_NAME` | GPT model deployment name |
160-
| `AZURE_OPENAI_DALLE_ENDPOINT` | Azure OpenAI endpoint for DALL-E (if separate) |
161-
| `AZURE_OPENAI_DALLE_DEPLOYMENT` | DALL-E deployment name (dall-e-3) |
159+
| `AZURE_OPENAI_GPT_MODEL` | GPT model deployment name |
160+
| `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` | Azure OpenAI endpoint for GPT image model (if separate) |
161+
| `AZURE_OPENAI_IMAGE_MODEL` | GPT image model deployment name (gpt-image-1) |
162162
| `COSMOS_ENDPOINT` | Azure Cosmos DB endpoint |
163163
| `COSMOS_DATABASE` | Cosmos DB database name |
164164
| `AZURE_STORAGE_ACCOUNT_NAME` | Storage account name |
@@ -182,7 +182,7 @@ BRAND_SECONDARY_COLOR=#107C10
182182
- [Local Development Guide](docs/LOCAL_DEPLOYMENT.md) - Run locally for development
183183
- [AZD Deployment Guide](docs/AZD_DEPLOYMENT.md) - Deploy with Azure Developer CLI
184184
- [Manual Deployment Guide](docs/DEPLOYMENT.md) - Step-by-step manual deployment
185-
- [Image Generation Configuration](docs/IMAGE_GENERATION.md) - DALL-E 3 and GPT-Image-1 setup
185+
- [Image Generation Configuration](docs/IMAGE_GENERATION.md) - GPT image model setup
186186

187187
## License
188188

content-gen/docs/AZD_DEPLOYMENT.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +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-4o, DALL-E 3 or GPT-Image-1, Text Embeddings)
41+
- Deploy Azure AI Services (GPT-5.1, GPT-Image-1)
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:
47-
- GPT-4o (or your chosen model)
48-
- DALL-E 3 or GPT-Image-1 (for image generation)
49-
- Text-embedding-3-large
47+
- GPT-5.1 (or your chosen model)
48+
- GPT-Image-1 (or GPT-Image-1.5 - for image generation)
5049

5150
## Quick Start
5251

@@ -301,7 +300,7 @@ When `enablePrivateNetworking` is enabled:
301300
│ │ │
302301
│ ┌───────▼──────────┐ ┌───────────────────────────────┐ │
303302
│ │ Storage Account │ │ Azure AI Services │ │
304-
│ └──────────────────┘ │ (GPT-4o, DALL-E, Embeddings) │ │
303+
│ └──────────────────┘ │ (GPT-5.1, GPT-Image-1) │ │
305304
│ └───────────────────────────────┘ │
306305
└─────────────────────────────────────────────────────────────────┘
307306
```

content-gen/docs/CustomizingAzdParameters.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ 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`, `dall-e-3`, `none`). |
19-
| `dalleModelCapacity` | integer | `1` | Sets the image model deployment capacity in RPM (minimum: `1`). |
18+
| `imageModelChoice` | string | `gpt-image-1` | Image model to deploy (allowed: `gpt-image-1`, `gpt-image-1.5`, `none`). |
19+
| `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. |
2222
| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string | `""` | Reuses an existing Log Analytics Workspace instead of creating a new one. |
@@ -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 dall-e-3
41+
azd env set imageModelChoice gpt-image-1
4242
azd env set ACR_NAME contentgencontainerreg
4343
```

content-gen/docs/DEPLOYMENT.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Check the [Azure Products by Region](https://azure.microsoft.com/en-us/explore/g
88

99
- [Azure AI Foundry](https://learn.microsoft.com/en-us/azure/ai-foundry)
1010
- [GPT Model Capacity](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models)
11-
- [DALL-E 3 Model Capacity](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models#dall-e-models)
1211
- [Azure App Service](https://learn.microsoft.com/en-us/azure/app-service/)
1312
- [Azure Container Registry](https://learn.microsoft.com/en-us/azure/container-registry/)
1413
- [Azure Container Instance](https://learn.microsoft.com/en-us/azure/container-instances/)
@@ -138,7 +137,7 @@ When you start the deployment, most parameters will have **default values**, but
138137
| **GPT Model Version** | The version of the selected GPT model. | 2025-11-13 |
139138
| **OpenAI API Version** | The Azure OpenAI API version to use. | 2025-01-01-preview |
140139
| **GPT Model Deployment Capacity** | Configure capacity for **GPT models** (in thousands). | 150k |
141-
| **Image Model** | Choose from **dall-e-3, gpt-image-1, gpt-image-1.5** | gpt-image-1 |
140+
| **Image Model** | Choose from **gpt-image-1, gpt-image-1.5** | gpt-image-1 |
142141
| **Image Tag** | Docker image tag to deploy. Common values: `latest`, `dev`, `hotfix`. | latest |
143142
| **Existing Log Analytics Workspace** | To reuse an existing Log Analytics Workspace ID. | *(empty)* |
144143
| **Existing Azure AI Foundry Project** | To reuse an existing Azure AI Foundry Project ID instead of creating a new one. | *(empty)* |
@@ -148,11 +147,11 @@ When you start the deployment, most parameters will have **default values**, but
148147
<details>
149148
<summary><b>[Optional] Quota Recommendations</b></summary>
150149

151-
By default, the **GPT-4o-mini model capacity** in deployment is set to **30k tokens**, so we recommend updating the following:
150+
By default, the **GPT-5.1 model capacity** in deployment is set to **150k tokens**, so we recommend updating the following:
152151

153-
> **For GPT-4o-mini - increase the capacity to at least 150k tokens post-deployment for optimal performance.**
152+
> **For GPT-5.1 - increase the capacity post-deployment for optimal performance if required.**
154153

155-
> **For DALL-E 3 - ensure you have sufficient capacity for image generation requests.**
154+
> **For GPT-Image-1 - ensure you have sufficient capacity for image generation requests.**
156155

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

@@ -213,13 +212,13 @@ az webapp config set -g $RESOURCE_GROUP -n <app-name> --http20-enabled false
213212
214213
### Image Generation Not Working
215214
216-
**Symptom**: DALL-E/GPT-Image requests fail
215+
**Symptom**: GPT-Image requests fail
217216
218-
**Cause**: Missing DALL-E/GPT-Image model deployment or incorrect endpoint
217+
**Cause**: Missing GPT-Image model deployment or incorrect endpoint
219218
220219
**Solution**:
221-
1. Verify DALL-E 3 or GPT-Image-1 or GPT-Image-1.5 deployment exists in Azure OpenAI resource
222-
2. Check `AZURE_OPENAI_IMAGE_MODEL` environment variable
220+
1. Verify GPT-Image-1 or GPT-Image-1.5 deployment exists in Azure OpenAI resource
221+
2. Check `AZURE_OPENAI_IMAGE_MODEL` and `AZURE_OPENAI_GPT_IMAGE_ENDPOINT` environment variables
223222
224223
</details>
225224
@@ -245,7 +244,7 @@ The solution consists of:
245244
- **Frontend**: React + Vite + TypeScript + Fluent UI running on Azure App Service with Node.js proxy
246245
- **AI Services**:
247246
- Azure OpenAI (GPT model for text generation)
248-
- Azure OpenAI (DALL-E 3 for image generation)
247+
- Azure OpenAI (GPT Image model for image generation)
249248
- **Data Services**:
250249
- Azure Cosmos DB (products catalog, conversations)
251250
- Azure Blob Storage (product images, generated images)

0 commit comments

Comments
 (0)