chore: Dev to Main

.devcontainer/Dockerfile

@@ -1,5 +1,10 @@
 FROM mcr.microsoft.com/devcontainers/python:3.11-bullseye
 
+# Route package managers through Microsoft proxy feeds so builds work on the
+# Microsoft-managed network where the public npm/PyPI URLs are blocked.
+ENV NPM_CONFIG_REGISTRY=https://pkgs.dev.azure.com/ms-feed-12/1es-public/_packaging/npm-public/npm/registry/
+ENV PIP_INDEX_URL=https://packagefeedproxy.microsoft.io/pypi/simple/
+
 # Remove Yarn repository to avoid GPG key expiration issue
 # Yarn v1 is deprecated, and most projects use npm/pnpm/yarn v2+ via corepack now
 RUN rm -f /etc/apt/sources.list.d/yarn.list

.devcontainer/devcontainer.json

@@ -33,6 +33,10 @@
             ]
         }
     },
+    "containerEnv": {
+        "NPM_CONFIG_REGISTRY": "https://pkgs.dev.azure.com/ms-feed-12/1es-public/_packaging/npm-public/npm/registry/",
+        "PIP_INDEX_URL": "https://packagefeedproxy.microsoft.io/pypi/simple/"
+    },
     "forwardPorts": [3000, 3100],
     "remoteUser": "vscode",
     "hostRequirements": {

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

@@ -50,7 +50,7 @@ jobs:
           pip3 --version
 
           # Upgrade pip
-          python3 -m pip install --upgrade pip
+          python3 -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/ 
 
       - name: Enable Public Network Access (avm-waf only)
         if: inputs.DEPLOYMENT_FLAVOR == 'avm-waf'

.github/workflows/pylint.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/ 
           pip install -r chat-app/backend/requirements.txt --no-cache-dir
           pip install -r scenario-app/backend/requirements.txt --no-cache-dir
 

.github/workflows/test-automation-v2.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
+          python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
           pip install -r tests/e2e-test/requirements.txt
 
       - name: Ensure browsers are installed

.github/workflows/tests.yaml

@@ -45,6 +45,7 @@ jobs:
 
       - name: Install Backend Dependencies
         run: |
+          python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
           python -m pip install -r chat-app/backend/requirements.txt
           python -m pip install -r scenario-app/backend/requirements.txt
 

chat-app/backend/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 COPY chat-app/backend/requirements.txt .
-RUN pip install --no-cache-dir --upgrade pip
+RUN pip install --no-cache-dir --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY chat-app/backend/ .

chat-app/backend/README.md

@@ -139,7 +139,7 @@ chat-app/backend/
 
 ```bash
 # Install test dependencies
-pip install pytest pytest-asyncio
+pip install -r requirements-dev.txt
 
 # Run tests
 pytest

chat-app/backend/requirements-dev.txt

@@ -0,0 +1,4 @@
+--index-url https://packagefeedproxy.microsoft.io/pypi/simple/
+
+pytest
+pytest-asyncio

chat-app/backend/requirements.txt

@@ -1,3 +1,5 @@
+--index-url https://packagefeedproxy.microsoft.io/pypi/simple/
+
 cachetools==7.0.5
 python-dotenv==1.2.2
 python-multipart==0.0.32

chat-app/frontend/.npmrc

@@ -0,0 +1 @@
+registry=https://pkgs.dev.azure.com/ms-feed-12/1es-public/_packaging/npm-public/npm/registry/

chat-app/frontend/Dockerfile

@@ -4,8 +4,8 @@ FROM mcr.microsoft.com/azurelinux/base/nodejs:20 AS builder
 # Set working directory
 WORKDIR /app
 
-# Copy package files
-COPY package*.json ./
+# Copy package files and npm registry config (Microsoft proxy feed)
+COPY package*.json .npmrc ./
 
 # Install dependencies with legacy peer deps for React 19 compatibility
 RUN npm ci --legacy-peer-deps

documents/LocalDevelopmentSetup.md

@@ -285,7 +285,7 @@ You should see `(.venv)` in your prompt.
 
 ```bash
 # Chat backend
-pip install --upgrade pip
+pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
 pip install -r chat-app/backend/requirements.txt
 
 # Scenario backend (only if you plan to run it)

infra/avm/main.bicep

@@ -446,8 +446,7 @@ module windowsVmDataCollectionRules './modules/monitoring/data-collection-rule.b
   }
 }
 
-var virtualMachineAvailabilityZone = 1
-
+var virtualMachineAvailabilityZone = -1
 module proximityPlacementGroup './modules/compute/proximity-placement-group.bicep' = if (enablePrivateNetworking) {
   name: take('module.proximity-placement-group.${solutionName}', 64)
   params: {

infra/avm/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.46.1.21595",
-      "templateHash": "11564598993201729613"
+      "templateHash": "16817155437094360629"
     }
   },
   "parameters": {
@@ -369,7 +369,7 @@
     ],
     "effectiveAppServicePlanSku": "[if(or(parameters('enableScalability'), parameters('enableRedundancy')), 'P1v3', parameters('appServicePlanSku'))]",
     "resourceTags": "[union(variables('existingTags'), parameters('tags'), createObject('TemplateName', 'Customer Chat bot', 'CreatedBy', variables('createdBy'), 'DeploymentName', deployment().name, 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF')))]",
-    "virtualMachineAvailabilityZone": 1,
+    "virtualMachineAvailabilityZone": -1,
     "helloWorldDefaultImageName": "DOCKER|mcr.microsoft.com/azuredocs/containerapps-helloworld:latest",
     "chatApiAppName": "[format('api-chat-{0}', variables('solutionSuffix'))]",
     "chatWebAppName": "[format('app-chat-{0}', variables('solutionSuffix'))]",
@@ -28342,8 +28342,8 @@
       },
       "dependsOn": [
         "ai_foundry_project",
-        "[format('privateDnsZoneDeployments[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('privateDnsZoneDeployments[{0}]', variables('dnsZoneIndex').openAI)]",
+        "[format('privateDnsZoneDeployments[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('privateDnsZoneDeployments[{0}]', variables('dnsZoneIndex').aiServices)]",
         "virtualNetwork"
       ]

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.46.1.21595",
-      "templateHash": "6462978155776172807"
+      "templateHash": "15706420920984431109"
     }
   },
   "parameters": {
@@ -5048,7 +5048,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.46.1.21595",
-              "templateHash": "18185621956314540221"
+              "templateHash": "15076250984768619028"
             }
           },
           "parameters": {
@@ -5411,7 +5411,7 @@
             ],
             "effectiveAppServicePlanSku": "[if(or(parameters('enableScalability'), parameters('enableRedundancy')), 'P1v3', parameters('appServicePlanSku'))]",
             "resourceTags": "[union(variables('existingTags'), parameters('tags'), createObject('TemplateName', 'Customer Chat bot', 'CreatedBy', variables('createdBy'), 'DeploymentName', deployment().name, 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF')))]",
-            "virtualMachineAvailabilityZone": 1,
+            "virtualMachineAvailabilityZone": -1,
             "helloWorldDefaultImageName": "DOCKER|mcr.microsoft.com/azuredocs/containerapps-helloworld:latest",
             "chatApiAppName": "[format('api-chat-{0}', variables('solutionSuffix'))]",
             "chatWebAppName": "[format('app-chat-{0}', variables('solutionSuffix'))]",
@@ -33384,9 +33384,9 @@
               },
               "dependsOn": [
                 "ai_foundry_project",
-                "[format('privateDnsZoneDeployments[{0}]', variables('dnsZoneIndex').openAI)]",
                 "[format('privateDnsZoneDeployments[{0}]', variables('dnsZoneIndex').aiServices)]",
                 "[format('privateDnsZoneDeployments[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
+                "[format('privateDnsZoneDeployments[{0}]', variables('dnsZoneIndex').openAI)]",
                 "virtualNetwork"
               ]
             },

infra/scripts/post-provision/agent_scripts/requirements.txt

@@ -1,3 +1,5 @@
+--index-url https://packagefeedproxy.microsoft.io/pypi/simple/
+
 agent-framework-azure-ai==1.0.0rc6
 agent-framework-core==1.0.0rc6
 azure-ai-projects>=2.3.0

infra/scripts/post-provision/agent_scripts/run_create_agents_scripts.ps1

@@ -326,7 +326,7 @@ $requirementFile = "infra/scripts/post-provision/agent_scripts/requirements.txt"
 
 # Download and install Python requirements
 Write-Host "Installing Python requirements..."
-python -m pip install --upgrade pip
+python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
 python -m pip install --quiet -r "$requirementFile"
 
 # For WAF deployments, temporarily enable public network access on Azure AI Foundry

infra/scripts/post-provision/agent_scripts/run_create_agents_scripts.sh

@@ -561,7 +561,7 @@ fi
 requirementFile="infra/scripts/post-provision/agent_scripts/requirements.txt"
 
 # Download and install Python requirements
-python -m pip install --upgrade pip
+python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
 python -m pip install --quiet -r "$requirementFile"
 
 # Enable public network access for required services

infra/scripts/post-provision/data_scripts/requirements.txt

@@ -1,3 +1,5 @@
+--index-url https://packagefeedproxy.microsoft.io/pypi/simple/
+
 openai==2.33.0
 azure-identity==1.25.3
 azure-search-documents==11.7.0b2

infra/scripts/post-provision/data_scripts/run_upload_data_scripts.ps1

@@ -464,7 +464,7 @@ $requirementFile = "infra/scripts/post-provision/data_scripts/requirements.txt"
 
 # Download and install Python requirements
 Write-Host "Installing Python requirements..."
-python -m pip install --upgrade pip
+python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
 python -m pip install --quiet -r "$requirementFile"
 
 # For WAF deployments, temporarily enable public network access on Azure AI Foundry (needed for embeddings)

infra/scripts/post-provision/data_scripts/run_upload_data_scripts.sh

@@ -739,7 +739,7 @@ fi
 requirementFile="infra/scripts/post-provision/data_scripts/requirements.txt"
 
 # Download and install Python requirements
-python -m pip install --upgrade pip
+python -m pip install --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
 python -m pip install --quiet -r "$requirementFile"
 
 # Enable public network access for required services

infra/vscode_web/endpoint-requirements.txt

@@ -1,3 +1,4 @@
+--index-url https://packagefeedproxy.microsoft.io/pypi/simple/
 azure-ai-projects>=2.3.0
 azure-identity==1.25.3
 ansible-core~=2.20.3

infra/vscode_web/requirements.txt

@@ -1,3 +1,4 @@
+--index-url https://packagefeedproxy.microsoft.io/pypi/simple/
 azure-ai-projects>=2.3.0
 azure-identity==1.25.3
 ansible-core~=2.20.3

scenario-app/backend/Dockerfile

@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 COPY requirements.txt .
-RUN pip install --no-cache-dir --upgrade pip
+RUN pip install --no-cache-dir --upgrade pip --index-url https://packagefeedproxy.microsoft.io/pypi/simple/
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .

scenario-app/backend/requirements.txt

@@ -1,3 +1,5 @@
+--index-url https://packagefeedproxy.microsoft.io/pypi/simple/
+
 # Base packages for E-commerce API
 cachetools==7.0.0
 python-dotenv==1.2.1

scenario-app/frontend/.npmrc

@@ -0,0 +1 @@
+registry=https://pkgs.dev.azure.com/ms-feed-12/1es-public/_packaging/npm-public/npm/registry/

scenario-app/frontend/Dockerfile

@@ -1,6 +1,6 @@
 FROM mcr.microsoft.com/azurelinux/base/nodejs:20 AS widget-builder
 WORKDIR /src/chat-app/frontend
-COPY chat-app/frontend/package*.json ./
+COPY chat-app/frontend/package*.json chat-app/frontend/.npmrc ./
 RUN npm ci --legacy-peer-deps
 COPY chat-app/frontend/ ./
 RUN npm run build
@@ -9,7 +9,7 @@ FROM mcr.microsoft.com/azurelinux/base/nodejs:20 AS app-builder
 WORKDIR /src/scenario-app/frontend
 ARG VITE_SCENARIO=ecommerce
 ENV VITE_SCENARIO=$VITE_SCENARIO
-COPY scenario-app/frontend/package*.json ./
+COPY scenario-app/frontend/package*.json scenario-app/frontend/.npmrc ./
 RUN npm ci --legacy-peer-deps
 COPY scenario-app/frontend/ ./
 RUN npm run build