update files, remove extra aoai connection

Author: sophia-ramsey

azure.yaml

@@ -1,19 +1,32 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
+# TODO: do we need hooks? 
+# TODO: do we need all of the variables?
 
-name: azure-ai-projects-file-search
+name: azd-aistudio-starter
 metadata:
-    template: [email protected]
+  template: [email protected]
+
 services:
-    src:
-        project: src
-        host: containerapp
-        language: python
-        docker:
-            path: Dockerfile
+  api:
+    project: ./src
+    language: py
+    host: containerapp
+    docker:
+      remoteBuild: true
 
-# TODO: do we need hooks? 
+hooks:
+  postprovision:
+    windows:
+      shell: pwsh
+      run: ./scripts/write_env.ps1
+      continueOnError: true
+      interactive: true
+    posix:
+      shell: sh
+      run: ./scripts/write_env.sh
+      continueOnError: true
+      interactive: true
 
-# TODO: do we need all of these?
 pipeline:
   variables:
     - AZURE_RESOURCE_GROUP

infra/core/ai/hub.bicep

@@ -14,8 +14,8 @@ param containerRegistryId string = ''
 param aiServicesName string
 @description('The AI Services connection name to use for the AI Foundry Hub Resource')
 param aiServicesConnectionName string
-@description('The AI Services Content Safety connection name to use for the AI Foundry Hub Resource')
-param aiServicesContentSafetyConnectionName string
+// @description('The AI Services Content Safety connection name to use for the AI Foundry Hub Resource')
+// param aiServicesContentSafetyConnectionName string
 @description('The Azure Cognitive Search service name to use for the AI Foundry Hub Resource')
 param aiSearchName string = ''
 @description('The Azure Cognitive Search service connection name to use for the AI Foundry Hub Resource')
@@ -78,23 +78,23 @@ resource hub 'Microsoft.MachineLearningServices/workspaces@2024-07-01-preview' =
     }
   }
 
-  resource contentSafetyConnection 'connections' = {
-    name: aiServicesContentSafetyConnectionName
-    properties: {
-      category: 'AzureOpenAI'
-      authType: 'ApiKey'
-      isSharedToAll: true
-      target: aiService.properties.endpoints['Content Safety']
-      metadata: {
-        ApiVersion: '2023-07-01-preview'
-        ApiType: 'azure'
-        ResourceId: aiService.id
-      }
-      credentials: {
-        key: aiService.listKeys().key1
-      }
-    }
-  }
+  // resource contentSafetyConnection 'connections' = {
+  //   name: aiServicesContentSafetyConnectionName
+  //   properties: {
+  //     category: 'AzureOpenAI'
+  //     authType: 'ApiKey'
+  //     isSharedToAll: true
+  //     target: aiService.properties.endpoints['Content Safety']
+  //     metadata: {
+  //       ApiVersion: '2023-07-01-preview'
+  //       ApiType: 'azure'
+  //       ResourceId: aiService.id
+  //     }
+  //     credentials: {
+  //       key: aiService.listKeys().key1
+  //     }
+  //   }
+  // }
 
   resource searchConnection 'connections' =
     if (!empty(aiSearchName)) {

infra/core/host/ai-environment.bicep

@@ -16,8 +16,8 @@ param aiServicesName string
 param aiServicesConnectionName string
 @description('The AI Services model deployments.')
 param aiServiceModelDeployments array = []
-@description('The AI Services content safety connection name.')
-param aiServicesContentSafetyConnectionName string
+// @description('The AI Services content safety connection name.')
+// param aiServicesContentSafetyConnectionName string
 @description('The Log Analytics resource name.')
 param logAnalyticsName string = ''
 @description('The Application Insights resource name.')
@@ -59,7 +59,7 @@ module hub '../ai/hub.bicep' = {
     applicationInsightsId: hubDependencies.outputs.applicationInsightsId
     aiServicesName: hubDependencies.outputs.aiServicesName
     aiServicesConnectionName: aiServicesConnectionName
-    aiServicesContentSafetyConnectionName: aiServicesContentSafetyConnectionName
+  //   aiServicesContentSafetyConnectionName: aiServicesContentSafetyConnectionName
     aiSearchName: hubDependencies.outputs.searchServiceName
     aiSearchConnectionName: searchConnectionName
   }

infra/main.bicep

@@ -54,8 +54,8 @@ param applicationInsightsName string = ''
 param aiServicesName string = ''
 @description('The AI Services connection name. If ommited will use a default value')
 param aiServicesConnectionName string = ''
-@description('The AI Services content safety connection name. If ommited will use a default value')
-param aiServicesContentSafetyConnectionName string = ''
+// @description('The AI Services content safety connection name. If ommited will use a default value')
+// param aiServicesContentSafetyConnectionName string = ''
 @description('The Azure Container Registry resource name. If ommited will be generated')
 param containerRegistryName string = ''
 @description('The Azure Key Vault resource name. If ommited will be generated')
@@ -188,9 +188,9 @@ module ai 'core/host/ai-environment.bicep' = if (empty(aiExistingProjectConnecti
       : '${abbrs.storageStorageAccounts}${resourceToken}'
     aiServicesName: !empty(aiServicesName) ? aiServicesName : 'aoai-${resourceToken}'
     aiServicesConnectionName: !empty(aiServicesConnectionName) ? aiServicesConnectionName : 'aoai-${resourceToken}'
-    aiServicesContentSafetyConnectionName: !empty(aiServicesContentSafetyConnectionName)
-      ? aiServicesContentSafetyConnectionName
-      : 'aoai-content-safety-connection'
+    // aiServicesContentSafetyConnectionName: !empty(aiServicesContentSafetyConnectionName)
+    //   ? aiServicesContentSafetyConnectionName
+    //   : 'aoai-content-safety-connection'
     aiServiceModelDeployments: aiDeployments
     logAnalyticsName: logAnalyticsWorkspaceResolvedName
     applicationInsightsName: !useApplicationInsights

pyproject.toml

@@ -0,0 +1,5 @@
+[tool.ruff]
+line-length = 120
+target-version = "py39"
+lint.select = ["E", "F", "I", "UP"]
+lint.ignore = ["D203"]

requirements-dev.txt

@@ -0,0 +1,3 @@
+-r src/requirements.txt
+ruff
+pre-commit

src/api/main.py

@@ -43,7 +43,7 @@ async def lifespan(app: fastapi.FastAPI):
 
     ai_client = AIProjectClient.from_connection_string(
         credential=DefaultAzureCredential(exclude_shared_token_cache_credential=True),
-        conn_str=os.environ["PROJECT_CONNECTION_STRING"],
+        conn_str=os.environ["AZURE_AIPROJECT_CONNECTION_STRING"],
     )
 
     # TODO: add more files are not supported for citation at the moment