diff --git a/.github/workflows/azure-dev.yaml b/.github/workflows/azure-dev.yaml index f2d7559..835a51d 100644 --- a/.github/workflows/azure-dev.yaml +++ b/.github/workflows/azure-dev.yaml @@ -70,7 +70,7 @@ jobs: mv ./target/$originaljarname ./target/app.jar - name: Upload artifacts for backend deployment jobs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: spring-boot-app path: | @@ -86,7 +86,7 @@ jobs: steps: - name: Download backend artifact from build job - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4.1.7 with: name: spring-boot-app path: ./backend diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json index f759bdf..9cbf3b9 100644 --- a/app/frontend/package-lock.json +++ b/app/frontend/package-lock.json @@ -14,7 +14,7 @@ "@fluentui/react-components": "^9.37.3", "@fluentui/react-icons": "^2.0.221", "@react-spring/web": "^9.7.3", - "dompurify": "^3.0.6", + "dompurify": "^3.1.3", "frontend": "file:", "ndjson-readablestream": "^1.0.7", "react": "^18.2.0", @@ -29,7 +29,7 @@ "@vitejs/plugin-react": "^4.1.1", "prettier": "^3.0.3", "typescript": "^5.2.2", - "vite": "^4.5.3" + "vite": "^4.5.5" }, "engines": { "node": ">=14.0.0" @@ -2673,9 +2673,9 @@ } }, "node_modules/dompurify": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz", - "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.3.tgz", + "integrity": "sha512-5sOWYSNPaxz6o2MUPvtyxTTqR4D3L77pr5rUQoWgD5ROQtVIZQgJkXbo1DLlK3vj11YGw5+LnF4SYti4gZmwng==" }, "node_modules/electron-to-chromium": { "version": "1.4.639", @@ -3103,9 +3103,9 @@ } }, "node_modules/rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "bin": { "rollup": "dist/bin/rollup" }, @@ -3257,9 +3257,9 @@ } }, "node_modules/vite": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", - "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.5.tgz", + "integrity": "sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==", "dev": true, "dependencies": { "esbuild": "^0.18.10", @@ -5178,9 +5178,9 @@ } }, "dompurify": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz", - "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.3.tgz", + "integrity": "sha512-5sOWYSNPaxz6o2MUPvtyxTTqR4D3L77pr5rUQoWgD5ROQtVIZQgJkXbo1DLlK3vj11YGw5+LnF4SYti4gZmwng==" }, "electron-to-chromium": { "version": "1.4.639", @@ -5248,7 +5248,7 @@ "@types/react": "^18.2.34", "@types/react-dom": "^18.2.14", "@vitejs/plugin-react": "^4.1.1", - "dompurify": "^3.0.6", + "dompurify": "^3.1.3", "frontend": "file:", "ndjson-readablestream": "^1.0.7", "prettier": "^3.0.3", @@ -5257,7 +5257,7 @@ "react-router-dom": "^6.18.0", "scheduler": "^0.20.2", "typescript": "^5.2.2", - "vite": "^4.5.3" + "vite": "^4.5.5" }, "dependencies": { "@ampproject/remapping": { @@ -7119,9 +7119,9 @@ } }, "dompurify": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.6.tgz", - "integrity": "sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.3.tgz", + "integrity": "sha512-5sOWYSNPaxz6o2MUPvtyxTTqR4D3L77pr5rUQoWgD5ROQtVIZQgJkXbo1DLlK3vj11YGw5+LnF4SYti4gZmwng==" }, "electron-to-chromium": { "version": "1.4.639", @@ -7420,9 +7420,9 @@ } }, "rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "requires": { "fsevents": "~2.3.2" } @@ -7517,9 +7517,9 @@ "requires": {} }, "vite": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", - "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.5.tgz", + "integrity": "sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==", "dev": true, "requires": { "esbuild": "^0.18.10", @@ -7780,9 +7780,9 @@ } }, "rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "requires": { "fsevents": "~2.3.2" } @@ -7877,9 +7877,9 @@ "requires": {} }, "vite": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", - "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.5.tgz", + "integrity": "sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==", "dev": true, "requires": { "esbuild": "^0.18.10", diff --git a/app/frontend/package.json b/app/frontend/package.json index 11b5889..bc52488 100644 --- a/app/frontend/package.json +++ b/app/frontend/package.json @@ -18,7 +18,7 @@ "@fluentui/react-components": "^9.37.3", "@fluentui/react-icons": "^2.0.221", "@react-spring/web": "^9.7.3", - "dompurify": "^3.0.6", + "dompurify": "^3.1.3", "frontend": "file:", "ndjson-readablestream": "^1.0.7", "react": "^18.2.0", @@ -33,6 +33,6 @@ "@vitejs/plugin-react": "^4.1.1", "prettier": "^3.0.3", "typescript": "^5.2.2", - "vite": "^4.5.3" + "vite": "^4.5.5" } } diff --git a/app/indexer/core/src/main/java/com/microsoft/openai/samples/indexer/DocumentProcessor.java b/app/indexer/core/src/main/java/com/microsoft/openai/samples/indexer/DocumentProcessor.java index 7fa2be5..02a8314 100644 --- a/app/indexer/core/src/main/java/com/microsoft/openai/samples/indexer/DocumentProcessor.java +++ b/app/indexer/core/src/main/java/com/microsoft/openai/samples/indexer/DocumentProcessor.java @@ -1,12 +1,5 @@ package com.microsoft.openai.samples.indexer; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.stream.Collectors; - import com.microsoft.openai.samples.indexer.index.SearchIndexManager; import com.microsoft.openai.samples.indexer.parser.PDFParser; import com.microsoft.openai.samples.indexer.parser.Page; @@ -14,6 +7,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import java.util.stream.Collectors; + /** * The DocumentProcessor class is responsible for processing and indexing documents. * It takes a document as input, either as a file or as a byte array, and processes it for indexing. @@ -47,6 +46,7 @@ public void indexDocumentfromFile(String filepath, String category) throws IOExc public void indexDocumentFromBytes(String filename, String category, byte[] content){ logger.debug("Indexing file {}", filename); + //TODO add support for other file types (docx, pptx, txt, md, html, etc) List pages = pdfParser.parse(content); logger.info("Found {} pages in file {}", pages.size(), filename); diff --git a/deploy/aca/infra/main.bicep b/deploy/aca/infra/main.bicep index cab7402..5aca155 100644 --- a/deploy/aca/infra/main.bicep +++ b/deploy/aca/infra/main.bicep @@ -60,12 +60,15 @@ param formRecognizerResourceGroupLocation string = location param formRecognizerSkuName string = 'S0' param chatGptDeploymentName string // Set in main.parameters.json -param chatGptDeploymentCapacity int = 60 -param chatGptModelName string = 'gpt-35-turbo' -param chatGptModelVersion string = '0613' +param chatGptDeploymentCapacity int = 80 +param chatGptDeploymentSkuName string= 'Standard' +param chatGptModelName string = 'gpt-4o-mini' +param chatGptModelVersion string = '2024-07-18' param embeddingDeploymentName string // Set in main.parameters.json -param embeddingDeploymentCapacity int = 80 -param embeddingModelName string = 'text-embedding-ada-002' +param embeddingDeploymentCapacity int = 120 + +param embeddingModelName string = 'text-embedding-3-small' +param embeddingModelVersion string = '1' param servicebusNamespace string = '' param serviceBusSkuName string = 'Standard' @@ -307,7 +310,7 @@ module openAi '../../shared/ai/cognitiveservices.bicep' = { version: chatGptModelVersion } sku: { - name: 'Standard' + name: chatGptDeploymentSkuName capacity: chatGptDeploymentCapacity } } @@ -316,7 +319,7 @@ module openAi '../../shared/ai/cognitiveservices.bicep' = { model: { format: 'OpenAI' name: embeddingModelName - version: '2' + version: embeddingModelVersion } sku: { name: 'Standard' diff --git a/deploy/aca/infra/main.parameters.json b/deploy/aca/infra/main.parameters.json index fd55cd4..f1190bf 100644 --- a/deploy/aca/infra/main.parameters.json +++ b/deploy/aca/infra/main.parameters.json @@ -69,16 +69,31 @@ "value": "${AZURE_STORAGE_SKU=Standard_LRS}" }, "chatGptModelName": { - "value": "${AZURE_OPENAI_CHATGPT_MODEL=gpt-35-turbo}" + "value": "${AZURE_OPENAI_CHATGPT_MODEL=gpt-4o-mini}" }, "chatGptModelVersion": { - "value": "${AZURE_OPENAI_CHATGPT_VERSION=0613}" + "value": "${AZURE_OPENAI_CHATGPT_VERSION=2024-07-18}" }, "chatGptDeploymentName": { - "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT=chat}" + "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT=gpt-4o-mini}" + }, + "chatGptDeploymentCapacity": { + "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY=80}" + }, + "chatGptDeploymentSkuName": { + "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME=Standard}" + }, + "embeddingModelName": { + "value": "${AZURE_OPENAI_EMB_MODEL=text-embedding-3-small}" + }, + "embeddingModelVersion": { + "value": "${AZURE_OPENAI_EMB_MODEL_VERSION=1}" }, "embeddingDeploymentName": { - "value": "${AZURE_OPENAI_EMB_DEPLOYMENT=embedding}" + "value": "${AZURE_OPENAI_EMB_DEPLOYMENT=text-embedding-3-small}" + }, + "embeddingDeploymentCapacity": { + "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY=120}" }, "useApplicationInsights": { "value": "${AZURE_USE_APPLICATION_INSIGHTS=true}" diff --git a/deploy/aks/infra/main.bicep b/deploy/aks/infra/main.bicep index 4b86e9f..110b5e5 100644 --- a/deploy/aks/infra/main.bicep +++ b/deploy/aks/infra/main.bicep @@ -62,12 +62,15 @@ param formRecognizerResourceGroupLocation string = location param formRecognizerSkuName string = 'S0' param chatGptDeploymentName string // Set in main.parameters.json -param chatGptDeploymentCapacity int = 60 -param chatGptModelName string = 'gpt-35-turbo' -param chatGptModelVersion string = '0613' +param chatGptDeploymentCapacity int = 80 +param chatGptModelName string = 'gpt-4o-mini' +param chatGptModelVersion string = '2024-07-18' +param chatGptDeploymentSkuName string= 'Standard' + param embeddingDeploymentName string // Set in main.parameters.json -param embeddingDeploymentCapacity int = 80 -param embeddingModelName string = 'text-embedding-ada-002' +param embeddingDeploymentCapacity int = 120 +param embeddingModelName string = 'text-embedding-3-small' +param embeddingModelVersion string = '1' param servicebusNamespace string = '' param serviceBusSkuName string = 'Standard' @@ -177,7 +180,7 @@ module openAi '../../shared/ai/cognitiveservices.bicep' = if (openAiHost == 'azu version: chatGptModelVersion } sku: { - name: 'Standard' + name: chatGptDeploymentSkuName capacity: chatGptDeploymentCapacity } } @@ -186,7 +189,7 @@ module openAi '../../shared/ai/cognitiveservices.bicep' = if (openAiHost == 'azu model: { format: 'OpenAI' name: embeddingModelName - version: '2' + version: embeddingModelVersion } sku: { name: 'Standard' diff --git a/deploy/aks/infra/main.parameters.json b/deploy/aks/infra/main.parameters.json index 8bb96d6..08e1294 100644 --- a/deploy/aks/infra/main.parameters.json +++ b/deploy/aks/infra/main.parameters.json @@ -69,16 +69,31 @@ "value": "${AZURE_STORAGE_SKU=Standard_LRS}" }, "chatGptModelName": { - "value": "${AZURE_OPENAI_CHATGPT_MODEL=gpt-35-turbo}" + "value": "${AZURE_OPENAI_CHATGPT_MODEL=gpt-4o-mini}" }, "chatGptModelVersion": { - "value": "${AZURE_OPENAI_CHATGPT_VERSION=0613}" + "value": "${AZURE_OPENAI_CHATGPT_VERSION=2024-07-18}" }, "chatGptDeploymentName": { - "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT=chat}" + "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT=gpt-4o-mini}" + }, + "chatGptDeploymentCapacity": { + "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY=80}" + }, + "chatGptDeploymentSkuName": { + "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME=Standard}" + }, + "embeddingModelName": { + "value": "${AZURE_OPENAI_EMB_MODEL=text-embedding-3-small}" + }, + "embeddingModelVersion": { + "value": "${AZURE_OPENAI_EMB_MODEL_VERSION=1}" }, "embeddingDeploymentName": { - "value": "${AZURE_OPENAI_EMB_DEPLOYMENT=embedding}" + "value": "${AZURE_OPENAI_EMB_DEPLOYMENT=text-embedding-3-small}" + }, + "embeddingDeploymentCapacity": { + "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY=120}" }, "openAiHost":{ "value": "${OPENAI_HOST=azure}" diff --git a/deploy/app-service/infra/main.bicep b/deploy/app-service/infra/main.bicep index a91ddbb..2a42954 100644 --- a/deploy/app-service/infra/main.bicep +++ b/deploy/app-service/infra/main.bicep @@ -11,7 +11,7 @@ param location string param appServicePlanName string = '' param backendServiceName string = '' -param indexServiceName string = '' +//param indexServiceName string = '' param resourceGroupName string = '' param applicationInsightsDashboardName string = '' @@ -39,8 +39,8 @@ param openAiHost string // Set in main.parameters.json param openAiServiceName string = '' param openAiResourceGroupName string = '' -@description('Location for the OpenAI resource group') -@allowed(['canadaeast', 'eastus', 'eastus2', 'francecentral', 'switzerlandnorth', 'uksouth', 'japaneast', 'northcentralus', 'australiaeast', 'swedencentral']) +@description('Location for the OpenAI resource group. Options are constrained by text-embedding-3-small limited deployments regions') +@allowed(['canadaeast', 'eastus', 'eastus2', 'japaneast']) @metadata({ azd: { type: 'location' @@ -61,12 +61,14 @@ param formRecognizerResourceGroupLocation string = location param formRecognizerSkuName string = 'S0' param chatGptDeploymentName string // Set in main.parameters.json -param chatGptDeploymentCapacity int = 60 -param chatGptModelName string = 'gpt-35-turbo' -param chatGptModelVersion string = '0613' +param chatGptDeploymentCapacity int = 80 +param chatGptDeploymentSkuName string= 'Standard' +param chatGptModelName string = 'gpt-4o-mini' +param chatGptModelVersion string = '2024-07-18' param embeddingDeploymentName string // Set in main.parameters.json -param embeddingDeploymentCapacity int = 80 -param embeddingModelName string = 'text-embedding-ada-002' +param embeddingDeploymentCapacity int = 120 +param embeddingModelName string = 'text-embedding-3-small' +param embeddingModelVersion string = '1' // Used for the optional login and document level access control system param useAuthentication bool = false @@ -188,6 +190,7 @@ module backend '../../shared/host/appservice.bicep' = { } } +/* module indexer '../../shared/host/functions.bicep' = { name: 'indexer' scope: resourceGroup @@ -219,6 +222,7 @@ module indexer '../../shared/host/functions.bicep' = { } } +*/ module openAi '../../shared/ai/cognitiveservices.bicep' = if (openAiHost == 'azure') { name: 'openai' scope: openAiResourceGroup @@ -238,7 +242,7 @@ module openAi '../../shared/ai/cognitiveservices.bicep' = if (openAiHost == 'azu version: chatGptModelVersion } sku: { - name: 'Standard' + name: chatGptDeploymentSkuName capacity: chatGptDeploymentCapacity } } @@ -247,7 +251,7 @@ module openAi '../../shared/ai/cognitiveservices.bicep' = if (openAiHost == 'azu model: { format: 'OpenAI' name: embeddingModelName - version: '2' + version: embeddingModelVersion } sku: { name: 'Standard' @@ -398,6 +402,7 @@ module openAiRoleBackend '../../shared/security/role.bicep' = if (openAiHost == } } +/* module openAiRoleIndexer '../../shared/security/role.bicep' = { scope: openAiResourceGroup name: 'openai-role-indexer' @@ -407,6 +412,7 @@ module openAiRoleIndexer '../../shared/security/role.bicep' = { principalType: 'ServicePrincipal' } } +*/ module storageRoleBackend '../../shared/security/role.bicep' = { scope: storageResourceGroup @@ -418,6 +424,7 @@ module storageRoleBackend '../../shared/security/role.bicep' = { } } +/* module storageRoleIndexer '../../shared/security/role.bicep' = { scope: storageResourceGroup name: 'storage-role-indexer' @@ -428,6 +435,8 @@ module storageRoleIndexer '../../shared/security/role.bicep' = { } } +*/ + module searchRoleBackend '../../shared/security/role.bicep' = { scope: searchServiceResourceGroup name: 'search-role-backend' @@ -438,6 +447,7 @@ module searchRoleBackend '../../shared/security/role.bicep' = { } } +/* module searchRoleIndexer '../../shared/security/role.bicep' = { scope: searchServiceResourceGroup name: 'search-role-indexer' @@ -457,6 +467,7 @@ module formRecognizerRoleIndexer '../../shared/security/role.bicep' = { principalType: 'ServicePrincipal' } } +*/ output AZURE_LOCATION string = location output AZURE_TENANT_ID string = tenant().tenantId @@ -487,4 +498,4 @@ output AZURE_STORAGE_CONTAINER string = storageContainerName output AZURE_STORAGE_RESOURCE_GROUP string = storageResourceGroup.name output BACKEND_URI string = backend.outputs.uri -output INDEXER_FUNCTIONAPP_NAME string = indexer.outputs.name +//output INDEXER_FUNCTIONAPP_NAME string = indexer.outputs.name diff --git a/deploy/app-service/infra/main.parameters.json b/deploy/app-service/infra/main.parameters.json index 8bb96d6..08e1294 100644 --- a/deploy/app-service/infra/main.parameters.json +++ b/deploy/app-service/infra/main.parameters.json @@ -69,16 +69,31 @@ "value": "${AZURE_STORAGE_SKU=Standard_LRS}" }, "chatGptModelName": { - "value": "${AZURE_OPENAI_CHATGPT_MODEL=gpt-35-turbo}" + "value": "${AZURE_OPENAI_CHATGPT_MODEL=gpt-4o-mini}" }, "chatGptModelVersion": { - "value": "${AZURE_OPENAI_CHATGPT_VERSION=0613}" + "value": "${AZURE_OPENAI_CHATGPT_VERSION=2024-07-18}" }, "chatGptDeploymentName": { - "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT=chat}" + "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT=gpt-4o-mini}" + }, + "chatGptDeploymentCapacity": { + "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY=80}" + }, + "chatGptDeploymentSkuName": { + "value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU_NAME=Standard}" + }, + "embeddingModelName": { + "value": "${AZURE_OPENAI_EMB_MODEL=text-embedding-3-small}" + }, + "embeddingModelVersion": { + "value": "${AZURE_OPENAI_EMB_MODEL_VERSION=1}" }, "embeddingDeploymentName": { - "value": "${AZURE_OPENAI_EMB_DEPLOYMENT=embedding}" + "value": "${AZURE_OPENAI_EMB_DEPLOYMENT=text-embedding-3-small}" + }, + "embeddingDeploymentCapacity": { + "value": "${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY=120}" }, "openAiHost":{ "value": "${OPENAI_HOST=azure}"