Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add deployments elements needed for multi-user chat #1293

Merged
merged 7 commits into from
Jun 2, 2023
Merged

Add deployments elements needed for multi-user chat #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4900262
Improve backend deployment doc
glahaye May 25, 2023
dd82d99
Merge branch 'main' of https://github.com/glahaye/semantic-kernel
glahaye May 31, 2023
af517ae
Add deployment elements required for multi-user chat
glahaye May 31, 2023
6fa15d8
Merge branch 'main' into mu-deploy
adrianwyatt Jun 1, 2023
652088c
Merge branch 'main' into mu-deploy
adrianwyatt Jun 1, 2023
1064a7c
Merge branch 'main' into mu-deploy
glahaye Jun 2, 2023
950175a
Merge branch 'main' into mu-deploy
glahaye Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions samples/apps/copilot-chat-app/webapi/DeploymentTemplates/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ resource appServiceWebConfig 'Microsoft.Web/sites/config@2022-09-01' = {
netFrameworkVersion: 'v6.0'
use32BitWorkerProcess: false
vnetRouteAllEnabled: true
webSocketsEnabled: true
appSettings: [
{
name: 'AIService:Type'
Expand Down Expand Up @@ -595,6 +596,37 @@ resource sessionContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/co
}
}

resource participantContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = if (deployCosmosDB) {
parent: cosmosDatabase
name: 'chatparticipants'
properties: {
resource: {
id: 'chatparticipants'
indexingPolicy: {
indexingMode: 'consistent'
automatic: true
includedPaths: [
{
path: '/*'
}
]
excludedPaths: [
{
path: '/"_etag"/?'
}
]
}
partitionKey: {
paths: [
'/id'
]
kind: 'Hash'
version: 2
}
}
}
}

resource speechAccount 'Microsoft.CognitiveServices/accounts@2022-12-01' = if (deploySpeechServices) {
name: 'cog-${uniqueName}'
location: location
Expand Down
40 changes: 38 additions & 2 deletions samples/apps/copilot-chat-app/webapi/DeploymentTemplates/sk-existing-azureopenai.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "4414214024449267703"
"templateHash": "11779741438695372787"
}
},
"parameters": {
Expand Down Expand Up @@ -163,7 +163,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "13834272519683618494"
"templateHash": "11121756795286782434"
}
},
"parameters": {
Expand Down Expand Up @@ -401,6 +401,7 @@
"netFrameworkVersion": "v6.0",
"use32BitWorkerProcess": false,
"vnetRouteAllEnabled": true,
"webSocketsEnabled": true,
"appSettings": [
{
"name": "AIService:Type",
Expand Down Expand Up @@ -899,6 +900,41 @@
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', toLower(format('cosmos-{0}', variables('uniqueName'))), 'CopilotChat')]"
]
},
{
"condition": "[parameters('deployCosmosDB')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"apiVersion": "2023-04-15",
"name": "[format('{0}/{1}/{2}', toLower(format('cosmos-{0}', variables('uniqueName'))), 'CopilotChat', 'chatparticipants')]",
"properties": {
"resource": {
"id": "chatparticipants",
"indexingPolicy": {
"indexingMode": "consistent",
"automatic": true,
"includedPaths": [
{
"path": "/*"
}
],
"excludedPaths": [
{
"path": "/\"_etag\"/?"
}
]
},
"partitionKey": {
"paths": [
"/id"
],
"kind": "Hash",
"version": 2
}
}
},
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', toLower(format('cosmos-{0}', variables('uniqueName'))), 'CopilotChat')]"
]
},
{
"condition": "[parameters('deploySpeechServices')]",
"type": "Microsoft.CognitiveServices/accounts",
Expand Down
40 changes: 38 additions & 2 deletions samples/apps/copilot-chat-app/webapi/DeploymentTemplates/sk-existing-openai.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "15686037844465739324"
"templateHash": "697508036669684325"
}
},
"parameters": {
Expand Down Expand Up @@ -158,7 +158,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "13834272519683618494"
"templateHash": "11121756795286782434"
}
},
"parameters": {
Expand Down Expand Up @@ -396,6 +396,7 @@
"netFrameworkVersion": "v6.0",
"use32BitWorkerProcess": false,
"vnetRouteAllEnabled": true,
"webSocketsEnabled": true,
"appSettings": [
{
"name": "AIService:Type",
Expand Down Expand Up @@ -894,6 +895,41 @@
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', toLower(format('cosmos-{0}', variables('uniqueName'))), 'CopilotChat')]"
]
},
{
"condition": "[parameters('deployCosmosDB')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"apiVersion": "2023-04-15",
"name": "[format('{0}/{1}/{2}', toLower(format('cosmos-{0}', variables('uniqueName'))), 'CopilotChat', 'chatparticipants')]",
"properties": {
"resource": {
"id": "chatparticipants",
"indexingPolicy": {
"indexingMode": "consistent",
"automatic": true,
"includedPaths": [
{
"path": "/*"
}
],
"excludedPaths": [
{
"path": "/\"_etag\"/?"
}
]
},
"partitionKey": {
"paths": [
"/id"
],
"kind": "Hash",
"version": 2
}
}
},
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', toLower(format('cosmos-{0}', variables('uniqueName'))), 'CopilotChat')]"
]
},
{
"condition": "[parameters('deploySpeechServices')]",
"type": "Microsoft.CognitiveServices/accounts",
Expand Down
40 changes: 38 additions & 2 deletions samples/apps/copilot-chat-app/webapi/DeploymentTemplates/sk-new.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "5066471234853584573"
"templateHash": "3338430546815090156"
}
},
"parameters": {
Expand Down Expand Up @@ -145,7 +145,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "13834272519683618494"
"templateHash": "11121756795286782434"
}
},
"parameters": {
Expand Down Expand Up @@ -383,6 +383,7 @@
"netFrameworkVersion": "v6.0",
"use32BitWorkerProcess": false,
"vnetRouteAllEnabled": true,
"webSocketsEnabled": true,
"appSettings": [
{
"name": "AIService:Type",
Expand Down Expand Up @@ -881,6 +882,41 @@
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', toLower(format('cosmos-{0}', variables('uniqueName'))), 'CopilotChat')]"
]
},
{
"condition": "[parameters('deployCosmosDB')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"apiVersion": "2023-04-15",
"name": "[format('{0}/{1}/{2}', toLower(format('cosmos-{0}', variables('uniqueName'))), 'CopilotChat', 'chatparticipants')]",
"properties": {
"resource": {
"id": "chatparticipants",
"indexingPolicy": {
"indexingMode": "consistent",
"automatic": true,
"includedPaths": [
{
"path": "/*"
}
],
"excludedPaths": [
{
"path": "/\"_etag\"/?"
}
]
},
"partitionKey": {
"paths": [
"/id"
],
"kind": "Hash",
"version": 2
}
}
},
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', toLower(format('cosmos-{0}', variables('uniqueName'))), 'CopilotChat')]"
]
},
{
"condition": "[parameters('deploySpeechServices')]",
"type": "Microsoft.CognitiveServices/accounts",
Expand Down