Added new env vars comment out new continer until its published

Author: TravisHilbert

infra/deploy_ai_foundry.bicep

@@ -298,3 +298,5 @@ output storageAccountName string = storageNameCleaned
 
 output logAnalyticsId string = logAnalytics.id
 output storageAccountId string = storage.id
+
+output projectConnectionString string = '${split(aiHubProject.properties.discoveryUrl, '/')[2]};${subscription().subscriptionId};${resourceGroup().name};${aiHubProject.name}'

infra/main.bicep

@@ -1,7 +1,7 @@
 @minLength(3)
 @maxLength(10)
 @description('Prefix for all resources created by this template.  This prefix will be used to create unique names for all resources.  The prefix must be unique within the resource group.')
-param ResourcePrefix string 
+param ResourcePrefix string
 
 @allowed([
   'australiaeast'
@@ -29,7 +29,7 @@ param ResourcePrefix string
   'westus3'
 ])
 @description('Location for all Ai services resources. This location can be different from the resource group location.')
-param AiLocation string  // The location used for all deployed resources.  This location must be in the same region as the resource group.
+param AiLocation string   // The location used for all deployed resources.  This location must be in the same region as the resource group.
 param capacity int = 5
 
 
@@ -46,7 +46,7 @@ var randomString = substring(uniqueString(resourceGroup().id), 0, 4)
 // Combine the base name with the random suffix
 var finalName = '${ResourcePrefix}-${randomString}'
 
-var imageVersion = 'rc1'
+var imageVersion = 'rc1' //Change to "Fnd01" when new container is available
 var location  = resourceGroup().location
 var dblocation  = resourceGroup().location
 var cosmosdbDatabase  = 'cmsadb'
@@ -352,6 +352,26 @@ resource containerAppBackend 'Microsoft.App/containerApps@2023-05-01' = {
               name: 'TERMINATION_MODEL_DEPLOY'
               value: llmModel
             }
+            {
+              name: 'AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME'
+              value: llmModel
+            }
+            {
+              name: 'AZURE_AI_AGENT_PROJECT_NAME'
+              value: aifoundry.outputs.aiProjectName
+            }
+            {
+              name: 'AZURE_AI_AGENT_RESOURCE_GROUP_NAME'
+              value: resourceGroup().name
+            }
+            {
+              name: 'AZURE_AI_AGENT_SUBSCRIPTION_ID'
+              value: subscription().subscriptionId
+            }
+            {
+              name: 'AZURE_AI_AGENT_PROJECT_CONNECTION_STRING'
+              value: aifoundry.outputs.projectConnectionString
+            }
           ]
           resources: {
             cpu: 1

infra/main.json

@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.33.93.31351",
-      "templateHash": "11802129812634129151"
+      "version": "0.34.44.8038",
+      "templateHash": "8953208502938265930"
     }
   },
   "parameters": {
@@ -216,6 +216,26 @@
                 {
                   "name": "TERMINATION_MODEL_DEPLOY",
                   "value": "[variables('llmModel')]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME",
+                  "value": "[variables('llmModel')]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_PROJECT_NAME",
+                  "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiProjectName.value]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_RESOURCE_GROUP_NAME",
+                  "value": "[resourceGroup().name]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_SUBSCRIPTION_ID",
+                  "value": "[subscription().subscriptionId]"
+                },
+                {
+                  "name": "AZURE_AI_AGENT_PROJECT_CONNECTION_STRING",
+                  "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.projectConnectionString.value]"
                 }
               ],
               "resources": {
@@ -353,8 +373,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "11665286146084422127"
+              "version": "0.34.44.8038",
+              "templateHash": "17863870312619064541"
             }
           },
           "parameters": {
@@ -451,8 +471,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "4388214478635448075"
+              "version": "0.34.44.8038",
+              "templateHash": "10664495342911727649"
             }
           },
           "parameters": {
@@ -589,8 +609,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.93.31351",
-              "templateHash": "10270252950808398257"
+              "version": "0.34.44.8038",
+              "templateHash": "8087543237770345715"
             }
           },
           "parameters": {
@@ -939,6 +959,10 @@
             "storageAccountId": {
               "type": "string",
               "value": "[resourceId('Microsoft.Storage/storageAccounts', variables('storageNameCleaned'))]"
+            },
+            "projectConnectionString": {
+              "type": "string",
+              "value": "[format('{0};{1};{2};{3}', split(reference(resourceId('Microsoft.MachineLearningServices/workspaces', variables('aiProjectName')), '2024-01-01-preview').discoveryUrl, '/')[2], subscription().subscriptionId, resourceGroup().name, variables('aiProjectName'))]"
             }
           }
         }