update local development scripts and output variable names

Author: Ragini-Microsoft

content-gen/.env.template content-gen/.env.samplecontent-gen/.env.template renamed to content-gen/.env.sample

@@ -9,6 +9,8 @@ AZURE_CLIENT_ID=
 # =============================================================================
 # Azure OpenAI Configuration
 # =============================================================================
+AI_FOUNDRY_RESOURCE_ID=/subscriptions/your-subscription-id/resourceGroups/your-resource-group/providers/Microsoft.CognitiveServices/accounts/your-aif-account
+AZURE_EXISTING_AI_PROJECT_RESOURCE_ID=/subscriptions/your-subscription-id/resourceGroups/your-resource-group/providers/Microsoft.CognitiveServices/accounts/your-aif-account/projects/your-project-name
 # Your Azure OpenAI endpoint (e.g., https://your-resource.openai.azure.com/)
 AZURE_OPENAI_ENDPOINT=https://your-openai.openai.azure.com/
 

content-gen/azure.yaml

@@ -60,11 +60,11 @@ hooks:
         Write-Host "Web App URL: " -NoNewline
         Write-Host "$env:WEB_APP_URL" -ForegroundColor Cyan
         Write-Host "Storage Account: " -NoNewline
-        Write-Host "$env:STORAGE_ACCOUNT_NAME" -ForegroundColor Cyan
+        Write-Host "$env:AZURE_BLOB_ACCOUNT_NAME" -ForegroundColor Cyan
         Write-Host "AI Search Service: " -NoNewline
         Write-Host "$env:AI_SEARCH_SERVICE_NAME" -ForegroundColor Cyan
         Write-Host "AI Search Index: " -NoNewline
-        Write-Host "$env:AI_SEARCH_INDEX" -ForegroundColor Cyan
+        Write-Host "$env:AZURE_AI_SEARCH_PRODUCTS_INDEX" -ForegroundColor Cyan
         Write-Host "AI Service Location: " -NoNewline
         Write-Host "$env:AI_SERVICE_LOCATION" -ForegroundColor Cyan
         
@@ -132,9 +132,9 @@ hooks:
         echo "===== Provision Complete ====="
         echo ""
         echo "Web App URL: $WEB_APP_URL"
-        echo "Storage Account: $STORAGE_ACCOUNT_NAME"
+        echo "Storage Account: $AZURE_BLOB_ACCOUNT_NAME"
         echo "AI Search Service: $AI_SEARCH_SERVICE_NAME"
-        echo "AI Search Index: $AI_SEARCH_INDEX"
+        echo "AI Search Index: $AZURE_AI_SEARCH_PRODUCTS_INDEX"
         echo "AI Service Location: $AI_SERVICE_LOCATION"
         
         # Run post-deployment role assignments

content-gen/docs/LOCAL_DEPLOYMENT.md

@@ -54,7 +54,7 @@ If you have an existing Azure deployment with `azd`:
 
 1. Copy the environment template:
    ```bash
-   cp .env.template .env
+   cp .env.sample .env
    ```
 
 2. Edit `.env` with your Azure resource values (see [Environment Variables Reference](#environment-variables-reference) below)

content-gen/infra/main.bicep

@@ -892,25 +892,28 @@ output APP_SERVICE_NAME string = webSite.outputs.name
 output WEB_APP_URL string = 'https://${webSite.outputs.name}.azurewebsites.net'
 
 @description('Contains Storage Account Name')
-output STORAGE_ACCOUNT_NAME string = storageAccount.outputs.name
+output AZURE_BLOB_ACCOUNT_NAME string = storageAccount.outputs.name
 
 @description('Contains Product Images Container')
-output STORAGE_PRODUCT_IMAGES_CONTAINER string = productImagesContainer
+output AZURE_BLOB_PRODUCT_IMAGES_CONTAINER string = productImagesContainer
 
 @description('Contains Generated Images Container')
-output STORAGE_GENERATED_IMAGES_CONTAINER string = generatedImagesContainer
+output AZURE_BLOB_GENERATED_IMAGES_CONTAINER string = generatedImagesContainer
 
 @description('Contains CosmosDB Account Name')
 output COSMOSDB_ACCOUNT_NAME string = cosmosDB.outputs.name
 
+@description('Contains CosmosDB Endpoint URL')
+output AZURE_COSMOS_ENDPOINT string = 'https://cosmos-${solutionSuffix}.documents.azure.com:443/'
+
 @description('Contains CosmosDB Database Name')
-output COSMOSDB_DATABASE_NAME string = cosmosDBDatabaseName
+output AZURE_COSMOS_DATABASE_NAME string = cosmosDBDatabaseName
 
 @description('Contains CosmosDB Products Container')
-output COSMOSDB_PRODUCTS_CONTAINER string = cosmosDBProductsContainer
+output AZURE_COSMOS_PRODUCTS_CONTAINER string = cosmosDBProductsContainer
 
 @description('Contains CosmosDB Conversations Container')
-output COSMOSDB_CONVERSATIONS_CONTAINER string = cosmosDBConversationsContainer
+output AZURE_COSMOS_CONVERSATIONS_CONTAINER string = cosmosDBConversationsContainer
 
 @description('Contains Resource Group Name')
 output RESOURCE_GROUP_NAME string = resourceGroup().name
@@ -924,18 +927,36 @@ output AI_FOUNDRY_RG_NAME string = aiFoundryAiServicesResourceGroupName
 @description('Contains AI Foundry Resource ID')
 output AI_FOUNDRY_RESOURCE_ID string = useExistingAiFoundryAiProject ? '' : aiFoundryAiServices!.outputs.resourceId
 
+@description('Contains existing AI project resource ID.')
+output AZURE_EXISTING_AI_PROJECT_RESOURCE_ID string = azureExistingAIProjectResourceId
+
+@description('Contains AI Search Service Endpoint URL')
+output AZURE_AI_SEARCH_ENDPOINT string = 'https://${aiSearch.outputs.name}.search.windows.net/'
+
 @description('Contains AI Search Service Name')
 output AI_SEARCH_SERVICE_NAME string = aiSearch.outputs.name
 
-@description('Contains AI Search Index')
-output AI_SEARCH_INDEX string = azureSearchIndex
+@description('Contains AI Search Product Index')
+output AZURE_AI_SEARCH_PRODUCTS_INDEX string = azureSearchIndex
+
+@description('Contains AI Search Image Index')
+output AZURE_AI_SEARCH_IMAGE_INDEX string = 'product-images'
+
+@description('Contains Azure OpenAI endpoint URL')
+output AZURE_OPENAI_ENDPOINT string = 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/'
 
 @description('Contains GPT Model')
-output AZURE_OPENAI_MODEL string = gptModelName
+output AZURE_OPENAI_GPT_MODEL string = gptModelName
 
 @description('Contains Image Model (empty if none selected)')
 output AZURE_OPENAI_IMAGE_MODEL string = imageModelConfig[imageModelChoice].name
 
+@description('Contains Azure OpenAI GPT/Image endpoint URL (empty if no image model selected)')
+output AZURE_OPENAI_GPT_IMAGE_ENDPOINT string = imageModelChoice != 'none' ? 'https://${aiFoundryAiServicesResourceName}.openai.azure.com/' : ''
+
+@description('Contains Azure OpenAI API Version')
+output AZURE_OPENAI_API_VERSION string = azureOpenaiAPIVersion
+
 @description('Contains OpenAI Resource')
 output AZURE_OPENAI_RESOURCE string = aiFoundryAiServicesResourceName
 

content-gen/infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.39.26.7824",
-      "templateHash": "8571608347823667459"
+      "templateHash": "9035268371577303624"
     },
     "name": "Intelligent Content Generation Accelerator",
     "description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
@@ -194,7 +194,7 @@
     },
     "acrName": {
       "type": "string",
-      "defaultValue": "contentgenacrmaint",
+      "defaultValue": "contentgencontainerreg",
       "metadata": {
         "description": "Required. The existing Container Registry name (without .azurecr.io). Must contain pre-built images: content-gen-app and content-gen-api."
       }
@@ -33461,21 +33461,21 @@
       },
       "value": "[format('https://{0}.azurewebsites.net', reference('webSite').outputs.name.value)]"
     },
-    "STORAGE_ACCOUNT_NAME": {
+    "AZURE_BLOB_ACCOUNT_NAME": {
       "type": "string",
       "metadata": {
         "description": "Contains Storage Account Name"
       },
       "value": "[reference('storageAccount').outputs.name.value]"
     },
-    "STORAGE_PRODUCT_IMAGES_CONTAINER": {
+    "AZURE_BLOB_PRODUCT_IMAGES_CONTAINER": {
       "type": "string",
       "metadata": {
         "description": "Contains Product Images Container"
       },
       "value": "[variables('productImagesContainer')]"
     },
-    "STORAGE_GENERATED_IMAGES_CONTAINER": {
+    "AZURE_BLOB_GENERATED_IMAGES_CONTAINER": {
       "type": "string",
       "metadata": {
         "description": "Contains Generated Images Container"
@@ -33489,21 +33489,28 @@
       },
       "value": "[reference('cosmosDB').outputs.name.value]"
     },
-    "COSMOSDB_DATABASE_NAME": {
+    "AZURE_COSMOS_ENDPOINT": {
+      "type": "string",
+      "metadata": {
+        "description": "Contains CosmosDB Endpoint URL"
+      },
+      "value": "[format('https://cosmos-{0}.documents.azure.com:443/', variables('solutionSuffix'))]"
+    },
+    "AZURE_COSMOS_DATABASE_NAME": {
       "type": "string",
       "metadata": {
         "description": "Contains CosmosDB Database Name"
       },
       "value": "[variables('cosmosDBDatabaseName')]"
     },
-    "COSMOSDB_PRODUCTS_CONTAINER": {
+    "AZURE_COSMOS_PRODUCTS_CONTAINER": {
       "type": "string",
       "metadata": {
         "description": "Contains CosmosDB Products Container"
       },
       "value": "[variables('cosmosDBProductsContainer')]"
     },
-    "COSMOSDB_CONVERSATIONS_CONTAINER": {
+    "AZURE_COSMOS_CONVERSATIONS_CONTAINER": {
       "type": "string",
       "metadata": {
         "description": "Contains CosmosDB Conversations Container"
@@ -33538,21 +33545,49 @@
       },
       "value": "[if(variables('useExistingAiFoundryAiProject'), '', reference('aiFoundryAiServices').outputs.resourceId.value)]"
     },
+    "AZURE_EXISTING_AI_PROJECT_RESOURCE_ID": {
+      "type": "string",
+      "metadata": {
+        "description": "Contains existing AI project resource ID."
+      },
+      "value": "[parameters('azureExistingAIProjectResourceId')]"
+    },
+    "AZURE_AI_SEARCH_ENDPOINT": {
+      "type": "string",
+      "metadata": {
+        "description": "Contains AI Search Service Endpoint URL"
+      },
+      "value": "[format('https://{0}.search.windows.net/', reference('aiSearch').outputs.name.value)]"
+    },
     "AI_SEARCH_SERVICE_NAME": {
       "type": "string",
       "metadata": {
         "description": "Contains AI Search Service Name"
       },
       "value": "[reference('aiSearch').outputs.name.value]"
     },
-    "AI_SEARCH_INDEX": {
+    "AZURE_AI_SEARCH_PRODUCTS_INDEX": {
       "type": "string",
       "metadata": {
-        "description": "Contains AI Search Index"
+        "description": "Contains AI Search Product Index"
       },
       "value": "[variables('azureSearchIndex')]"
     },
-    "AZURE_OPENAI_MODEL": {
+    "AZURE_AI_SEARCH_IMAGE_INDEX": {
+      "type": "string",
+      "metadata": {
+        "description": "Contains AI Search Image Index"
+      },
+      "value": "product-images"
+    },
+    "AZURE_OPENAI_ENDPOINT": {
+      "type": "string",
+      "metadata": {
+        "description": "Contains Azure OpenAI endpoint URL"
+      },
+      "value": "[format('https://{0}.openai.azure.com/', variables('aiFoundryAiServicesResourceName'))]"
+    },
+    "AZURE_OPENAI_GPT_MODEL": {
       "type": "string",
       "metadata": {
         "description": "Contains GPT Model"
@@ -33566,6 +33601,20 @@
       },
       "value": "[variables('imageModelConfig')[parameters('imageModelChoice')].name]"
     },
+    "AZURE_OPENAI_GPT_IMAGE_ENDPOINT": {
+      "type": "string",
+      "metadata": {
+        "description": "Contains Azure OpenAI GPT/Image endpoint URL (empty if no image model selected)"
+      },
+      "value": "[if(not(equals(parameters('imageModelChoice'), 'none')), format('https://{0}.openai.azure.com/', variables('aiFoundryAiServicesResourceName')), '')]"
+    },
+    "AZURE_OPENAI_API_VERSION": {
+      "type": "string",
+      "metadata": {
+        "description": "Contains Azure OpenAI API Version"
+      },
+      "value": "[parameters('azureOpenaiAPIVersion')]"
+    },
     "AZURE_OPENAI_RESOURCE": {
       "type": "string",
       "metadata": {