Revert "updated local dev scripts"

This reverts commit 9e50355.

Author: Ragini-Microsoft

content-gen/infra/main.bicep

@@ -1006,15 +1006,3 @@ output CONTAINER_INSTANCE_FQDN string = enablePrivateNetworking ? '' : container
 
 @description('Contains ACR Name')
 output ACR_NAME string = acrResourceName
-
-@description('Contains flag for Azure AI Foundry usage')
-output USE_FOUNDRY bool = useFoundryMode ? true : false
-
-@description('Contains Azure AI Project Endpoint')
-output AZURE_AI_PROJECT_ENDPOINT string = aiFoundryAiProjectEndpoint
-
-@description('Contains Azure AI Model Deployment Name')
-output AZURE_AI_MODEL_DEPLOYMENT_NAME string = gptModelName
-
-@description('Contains Azure AI Image Model Deployment Name (empty if none selected)')
-output AZURE_AI_IMAGE_MODEL_DEPLOYMENT string = imageModelConfig[imageModelChoice].name

content-gen/infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.39.26.7824",
-      "templateHash": "12629934330443935294"
+      "templateHash": "9059763401810969608"
     },
     "name": "Intelligent Content Generation Accelerator",
     "description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
@@ -172,13 +172,6 @@
         "description": "Optional. Enable monitoring for applicable resources (WAF-aligned)."
       }
     },
-    "useFoundryMode": {
-      "type": "bool",
-      "defaultValue": true,
-      "metadata": {
-        "description": "Optional. Enable Azure AI Foundry mode for multi-agent orchestration."
-      }
-    },
     "enableScalability": {
       "type": "bool",
       "defaultValue": false,
@@ -33267,22 +33260,6 @@
               {
                 "name": "RUNNING_IN_PRODUCTION",
                 "value": "true"
-              },
-              {
-                "name": "USE_FOUNDRY",
-                "value": "[if(parameters('useFoundryMode'), 'true', 'false')]"
-              },
-              {
-                "name": "AZURE_AI_PROJECT_ENDPOINT",
-                "value": "[if(variables('useExistingAiFoundryAiProject'), format('https://{0}.services.ai.azure.com/api/projects/{1}', variables('aiFoundryAiServicesResourceName'), variables('aiFoundryAiProjectResourceName')), reference('aiFoundryAiServicesProject').outputs.apiEndpoint.value)]"
-              },
-              {
-                "name": "AZURE_AI_MODEL_DEPLOYMENT_NAME",
-                "value": "[parameters('gptModelName')]"
-              },
-              {
-                "name": "AZURE_AI_IMAGE_MODEL_DEPLOYMENT",
-                "value": "[variables('imageModelConfig')[parameters('imageModelChoice')].name]"
               }
             ]
           }
@@ -33479,7 +33456,6 @@
         }
       },
       "dependsOn": [
-        "aiFoundryAiServicesProject",
         "userAssignedIdentity",
         "virtualNetwork"
       ]
@@ -33716,34 +33692,6 @@
         "description": "Contains ACR Name"
       },
       "value": "[variables('acrResourceName')]"
-    },
-    "USE_FOUNDRY": {
-      "type": "bool",
-      "metadata": {
-        "description": "Contains flag for Azure AI Foundry usage"
-      },
-      "value": "[if(parameters('useFoundryMode'), true(), false())]"
-    },
-    "AZURE_AI_PROJECT_ENDPOINT": {
-      "type": "string",
-      "metadata": {
-        "description": "Contains Azure AI Project Endpoint"
-      },
-      "value": "[if(variables('useExistingAiFoundryAiProject'), format('https://{0}.services.ai.azure.com/api/projects/{1}', variables('aiFoundryAiServicesResourceName'), variables('aiFoundryAiProjectResourceName')), reference('aiFoundryAiServicesProject').outputs.apiEndpoint.value)]"
-    },
-    "AZURE_AI_MODEL_DEPLOYMENT_NAME": {
-      "type": "string",
-      "metadata": {
-        "description": "Contains Azure AI Model Deployment Name"
-      },
-      "value": "[parameters('gptModelName')]"
-    },
-    "AZURE_AI_IMAGE_MODEL_DEPLOYMENT": {
-      "type": "string",
-      "metadata": {
-        "description": "Contains Azure AI Image Model Deployment Name (empty if none selected)"
-      },
-      "value": "[variables('imageModelConfig')[parameters('imageModelChoice')].name]"
     }
   }
 }

content-gen/scripts/local_dev.ps1

@@ -31,7 +31,7 @@ $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 $ProjectRoot = Split-Path -Parent $ScriptDir
 $SrcDir = Join-Path $ProjectRoot "src"
 $BackendDir = Join-Path $SrcDir "backend"
-$FrontendDir = Join-Path $SrcDir "app\frontend"
+$FrontendDir = Join-Path $SrcDir "frontend"
 
 # Default ports
 $BackendPort = if ($env:BACKEND_PORT) { $env:BACKEND_PORT } else { "5000" }
@@ -174,7 +174,7 @@ function Ensure-CosmosDBRole {
     $roleDefId = "00000000-0000-0000-0000-000000000002"
 
     # Check if role already assigned
-    $existing = az cosmosdb sql role assignment list --resource-group $resourceGroup --account-name $cosmosAccount --query "[?principalId=='$signedUserId' && contains(roleDefinitionId, '$roleDefId')].id | [0]" -o tsv 2>$null
+    $existing = az cosmosdb sql role assignment list --resource-group $resourceGroup --account-name $cosmosAccount --query "[?principalId=='$signedUserId'].id" -o tsv 2>$null
 
     if ($existing) {
         Write-Success "Cosmos DB role already assigned."
@@ -189,53 +189,6 @@ function Ensure-CosmosDBRole {
     }
 }
 
-function Ensure-StorageRole {
-    Write-Info "Checking Storage Blob Data Contributor role..."
-    
-    # Get env vars
-    $storageAccount = $null
-    $resourceGroup = $null
-    if (Test-Path ".env") {
-        Get-Content ".env" | ForEach-Object {
-            if ($_ -match "^AZURE_BLOB_ACCOUNT_NAME=(.*)$") { $storageAccount = $matches[1].Trim('"').Trim("'") }
-            if ($_ -match "^RESOURCE_GROUP_NAME=(.*)$") { $resourceGroup = $matches[1].Trim('"').Trim("'") }
-        }
-    }
-    
-    if (-not $storageAccount -or -not $resourceGroup) {
-        Write-Error "AZURE_BLOB_ACCOUNT_NAME or RESOURCE_GROUP_NAME not found in .env"
-        exit 1
-    }
-    
-    $signedUserId = az ad signed-in-user show --query id -o tsv 2>$null
-    if (-not $signedUserId) {
-        Write-Error "Could not get signed-in user ID."
-        exit 1
-    }
-    
-    # Get storage account resource ID
-    $storageResourceId = az storage account show --name $storageAccount --resource-group $resourceGroup --query id -o tsv 2>$null
-    if (-not $storageResourceId) {
-        Write-Error "Could not get storage account resource ID."
-        exit 1
-    }
-    
-    $roleId = "Storage Blob Data Contributor"
-    $existing = az role assignment list --assignee $signedUserId --role $roleId --scope $storageResourceId --query "[0].id" -o tsv 2>$null
-    
-    if ($existing) {
-        Write-Success "Storage Blob Data Contributor role already assigned."
-    } else {
-        Write-Info "Assigning Storage Blob Data Contributor role..."
-        az role assignment create --assignee $signedUserId --role $roleId --scope $storageResourceId --output none 2>$null
-        if ($LASTEXITCODE -ne 0) {
-            Write-Error "Failed to assign Storage Blob Data Contributor role."
-            exit 1
-        }
-        Write-Success "Storage Blob Data Contributor role assigned."
-    }
-}
-
 # =============================================================================
 # Setup Function
 # =============================================================================
@@ -386,7 +339,6 @@ function Start-Backend {
     Ensure-AzureLogin
     Ensure-AzureAIUserRole
     Ensure-CosmosDBRole
-    Ensure-StorageRole
 
     # Activate virtual environment
     if (Test-Path ".venv") {
@@ -482,7 +434,6 @@ function Start-All {
     Ensure-AzureLogin
     Ensure-AzureAIUserRole
     Ensure-CosmosDBRole
-    Ensure-StorageRole
 
     Write-Info "Starting backend and frontend in parallel..."
     Write-Info ""

content-gen/scripts/local_dev.sh

@@ -34,7 +34,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 SRC_DIR="$PROJECT_ROOT/src"
 BACKEND_DIR="$SRC_DIR/backend"
-FRONTEND_DIR="$SRC_DIR/app/frontend"
+FRONTEND_DIR="$SRC_DIR/frontend"
 
 # Default ports
 BACKEND_PORT=${BACKEND_PORT:-5000}
@@ -168,7 +168,7 @@ ensure_cosmosdb_role() {
 
     # Check if role already assigned
     local existing
-    existing=$(az cosmosdb sql role assignment list --resource-group "$resource_group" --account-name "$cosmos_account" --query "[?principalId=='$signed_user_id' && contains(roleDefinitionId, '$role_def_id')].id | [0]" -o tsv 2>/dev/null)
+    existing=$(az cosmosdb sql role assignment list --resource-group "$resource_group" --account-name "$cosmos_account" --query "[?principalId=='$signed_user_id'].id" -o tsv 2>/dev/null)
 
     if [ -n "$existing" ]; then
         print_success "Cosmos DB role already assigned."
@@ -183,52 +183,6 @@ ensure_cosmosdb_role() {
     fi
 }
 
-ensure_storage_role() {
-    print_info "Checking Storage Blob Data Contributor role..."
-    
-    local storage_account=""
-    local resource_group=""
-    if [ -f ".env" ]; then
-        storage_account=$(grep "^AZURE_BLOB_ACCOUNT_NAME=" .env | cut -d'=' -f2- | tr -d '"' | tr -d "'" || echo "")
-        resource_group=$(grep "^RESOURCE_GROUP_NAME=" .env | cut -d'=' -f2- | tr -d '"' | tr -d "'" || echo "")
-    fi
-    
-    if [ -z "$storage_account" ] || [ -z "$resource_group" ]; then
-        print_error "AZURE_BLOB_ACCOUNT_NAME or RESOURCE_GROUP_NAME not found in .env"
-        exit 1
-    fi
-    
-    local signed_user_id
-    signed_user_id=$(az ad signed-in-user show --query id -o tsv 2>/dev/null)
-    if [ -z "$signed_user_id" ]; then
-        print_error "Could not get signed-in user ID."
-        exit 1
-    fi
-    
-    # Get storage account resource ID
-    local storage_resource_id
-    storage_resource_id=$(az storage account show --name "$storage_account" --resource-group "$resource_group" --query id -o tsv 2>/dev/null)
-    if [ -z "$storage_resource_id" ]; then
-        print_error "Could not get storage account resource ID."
-        exit 1
-    fi
-    
-    local role_name="Storage Blob Data Contributor"
-    local existing
-    existing=$(MSYS_NO_PATHCONV=1 az role assignment list --assignee "$signed_user_id" --role "$role_name" --scope "$storage_resource_id" --query "[0].id" -o tsv 2>/dev/null)
-    
-    if [ -n "$existing" ]; then
-        print_success "Storage Blob Data Contributor role already assigned."
-    else
-        print_info "Assigning Storage Blob Data Contributor role..."
-        if ! MSYS_NO_PATHCONV=1 az role assignment create --assignee "$signed_user_id" --role "$role_name" --scope "$storage_resource_id" --output none 2>/dev/null; then
-            print_error "Failed to assign Storage Blob Data Contributor role."
-            exit 1
-        fi
-        print_success "Storage Blob Data Contributor role assigned."
-    fi
-}
-
 # =============================================================================
 # Setup Function
 # =============================================================================
@@ -369,7 +323,6 @@ start_backend() {
     ensure_azure_login
     ensure_azure_ai_user_role
     ensure_cosmosdb_role
-    ensure_storage_role
 
     # Activate virtual environment
     if [ -d ".venv" ]; then
@@ -457,7 +410,6 @@ start_all() {
     ensure_azure_login
     ensure_azure_ai_user_role
     ensure_cosmosdb_role
-    ensure_storage_role
 
     print_info "Starting backend and frontend in parallel..."
     print_info ""