diff --git a/.gitignore b/.gitignore
index e51f3af2e2..6e03826383 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,7 @@ npm-debug.log*
node_modules
static/
+/data
data/**/*.md5
.DS_Store
diff --git a/data/Benefit_Options.pdf b/data/Benefit_Options.pdf
deleted file mode 100644
index 6a4c07dc94..0000000000
Binary files a/data/Benefit_Options.pdf and /dev/null differ
diff --git a/data/Contoso_Electronics_Company_Overview.md b/data/Contoso_Electronics_Company_Overview.md
deleted file mode 100644
index 033d7dd84a..0000000000
--- a/data/Contoso_Electronics_Company_Overview.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Contoso Electronics
-
-*Disclaimer: This content is generated by AI and may not accurately represent factual information about any real entity. Use this information with caution and verify details from reliable sources.*
-
-## History
-
-Contoso Electronics, a pioneering force in the tech industry, was founded in 1985 by visionary entrepreneurs with a passion for innovation. Over the years, the company has played a pivotal role in shaping the landscape of consumer electronics.
-
-| Year | Milestone |
-|------|-----------|
-| 1985 | Company founded with a focus on cutting-edge technology |
-| 1990 | Launched the first-ever handheld personal computer |
-| 2000 | Introduced groundbreaking advancements in AI and robotics |
-| 2015 | Expansion into sustainable and eco-friendly product lines |
-
-## Company Overview
-
-At Contoso Electronics, we take pride in fostering a dynamic and inclusive workplace. Our dedicated team of experts collaborates to create innovative solutions that empower and connect people globally.
-
-### Core Values
-
-- **Innovation:** Constantly pushing the boundaries of technology.
-- **Diversity:** Embracing different perspectives for creative excellence.
-- **Sustainability:** Committed to eco-friendly practices in our products.
-
-## Vacation Perks
-
-We believe in work-life balance and understand the importance of well-deserved breaks. Our vacation perks are designed to help our employees recharge and return with renewed enthusiasm.
-
-| Vacation Tier | Duration | Additional Benefits |
-|---------------|----------|---------------------|
-| Standard | 2 weeks | Health and wellness stipend |
-| Senior | 4 weeks | Travel vouchers for a dream destination |
-| Executive | 6 weeks | Luxury resort getaway with family |
-
-## Employee Recognition
-
-Recognizing the hard work and dedication of our employees is at the core of our culture. Here are some ways we celebrate achievements:
-
-- Monthly "Innovator of the Month" awards
-- Annual gala with awards for outstanding contributions
-- Team-building retreats for high-performing departments
-
-## Join Us!
-
-Contoso Electronics is always on the lookout for talented individuals who share our passion for innovation. If you're ready to be part of a dynamic team shaping the future of technology, check out our [careers page](http://www.contoso.com) for exciting opportunities.
-
-[Learn more about Contoso Electronics!](http://www.contoso.com)
diff --git a/data/GPT4V_Examples/Financial Market Analysis Report 2023.pdf b/data/GPT4V_Examples/Financial Market Analysis Report 2023.pdf
deleted file mode 100644
index eef17aad75..0000000000
Binary files a/data/GPT4V_Examples/Financial Market Analysis Report 2023.pdf and /dev/null differ
diff --git a/data/Json_Examples/2189.json b/data/Json_Examples/2189.json
deleted file mode 100644
index d7066c9fbd..0000000000
--- a/data/Json_Examples/2189.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "AreaPath": "SmartHotel360",
- "AssignedTo": null,
- "Categories": null,
- "ChangedDate": "2023-12-13T23:08:38.69Z",
- "ClosedDate": null,
- "CreatedDate": "2023-12-13T23:08:38.69Z",
- "Description": "As a customer, I would like to reserve a conference room such that:
1. It should display available date and time slots
2. Give an option to reserve a conference room for X hours
3. One can reserve a conference room for max 4 hours per day
",
- "Id": 2189,
- "State": "New",
- "StateChangeDate": "2023-12-13T23:08:38.69Z",
- "Tags": "Reservation",
- "Title": "As a customer, I would like to reserve a conference room"
-}
diff --git a/data/Json_Examples/2190.json b/data/Json_Examples/2190.json
deleted file mode 100644
index 5a45f1158f..0000000000
--- a/data/Json_Examples/2190.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "AreaPath": "SmartHotel360",
- "AssignedTo": null,
- "Categories": null,
- "ChangedDate": "2023-12-13T23:08:38.997Z",
- "ClosedDate": null,
- "CreatedDate": "2023-12-13T23:08:38.997Z",
- "Description": "Enter the guest's name to whom you would\nlike to send a confirmation, display the company, contact, source\nand agent associated\nwith the reservation.
",
- "Id": 2190,
- "State": "New",
- "StateChangeDate": "2023-12-13T23:08:38.997Z",
- "Tags": "Notification",
- "Title": "As a reservation agent, I would like to send confirmations to guest"
-}
diff --git a/data/Json_Examples/2191.json b/data/Json_Examples/2191.json
deleted file mode 100644
index 455e4c9a24..0000000000
--- a/data/Json_Examples/2191.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "AreaPath": "SmartHotel360",
- "AssignedTo": null,
- "Categories": null,
- "ChangedDate": "2023-12-13T23:08:39.17Z",
- "ClosedDate": null,
- "CreatedDate": "2023-12-13T23:08:39.17Z",
- "Description": "If you have not picked up\nyour vehicle you can remove or cancel your reservation by clicking here.
1. Car reserved should have an option to cancel the request
2. Car driver should receive a notification about cancellation
",
- "Id": 2191,
- "State": "New",
- "StateChangeDate": "2023-12-13T23:08:39.17Z",
- "Tags": "Reservation",
- "Title": "As a customer, I should be able to remove a car reservation "
-}
diff --git a/data/Json_Examples/2192.json b/data/Json_Examples/2192.json
deleted file mode 100644
index d2e489f317..0000000000
--- a/data/Json_Examples/2192.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "AreaPath": "SmartHotel360",
- "AssignedTo": null,
- "Categories": null,
- "ChangedDate": "2023-12-13T23:08:39.383Z",
- "ClosedDate": null,
- "CreatedDate": "2023-12-13T23:08:39.383Z",
- "Description": "As a courtesy, grant an\nextra hour or two to leave the room, especially if it isn't booked\nfor the upcoming evening. But customer must call the front desk\nin advance and request a late checkout.
1. Late Check-in time should be displayed
2. Request should be sent to front-desk
3. Any extra charge should be displayed
",
- "Id": 2192,
- "State": "New",
- "StateChangeDate": "2023-12-13T23:08:39.383Z",
- "Tags": "Front-desk; Members; Reservation",
- "Title": "As a customer, I should be able to request hotel for late Check-out"
-}
diff --git a/data/Json_Examples/query.json b/data/Json_Examples/query.json
deleted file mode 100644
index ceb9dc1a6f..0000000000
--- a/data/Json_Examples/query.json
+++ /dev/null
@@ -1,244 +0,0 @@
-[
- {
- "fields": {
- "System.Id": 2348,
- "System.State": "New",
- "System.Title": "Provide related items or frequently bought together section when people browse or search",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2348,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2348"
- },
- {
- "fields": {
- "System.Id": 2349,
- "System.State": "New",
- "System.Title": "As tester, I need to test the website on all the relevant broswers and devices and be sure that it can handle our load.",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2349,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2349"
- },
- {
- "fields": {
- "System.Id": 2350,
- "System.State": "New",
- "System.Title": "As a customer, I should be able to put items to shopping cart",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2350,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2350"
- },
- {
- "fields": {
- "System.Id": 2351,
- "System.State": "New",
- "System.Title": "As a customer, I should be able to print my purchase order",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2351,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2351"
- },
- {
- "fields": {
- "System.Id": 2352,
- "System.State": "New",
- "System.Title": "As a customer, I would like to have a sort capabaility by price and customer ratings",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2352,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2352"
- },
- {
- "fields": {
- "System.Id": 2353,
- "System.State": "New",
- "System.Title": "Recommended products must be based on customer purchase pattern history",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2353,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2353"
- },
- {
- "fields": {
- "System.Id": 2354,
- "System.State": "New",
- "System.Title": "As a customer, I would like to save my addresses so that I can easily select the address for delivery",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2354,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2354"
- },
- {
- "fields": {
- "System.Id": 2355,
- "System.State": "New",
- "System.Title": "As marketer, I want to run an A|B test on alternative Web Sites using Application Insights.",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2355,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2355"
- },
- {
- "fields": {
- "System.AssignedTo": {
- "_links": {
- "avatar": {
- "href": "https://dev.azure.com/codebytes/_apis/GraphProfile/MemberAvatars/aad.ZDlhOGEyZjktMGZmZS03YjY4LTlkYjctNjk1ZWZiNGY2Nzg0"
- }
- },
- "descriptor": "aad.ZDlhOGEyZjktMGZmZS03YjY4LTlkYjctNjk1ZWZiNGY2Nzg0",
- "displayName": "Chris Ayers",
- "id": "cd8258ec-ad87-4c0d-9026-e5e343447185",
- "imageUrl": "https://dev.azure.com/codebytes/_apis/GraphProfile/MemberAvatars/aad.ZDlhOGEyZjktMGZmZS03YjY4LTlkYjctNjk1ZWZiNGY2Nzg0",
- "uniqueName": "chrisayers@microsoft.com",
- "url": "https://spsprodeus27.vssps.visualstudio.com/A6b854e9d-a8be-405d-a4cc-5eb8e7027155/_apis/Identities/cd8258ec-ad87-4c0d-9026-e5e343447185"
- },
- "System.Id": 2356,
- "System.State": "Done",
- "System.Title": "Provide customers the ability to track status of the package",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2356,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2356"
- },
- {
- "fields": {
- "System.AssignedTo": {
- "_links": {
- "avatar": {
- "href": "https://dev.azure.com/codebytes/_apis/GraphProfile/MemberAvatars/aad.ZDlhOGEyZjktMGZmZS03YjY4LTlkYjctNjk1ZWZiNGY2Nzg0"
- }
- },
- "descriptor": "aad.ZDlhOGEyZjktMGZmZS03YjY4LTlkYjctNjk1ZWZiNGY2Nzg0",
- "displayName": "Chris Ayers",
- "id": "cd8258ec-ad87-4c0d-9026-e5e343447185",
- "imageUrl": "https://dev.azure.com/codebytes/_apis/GraphProfile/MemberAvatars/aad.ZDlhOGEyZjktMGZmZS03YjY4LTlkYjctNjk1ZWZiNGY2Nzg0",
- "uniqueName": "chrisayers@microsoft.com",
- "url": "https://spsprodeus27.vssps.visualstudio.com/A6b854e9d-a8be-405d-a4cc-5eb8e7027155/_apis/Identities/cd8258ec-ad87-4c0d-9026-e5e343447185"
- },
- "System.Id": 2357,
- "System.State": "Done",
- "System.Title": "As a customer, I would like to have the ability to send my items as gift",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2357,
- "relations": null,
- "rev": 2,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2357"
- },
- {
- "fields": {
- "System.Id": 2358,
- "System.State": "Committed",
- "System.Title": "As a customer, I would like to store my credit card details securely",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2358,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2358"
- },
- {
- "fields": {
- "System.Id": 2359,
- "System.State": "Committed",
- "System.Title": "As a customer, I should be able to select different shipping option",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2359,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2359"
- },
- {
- "fields": {
- "System.Id": 2360,
- "System.State": "Committed",
- "System.Title": "As developer, I want to use Azure Machine Learning to provide a recommendations engine behind the website.",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2360,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2360"
- },
- {
- "fields": {
- "System.Id": 2361,
- "System.State": "Committed",
- "System.Title": "Provide tentative duration for shipping.",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2361,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2361"
- },
- {
- "fields": {
- "System.Id": 2362,
- "System.State": "Approved",
- "System.Title": "Notify the user about any changes made to the order",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2362,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2362"
- },
- {
- "fields": {
- "System.Id": 2363,
- "System.State": "Approved",
- "System.Title": "As a admin, I should be able to update prices on ad-hoc condition",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2363,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2363"
- },
- {
- "fields": {
- "System.Id": 2364,
- "System.State": "Approved",
- "System.Title": "As a customer, I would like to provide my feedback on items that I have purchased",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2364,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2364"
- },
- {
- "fields": {
- "System.Id": 2365,
- "System.State": "Approved",
- "System.Title": "As a customer, I would like to have a wishlist where I can add items for future purchase",
- "System.WorkItemType": "Product Backlog Item"
- },
- "id": 2365,
- "relations": null,
- "rev": 1,
- "url": "https://dev.azure.com/codebytes/_apis/wit/workItems/2365"
- }
-]
diff --git a/data/Northwind_Health_Plus_Benefits_Details.pdf b/data/Northwind_Health_Plus_Benefits_Details.pdf
deleted file mode 100644
index 97579a4fb5..0000000000
Binary files a/data/Northwind_Health_Plus_Benefits_Details.pdf and /dev/null differ
diff --git a/data/Northwind_Standard_Benefits_Details.pdf b/data/Northwind_Standard_Benefits_Details.pdf
deleted file mode 100644
index 7d50ff8c02..0000000000
Binary files a/data/Northwind_Standard_Benefits_Details.pdf and /dev/null differ
diff --git a/data/PerksPlus.pdf b/data/PerksPlus.pdf
deleted file mode 100644
index 2e167a2a6a..0000000000
Binary files a/data/PerksPlus.pdf and /dev/null differ
diff --git a/data/employee_handbook.pdf b/data/employee_handbook.pdf
deleted file mode 100644
index 878f36f7dd..0000000000
Binary files a/data/employee_handbook.pdf and /dev/null differ
diff --git a/data/role_library.pdf b/data/role_library.pdf
deleted file mode 100644
index ff70c65651..0000000000
Binary files a/data/role_library.pdf and /dev/null differ
diff --git a/infra/main.bicep b/infra/main.bicep
index bc019f9c49..162733b0e3 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -57,7 +57,9 @@ param speechServiceResourceGroupName string = ''
param speechServiceLocation string = ''
param speechServiceName string = ''
param speechServiceSkuName string // Set in main.parameters.json
-param useGPT4V bool = false
+param useGPT4v bool = false
+param useGPT4 bool = true
+param altEmb bool = false
@description('Location for the OpenAI resource group')
@allowed([
@@ -110,33 +112,45 @@ param chatGptModelName string = ''
param chatGptDeploymentName string = ''
param chatGptDeploymentVersion string = ''
param chatGptDeploymentCapacity int = 0
-var chatGpt = {
- modelName: !empty(chatGptModelName)
- ? chatGptModelName
- : startsWith(openAiHost, 'azure') ? 'gpt-35-turbo' : 'gpt-3.5-turbo'
- deploymentName: !empty(chatGptDeploymentName) ? chatGptDeploymentName : 'chat'
- deploymentVersion: !empty(chatGptDeploymentVersion) ? chatGptDeploymentVersion : '0613'
- deploymentCapacity: chatGptDeploymentCapacity != 0 ? chatGptDeploymentCapacity : 30
-}
-
-param embeddingModelName string = ''
-param embeddingDeploymentName string = ''
-param embeddingDeploymentVersion string = ''
-param embeddingDeploymentCapacity int = 0
-param embeddingDimensions int = 0
-var embedding = {
- modelName: !empty(embeddingModelName) ? embeddingModelName : 'text-embedding-ada-002'
- deploymentName: !empty(embeddingDeploymentName) ? embeddingDeploymentName : 'embedding'
- deploymentVersion: !empty(embeddingDeploymentVersion) ? embeddingDeploymentVersion : '2'
- deploymentCapacity: embeddingDeploymentCapacity != 0 ? embeddingDeploymentCapacity : 30
- dimensions: embeddingDimensions != 0 ? embeddingDimensions : 1536
-}
+// To be removed during cleanup now that 4V is no longer the default
param gpt4vModelName string = 'gpt-4o'
param gpt4vDeploymentName string = 'gpt-4o'
param gpt4vModelVersion string = '2024-05-13'
param gpt4vDeploymentCapacity int = 10
+param gpt4ModelName string = 'gpt-4o'
+param gpt4DeploymentName string = 'opensourcerer-completions-4o'
+param gpt4ModelVersion string = '2024-05-13'
+param gpt4DeploymentCapacity int = 50
+
+var chatGpt = {
+ modelName: !useGPT4 ? chatGptModelName : gpt4ModelName
+ deploymentName: !useGPT4 ? chatGptDeploymentName : gpt4DeploymentName
+ deploymentVersion: !useGPT4 ? chatGptDeploymentVersion : gpt4ModelVersion
+ deploymentCapacity: !useGPT4 ? chatGptDeploymentCapacity : gpt4DeploymentCapacity
+}
+
+param embeddingModelName string = 'text-embedding-ada-002'
+param embeddingDeploymentName string = 'opensourcerer-embeddings'
+param embeddingDeploymentVersion string = '2'
+param embeddingDeploymentCapacity int = 50
+param embeddingDimensions int = 1536
+
+param AlternateEmbeddingModelName string = 'text-embedding-3-large'
+param AlternateEmbeddingDeploymentName string = 'opensourcerer-embeddings-003'
+param AlternateEmbeddingDeploymentVersion string = '1'
+param AlternateEmbeddingDeploymentCapacity int = 50
+param AlternateEmbeddingDimensions int = 1536
+
+var embedding = {
+ modelName: !altEmb ? embeddingModelName : AlternateEmbeddingModelName
+ deploymentName: !altEmb ? embeddingDeploymentName : AlternateEmbeddingDeploymentName
+ deploymentVersion: !altEmb ? embeddingDeploymentVersion : AlternateEmbeddingDeploymentVersion
+ deploymentCapacity: !altEmb ? embeddingDeploymentCapacity : AlternateEmbeddingDeploymentCapacity
+ dimensions: !altEmb ? embeddingDimensions : AlternateEmbeddingDimensions
+}
+
param tenantId string = tenant().tenantId
param authTenantId string = ''
@@ -304,7 +318,7 @@ var appEnvVariables = {
AZURE_SEARCH_INDEX: searchIndexName
AZURE_SEARCH_SERVICE: searchService.outputs.name
AZURE_SEARCH_SEMANTIC_RANKER: actualSearchServiceSemanticRankerLevel
- AZURE_VISION_ENDPOINT: useGPT4V ? computerVision.outputs.endpoint : ''
+ AZURE_VISION_ENDPOINT: useGPT4 ? computerVision.outputs.endpoint : ''
AZURE_SEARCH_QUERY_LANGUAGE: searchQueryLanguage
AZURE_SEARCH_QUERY_SPELLER: searchQuerySpeller
APPLICATIONINSIGHTS_CONNECTION_STRING: useApplicationInsights
@@ -327,7 +341,7 @@ var appEnvVariables = {
AZURE_OPENAI_SERVICE: isAzureOpenAiHost && deployAzureOpenAi ? openAi.outputs.name : ''
AZURE_OPENAI_CHATGPT_DEPLOYMENT: chatGpt.deploymentName
AZURE_OPENAI_EMB_DEPLOYMENT: embedding.deploymentName
- AZURE_OPENAI_GPT4V_DEPLOYMENT: useGPT4V ? gpt4vDeploymentName : ''
+ AZURE_OPENAI_GPT4V_DEPLOYMENT: useGPT4 ? gpt4vDeploymentName : ''
AZURE_OPENAI_API_VERSION: azureOpenAiApiVersion
AZURE_OPENAI_API_KEY_OVERRIDE: azureOpenAiApiKey
AZURE_OPENAI_CUSTOM_URL: azureOpenAiCustomUrl
@@ -349,7 +363,7 @@ var appEnvVariables = {
// CORS support, for frontends on other hosts
ALLOWED_ORIGIN: allowedOrigin
USE_VECTORS: useVectors
- USE_GPT4V: useGPT4V
+ USE_GPT4V: useGPT4
USE_USER_UPLOAD: useUserUpload
AZURE_USERSTORAGE_ACCOUNT: useUserUpload ? userStorage.outputs.name : ''
AZURE_USERSTORAGE_CONTAINER: useUserUpload ? userStorageContainerName : ''
@@ -383,8 +397,8 @@ module backend 'core/host/appservice.bicep' = if (deploymentTarget == 'appservic
disableAppServicesAuthentication: disableAppServicesAuthentication
clientSecretSettingName: !empty(clientAppSecret) ? 'AZURE_CLIENT_APP_SECRET' : ''
authenticationIssuerUri: authenticationIssuerUri
- use32BitWorkerProcess: appServiceSkuName == 'F1'
- alwaysOn: appServiceSkuName != 'F1'
+ use32BitWorkerProcess: appServiceSkuName == 'S1'
+ alwaysOn: appServiceSkuName != 'S1'
appSettings: appEnvVariables
}
}
@@ -473,7 +487,7 @@ var defaultOpenAiDeployments = [
var openAiDeployments = concat(
defaultOpenAiDeployments,
- useGPT4V
+ useGPT4v
? [
{
name: gpt4vDeploymentName
@@ -537,7 +551,7 @@ module documentIntelligence 'br/public:avm/res/cognitive-services/account:0.5.4'
}
}
-module computerVision 'br/public:avm/res/cognitive-services/account:0.5.4' = if (useGPT4V) {
+module computerVision 'br/public:avm/res/cognitive-services/account:0.5.4' = if (useGPT4) {
name: 'computerVision'
scope: computerVisionResourceGroup
params: {
@@ -855,7 +869,7 @@ var openAiPrivateEndpointConnection = (isAzureOpenAiHost && deployAzureOpenAi &&
dnsZoneName: 'privatelink.openai.azure.com'
resourceIds: concat(
[openAi.outputs.resourceId],
- useGPT4V ? [computerVision.outputs.resourceId] : [],
+ useGPT4 ? [computerVision.outputs.resourceId] : [],
!useLocalPdfParser ? [documentIntelligence.outputs.resourceId] : []
)
}
@@ -926,7 +940,7 @@ module searchContribRoleBackend 'core/security/role.bicep' = if (useUserUpload)
}
// For computer vision access by the backend
-module computerVisionRoleBackend 'core/security/role.bicep' = if (useGPT4V) {
+module computerVisionRoleBackend 'core/security/role.bicep' = if (useGPT4) {
scope: computerVisionResourceGroup
name: 'computervision-role-backend'
params: {
@@ -973,7 +987,7 @@ output AZURE_OPENAI_GPT4V_DEPLOYMENT string = isAzureOpenAiHost ? gpt4vDeploymen
output AZURE_SPEECH_SERVICE_ID string = useSpeechOutputAzure ? speech.outputs.resourceId : ''
output AZURE_SPEECH_SERVICE_LOCATION string = useSpeechOutputAzure ? speech.outputs.location : ''
-output AZURE_VISION_ENDPOINT string = useGPT4V ? computerVision.outputs.endpoint : ''
+output AZURE_VISION_ENDPOINT string = useGPT4 ? computerVision.outputs.endpoint : ''
output AZURE_DOCUMENTINTELLIGENCE_SERVICE string = documentIntelligence.outputs.name
output AZURE_DOCUMENTINTELLIGENCE_RESOURCE_GROUP string = documentIntelligenceResourceGroup.name
diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 44a3a244fd..2b88a6890b 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -84,7 +84,7 @@
"value": "${AZURE_APP_SERVICE_PLAN}"
},
"appServiceSkuName": {
- "value": "${AZURE_APP_SERVICE_SKU=B1}"
+ "value": "${AZURE_APP_SERVICE_SKU=S1}"
},
"backendServiceName": {
"value": "${AZURE_APP_SERVICE}"
@@ -117,7 +117,7 @@
"value": "${AZURE_OPENAI_EMB_DIMENSIONS}"
},
"gpt4vDeploymentCapacity":{
- "value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY=10}"
+ "value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY}"
},
"openAiHost": {
"value": "${OPENAI_HOST=azure}"
@@ -153,7 +153,7 @@
"value": "${USE_VECTORS=true}"
},
"useGPT4V": {
- "value": "${USE_GPT4V=false}"
+ "value": "${USE_GPT4V}"
},
"enableLanguagePicker": {
"value": "${ENABLE_LANGUAGE_PICKER=false}"
diff --git a/infra/main.test.bicep b/infra/main.test.bicep
index 5195aaa907..a84cc26b05 100644
--- a/infra/main.test.bicep
+++ b/infra/main.test.bicep
@@ -13,7 +13,7 @@ module main 'main.bicep' = {
params: {
environmentName: environmentName
location: location
- appServiceSkuName: 'B1'
+ appServiceSkuName: 'S1'
computerVisionSkuName: 'S1'
documentIntelligenceResourceGroupLocation: location
documentIntelligenceSkuName: 'S0'