Skip to content

Commit 31a4dec

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #288 from microsoft/add-appser-envvar-values
fix: added app service env variable values and made "sourceurl" index field as searchable to show citations
2 parents bd88252 + 8d7924a commit 31a4dec

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

‎app.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ async def get_section_content(request_body, request_headers):
912912
def retrieve_document(filepath):
913913
try:
914914
search_client = init_ai_search_client()
915-
search_query = f"filepath eq '{filepath}'"
915+
search_query = f"sourceurl eq '{filepath}'"
916916
# Execute the search query
917917
results = search_client.search(search_query)
918918

‎frontend/src/pages/document/Document.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const Document = (): JSX.Element => {
3939
{isLoading ? ( // Step 4
4040
<p>Loading...</p>
4141
) : document ? (
42-
<p>{document.full_content}</p>
42+
<p>{document.content}</p>
4343
) : (
4444
<h1>Document not found. Please try again.</h1>
4545
)}

‎infra/deploy_app_service.bicep‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,31 @@ param aiSearchService string
4848
param AzureSearchKey string = ''
4949

5050
@description('Enable Semantic Search in Azure Search')
51-
param AzureSearchUseSemanticSearch string = ''
51+
param AzureSearchUseSemanticSearch string = 'False'
5252

5353
@description('Enable In-Domain Search in Azure Search')
54-
param AzureSearchEnableInDomain string = ''
54+
param AzureSearchEnableInDomain string = 'True'
5555

5656
@description('Azure Search Top K')
57-
param AzureSearchTopK string = ''
57+
param AzureSearchTopK string = '5'
5858

5959
@description('Azure Search Query Type')
60-
param AzureSearchQueryType string = ''
60+
param AzureSearchQueryType string = 'simple'
6161

6262
@description('Azure Search Index Is Prechunked')
63-
param AzureSearchIndexIsPrechunked string = ''
63+
param AzureSearchIndexIsPrechunked string = 'True'
6464

6565
@description('Azure Search Vector Fields')
66-
param AzureSearchVectorFields string = ''
66+
param AzureSearchVectorFields string = 'contentVector'
6767

6868
@description('Azure Search Strictness')
69-
param AzureSearchStrictness string = ''
69+
param AzureSearchStrictness string = '3'
7070

7171
@description('Azure Search Permitted Groups Field')
7272
param AzureSearchPermittedGroupsField string = ''
7373

7474
@description('Azure Search Content Columns')
75-
param AzureSearchContentColumns string = ''
75+
param AzureSearchContentColumns string = 'content'
7676

7777
@description('Azure Search Title Column')
7878
param AzureSearchTitleColumn string = ''
@@ -81,16 +81,16 @@ param AzureSearchTitleColumn string = ''
8181
param AzureSearchUrlColumn string = ''
8282

8383
@description('Azure Search Filename Column')
84-
param AzureSearchFilenameColumn string = ''
84+
param AzureSearchFilenameColumn string = 'sourceurl'
8585

8686
@description('Azure Search Semantic Search Config')
87-
param AzureSearchSemanticSearchConfig string = ''
87+
param AzureSearchSemanticSearchConfig string = 'my-semantic-config'
8888

8989
@description('Azure Cosmos DB Account')
9090
param AZURE_COSMOSDB_ACCOUNT string = ''
9191

9292
@description('Azure Search Index')
93-
param AzureSearchIndex string = ''
93+
param AzureSearchIndex string = 'pdf_index'
9494

9595
@description('Azure Cosmos DB Conversations Container')
9696
param AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = ''

‎infra/main.bicep‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ param deploymentType string = 'Standard'
3535
])
3636
param gptModelName string = 'gpt-4'
3737

38-
param azureOpenAIAPIVersion string = '2024-05-01-preview'
38+
param azureOpenaiAPIVersion string = '2024-05-01-preview'
3939

4040
@minValue(10)
4141
@description('Capacity of the GPT deployment:')
@@ -97,7 +97,7 @@ module aifoundry 'deploy_ai_foundry.bicep' = {
9797
keyVaultName: kvault.outputs.keyvaultName
9898
deploymentType: deploymentType
9999
gptModelName: gptModelName
100-
gptModelVersion: azureOpenAIAPIVersion
100+
gptModelVersion: azureOpenaiAPIVersion
101101
gptDeploymentCapacity: gptDeploymentCapacity
102102
embeddingModel: embeddingModel
103103
embeddingDeploymentCapacity: embeddingDeploymentCapacity
@@ -377,7 +377,7 @@ module appserviceModule 'deploy_app_service.bicep' = {
377377
AzureOpenAIEndpoint:aifoundry.outputs.aiServicesTarget
378378
AzureOpenAIModel: gptModelName //'gpt-4o-mini'
379379
AzureOpenAIKey:keyVault.getSecret('AZURE-OPENAI-KEY')
380-
azureOpenAIApiVersion: azureOpenAIAPIVersion //'2024-02-15-preview'
380+
azureOpenAIApiVersion: azureOpenaiAPIVersion //'2024-02-15-preview'
381381
AZURE_OPENAI_RESOURCE:aifoundry.outputs.aiServicesName
382382
USE_CHAT_HISTORY_ENABLED:'True'
383383
AZURE_COSMOSDB_ACCOUNT: cosmosDBModule.outputs.cosmosAccountName

‎infra/main.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.33.93.31351",
8-
"templateHash": "15591172735460382570"
8+
"templateHash": "4863966964832108128"
99
}
1010
},
1111
"parameters": {
@@ -51,7 +51,7 @@
5151
"description": "Name of the GPT model to deploy:"
5252
}
5353
},
54-
"azureOpenAIAPIVersion": {
54+
"azureOpenaiAPIVersion": {
5555
"type": "string",
5656
"defaultValue": "2024-05-01-preview"
5757
},
@@ -362,7 +362,7 @@
362362
"value": "[parameters('gptModelName')]"
363363
},
364364
"gptModelVersion": {
365-
"value": "[parameters('azureOpenAIAPIVersion')]"
365+
"value": "[parameters('azureOpenaiAPIVersion')]"
366366
},
367367
"gptDeploymentCapacity": {
368368
"value": "[parameters('gptDeploymentCapacity')]"
@@ -1183,7 +1183,7 @@
11831183
}
11841184
},
11851185
"azureOpenAIApiVersion": {
1186-
"value": "[parameters('azureOpenAIAPIVersion')]"
1186+
"value": "[parameters('azureOpenaiAPIVersion')]"
11871187
},
11881188
"AZURE_OPENAI_RESOURCE": {
11891189
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiServicesName.value]"
@@ -1211,7 +1211,7 @@
12111211
"_generator": {
12121212
"name": "bicep",
12131213
"version": "0.33.93.31351",
1214-
"templateHash": "363244865426099616"
1214+
"templateHash": "15057452249812707948"
12151215
}
12161216
},
12171217
"parameters": {
@@ -1301,49 +1301,49 @@
13011301
},
13021302
"AzureSearchUseSemanticSearch": {
13031303
"type": "string",
1304-
"defaultValue": "",
1304+
"defaultValue": "False",
13051305
"metadata": {
13061306
"description": "Enable Semantic Search in Azure Search"
13071307
}
13081308
},
13091309
"AzureSearchEnableInDomain": {
13101310
"type": "string",
1311-
"defaultValue": "",
1311+
"defaultValue": "True",
13121312
"metadata": {
13131313
"description": "Enable In-Domain Search in Azure Search"
13141314
}
13151315
},
13161316
"AzureSearchTopK": {
13171317
"type": "string",
1318-
"defaultValue": "",
1318+
"defaultValue": "5",
13191319
"metadata": {
13201320
"description": "Azure Search Top K"
13211321
}
13221322
},
13231323
"AzureSearchQueryType": {
13241324
"type": "string",
1325-
"defaultValue": "",
1325+
"defaultValue": "simple",
13261326
"metadata": {
13271327
"description": "Azure Search Query Type"
13281328
}
13291329
},
13301330
"AzureSearchIndexIsPrechunked": {
13311331
"type": "string",
1332-
"defaultValue": "",
1332+
"defaultValue": "True",
13331333
"metadata": {
13341334
"description": "Azure Search Index Is Prechunked"
13351335
}
13361336
},
13371337
"AzureSearchVectorFields": {
13381338
"type": "string",
1339-
"defaultValue": "",
1339+
"defaultValue": "contentVector",
13401340
"metadata": {
13411341
"description": "Azure Search Vector Fields"
13421342
}
13431343
},
13441344
"AzureSearchStrictness": {
13451345
"type": "string",
1346-
"defaultValue": "",
1346+
"defaultValue": "3",
13471347
"metadata": {
13481348
"description": "Azure Search Strictness"
13491349
}
@@ -1357,7 +1357,7 @@
13571357
},
13581358
"AzureSearchContentColumns": {
13591359
"type": "string",
1360-
"defaultValue": "",
1360+
"defaultValue": "content",
13611361
"metadata": {
13621362
"description": "Azure Search Content Columns"
13631363
}
@@ -1378,14 +1378,14 @@
13781378
},
13791379
"AzureSearchFilenameColumn": {
13801380
"type": "string",
1381-
"defaultValue": "",
1381+
"defaultValue": "sourceurl",
13821382
"metadata": {
13831383
"description": "Azure Search Filename Column"
13841384
}
13851385
},
13861386
"AzureSearchSemanticSearchConfig": {
13871387
"type": "string",
1388-
"defaultValue": "",
1388+
"defaultValue": "my-semantic-config",
13891389
"metadata": {
13901390
"description": "Azure Search Semantic Search Config"
13911391
}
@@ -1399,7 +1399,7 @@
13991399
},
14001400
"AzureSearchIndex": {
14011401
"type": "string",
1402-
"defaultValue": "",
1402+
"defaultValue": "pdf_index",
14031403
"metadata": {
14041404
"description": "Azure Search Index"
14051405
}

‎infra/scripts/index_scripts/01_create_search_index.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def create_search_index():
5757
SimpleField(name="id", type=SearchFieldDataType.String, key=True),
5858
SimpleField(name="chunk_id", type=SearchFieldDataType.String),
5959
SearchField(name="content", type=SearchFieldDataType.String),
60-
SimpleField(name="sourceurl", type=SearchFieldDataType.String),
60+
SearchableField(name="sourceurl", type=SearchFieldDataType.String),
6161
SearchField(name="contentVector", type=SearchFieldDataType.Collection(SearchFieldDataType.Single), \
6262
vector_search_dimensions=1536,vector_search_profile_name="myHnswProfile"
6363
)

0 commit comments

Comments
 (0)