Skip to content

Commit e922960

Browse files
Merge pull request #278 from microsoft/az-search-params
feat - azure search params and github pipeline variable changes
2 parents 110206e + b7228bd commit e922960

File tree

3 files changed

+86
-3
lines changed

3 files changed

+86
-3
lines changed

.github/workflows/azure-dev-validation.yml renamed to .github/workflows/azure-dev.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Azure Template Validation
22
on:
3-
workflow_dispatch:
3+
push:
4+
branches:
5+
- dev
6+
- main
47

58
permissions:
69
contents: read

azure.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
environment:
2-
name: BYC-Generic-Accelerator
2+
name: Document-generation-solution-accelerator
33
location: eastus
44

55
parameters:
@@ -11,7 +11,7 @@ parameters:
1111
default: eastus2
1212
baseUrl:
1313
type: string
14-
default: 'https://github.com/blessing-sanusi/BYC-Generic-Accelerator'
14+
default: 'https://github.com/microsoft/document-generation-solution-accelerator'
1515

1616
deployment:
1717
mode: Incremental

infra/deploy_app_service.bicep

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,42 @@ param AzureOpenAIKey string
4141
param azureOpenAIApiVersion string
4242
param AZURE_OPENAI_RESOURCE string = ''
4343
param USE_CHAT_HISTORY_ENABLED string = ''
44+
param aiSearchService string
45+
param keyvaultName string
46+
47+
@description('Enable Semantic Search in Azure Search')
48+
param AzureSearchUseSemanticSearch string = ''
49+
50+
@description('Enable In-Domain Search in Azure Search')
51+
param AzureSearchEnableInDomain string = ''
52+
53+
@description('Azure Search Top K')
54+
param AzureSearchTopK string = ''
55+
56+
@description('Azure Search Index Is Prechunked')
57+
param AzureSearchIndexIsPrechunked string = ''
58+
59+
@description('Azure Search Content Columns')
60+
param AzureSearchContentColumns string = ''
61+
62+
@description('Azure Search Title Column')
63+
param AzureSearchTitleColumn string = ''
64+
65+
@description('Azure Search URL Column')
66+
param AzureSearchUrlColumn string = ''
67+
68+
@description('Azure Search Filename Column')
69+
param AzureSearchFilenameColumn string = ''
70+
71+
@description('Azure Search Semantic Search Config')
72+
param AzureSearchSemanticSearchConfig string = ''
4473

4574
@description('Azure Cosmos DB Account')
4675
param AZURE_COSMOSDB_ACCOUNT string = ''
4776

77+
@description('Azure Search Index')
78+
param AzureSearchIndex string = ''
79+
4880
@description('Azure Cosmos DB Conversations Container')
4981
param AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = ''
5082

@@ -96,6 +128,54 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
96128
name: 'APPINSIGHTS_INSTRUMENTATIONKEY'
97129
value: reference(applicationInsightsId, '2015-05-01').InstrumentationKey
98130
}
131+
{
132+
name: 'AZURE_SEARCH_SERVICE'
133+
value: aiSearchService
134+
}
135+
{
136+
name: 'AZURE_SEARCH_INDEX'
137+
value: AzureSearchIndex
138+
}
139+
{
140+
name: 'AZURE_SEARCH_KEY'
141+
value:keyvaultName
142+
}
143+
{
144+
name: 'AZURE_SEARCH_USE_SEMANTIC_SEARCH'
145+
value: AzureSearchUseSemanticSearch
146+
}
147+
{
148+
name: 'AZURE_SEARCH_SEMANTIC_SEARCH_CONFIG'
149+
value: AzureSearchSemanticSearchConfig
150+
}
151+
{
152+
name: 'AZURE_SEARCH_INDEX_IS_PRECHUNKED'
153+
value: AzureSearchIndexIsPrechunked
154+
}
155+
{
156+
name: 'AZURE_SEARCH_TOP_K'
157+
value: AzureSearchTopK
158+
}
159+
{
160+
name: 'AZURE_SEARCH_ENABLE_IN_DOMAIN'
161+
value: AzureSearchEnableInDomain
162+
}
163+
{
164+
name: 'AZURE_SEARCH_CONTENT_COLUMNS'
165+
value: AzureSearchContentColumns
166+
}
167+
{
168+
name: 'AZURE_SEARCH_FILENAME_COLUMN'
169+
value: AzureSearchFilenameColumn
170+
}
171+
{
172+
name: 'AZURE_SEARCH_TITLE_COLUMN'
173+
value: AzureSearchTitleColumn
174+
}
175+
{
176+
name: 'AZURE_SEARCH_URL_COLUMN'
177+
value: AzureSearchUrlColumn
178+
}
99179
{
100180
name: 'AZURE_OPENAI_API_VERSION'
101181
value: azureOpenAIApiVersion

0 commit comments

Comments
 (0)