Skip to content

Commit 3053ffc

Browse files
Vamshi-MicrosoftVamshi-Microsoft
committed
Merge branch 'dev' into exp-changes
2 parents 2cc84de + b88f111 commit 3053ffc

File tree

9 files changed

+64
-760
lines changed

9 files changed

+64
-760
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ updates:
2020
target-branch: "dependabotchanges"
2121
open-pull-requests-limit: 100
2222

23-
- package-ecosystem: "pip"
24-
directory: "/src/AzureFunction"
25-
schedule:
26-
interval: "monthly"
27-
commit-message:
28-
prefix: "build"
29-
target-branch: "dependabotchanges"
30-
open-pull-requests-limit: 100
31-
3223
- package-ecosystem: "pip"
3324
directory: "/src/infra/scripts/fabric_scripts"
3425
schedule:

‎infra/deploy_app_service.bicep‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ param AzureSearchUseSemanticSearch string = 'False'
3232
@description('Semantic search config')
3333
param AzureSearchSemanticSearchConfig string = 'default'
3434

35-
@description('Is the index prechunked')
36-
param AzureSearchIndexIsPrechunked string = 'False'
37-
3835
@description('Top K results')
3936
param AzureSearchTopK string = '5'
4037

@@ -59,9 +56,6 @@ param AzureOpenAIResource string
5956
@description('Azure OpenAI Model Deployment Name')
6057
param AzureOpenAIModel string
6158

62-
@description('Azure OpenAI Model Name')
63-
param AzureOpenAIModelName string = 'gpt-4o-mini'
64-
6559
@description('Azure Open AI Endpoint')
6660
param AzureOpenAIEndpoint string = ''
6761

@@ -116,15 +110,9 @@ param AzureOpenAIEmbeddingkey string = ''
116110
@description('Azure Open AI Embedding Endpoint')
117111
param AzureOpenAIEmbeddingEndpoint string = ''
118112

119-
@description('Enable chat history by deploying a Cosmos DB instance')
120-
param WebAppEnableChatHistory string = 'False'
121-
122113
@description('Use Azure Function')
123114
param USE_INTERNAL_STREAM string = 'True'
124115

125-
@description('Azure Function Endpoint')
126-
param STREAMING_AZUREFUNCTION_ENDPOINT string = ''
127-
128116
@description('SQL Database Server Name')
129117
param SQLDB_SERVER string = ''
130118

@@ -163,8 +151,6 @@ param userassignedIdentityId string
163151
param userassignedIdentityClientId string
164152
param applicationInsightsId string
165153

166-
@secure()
167-
param azureSearchAdminKey string
168154
param azureSearchServiceEndpoint string
169155

170156
@description('Azure Function App SQL System Prompt')
@@ -240,10 +226,6 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
240226
name: 'AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG'
241227
value: AzureSearchSemanticSearchConfig
242228
}
243-
{
244-
name: 'AZURE_SEARCH_INDEX_IS_PRECHUNKED'
245-
value: AzureSearchIndexIsPrechunked
246-
}
247229
{
248230
name: 'AZURE_SEARCH_TOP_K'
249231
value: AzureSearchTopK
@@ -284,10 +266,6 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
284266
name: 'AZURE_OPENAI_KEY'
285267
value: AzureOpenAIKey
286268
}
287-
{
288-
name: 'AZURE_OPENAI_MODEL_NAME'
289-
value: AzureOpenAIModelName
290-
}
291269
{
292270
name: 'AZURE_OPENAI_TEMPERATURE'
293271
value: AzureOpenAITemperature
@@ -346,11 +324,6 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
346324
name: 'AZURE_OPENAI_EMBEDDING_ENDPOINT'
347325
value: AzureOpenAIEmbeddingEndpoint
348326
}
349-
350-
{
351-
name: 'WEB_APP_ENABLE_CHAT_HISTORY'
352-
value: WebAppEnableChatHistory
353-
}
354327

355328
{name: 'SQLDB_SERVER'
356329
value: SQLDB_SERVER
@@ -372,10 +345,6 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
372345
value: USE_INTERNAL_STREAM
373346
}
374347

375-
{name: 'STREAMING_AZUREFUNCTION_ENDPOINT'
376-
value: STREAMING_AZUREFUNCTION_ENDPOINT
377-
}
378-
379348
{name: 'AZURE_COSMOSDB_ACCOUNT'
380349
value: AZURE_COSMOSDB_ACCOUNT
381350
}
@@ -391,30 +360,10 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
391360
//{name: 'VITE_POWERBI_EMBED_URL'
392361
// value: VITE_POWERBI_EMBED_URL
393362
//}
394-
{
395-
name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
396-
value: 'true'
397-
}
398-
{
399-
name: 'UWSGI_PROCESSES'
400-
value: '2'
401-
}
402-
{
403-
name: 'UWSGI_THREADS'
404-
value: '2'
405-
}
406363
{
407364
name: 'SQLDB_USER_MID'
408365
value: userassignedIdentityClientId
409366
}
410-
{
411-
name: 'OPENAI_API_VERSION'
412-
value: AzureOpenAIApiVersion
413-
}
414-
{
415-
name: 'AZURE_AI_SEARCH_API_KEY'
416-
value: azureSearchAdminKey
417-
}
418367
{
419368
name: 'AZURE_AI_SEARCH_ENDPOINT'
420369
value: azureSearchServiceEndpoint

‎infra/main.bicep‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,17 +204,15 @@ module appserviceModule 'deploy_app_service.bicep' = {
204204
AzureSearchKey:keyVault.getSecret('AZURE-SEARCH-KEY')
205205
AzureSearchUseSemanticSearch:'True'
206206
AzureSearchSemanticSearchConfig:'my-semantic-config'
207-
AzureSearchIndexIsPrechunked:'False'
208207
AzureSearchTopK:'5'
209208
AzureSearchContentColumns:'content'
210209
AzureSearchFilenameColumn:'chunk_id'
211210
AzureSearchTitleColumn:'client_id'
212211
AzureSearchUrlColumn:'sourceurl'
213-
AzureOpenAIResource:aifoundry.outputs.aiServicesTarget
212+
AzureOpenAIResource:aifoundry.outputs.aiServicesName
214213
AzureOpenAIEndpoint:aifoundry.outputs.aiServicesTarget
215214
AzureOpenAIModel:gptModelName
216215
AzureOpenAIKey:keyVault.getSecret('AZURE-OPENAI-KEY')
217-
AzureOpenAIModelName:gptModelName
218216
AzureOpenAITemperature:'0'
219217
AzureOpenAITopP:'1'
220218
AzureOpenAIMaxTokens:'1000'
@@ -243,7 +241,6 @@ module appserviceModule 'deploy_app_service.bicep' = {
243241
userassignedIdentityClientId:managedIdentityModule.outputs.managedIdentityWebAppOutput.clientId
244242
userassignedIdentityId:managedIdentityModule.outputs.managedIdentityWebAppOutput.id
245243
applicationInsightsId: aifoundry.outputs.applicationInsightsId
246-
azureSearchAdminKey:keyVault.getSecret('AZURE-SEARCH-KEY')
247244
azureSearchServiceEndpoint:aifoundry.outputs.aiSearchTarget
248245
sqlSystemPrompt: functionAppSqlPrompt
249246
callTranscriptSystemPrompt: functionAppCallTranscriptSystemPrompt

‎infra/main.json‎

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -2139,9 +2139,6 @@
21392139
"AzureSearchSemanticSearchConfig": {
21402140
"value": "my-semantic-config"
21412141
},
2142-
"AzureSearchIndexIsPrechunked": {
2143-
"value": "False"
2144-
},
21452142
"AzureSearchTopK": {
21462143
"value": "5"
21472144
},
@@ -2158,7 +2155,7 @@
21582155
"value": "sourceurl"
21592156
},
21602157
"AzureOpenAIResource": {
2161-
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiServicesTarget.value]"
2158+
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiServicesName.value]"
21622159
},
21632160
"AzureOpenAIEndpoint": {
21642161
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiServicesTarget.value]"
@@ -2174,9 +2171,6 @@
21742171
"secretName": "AZURE-OPENAI-KEY"
21752172
}
21762173
},
2177-
"AzureOpenAIModelName": {
2178-
"value": "[parameters('gptModelName')]"
2179-
},
21802174
"AzureOpenAITemperature": {
21812175
"value": "0"
21822176
},
@@ -2268,14 +2262,6 @@
22682262
"applicationInsightsId": {
22692263
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.applicationInsightsId.value]"
22702264
},
2271-
"azureSearchAdminKey": {
2272-
"reference": {
2273-
"keyVault": {
2274-
"id": "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.KeyVault/vaults', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.keyvaultName.value)]"
2275-
},
2276-
"secretName": "AZURE-SEARCH-KEY"
2277-
}
2278-
},
22792265
"azureSearchServiceEndpoint": {
22802266
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiSearchTarget.value]"
22812267
},
@@ -2383,13 +2369,6 @@
23832369
"description": "Semantic search config"
23842370
}
23852371
},
2386-
"AzureSearchIndexIsPrechunked": {
2387-
"type": "string",
2388-
"defaultValue": "False",
2389-
"metadata": {
2390-
"description": "Is the index prechunked"
2391-
}
2392-
},
23932372
"AzureSearchTopK": {
23942373
"type": "string",
23952374
"defaultValue": "5",
@@ -2444,13 +2423,6 @@
24442423
"description": "Azure OpenAI Model Deployment Name"
24452424
}
24462425
},
2447-
"AzureOpenAIModelName": {
2448-
"type": "string",
2449-
"defaultValue": "gpt-4o-mini",
2450-
"metadata": {
2451-
"description": "Azure OpenAI Model Name"
2452-
}
2453-
},
24542426
"AzureOpenAIEndpoint": {
24552427
"type": "string",
24562428
"defaultValue": "",
@@ -2576,27 +2548,13 @@
25762548
"description": "Azure Open AI Embedding Endpoint"
25772549
}
25782550
},
2579-
"WebAppEnableChatHistory": {
2580-
"type": "string",
2581-
"defaultValue": "False",
2582-
"metadata": {
2583-
"description": "Enable chat history by deploying a Cosmos DB instance"
2584-
}
2585-
},
25862551
"USE_INTERNAL_STREAM": {
25872552
"type": "string",
25882553
"defaultValue": "True",
25892554
"metadata": {
25902555
"description": "Use Azure Function"
25912556
}
25922557
},
2593-
"STREAMING_AZUREFUNCTION_ENDPOINT": {
2594-
"type": "string",
2595-
"defaultValue": "",
2596-
"metadata": {
2597-
"description": "Azure Function Endpoint"
2598-
}
2599-
},
26002558
"SQLDB_SERVER": {
26012559
"type": "string",
26022560
"defaultValue": "",
@@ -2665,9 +2623,6 @@
26652623
"applicationInsightsId": {
26662624
"type": "string"
26672625
},
2668-
"azureSearchAdminKey": {
2669-
"type": "securestring"
2670-
},
26712626
"azureSearchServiceEndpoint": {
26722627
"type": "string"
26732628
},
@@ -2764,10 +2719,6 @@
27642719
"name": "AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG",
27652720
"value": "[parameters('AzureSearchSemanticSearchConfig')]"
27662721
},
2767-
{
2768-
"name": "AZURE_SEARCH_INDEX_IS_PRECHUNKED",
2769-
"value": "[parameters('AzureSearchIndexIsPrechunked')]"
2770-
},
27712722
{
27722723
"name": "AZURE_SEARCH_TOP_K",
27732724
"value": "[parameters('AzureSearchTopK')]"
@@ -2808,10 +2759,6 @@
28082759
"name": "AZURE_OPENAI_KEY",
28092760
"value": "[parameters('AzureOpenAIKey')]"
28102761
},
2811-
{
2812-
"name": "AZURE_OPENAI_MODEL_NAME",
2813-
"value": "[parameters('AzureOpenAIModelName')]"
2814-
},
28152762
{
28162763
"name": "AZURE_OPENAI_TEMPERATURE",
28172764
"value": "[parameters('AzureOpenAITemperature')]"
@@ -2868,10 +2815,6 @@
28682815
"name": "AZURE_OPENAI_EMBEDDING_ENDPOINT",
28692816
"value": "[parameters('AzureOpenAIEmbeddingEndpoint')]"
28702817
},
2871-
{
2872-
"name": "WEB_APP_ENABLE_CHAT_HISTORY",
2873-
"value": "[parameters('WebAppEnableChatHistory')]"
2874-
},
28752818
{
28762819
"name": "SQLDB_SERVER",
28772820
"value": "[parameters('SQLDB_SERVER')]"
@@ -2892,10 +2835,6 @@
28922835
"name": "USE_INTERNAL_STREAM",
28932836
"value": "[parameters('USE_INTERNAL_STREAM')]"
28942837
},
2895-
{
2896-
"name": "STREAMING_AZUREFUNCTION_ENDPOINT",
2897-
"value": "[parameters('STREAMING_AZUREFUNCTION_ENDPOINT')]"
2898-
},
28992838
{
29002839
"name": "AZURE_COSMOSDB_ACCOUNT",
29012840
"value": "[parameters('AZURE_COSMOSDB_ACCOUNT')]"
@@ -2912,30 +2851,10 @@
29122851
"name": "AZURE_COSMOSDB_ENABLE_FEEDBACK",
29132852
"value": "[parameters('AZURE_COSMOSDB_ENABLE_FEEDBACK')]"
29142853
},
2915-
{
2916-
"name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
2917-
"value": "true"
2918-
},
2919-
{
2920-
"name": "UWSGI_PROCESSES",
2921-
"value": "2"
2922-
},
2923-
{
2924-
"name": "UWSGI_THREADS",
2925-
"value": "2"
2926-
},
29272854
{
29282855
"name": "SQLDB_USER_MID",
29292856
"value": "[parameters('userassignedIdentityClientId')]"
29302857
},
2931-
{
2932-
"name": "OPENAI_API_VERSION",
2933-
"value": "[parameters('AzureOpenAIApiVersion')]"
2934-
},
2935-
{
2936-
"name": "AZURE_AI_SEARCH_API_KEY",
2937-
"value": "[parameters('azureSearchAdminKey')]"
2938-
},
29392858
{
29402859
"name": "AZURE_AI_SEARCH_ENDPOINT",
29412860
"value": "[parameters('azureSearchServiceEndpoint')]"

0 commit comments

Comments
 (0)