diff --git a/.github/workflows/copilot-build-backend.yml b/.github/workflows/copilot-build-backend.yml index eca148c0b..bdb4690e1 100644 --- a/.github/workflows/copilot-build-backend.yml +++ b/.github/workflows/copilot-build-backend.yml @@ -38,13 +38,13 @@ jobs: fetch-depth: 0 - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v0 + uses: gittools/actions/gitversion/setup@v1 with: versionSpec: "5.x" - name: Determine version id: gitversion - uses: gittools/actions/gitversion/execute@v0 + uses: gittools/actions/gitversion/execute@v1 - name: Set version tag id: versiontag diff --git a/.github/workflows/copilot-build-memorypipeline.yml b/.github/workflows/copilot-build-memorypipeline.yml index 9bee10b4a..d45011ad0 100644 --- a/.github/workflows/copilot-build-memorypipeline.yml +++ b/.github/workflows/copilot-build-memorypipeline.yml @@ -32,13 +32,13 @@ jobs: fetch-depth: 0 - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v0 + uses: gittools/actions/gitversion/setup@v1 with: versionSpec: "5.x" - name: Determine version id: gitversion - uses: gittools/actions/gitversion/execute@v0 + uses: gittools/actions/gitversion/execute@v1 - name: Set version tag id: versiontag diff --git a/.github/workflows/copilot-build-plugins.yml b/.github/workflows/copilot-build-plugins.yml index 9eab6ea8c..57c0c4406 100644 --- a/.github/workflows/copilot-build-plugins.yml +++ b/.github/workflows/copilot-build-plugins.yml @@ -32,13 +32,13 @@ jobs: fetch-depth: 0 - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v0 + uses: gittools/actions/gitversion/setup@v1 with: versionSpec: "5.x" - name: Determine version id: gitversion - uses: gittools/actions/gitversion/execute@v0 + uses: gittools/actions/gitversion/execute@v1 - name: Set version tag id: versiontag diff --git a/.github/workflows/copilot-deploy-backend.yml b/.github/workflows/copilot-deploy-backend.yml index 5c5ae245f..83948783e 100644 --- a/.github/workflows/copilot-deploy-backend.yml +++ b/.github/workflows/copilot-deploy-backend.yml @@ -12,13 +12,6 @@ on: DEPLOYMENT_NAME: required: true type: string - secrets: - AZURE_CLIENT_ID: - required: true - AZURE_TENANT_ID: - required: true - AZURE_SUBSCRIPTION_ID: - required: true outputs: backend-host: description: "Host to which backend is deployed" @@ -57,11 +50,11 @@ jobs: working-directory: "${{ github.workspace }}/${{inputs.ARTIFACT_NAME}}" - name: Azure login - uses: azure/login@v1 + uses: azure/login@v2 with: - client-id: ${{secrets.AZURE_CLIENT_ID}} - tenant-id: ${{secrets.AZURE_TENANT_ID}} - subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} + client-id: ${{vars.AZURE_GITHUB_ACCESS_APP_ID}} + tenant-id: ${{vars.AZURE_GITHUB_ACCESS_TENANT_ID}} + subscription-id: ${{vars.AZURE_GITHUB_ACCESS_SUB_ID}} enable-AzPSSession: false - name: Get app name @@ -72,7 +65,7 @@ jobs: echo "backend-host=$WEB_APP_NAME" >> $GITHUB_OUTPUT - name: Enable Run From Package - uses: azure/CLI@v1 + uses: azure/CLI@v2 with: azcliversion: 2.30.0 inlineScript: | @@ -80,4 +73,4 @@ jobs: - name: "Deploy" run: | - scripts/deploy/deploy-webapi.sh -p "${{ github.workspace }}/${{inputs.ARTIFACT_NAME}}/webapi.zip" -d ${{inputs.DEPLOYMENT_NAME}} -s ${{secrets.AZURE_SUBSCRIPTION_ID}} -rg ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --skip-app-registration + scripts/deploy/deploy-webapi.sh -p "${{ github.workspace }}/${{inputs.ARTIFACT_NAME}}/webapi.zip" -d ${{inputs.DEPLOYMENT_NAME}} -s ${{vars.AZURE_SUBSCRIPTION_ID}} -rg ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --skip-app-registration diff --git a/.github/workflows/copilot-deploy-environment.yml b/.github/workflows/copilot-deploy-environment.yml index 63cd96a4c..c29b4bae8 100644 --- a/.github/workflows/copilot-deploy-environment.yml +++ b/.github/workflows/copilot-deploy-environment.yml @@ -15,15 +15,6 @@ on: PLUGINS_ARTIFACT_NAME: required: true type: string - secrets: - AZURE_CLIENT_ID: - required: true - AZURE_TENANT_ID: - required: true - AZURE_SUBSCRIPTION_ID: - required: true - AZURE_OPENAI_ENDPOINT: - required: true outputs: backend-host: description: "Host on which backend runs" @@ -38,11 +29,6 @@ jobs: uses: ./.github/workflows/copilot-deploy-infra.yml with: ENVIRONMENT: ${{inputs.ENVIRONMENT}} - secrets: - AZURE_CLIENT_ID: ${{secrets.AZURE_CLIENT_ID}} - AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}} - AZURE_SUBSCRIPTION_ID: ${{secrets.AZURE_SUBSCRIPTION_ID}} - AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}} deploy-backend: needs: [deploy-infra] @@ -51,10 +37,6 @@ jobs: ARTIFACT_NAME: ${{inputs.WEBAPI_ARTIFACT_NAME}} DEPLOYMENT_NAME: ${{needs.deploy-infra.outputs.deployment-id}} ENVIRONMENT: ${{inputs.ENVIRONMENT}} - secrets: - AZURE_CLIENT_ID: ${{secrets.AZURE_CLIENT_ID}} - AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}} - AZURE_SUBSCRIPTION_ID: ${{secrets.AZURE_SUBSCRIPTION_ID}} deploy-memorypipeline: needs: [deploy-infra] @@ -63,10 +45,6 @@ jobs: ARTIFACT_NAME: ${{inputs.MEMORYPIPELINE_ARTIFACT_NAME}} DEPLOYMENT_NAME: ${{needs.deploy-infra.outputs.deployment-id}} ENVIRONMENT: ${{inputs.ENVIRONMENT}} - secrets: - AZURE_CLIENT_ID: ${{secrets.AZURE_CLIENT_ID}} - AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}} - AZURE_SUBSCRIPTION_ID: ${{secrets.AZURE_SUBSCRIPTION_ID}} deploy-plugins: needs: [deploy-infra] @@ -75,7 +53,3 @@ jobs: ARTIFACT_NAME: ${{inputs.PLUGINS_ARTIFACT_NAME}} DEPLOYMENT_NAME: ${{needs.deploy-infra.outputs.deployment-id}} ENVIRONMENT: ${{inputs.ENVIRONMENT}} - secrets: - AZURE_CLIENT_ID: ${{secrets.AZURE_CLIENT_ID}} - AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}} - AZURE_SUBSCRIPTION_ID: ${{secrets.AZURE_SUBSCRIPTION_ID}} diff --git a/.github/workflows/copilot-deploy-infra.yml b/.github/workflows/copilot-deploy-infra.yml index 3cc1b6c6c..c7e13d70a 100644 --- a/.github/workflows/copilot-deploy-infra.yml +++ b/.github/workflows/copilot-deploy-infra.yml @@ -6,15 +6,6 @@ on: ENVIRONMENT: required: true type: string - secrets: - AZURE_CLIENT_ID: - required: true - AZURE_TENANT_ID: - required: true - AZURE_SUBSCRIPTION_ID: - required: true - AZURE_OPENAI_ENDPOINT: - required: true outputs: deployment-id: description: "The Id of the current deployment." @@ -45,20 +36,19 @@ jobs: clean: true - name: Azure login - uses: azure/login@v1 + uses: azure/login@v2 with: - client-id: ${{secrets.AZURE_CLIENT_ID}} - tenant-id: ${{secrets.AZURE_TENANT_ID}} - subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} + client-id: ${{vars.AZURE_GITHUB_ACCESS_APP_ID}} + tenant-id: ${{vars.AZURE_GITHUB_ACCESS_TENANT_ID}} + subscription-id: ${{vars.AZURE_GITHUB_ACCESS_SUB_ID}} enable-AzPSSession: false - name: deploy-infra - uses: azure/CLI@v1 + uses: azure/CLI@v2 with: azcliversion: 2.30.0 inlineScript: | - AI_SERVICE_KEY=$(az cognitiveservices account keys list --name ${{vars.AZUREOPENAI__NAME}} --resource-group ${{vars.AZUREOPENAI_DEPLOYMENT_GROUP_NAME}} | jq -r '.key1') + AI_SERVICE_KEY=$(az cognitiveservices account keys list --name ${{vars.AZURE_OPENAI_NAME}} --resource-group ${{vars.AZUREOPENAI_DEPLOYMENT_GROUP_NAME}} | jq -r '.key1') echo "::add-mask::$AI_SERVICE_KEY" APP_TENANT_ID=${{vars.APPLICATION_TENANT_ID}} - [ -z "$APP_TENANT_ID" ] && APP_TENANT_ID=${{secrets.AZURE_TENANT_ID}} # Use secrets.AZURE_TENANT_ID if vars.APPLICATION_TENANT_ID is not set - scripts/deploy/deploy-azure.sh --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{steps.deployment-id.outputs.deployment_name}} --region ${{vars.CC_DEPLOYMENT_REGION}} --client-id ${{vars.BACKEND_CLIENT_ID}} --frontend-client-id ${{vars.APPLICATION_CLIENT_ID}} --tenant-id $APP_TENANT_ID --instance ${{vars.AZURE_INSTANCE}} --ai-service AzureOpenAI --ai-endpoint ${{secrets.AZURE_OPENAI_ENDPOINT}} --ai-service-key $AI_SERVICE_KEY --app-service-sku ${{vars.WEBAPP_API_SKU}} --no-deploy-package --debug-deployment --deploy-web-searcher-plugin + scripts/deploy/deploy-azure.sh --subscription ${{vars.AZURE_SUBSCRIPTION_ID}} --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} --deployment-name ${{steps.deployment-id.outputs.deployment_name}} --region ${{vars.CC_DEPLOYMENT_REGION}} --client-id ${{vars.BACKEND_CLIENT_ID}} --frontend-client-id ${{vars.APPLICATION_CLIENT_ID}} --tenant-id $APP_TENANT_ID --instance ${{vars.AZURE_INSTANCE}} --ai-service AzureOpenAI --ai-endpoint ${{vars.AZURE_OPENAI_ENDPOINT}} --ai-service-key $AI_SERVICE_KEY --app-service-sku ${{vars.WEBAPP_API_SKU}} --no-deploy-package --debug-deployment --deploy-web-searcher-plugin diff --git a/.github/workflows/copilot-deploy-memorypipeline.yml b/.github/workflows/copilot-deploy-memorypipeline.yml index ccecc21c2..998751e9c 100644 --- a/.github/workflows/copilot-deploy-memorypipeline.yml +++ b/.github/workflows/copilot-deploy-memorypipeline.yml @@ -12,13 +12,6 @@ on: DEPLOYMENT_NAME: required: true type: string - secrets: - AZURE_CLIENT_ID: - required: true - AZURE_TENANT_ID: - required: true - AZURE_SUBSCRIPTION_ID: - required: true permissions: contents: read @@ -49,11 +42,11 @@ jobs: working-directory: "${{ github.workspace }}/${{inputs.ARTIFACT_NAME}}" - name: Azure login - uses: azure/login@v1 + uses: azure/login@v2 with: - client-id: ${{secrets.AZURE_CLIENT_ID}} - tenant-id: ${{secrets.AZURE_TENANT_ID}} - subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} + client-id: ${{vars.AZURE_GITHUB_ACCESS_APP_ID}} + tenant-id: ${{vars.AZURE_GITHUB_ACCESS_TENANT_ID}} + subscription-id: ${{vars.AZURE_GITHUB_ACCESS_SUB_ID}} enable-AzPSSession: false - name: Get app name @@ -62,7 +55,7 @@ jobs: echo "AZURE_WEBAPP_NAME=$WEB_APP_NAME" >> $GITHUB_ENV - name: Enable Run From Package - uses: azure/CLI@v1 + uses: azure/CLI@v2 with: azcliversion: 2.30.0 inlineScript: | diff --git a/.github/workflows/copilot-deploy-pipeline.yml b/.github/workflows/copilot-deploy-pipeline.yml index c2390b6c9..8c43f126c 100644 --- a/.github/workflows/copilot-deploy-pipeline.yml +++ b/.github/workflows/copilot-deploy-pipeline.yml @@ -31,17 +31,13 @@ jobs: WEBAPI_ARTIFACT_NAME: ${{needs.build-webapi.outputs.artifact}} MEMORYPIPELINE_ARTIFACT_NAME: ${{needs.build-memorypipeline.outputs.artifact}} PLUGINS_ARTIFACT_NAME: ${{needs.build-plugins.outputs.artifact}} - secrets: - AZURE_CLIENT_ID: ${{secrets.AZURE_CLIENT_ID}} - AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}} - AZURE_SUBSCRIPTION_ID: ${{secrets.AZURE_SUBSCRIPTION_ID}} - AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}} int-tests: uses: ./.github/workflows/copilot-run-integration-tests.yml needs: int with: BACKEND_HOST: ${{needs.int.outputs.backend-host}} + ENVIRONMENT: int stable: needs: [int-tests, build-webapi, build-memorypipeline, build-plugins] @@ -51,8 +47,3 @@ jobs: WEBAPI_ARTIFACT_NAME: ${{needs.build-webapi.outputs.artifact}} MEMORYPIPELINE_ARTIFACT_NAME: ${{needs.build-memorypipeline.outputs.artifact}} PLUGINS_ARTIFACT_NAME: ${{needs.build-plugins.outputs.artifact}} - secrets: - AZURE_CLIENT_ID: ${{secrets.AZURE_CLIENT_ID}} - AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}} - AZURE_SUBSCRIPTION_ID: ${{secrets.AZURE_SUBSCRIPTION_ID}} - AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}} diff --git a/.github/workflows/copilot-deploy-plugins.yml b/.github/workflows/copilot-deploy-plugins.yml index 396b2dceb..a5283bf43 100644 --- a/.github/workflows/copilot-deploy-plugins.yml +++ b/.github/workflows/copilot-deploy-plugins.yml @@ -12,13 +12,6 @@ on: DEPLOYMENT_NAME: required: true type: string - secrets: - AZURE_CLIENT_ID: - required: true - AZURE_TENANT_ID: - required: true - AZURE_SUBSCRIPTION_ID: - required: true permissions: contents: read @@ -54,17 +47,17 @@ jobs: working-directory: "${{ github.workspace }}/${{inputs.ARTIFACT_NAME}}" - name: "Azure login" - uses: azure/login@v1 + uses: azure/login@v2 with: - client-id: ${{secrets.AZURE_CLIENT_ID}} - tenant-id: ${{secrets.AZURE_TENANT_ID}} - subscription-id: ${{secrets.AZURE_SUBSCRIPTION_ID}} + client-id: ${{vars.AZURE_GITHUB_ACCESS_APP_ID}} + tenant-id: ${{vars.AZURE_GITHUB_ACCESS_TENANT_ID}} + subscription-id: ${{vars.AZURE_GITHUB_ACCESS_SUB_ID}} enable-AzPSSession: false - name: "Deploy" run: | scripts/deploy/deploy-plugins.sh \ --deployment-name ${{inputs.DEPLOYMENT_NAME}} \ - --subscription ${{secrets.AZURE_SUBSCRIPTION_ID}} \ + --subscription ${{vars.AZURE_SUBSCRIPTION_ID}} \ --resource-group ${{vars.CC_DEPLOYMENT_GROUP_NAME}} \ --packages "${{ github.workspace }}/${{inputs.ARTIFACT_NAME}}" diff --git a/.github/workflows/copilot-run-integration-tests.yml b/.github/workflows/copilot-run-integration-tests.yml index 4579f4ccd..9b00c4f87 100644 --- a/.github/workflows/copilot-run-integration-tests.yml +++ b/.github/workflows/copilot-run-integration-tests.yml @@ -6,17 +6,24 @@ on: BACKEND_HOST: required: true type: string + ENVIRONMENT: + required: true + type: string workflow_call: inputs: BACKEND_HOST: required: true type: string + ENVIRONMENT: + required: true + type: string permissions: contents: read jobs: tests: + environment: ${{inputs.ENVIRONMENT}} name: Integration Testing runs-on: windows-latest @@ -26,18 +33,15 @@ jobs: - name: Configure test environment working-directory: integration-tests env: - TenantId: ${{ secrets.COPILOT_CHAT_TEST_TENANT_ID }} - WebApiClientId: ${{ secrets.COPILOT_CHAT_TEST_APP_AAD_WEBAPI_CLIENT_ID }} - WebAppClientId: ${{ secrets.COPILOT_CHAT_TEST_APP_AAD_WEBAPP_CLIENT_ID }} - Username: ${{secrets.COPILOT_CHAT_TEST_USER_ACCOUNT1}} - Password: ${{secrets.COPILOT_CHAT_TEST_USER_PASSWORD1}} + TestUsername: ${{secrets.COPILOT_CHAT_TEST_USER_ACCOUNT1}} + TestPassword: ${{secrets.COPILOT_CHAT_TEST_USER_PASSWORD1}} run: | dotnet user-secrets set "BaseServerUrl" "https://${{inputs.BACKEND_HOST}}.azurewebsites.net/" - dotnet user-secrets set "Authority" "https://login.microsoftonline.com/$env:TenantID" - dotnet user-secrets set "ClientID" "$env:WebAppClientId" - dotnet user-secrets set "Scopes" "openid, offline_access, profile, api://$env:WebApiClientId/access_as_user" - dotnet user-secrets set "Username" "$env:Username" - dotnet user-secrets set "Password" "$env:Password" + dotnet user-secrets set "Authority" "https://login.microsoftonline.com/${{vars.APPLICATION_TENANT_ID}}" + dotnet user-secrets set "ClientID" ${{vars.APPLICATION_CLIENT_ID}} + dotnet user-secrets set "Scopes" "openid, offline_access, profile, api://${{vars.BACKEND_CLIENT_ID}}/access_as_user" + # dotnet user-secrets set "TestUsername" "$env:TestUsername" + # dotnet user-secrets set "TestPassword" "$env:TestPassword" - name: Run integration tests run: dotnet test --logger trx diff --git a/.github/workflows/copilot-test-e2e.yml b/.github/workflows/copilot-test-e2e.yml index 8ec76079d..197e5c04e 100644 --- a/.github/workflows/copilot-test-e2e.yml +++ b/.github/workflows/copilot-test-e2e.yml @@ -1,6 +1,10 @@ name: Copilot Chat Tests on: workflow_dispatch: + inputs: + ENVIRONMENT: + required: true + type: string merge_group: types: [checks_requested] @@ -9,6 +13,7 @@ permissions: jobs: e2e: + environment: ${{inputs.ENVIRONMENT}} defaults: run: working-directory: webapp @@ -37,20 +42,16 @@ jobs: working-directory: webapi env: AzureOpenAI__ApiKey: ${{ secrets.AZUREOPENAI__APIKEY }} - AzureOpenAI__Endpoint: ${{ secrets.AZUREOPENAI__ENDPOINT }} - TenantId: ${{ secrets.COPILOT_CHAT_TEST_TENANT_ID }} - WebApi_ClientId: ${{ secrets.COPILOT_CHAT_TEST_APP_AAD_WEBAPI_CLIENT_ID }} - WebApp_ClientId: ${{ secrets.COPILOT_CHAT_TEST_APP_AAD_WEBAPP_CLIENT_ID }} run: | dotnet dev-certs https dotnet user-secrets set "KernelMemory:Services:AzureOpenAIText:APIKey" "$AzureOpenAI__ApiKey" - dotnet user-secrets set "KernelMemory:Services:AzureOpenAIText:Endpoint" "$AzureOpenAI__Endpoint" + dotnet user-secrets set "KernelMemory:Services:AzureOpenAIText:Endpoint" ${{vars.AZURE_OPENAI_ENDPOINT}} dotnet user-secrets set "KernelMemory:Services:AzureOpenAIEmbedding:APIKey" "$AzureOpenAI__ApiKey" - dotnet user-secrets set "KernelMemory:Services:AzureOpenAIEmbedding:Endpoint" "$AzureOpenAI__Endpoint" + dotnet user-secrets set "KernelMemory:Services:AzureOpenAIEmbedding:Endpoint" ${{vars.AZURE_OPENAI_ENDPOINT}} dotnet user-secrets set "Authentication:Type" "AzureAd" - dotnet user-secrets set "Authentication:AzureAd:TenantId" "$TenantId" - dotnet user-secrets set "Authentication:AzureAd:ClientId" "$WebApi_ClientId" - dotnet user-secrets set "Frontend:AadClientId" "$WebApp_ClientId" + dotnet user-secrets set "Authentication:AzureAd:TenantId" ${{vars.APPLICATION_TENANT_ID}} + dotnet user-secrets set "Authentication:AzureAd:ClientId" ${{vars.BACKEND_CLIENT_ID}} + dotnet user-secrets set "Frontend:AadClientId" ${{vars.APPLICATION_CLIENT_ID}} - name: Start service in background working-directory: webapi diff --git a/.github/workflows/markdown-link-check-config.json b/.github/workflows/markdown-link-check-config.json index a79ee8f93..1044cc6e5 100644 --- a/.github/workflows/markdown-link-check-config.json +++ b/.github/workflows/markdown-link-check-config.json @@ -26,6 +26,9 @@ }, { "pattern": "^https://platform.openai.com" + }, + { + "pattern": "^https://stackoverflow.com" } ], "timeout": "20s", diff --git a/README.md b/README.md index 847658cf1..6efe8d594 100644 --- a/README.md +++ b/README.md @@ -69,11 +69,9 @@ You will need the following items to run the sample: - > **IMPORTANT:** For `AzureOpenAI`, if you deployed models `gpt-35-turbo` and `text-embedding-ada-002` with custom names (instead of the default names), also use the parameters: ```powershell - -CompletionModel {DEPLOYMENT_NAME} -EmbeddingModel {DEPLOYMENT_NAME} -PlannerModel {DEPLOYMENT_NAME} + -CompletionModel {DEPLOYMENT_NAME} -EmbeddingModel {DEPLOYMENT_NAME} ``` - > -PlannerModel name will be the same as -CompletionModel - Open the `.\Configure.ps1` script to see all of the available parameters. 1. Run Chat Copilot locally. This step starts both the backend API and frontend application. @@ -153,12 +151,9 @@ You will need the following items to run the sample: --endpoint {AZURE_OPENAI_ENDPOINT} \ --apikey {API_KEY} \ --completionmodel {DEPLOYMENT_NAME} \ - --plannermodel {DEPLOYMENT_NAME} \ --embeddingmodel {DEPLOYMENT_NAME} ``` - `--plannermodel` will be the same name as `--completionmodel` - 1. Run Chat Copilot locally. This step starts both the backend API and frontend application. ```bash diff --git a/integration-tests/ChatCopilotIntegrationTest.cs b/integration-tests/ChatCopilotIntegrationTest.cs index 91df3fdc4..84613fb95 100644 --- a/integration-tests/ChatCopilotIntegrationTest.cs +++ b/integration-tests/ChatCopilotIntegrationTest.cs @@ -20,8 +20,8 @@ public abstract class ChatCopilotIntegrationTest : IDisposable protected const string BaseUrlSettingName = "BaseServerUrl"; protected const string ClientIdSettingName = "ClientID"; protected const string AuthoritySettingName = "Authority"; - protected const string UsernameSettingName = "Username"; - protected const string PasswordSettingName = "Password"; + protected const string UsernameSettingName = "TestUsername"; + protected const string PasswordSettingName = "TestPassword"; protected const string ScopesSettingName = "Scopes"; protected readonly HttpClient _httpClient; diff --git a/integration-tests/ChatCopilotIntegrationTests.csproj b/integration-tests/ChatCopilotIntegrationTests.csproj index debb176fc..d57640b1f 100644 --- a/integration-tests/ChatCopilotIntegrationTests.csproj +++ b/integration-tests/ChatCopilotIntegrationTests.csproj @@ -14,13 +14,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/integration-tests/testsettings.json b/integration-tests/testsettings.json index 310a2f526..2ec088ac6 100644 --- a/integration-tests/testsettings.json +++ b/integration-tests/testsettings.json @@ -2,7 +2,7 @@ "BaseServerUrl": "https://localhost:40443/", "ClientID": "YOUR_FRONTEND_CLIEND_ID", "Authority": "https://login.microsoftonline.com/YOUR_TENANT_ID", - "Username": "YOUR_TEST_USERNAME", // Note that an environment variable with this name is usually set and will override this value! - "Password": "YOUR_TEST_PASSWORD", // Take care not to check your password in + "TestUsername": "YOUR_TEST_USERNAME", + "TestPassword": "YOUR_TEST_PASSWORD", // Take care not to check your password in "Scopes": "openid, offline_access, profile, api://YOUR_BACKEND_CLIENT_ID/access_as_user" } diff --git a/memorypipeline/CopilotChatMemoryPipeline.csproj b/memorypipeline/CopilotChatMemoryPipeline.csproj index 0906ac571..af0dc4712 100644 --- a/memorypipeline/CopilotChatMemoryPipeline.csproj +++ b/memorypipeline/CopilotChatMemoryPipeline.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/memorypipeline/README.md b/memorypipeline/README.md index e7f35030a..270047455 100644 --- a/memorypipeline/README.md +++ b/memorypipeline/README.md @@ -43,7 +43,7 @@ The memorypipeline is only needed when `SemanticMemory:DataIngestion:Orchestrati - RabbitMQ - SimpleQueues: stores messages on your local file system. - [Vector database](https://learn.microsoft.com/en-us/semantic-kernel/memories/vector-db): storage solution for high-dimensional vectors, aka [embeddings](https://github.com/microsoft/semantic-kernel/blob/main/docs/EMBEDDINGS.md). Available options: - - [AzureCognitiveSearch](https://learn.microsoft.com/en-us/azure/search/search-what-is-azure-search) + - [AzureAISearch](https://learn.microsoft.com/en-us/azure/search/search-what-is-azure-search) - [Qdrant](https://github.com/qdrant/qdrant) - SimpleVectorDb - TextFile: stores vectors on your local file system. @@ -72,8 +72,8 @@ The memorypipeline is only needed when `SemanticMemory:DataIngestion:Orchestrati 2. Find the **Url** under **Overview** and the **key** under **Keys** on the portal. 3. Run the following to set up the authentication to the resources: ```bash - dotnet user-secrets set SemanticMemory:Services:AzureCognitiveSearch:Endpoint [your secret] - dotnet user-secrets set SemanticMemory:Services:AzureCognitiveSearch:APIKey [your secret] + dotnet user-secrets set SemanticMemory:Services:AzureAISearch:Endpoint [your secret] + dotnet user-secrets set SemanticMemory:Services:AzureAISearch:APIKey [your secret] ``` ##### RabbitMQ diff --git a/memorypipeline/appsettings.json b/memorypipeline/appsettings.json index d6e9c2dc0..932afd299 100644 --- a/memorypipeline/appsettings.json +++ b/memorypipeline/appsettings.json @@ -18,7 +18,7 @@ // Distributed: asynchronous queue based orchestrator // - DistributedOrchestration is the detailed configuration for OrchestrationType=Distributed // - EmbeddingGeneratorTypes is the list of embedding generator types - // - VectorDbTypes is the list of vector database types + // - MemoryDbTypes is the list of vector database types "DataIngestion": { "OrchestrationType": "Distributed", // @@ -33,17 +33,17 @@ "AzureOpenAIEmbedding" ], // Vectors can be written to multiple storages, e.g. for data migration, A/B testing, etc. - "VectorDbTypes": [ + "MemoryDbTypes": [ "SimpleVectorDb" ] }, // // Memory retrieval configuration - A single EmbeddingGenerator and VectorDb. - // - VectorDbType: Vector database configuration: "SimpleVectorDb" or "AzureCognitiveSearch" or "Qdrant" + // - MemoryDbType: Vector database configuration: "SimpleVectorDb" or "AzureAISearch" or "Qdrant" // - EmbeddingGeneratorType: Embedding generator configuration: "AzureOpenAIEmbedding" or "OpenAI" // "Retrieval": { - "VectorDbType": "SimpleVectorDb", + "MemoryDbType": "SimpleVectorDb", "EmbeddingGeneratorType": "AzureOpenAIEmbedding" }, // @@ -122,9 +122,9 @@ // - APIKey is the key generated to access the service. // - Endpoint is the service endpoint url. // - "AzureCognitiveSearch": { + "AzureAISearch": { "Auth": "ApiKey", - //"APIKey": "", // dotnet user-secrets set "SemanticMemory:Services:AzureCognitiveSearch:APIKey" "MY_ACS_KEY" + //"APIKey": "", // dotnet user-secrets set "SemanticMemory:Services:AzureAISearch:APIKey" "MY_ACS_KEY" "Endpoint": "" }, // diff --git a/plugins/web-searcher/WebSearcher.csproj b/plugins/web-searcher/WebSearcher.csproj index 9da18df23..8f9571689 100644 --- a/plugins/web-searcher/WebSearcher.csproj +++ b/plugins/web-searcher/WebSearcher.csproj @@ -9,10 +9,10 @@ - + - - + + diff --git a/scripts/.env b/scripts/.env index 5e0516c5c..dbeb94515 100644 --- a/scripts/.env +++ b/scripts/.env @@ -2,9 +2,7 @@ # Default values ENV_COMPLETION_MODEL_OPEN_AI="gpt-3.5-turbo" -ENV_PLANNER_MODEL_OPEN_AI="gpt-3.5-turbo" ENV_COMPLETION_MODEL_AZURE_OPEN_AI="gpt-35-turbo" -ENV_PLANNER_MODEL_AZURE_OPEN_AI="gpt-35-turbo" ENV_EMBEDDING_MODEL="text-embedding-ada-002" ENV_ASPNETCORE="Development" ENV_INSTANCE="https://login.microsoftonline.com" diff --git a/scripts/Configure.ps1 b/scripts/Configure.ps1 index 47b1afe4e..94819526c 100644 --- a/scripts/Configure.ps1 +++ b/scripts/Configure.ps1 @@ -3,7 +3,7 @@ Configure user secrets, appsettings.Development.json, and webapp/.env for Chat Copilot. .PARAMETER AIService -The service type used: OpenAI or Azure OpenAI. +The service type used: OpenAI or AzureOpenAI. .PARAMETER APIKey The API key for the AI service. @@ -17,9 +17,6 @@ The chat completion model to use (e.g., gpt-3.5-turbo or gpt-4). .PARAMETER EmbeddingModel The embedding model to use (e.g., text-embedding-ada-002). -.PARAMETER PlannerModel -The chat completion model to use for planning (e.g., gpt-3.5-turbo or gpt-4). - .PARAMETER FrontendClientId The client (application) ID associated with your frontend's AAD app registration. @@ -51,9 +48,6 @@ param( [Parameter(Mandatory = $false)] [string]$EmbeddingModel, - [Parameter(Mandatory = $false)] - [string]$PlannerModel, - [Parameter(Mandatory = $false)] [string] $FrontendClientId, @@ -74,21 +68,17 @@ $varScriptFilePath = Join-Path "$PSScriptRoot" 'Variables.ps1' # Set remaining values from Variables.ps1 if ($AIService -eq $varOpenAI) { if (!$CompletionModel) { + Write-Host "No completion model provided - Defaulting to $varCompletionModelOpenAI" $CompletionModel = $varCompletionModelOpenAI } - if (!$PlannerModel) { - $PlannerModel = $varPlannerModelOpenAI - } # TO DO: Validate model values if set by command line. } elseif ($AIService -eq $varAzureOpenAI) { if (!$CompletionModel) { + Write-Host "No completion model provided - Defaulting to $varCompletionModelAzureOpenAI" $CompletionModel = $varCompletionModelAzureOpenAI } - if (!$PlannerModel) { - $PlannerModel = $varPlannerModelAzureOpenAI - } # TO DO: Validate model values if set by command line. @@ -177,9 +167,6 @@ $appsettingsOverrides = @{ Scopes = $varScopes } }; - Planner = @{ - Model = $PlannerModel - }; KernelMemory = @{ TextGeneratorType = $AIService; DataIngestion = @{ diff --git a/scripts/Variables.ps1 b/scripts/Variables.ps1 index 64e92c020..3d75b5c06 100644 --- a/scripts/Variables.ps1 +++ b/scripts/Variables.ps1 @@ -2,9 +2,7 @@ # Default values $varCompletionModelOpenAI = "gpt-3.5-turbo" -$varPlannerModelOpenAI = "gpt-3.5-turbo" $varCompletionModelAzureOpenAI = "gpt-35-turbo" -$varPlannerModelAzureOpenAI = "gpt-35-turbo" $varEmbeddingModel = "text-embedding-ada-002" $varASPNetCore = "Development" $varInstance = "https://login.microsoftonline.com" diff --git a/scripts/configure.sh b/scripts/configure.sh index f88c23328..7cf2a591b 100755 --- a/scripts/configure.sh +++ b/scripts/configure.sh @@ -37,11 +37,6 @@ while [[ $# -gt 0 ]]; do shift shift ;; - --plannermodel) - PLANNER_MODEL="$2" - shift - shift - ;; -fc | --frontend-clientid) FRONTEND_CLIENT_ID="$2" shift @@ -111,17 +106,11 @@ if [ "$AI_SERVICE" = "$ENV_OPEN_AI" ]; then if [ -z "$COMPLETION_MODEL" ]; then COMPLETION_MODEL="$ENV_COMPLETION_MODEL_OPEN_AI" fi - if [ -z "$PLANNER_MODEL" ]; then - PLANNER_MODEL="$ENV_PLANNER_MODEL_OPEN_AI" - fi # TO DO: Validate model values if set by command line. else # elif [ "$AI_SERVICE" = "$ENV_AZURE_OPEN_AI" ]; then if [ -z "$COMPLETION_MODEL" ]; then COMPLETION_MODEL="$ENV_COMPLETION_MODEL_AZURE_OPEN_AI" fi - if [ -z "$PLANNER_MODEL" ]; then - PLANNER_MODEL="$ENV_PLANNER_MODEL_AZURE_OPEN_AI" - fi # TO DO: Validate model values if set by command line. fi @@ -194,9 +183,6 @@ APPSETTINGS_OVERRIDES="{ \"Scopes\": \"${ENV_SCOPES}\" } }, - \"Planner\": { - \"Model\": \"${PLANNER_MODEL}\" - }, \"KernelMemory\": { \"TextGeneratorType\": \"${AI_SERVICE}\", \"DataIngestion\": { diff --git a/scripts/deploy/deploy-azure.ps1 b/scripts/deploy/deploy-azure.ps1 index c82787f6a..7dd91276d 100644 --- a/scripts/deploy/deploy-azure.ps1 +++ b/scripts/deploy/deploy-azure.ps1 @@ -58,10 +58,10 @@ param( # Azure AD cloud instance for authenticating users $AzureAdInstance = "https://login.microsoftonline.com", - [ValidateSet("AzureCognitiveSearch", "Qdrant")] + [ValidateSet("AzureAISearch", "Qdrant")] [string] # What method to use to persist embeddings - $MemoryStore = "AzureCognitiveSearch", + $MemoryStore = "AzureAISearch", [switch] # Don't deploy Cosmos DB for chat storage - Use volatile memory instead diff --git a/scripts/deploy/deploy-azure.sh b/scripts/deploy/deploy-azure.sh index 81f89d522..e6df71d05 100755 --- a/scripts/deploy/deploy-azure.sh +++ b/scripts/deploy/deploy-azure.sh @@ -22,7 +22,7 @@ usage() { echo " -i, --instance AZURE_AD_INSTANCE Azure AD cloud instance for authenticating users" echo " (default: \"https://login.microsoftonline.com\")" echo " -ms, --memory-store Method to use to persist embeddings. Valid values are" - echo " \"AzureCognitiveSearch\" (default) and \"Qdrant\"" + echo " \"AzureAISearch\" (default) and \"Qdrant\"" echo " -nc, --no-cosmos-db Don't deploy Cosmos DB for chat storage - Use volatile memory instead" echo " -ns, --no-speech-services Don't deploy Speech Services to enable speech as chat input" echo " -ws, --deploy-web-searcher-plugin Deploy the web searcher plugin" @@ -184,7 +184,7 @@ az account set -s "$SUBSCRIPTION" : "${REGION:="southcentralus"}" : "${WEB_APP_SVC_SKU:="B1"}" : "${AZURE_AD_INSTANCE:="https://login.microsoftonline.com"}" -: "${MEMORY_STORE:="AzureCognitiveSearch"}" +: "${MEMORY_STORE:="AzureAISearch"}" : "${NO_COSMOS_DB:=false}" : "${NO_SPEECH_SERVICES:=false}" : "${DEPLOY_WEB_SEARCHER_PLUGIN:=false}" diff --git a/scripts/deploy/main.bicep b/scripts/deploy/main.bicep index 5f4813b07..756affb15 100644 --- a/scripts/deploy/main.bicep +++ b/scripts/deploy/main.bicep @@ -37,9 +37,6 @@ param completionModel string = 'gpt-35-turbo' @description('Model to use for text embeddings') param embeddingModel string = 'text-embedding-ada-002' -@description('Completion model the task planner should use') -param plannerModel string = 'gpt-35-turbo' - @description('Azure OpenAI endpoint to use (Azure OpenAI only)') param aiEndpoint string = '' @@ -67,10 +64,10 @@ param deployCosmosDB bool = true @description('What method to use to persist embeddings') @allowed([ - 'AzureCognitiveSearch' + 'AzureAISearch' 'Qdrant' ]) -param memoryStore string = 'AzureCognitiveSearch' +param memoryStore string = 'AzureAISearch' @description('Whether to deploy Azure Speech Services to enable input by voice') param deploySpeechServices bool = true @@ -206,10 +203,6 @@ resource appServiceWebConfig 'Microsoft.Web/sites/config@2022-09-01' = { name: 'Authentication:AzureAd:Scopes' value: 'access_as_user' } - { - name: 'Planner:Model' - value: plannerModel - } { name: 'ChatStore:Type' value: deployCosmosDB ? 'cosmos' : 'volatile' @@ -311,11 +304,11 @@ resource appServiceWebConfig 'Microsoft.Web/sites/config@2022-09-01' = { value: aiService } { - name: 'KernelMemory:DataIngestion:VectorDbTypes:0' + name: 'KernelMemory:DataIngestion:MemoryDbTypes:0' value: memoryStore } { - name: 'KernelMemory:Retrieval:VectorDbType' + name: 'KernelMemory:Retrieval:MemoryDbType' value: memoryStore } { @@ -343,16 +336,16 @@ resource appServiceWebConfig 'Microsoft.Web/sites/config@2022-09-01' = { value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${storage.listKeys().keys[1].value}' } { - name: 'KernelMemory:Services:AzureCognitiveSearch:Auth' + name: 'KernelMemory:Services:AzureAISearch:Auth' value: 'ApiKey' } { - name: 'KernelMemory:Services:AzureCognitiveSearch:Endpoint' - value: memoryStore == 'AzureCognitiveSearch' ? 'https://${azureCognitiveSearch.name}.search.windows.net' : '' + name: 'KernelMemory:Services:AzureAISearch:Endpoint' + value: memoryStore == 'AzureAISearch' ? 'https://${azureAISearch.name}.search.windows.net' : '' } { - name: 'KernelMemory:Services:AzureCognitiveSearch:APIKey' - value: memoryStore == 'AzureCognitiveSearch' ? azureCognitiveSearch.listAdminKeys().primaryKey : '' + name: 'KernelMemory:Services:AzureAISearch:APIKey' + value: memoryStore == 'AzureAISearch' ? azureAISearch.listAdminKeys().primaryKey : '' } { name: 'KernelMemory:Services:Qdrant:Endpoint' @@ -480,7 +473,7 @@ resource appServiceMemoryPipelineConfig 'Microsoft.Web/sites/config@2022-09-01' value: aiService } { - name: 'KernelMemory:ImageOcrType' + name: 'KernelMemory:DataIngestion:ImageOcrType' value: 'AzureFormRecognizer' } { @@ -496,11 +489,11 @@ resource appServiceMemoryPipelineConfig 'Microsoft.Web/sites/config@2022-09-01' value: aiService } { - name: 'KernelMemory:DataIngestion:VectorDbTypes:0' + name: 'KernelMemory:DataIngestion:MemoryDbTypes:0' value: memoryStore } { - name: 'KernelMemory:Retrieval:VectorDbType' + name: 'KernelMemory:Retrieval:MemoryDbType' value: memoryStore } { @@ -528,16 +521,16 @@ resource appServiceMemoryPipelineConfig 'Microsoft.Web/sites/config@2022-09-01' value: 'DefaultEndpointsProtocol=https;AccountName=${storage.name};AccountKey=${storage.listKeys().keys[1].value}' } { - name: 'KernelMemory:Services:AzureCognitiveSearch:Auth' + name: 'KernelMemory:Services:AzureAISearch:Auth' value: 'ApiKey' } { - name: 'KernelMemory:Services:AzureCognitiveSearch:Endpoint' - value: memoryStore == 'AzureCognitiveSearch' ? 'https://${azureCognitiveSearch.name}.search.windows.net' : '' + name: 'KernelMemory:Services:AzureAISearch:Endpoint' + value: memoryStore == 'AzureAISearch' ? 'https://${azureAISearch.name}.search.windows.net' : '' } { - name: 'KernelMemory:Services:AzureCognitiveSearch:APIKey' - value: memoryStore == 'AzureCognitiveSearch' ? azureCognitiveSearch.listAdminKeys().primaryKey : '' + name: 'KernelMemory:Services:AzureAISearch:APIKey' + value: memoryStore == 'AzureAISearch' ? azureAISearch.listAdminKeys().primaryKey : '' } { name: 'KernelMemory:Services:Qdrant:Endpoint' @@ -812,7 +805,7 @@ resource appServiceQdrant 'Microsoft.Web/sites@2022-09-01' = if (memoryStore == } } -resource azureCognitiveSearch 'Microsoft.Search/searchServices@2022-09-01' = if (memoryStore == 'AzureCognitiveSearch') { +resource azureAISearch 'Microsoft.Search/searchServices@2022-09-01' = if (memoryStore == 'AzureAISearch') { name: 'acs-${uniqueName}' location: location sku: { diff --git a/scripts/deploy/main.json b/scripts/deploy/main.json index b38c967d2..27b231f48 100644 --- a/scripts/deploy/main.json +++ b/scripts/deploy/main.json @@ -4,8 +4,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.23.1.45101", - "templateHash": "10280441124249350356" + "version": "0.25.53.49325", + "templateHash": "1335279082624698663" } }, "parameters": { @@ -79,13 +79,6 @@ "description": "Model to use for text embeddings" } }, - "plannerModel": { - "type": "string", - "defaultValue": "gpt-35-turbo", - "metadata": { - "description": "Completion model the task planner should use" - } - }, "aiEndpoint": { "type": "string", "defaultValue": "", @@ -140,9 +133,9 @@ }, "memoryStore": { "type": "string", - "defaultValue": "AzureCognitiveSearch", + "defaultValue": "AzureAISearch", "allowedValues": [ - "AzureCognitiveSearch", + "AzureAISearch", "Qdrant" ], "metadata": { @@ -306,7 +299,7 @@ "use32BitWorkerProcess": false, "vnetRouteAllEnabled": true, "webSocketsEnabled": true, - "appSettings": "[concat(createArray(createObject('name', 'Authentication:Type', 'value', 'AzureAd'), createObject('name', 'Authentication:AzureAd:Instance', 'value', parameters('azureAdInstance')), createObject('name', 'Authentication:AzureAd:TenantId', 'value', parameters('azureAdTenantId')), createObject('name', 'Authentication:AzureAd:ClientId', 'value', parameters('webApiClientId')), createObject('name', 'Authentication:AzureAd:Scopes', 'value', 'access_as_user'), createObject('name', 'Planner:Model', 'value', parameters('plannerModel')), createObject('name', 'ChatStore:Type', 'value', if(parameters('deployCosmosDB'), 'cosmos', 'volatile')), createObject('name', 'ChatStore:Cosmos:Database', 'value', 'CopilotChat'), createObject('name', 'ChatStore:Cosmos:ChatSessionsContainer', 'value', 'chatsessions'), createObject('name', 'ChatStore:Cosmos:ChatMessagesContainer', 'value', 'chatmessages'), createObject('name', 'ChatStore:Cosmos:ChatMemorySourcesContainer', 'value', 'chatmemorysources'), createObject('name', 'ChatStore:Cosmos:ChatParticipantsContainer', 'value', 'chatparticipants'), createObject('name', 'ChatStore:Cosmos:ConnectionString', 'value', if(parameters('deployCosmosDB'), listConnectionStrings(resourceId('Microsoft.DocumentDB/databaseAccounts', toLower(format('cosmos-{0}', variables('uniqueName')))), '2023-04-15').connectionStrings[0].connectionString, '')), createObject('name', 'AzureSpeech:Region', 'value', parameters('location')), createObject('name', 'AzureSpeech:Key', 'value', if(parameters('deploySpeechServices'), listKeys(resourceId('Microsoft.CognitiveServices/accounts', format('cog-speech-{0}', variables('uniqueName'))), '2022-12-01').key1, '')), createObject('name', 'AllowedOrigins', 'value', '[*]'), createObject('name', 'Kestrel:Endpoints:Https:Url', 'value', 'https://localhost:443'), createObject('name', 'Frontend:AadClientId', 'value', parameters('frontendClientId')), createObject('name', 'Logging:LogLevel:Default', 'value', 'Warning'), createObject('name', 'Logging:LogLevel:CopilotChat.WebApi', 'value', 'Warning'), createObject('name', 'Logging:LogLevel:Microsoft.SemanticKernel', 'value', 'Warning'), createObject('name', 'Logging:LogLevel:Microsoft.AspNetCore.Hosting', 'value', 'Warning'), createObject('name', 'Logging:LogLevel:Microsoft.Hosting.Lifetimel', 'value', 'Warning'), createObject('name', 'Logging:ApplicationInsights:LogLevel:Default', 'value', 'Warning'), createObject('name', 'APPLICATIONINSIGHTS_CONNECTION_STRING', 'value', reference(resourceId('Microsoft.Insights/components', format('appins-{0}', variables('uniqueName'))), '2020-02-02').ConnectionString), createObject('name', 'ApplicationInsightsAgent_EXTENSION_VERSION', 'value', '~2'), createObject('name', 'KernelMemory:ContentStorageType', 'value', 'AzureBlobs'), createObject('name', 'KernelMemory:TextGeneratorType', 'value', parameters('aiService')), createObject('name', 'KernelMemory:DataIngestion:OrchestrationType', 'value', 'Distributed'), createObject('name', 'KernelMemory:DataIngestion:DistributedOrchestration:QueueType', 'value', 'AzureQueue'), createObject('name', 'KernelMemory:DataIngestion:EmbeddingGeneratorTypes:0', 'value', parameters('aiService')), createObject('name', 'KernelMemory:DataIngestion:VectorDbTypes:0', 'value', parameters('memoryStore')), createObject('name', 'KernelMemory:Retrieval:VectorDbType', 'value', parameters('memoryStore')), createObject('name', 'KernelMemory:Retrieval:EmbeddingGeneratorType', 'value', parameters('aiService')), createObject('name', 'KernelMemory:Services:AzureBlobs:Auth', 'value', 'ConnectionString'), createObject('name', 'KernelMemory:Services:AzureBlobs:ConnectionString', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1}', format('st{0}', variables('rgIdHash')), listKeys(resourceId('Microsoft.Storage/storageAccounts', format('st{0}', variables('rgIdHash'))), '2022-09-01').keys[1].value)), createObject('name', 'KernelMemory:Services:AzureBlobs:Container', 'value', 'chatmemory'), createObject('name', 'KernelMemory:Services:AzureQueue:Auth', 'value', 'ConnectionString'), createObject('name', 'KernelMemory:Services:AzureQueue:ConnectionString', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1}', format('st{0}', variables('rgIdHash')), listKeys(resourceId('Microsoft.Storage/storageAccounts', format('st{0}', variables('rgIdHash'))), '2022-09-01').keys[1].value)), createObject('name', 'KernelMemory:Services:AzureCognitiveSearch:Auth', 'value', 'ApiKey'), createObject('name', 'KernelMemory:Services:AzureCognitiveSearch:Endpoint', 'value', if(equals(parameters('memoryStore'), 'AzureCognitiveSearch'), format('https://{0}.search.windows.net', format('acs-{0}', variables('uniqueName'))), '')), createObject('name', 'KernelMemory:Services:AzureCognitiveSearch:APIKey', 'value', if(equals(parameters('memoryStore'), 'AzureCognitiveSearch'), listAdminKeys(resourceId('Microsoft.Search/searchServices', format('acs-{0}', variables('uniqueName'))), '2022-09-01').primaryKey, '')), createObject('name', 'KernelMemory:Services:Qdrant:Endpoint', 'value', if(equals(parameters('memoryStore'), 'Qdrant'), format('https://{0}', reference(resourceId('Microsoft.Web/sites', format('app-{0}-qdrant', variables('uniqueName'))), '2022-09-01').defaultHostName), '')), createObject('name', 'KernelMemory:Services:AzureOpenAIText:Auth', 'value', 'ApiKey'), createObject('name', 'KernelMemory:Services:AzureOpenAIText:Endpoint', 'value', if(parameters('deployNewAzureOpenAI'), reference(resourceId('Microsoft.CognitiveServices/accounts', format('ai-{0}', variables('uniqueName'))), '2023-05-01').endpoint, parameters('aiEndpoint'))), createObject('name', 'KernelMemory:Services:AzureOpenAIText:APIKey', 'value', if(parameters('deployNewAzureOpenAI'), listKeys(resourceId('Microsoft.CognitiveServices/accounts', format('ai-{0}', variables('uniqueName'))), '2023-05-01').key1, parameters('aiApiKey'))), createObject('name', 'KernelMemory:Services:AzureOpenAIText:Deployment', 'value', parameters('completionModel')), createObject('name', 'KernelMemory:Services:AzureOpenAIEmbedding:Auth', 'value', 'ApiKey'), createObject('name', 'KernelMemory:Services:AzureOpenAIEmbedding:Endpoint', 'value', if(parameters('deployNewAzureOpenAI'), reference(resourceId('Microsoft.CognitiveServices/accounts', format('ai-{0}', variables('uniqueName'))), '2023-05-01').endpoint, parameters('aiEndpoint'))), createObject('name', 'KernelMemory:Services:AzureOpenAIEmbedding:APIKey', 'value', if(parameters('deployNewAzureOpenAI'), listKeys(resourceId('Microsoft.CognitiveServices/accounts', format('ai-{0}', variables('uniqueName'))), '2023-05-01').key1, parameters('aiApiKey'))), createObject('name', 'KernelMemory:Services:AzureOpenAIEmbedding:Deployment', 'value', parameters('embeddingModel')), createObject('name', 'KernelMemory:Services:OpenAI:TextModel', 'value', parameters('completionModel')), createObject('name', 'KernelMemory:Services:OpenAI:EmbeddingModel', 'value', parameters('embeddingModel')), createObject('name', 'KernelMemory:Services:OpenAI:APIKey', 'value', parameters('aiApiKey')), createObject('name', 'Plugins:0:Name', 'value', 'Klarna Shopping'), createObject('name', 'Plugins:0:ManifestDomain', 'value', 'https://www.klarna.com')), if(parameters('deployWebSearcherPlugin'), createArray(createObject('name', 'Plugins:1:Name', 'value', 'WebSearcher'), createObject('name', 'Plugins:1:ManifestDomain', 'value', format('https://{0}', reference(resourceId('Microsoft.Web/sites', format('function-{0}-websearcher-plugin', variables('uniqueName'))), '2022-09-01').defaultHostName)), createObject('name', 'Plugins:1:Key', 'value', listkeys(format('{0}/host/default/', resourceId('Microsoft.Web/sites', format('function-{0}-websearcher-plugin', variables('uniqueName')))), '2022-09-01').functionKeys.default)), createArray()))]" + "appSettings": "[concat(createArray(createObject('name', 'Authentication:Type', 'value', 'AzureAd'), createObject('name', 'Authentication:AzureAd:Instance', 'value', parameters('azureAdInstance')), createObject('name', 'Authentication:AzureAd:TenantId', 'value', parameters('azureAdTenantId')), createObject('name', 'Authentication:AzureAd:ClientId', 'value', parameters('webApiClientId')), createObject('name', 'Authentication:AzureAd:Scopes', 'value', 'access_as_user'), createObject('name', 'ChatStore:Type', 'value', if(parameters('deployCosmosDB'), 'cosmos', 'volatile')), createObject('name', 'ChatStore:Cosmos:Database', 'value', 'CopilotChat'), createObject('name', 'ChatStore:Cosmos:ChatSessionsContainer', 'value', 'chatsessions'), createObject('name', 'ChatStore:Cosmos:ChatMessagesContainer', 'value', 'chatmessages'), createObject('name', 'ChatStore:Cosmos:ChatMemorySourcesContainer', 'value', 'chatmemorysources'), createObject('name', 'ChatStore:Cosmos:ChatParticipantsContainer', 'value', 'chatparticipants'), createObject('name', 'ChatStore:Cosmos:ConnectionString', 'value', if(parameters('deployCosmosDB'), listConnectionStrings(resourceId('Microsoft.DocumentDB/databaseAccounts', toLower(format('cosmos-{0}', variables('uniqueName')))), '2023-04-15').connectionStrings[0].connectionString, '')), createObject('name', 'AzureSpeech:Region', 'value', parameters('location')), createObject('name', 'AzureSpeech:Key', 'value', if(parameters('deploySpeechServices'), listKeys(resourceId('Microsoft.CognitiveServices/accounts', format('cog-speech-{0}', variables('uniqueName'))), '2022-12-01').key1, '')), createObject('name', 'AllowedOrigins', 'value', '[*]'), createObject('name', 'Kestrel:Endpoints:Https:Url', 'value', 'https://localhost:443'), createObject('name', 'Frontend:AadClientId', 'value', parameters('frontendClientId')), createObject('name', 'Logging:LogLevel:Default', 'value', 'Warning'), createObject('name', 'Logging:LogLevel:CopilotChat.WebApi', 'value', 'Warning'), createObject('name', 'Logging:LogLevel:Microsoft.SemanticKernel', 'value', 'Warning'), createObject('name', 'Logging:LogLevel:Microsoft.AspNetCore.Hosting', 'value', 'Warning'), createObject('name', 'Logging:LogLevel:Microsoft.Hosting.Lifetimel', 'value', 'Warning'), createObject('name', 'Logging:ApplicationInsights:LogLevel:Default', 'value', 'Warning'), createObject('name', 'APPLICATIONINSIGHTS_CONNECTION_STRING', 'value', reference(resourceId('Microsoft.Insights/components', format('appins-{0}', variables('uniqueName'))), '2020-02-02').ConnectionString), createObject('name', 'ApplicationInsightsAgent_EXTENSION_VERSION', 'value', '~2'), createObject('name', 'KernelMemory:ContentStorageType', 'value', 'AzureBlobs'), createObject('name', 'KernelMemory:TextGeneratorType', 'value', parameters('aiService')), createObject('name', 'KernelMemory:DataIngestion:OrchestrationType', 'value', 'Distributed'), createObject('name', 'KernelMemory:DataIngestion:DistributedOrchestration:QueueType', 'value', 'AzureQueue'), createObject('name', 'KernelMemory:DataIngestion:EmbeddingGeneratorTypes:0', 'value', parameters('aiService')), createObject('name', 'KernelMemory:DataIngestion:MemoryDbTypes:0', 'value', parameters('memoryStore')), createObject('name', 'KernelMemory:Retrieval:MemoryDbType', 'value', parameters('memoryStore')), createObject('name', 'KernelMemory:Retrieval:EmbeddingGeneratorType', 'value', parameters('aiService')), createObject('name', 'KernelMemory:Services:AzureBlobs:Auth', 'value', 'ConnectionString'), createObject('name', 'KernelMemory:Services:AzureBlobs:ConnectionString', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1}', format('st{0}', variables('rgIdHash')), listKeys(resourceId('Microsoft.Storage/storageAccounts', format('st{0}', variables('rgIdHash'))), '2022-09-01').keys[1].value)), createObject('name', 'KernelMemory:Services:AzureBlobs:Container', 'value', 'chatmemory'), createObject('name', 'KernelMemory:Services:AzureQueue:Auth', 'value', 'ConnectionString'), createObject('name', 'KernelMemory:Services:AzureQueue:ConnectionString', 'value', format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1}', format('st{0}', variables('rgIdHash')), listKeys(resourceId('Microsoft.Storage/storageAccounts', format('st{0}', variables('rgIdHash'))), '2022-09-01').keys[1].value)), createObject('name', 'KernelMemory:Services:AzureAISearch:Auth', 'value', 'ApiKey'), createObject('name', 'KernelMemory:Services:AzureAISearch:Endpoint', 'value', if(equals(parameters('memoryStore'), 'AzureAISearch'), format('https://{0}.search.windows.net', format('acs-{0}', variables('uniqueName'))), '')), createObject('name', 'KernelMemory:Services:AzureAISearch:APIKey', 'value', if(equals(parameters('memoryStore'), 'AzureAISearch'), listAdminKeys(resourceId('Microsoft.Search/searchServices', format('acs-{0}', variables('uniqueName'))), '2022-09-01').primaryKey, '')), createObject('name', 'KernelMemory:Services:Qdrant:Endpoint', 'value', if(equals(parameters('memoryStore'), 'Qdrant'), format('https://{0}', reference(resourceId('Microsoft.Web/sites', format('app-{0}-qdrant', variables('uniqueName'))), '2022-09-01').defaultHostName), '')), createObject('name', 'KernelMemory:Services:AzureOpenAIText:Auth', 'value', 'ApiKey'), createObject('name', 'KernelMemory:Services:AzureOpenAIText:Endpoint', 'value', if(parameters('deployNewAzureOpenAI'), reference(resourceId('Microsoft.CognitiveServices/accounts', format('ai-{0}', variables('uniqueName'))), '2023-05-01').endpoint, parameters('aiEndpoint'))), createObject('name', 'KernelMemory:Services:AzureOpenAIText:APIKey', 'value', if(parameters('deployNewAzureOpenAI'), listKeys(resourceId('Microsoft.CognitiveServices/accounts', format('ai-{0}', variables('uniqueName'))), '2023-05-01').key1, parameters('aiApiKey'))), createObject('name', 'KernelMemory:Services:AzureOpenAIText:Deployment', 'value', parameters('completionModel')), createObject('name', 'KernelMemory:Services:AzureOpenAIEmbedding:Auth', 'value', 'ApiKey'), createObject('name', 'KernelMemory:Services:AzureOpenAIEmbedding:Endpoint', 'value', if(parameters('deployNewAzureOpenAI'), reference(resourceId('Microsoft.CognitiveServices/accounts', format('ai-{0}', variables('uniqueName'))), '2023-05-01').endpoint, parameters('aiEndpoint'))), createObject('name', 'KernelMemory:Services:AzureOpenAIEmbedding:APIKey', 'value', if(parameters('deployNewAzureOpenAI'), listKeys(resourceId('Microsoft.CognitiveServices/accounts', format('ai-{0}', variables('uniqueName'))), '2023-05-01').key1, parameters('aiApiKey'))), createObject('name', 'KernelMemory:Services:AzureOpenAIEmbedding:Deployment', 'value', parameters('embeddingModel')), createObject('name', 'KernelMemory:Services:OpenAI:TextModel', 'value', parameters('completionModel')), createObject('name', 'KernelMemory:Services:OpenAI:EmbeddingModel', 'value', parameters('embeddingModel')), createObject('name', 'KernelMemory:Services:OpenAI:APIKey', 'value', parameters('aiApiKey')), createObject('name', 'Plugins:0:Name', 'value', 'Klarna Shopping'), createObject('name', 'Plugins:0:ManifestDomain', 'value', 'https://www.klarna.com')), if(parameters('deployWebSearcherPlugin'), createArray(createObject('name', 'Plugins:1:Name', 'value', 'WebSearcher'), createObject('name', 'Plugins:1:ManifestDomain', 'value', format('https://{0}', reference(resourceId('Microsoft.Web/sites', format('function-{0}-websearcher-plugin', variables('uniqueName'))), '2022-09-01').defaultHostName)), createObject('name', 'Plugins:1:Key', 'value', listkeys(format('{0}/host/default/', resourceId('Microsoft.Web/sites', format('function-{0}-websearcher-plugin', variables('uniqueName')))), '2022-09-01').functionKeys.default)), createArray()))]" }, "dependsOn": [ "[resourceId('Microsoft.Insights/components', format('appins-{0}', variables('uniqueName')))]", @@ -377,7 +370,7 @@ "value": "[parameters('aiService')]" }, { - "name": "KernelMemory:ImageOcrType", + "name": "KernelMemory:DataIngestion:ImageOcrType", "value": "AzureFormRecognizer" }, { @@ -393,11 +386,11 @@ "value": "[parameters('aiService')]" }, { - "name": "KernelMemory:DataIngestion:VectorDbTypes:0", + "name": "KernelMemory:DataIngestion:MemoryDbTypes:0", "value": "[parameters('memoryStore')]" }, { - "name": "KernelMemory:Retrieval:VectorDbType", + "name": "KernelMemory:Retrieval:MemoryDbType", "value": "[parameters('memoryStore')]" }, { @@ -425,16 +418,16 @@ "value": "[format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1}', format('st{0}', variables('rgIdHash')), listKeys(resourceId('Microsoft.Storage/storageAccounts', format('st{0}', variables('rgIdHash'))), '2022-09-01').keys[1].value)]" }, { - "name": "KernelMemory:Services:AzureCognitiveSearch:Auth", + "name": "KernelMemory:Services:AzureAISearch:Auth", "value": "ApiKey" }, { - "name": "KernelMemory:Services:AzureCognitiveSearch:Endpoint", - "value": "[if(equals(parameters('memoryStore'), 'AzureCognitiveSearch'), format('https://{0}.search.windows.net', format('acs-{0}', variables('uniqueName'))), '')]" + "name": "KernelMemory:Services:AzureAISearch:Endpoint", + "value": "[if(equals(parameters('memoryStore'), 'AzureAISearch'), format('https://{0}.search.windows.net', format('acs-{0}', variables('uniqueName'))), '')]" }, { - "name": "KernelMemory:Services:AzureCognitiveSearch:APIKey", - "value": "[if(equals(parameters('memoryStore'), 'AzureCognitiveSearch'), listAdminKeys(resourceId('Microsoft.Search/searchServices', format('acs-{0}', variables('uniqueName'))), '2022-09-01').primaryKey, '')]" + "name": "KernelMemory:Services:AzureAISearch:APIKey", + "value": "[if(equals(parameters('memoryStore'), 'AzureAISearch'), listAdminKeys(resourceId('Microsoft.Search/searchServices', format('acs-{0}', variables('uniqueName'))), '2022-09-01').primaryKey, '')]" }, { "name": "KernelMemory:Services:Qdrant:Endpoint", @@ -754,7 +747,7 @@ ] }, { - "condition": "[equals(parameters('memoryStore'), 'AzureCognitiveSearch')]", + "condition": "[equals(parameters('memoryStore'), 'AzureAISearch')]", "type": "Microsoft.Search/searchServices", "apiVersion": "2022-09-01", "name": "[format('acs-{0}', variables('uniqueName'))]", diff --git a/shared/ConfigurationBuilderExtensions.cs b/shared/ConfigurationBuilderExtensions.cs new file mode 100644 index 000000000..e3c5a0b50 --- /dev/null +++ b/shared/ConfigurationBuilderExtensions.cs @@ -0,0 +1,98 @@ +// Copyright (c) Microsoft. All rights reserved. + +using System; +using System.IO; +using System.Reflection; +using Microsoft.Extensions.Configuration; +using Microsoft.KernelMemory.Configuration; + +namespace CopilotChat.Shared; + +internal static class ConfigurationBuilderExtensions +{ + // ASP.NET env var + private const string AspnetEnvVar = "ASPNETCORE_ENVIRONMENT"; + + public static void AddKMConfigurationSources( + this IConfigurationBuilder builder, + bool useAppSettingsFiles = true, + bool useEnvVars = true, + bool useSecretManager = true, + string? settingsDirectory = null) + { + // Load env var name, either Development or Production + var env = Environment.GetEnvironmentVariable(AspnetEnvVar) ?? string.Empty; + + // Detect the folder containing configuration files + settingsDirectory ??= Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + ?? Directory.GetCurrentDirectory(); + builder.SetBasePath(settingsDirectory); + + // Add configuration files as sources + if (useAppSettingsFiles) + { + // Add appsettings.json, typically used for default settings, without credentials + var main = Path.Join(settingsDirectory, "appsettings.json"); + if (!File.Exists(main)) + { + throw new ConfigurationException($"appsettings.json not found. Directory: {settingsDirectory}"); + } + + builder.AddJsonFile(main, optional: false); + + // Add appsettings.development.json, used for local overrides and credentials + if (env.Equals("development", StringComparison.OrdinalIgnoreCase)) + { + var f1 = Path.Join(settingsDirectory, "appsettings.development.json"); + var f2 = Path.Join(settingsDirectory, "appsettings.Development.json"); + if (File.Exists(f1)) + { + builder.AddJsonFile(f1, optional: false); + } + else if (File.Exists(f2)) + { + builder.AddJsonFile(f2, optional: false); + } + } + + // Add appsettings.production.json, used for production settings and credentials + if (env.Equals("production", StringComparison.OrdinalIgnoreCase)) + { + var f1 = Path.Join(settingsDirectory, "appsettings.production.json"); + var f2 = Path.Join(settingsDirectory, "appsettings.Production.json"); + if (File.Exists(f1)) + { + builder.AddJsonFile(f1, optional: false); + } + else if (File.Exists(f2)) + { + builder.AddJsonFile(f2, optional: false); + } + } + } + + // Add Secret Manager as source + if (useSecretManager) + { + // GetEntryAssembly method can return null if the library is loaded + // from an unmanaged application, in which case UserSecrets are not supported. + var entryAssembly = Assembly.GetEntryAssembly(); + + // Support for user secrets. Secret Manager doesn't encrypt the stored secrets and + // shouldn't be treated as a trusted store. It's for development purposes only. + // see: https://learn.microsoft.com/aspnet/core/security/app-secrets?#secret-manager + if (entryAssembly != null && env.Equals("development", StringComparison.OrdinalIgnoreCase)) + { + builder.AddUserSecrets(entryAssembly, optional: true); + } + } + + // Add environment variables as source. + // Environment variables can override all the settings provided by the previous sources. + if (useEnvVars) + { + // Support for environment variables overriding the config files + builder.AddEnvironmentVariables(); + } + } +} diff --git a/shared/CopilotChatShared.csproj b/shared/CopilotChatShared.csproj index a70b39e9b..ef75a3cd3 100644 --- a/shared/CopilotChatShared.csproj +++ b/shared/CopilotChatShared.csproj @@ -9,7 +9,10 @@ - + + + + diff --git a/shared/KernelMemoryBuilderExtensions.cs b/shared/KernelMemoryBuilderExtensions.cs new file mode 100644 index 000000000..1b82ff732 --- /dev/null +++ b/shared/KernelMemoryBuilderExtensions.cs @@ -0,0 +1,38 @@ +// Copyright (c) Microsoft. All rights reserved. + +using Microsoft.Extensions.Configuration; +using Microsoft.KernelMemory; + +namespace CopilotChat.Shared; + +/// +/// Kernel Memory builder extensions for apps using settings in appsettings.json +/// and using IConfiguration. +/// +public static class KernelMemoryBuilderExtensions +{ + /// + /// Configure the builder using settings stored in the specified directory. + /// If directory is empty, use the current assembly folder + /// + /// KernelMemory builder instance + /// Directory containing appsettings.json (incl. dev/prod) + public static IKernelMemoryBuilder FromAppSettings(this IKernelMemoryBuilder builder, string? settingsDirectory = null) + { + return new ServiceConfiguration(settingsDirectory).PrepareBuilder(builder); + } + + /// + /// Configure the builder using settings from the given KernelMemoryConfig and IConfiguration instances. + /// + /// KernelMemory builder instance + /// KM configuration + /// Dependencies configuration, e.g. queue, embedding, storage, etc. + public static IKernelMemoryBuilder FromMemoryConfiguration( + this IKernelMemoryBuilder builder, + KernelMemoryConfig memoryConfiguration, + IConfiguration servicesConfiguration) + { + return new ServiceConfiguration(servicesConfiguration, memoryConfiguration).PrepareBuilder(builder); + } +} diff --git a/shared/MemoryClientBuilderExtensions.cs b/shared/MemoryClientBuilderExtensions.cs index 27bdba12e..e9d3f215a 100644 --- a/shared/MemoryClientBuilderExtensions.cs +++ b/shared/MemoryClientBuilderExtensions.cs @@ -10,11 +10,11 @@ namespace CopilotChat.Shared; /// public static class MemoryClientBuilderExtensions { - public static KernelMemoryBuilder WithCustomOcr(this KernelMemoryBuilder builder, IConfiguration configuration) + public static IKernelMemoryBuilder WithCustomOcr(this IKernelMemoryBuilder builder, IConfiguration configuration) { var ocrEngine = configuration.CreateCustomOcr(); - if (ocrEngine != null) + if (ocrEngine is not null) { builder.WithCustomImageOcr(ocrEngine); } diff --git a/shared/Ocr/ConfigurationExtensions.cs b/shared/Ocr/ConfigurationExtensions.cs index 095ae53b6..3d477e2c0 100644 --- a/shared/Ocr/ConfigurationExtensions.cs +++ b/shared/Ocr/ConfigurationExtensions.cs @@ -4,7 +4,7 @@ using CopilotChat.Shared.Ocr.Tesseract; using Microsoft.Extensions.Configuration; using Microsoft.KernelMemory.Configuration; -using Microsoft.KernelMemory.DataFormats.Image; +using Microsoft.KernelMemory.DataFormats; namespace CopilotChat.Shared.Ocr; diff --git a/shared/Ocr/Tesseract/TesseractOcrEngine.cs b/shared/Ocr/Tesseract/TesseractOcrEngine.cs index 5d9722292..75881c90c 100644 --- a/shared/Ocr/Tesseract/TesseractOcrEngine.cs +++ b/shared/Ocr/Tesseract/TesseractOcrEngine.cs @@ -3,7 +3,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using Microsoft.KernelMemory.DataFormats.Image; +using Microsoft.KernelMemory.DataFormats; using Tesseract; namespace CopilotChat.Shared.Ocr.Tesseract; diff --git a/shared/ServiceConfiguration.cs b/shared/ServiceConfiguration.cs new file mode 100644 index 000000000..7fd116d43 --- /dev/null +++ b/shared/ServiceConfiguration.cs @@ -0,0 +1,513 @@ +// Copyright (c) Microsoft. All rights reserved. + +using System; +using System.Collections.Generic; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.KernelMemory; +using Microsoft.KernelMemory.AI; +using Microsoft.KernelMemory.Configuration; +using Microsoft.KernelMemory.ContentStorage.DevTools; +using Microsoft.KernelMemory.MemoryStorage; +using Microsoft.KernelMemory.MemoryStorage.DevTools; +using Microsoft.KernelMemory.Pipeline.Queue.DevTools; +using Microsoft.KernelMemory.Postgres; + +namespace CopilotChat.Shared; + +internal sealed class ServiceConfiguration +{ + // Content of appsettings.json, used to access dynamic data under "Services" + private IConfiguration _rawAppSettings; + + // Normalized configuration + private KernelMemoryConfig _memoryConfiguration; + + // appsettings.json root node name + private const string ConfigRoot = "KernelMemory"; + + // ASP.NET env var + private const string AspnetEnvVar = "ASPNETCORE_ENVIRONMENT"; + + // OpenAI env var + private const string OpenAIEnvVar = "OPENAI_API_KEY"; + + public ServiceConfiguration(string? settingsDirectory = null) + : this(ReadAppSettings(settingsDirectory)) + { + } + + public ServiceConfiguration(IConfiguration rawAppSettings) + : this(rawAppSettings, + rawAppSettings.GetSection(ConfigRoot).Get() + ?? throw new ConfigurationException($"Unable to load Kernel Memory settings from the given configuration. " + + $"There should be a '{ConfigRoot}' root node, " + + $"with data mapping to '{nameof(KernelMemoryConfig)}'")) + { + } + + public ServiceConfiguration( + IConfiguration rawAppSettings, + KernelMemoryConfig memoryConfiguration) + { + this._rawAppSettings = rawAppSettings ?? throw new ConfigurationException("The given app settings configuration is NULL"); + this._memoryConfiguration = memoryConfiguration ?? throw new ConfigurationException("The given memory configuration is NULL"); + + if (!this.MinimumConfigurationIsAvailable(false)) { this.SetupForOpenAI(); } + + this.MinimumConfigurationIsAvailable(true); + } + + public IKernelMemoryBuilder PrepareBuilder(IKernelMemoryBuilder builder) + { + return this.BuildUsingConfiguration(builder); + } + + private IKernelMemoryBuilder BuildUsingConfiguration(IKernelMemoryBuilder builder) + { + if (this._memoryConfiguration == null) + { + throw new ConfigurationException("The given memory configuration is NULL"); + } + + if (this._rawAppSettings == null) + { + throw new ConfigurationException("The given app settings configuration is NULL"); + } + + // Required by ctors expecting KernelMemoryConfig via DI + builder.AddSingleton(this._memoryConfiguration); + + this.ConfigureMimeTypeDetectionDependency(builder); + + this.ConfigureTextPartitioning(builder); + + this.ConfigureQueueDependency(builder); + + this.ConfigureStorageDependency(builder); + + // The ingestion embedding generators is a list of generators that the "gen_embeddings" handler uses, + // to generate embeddings for each partition. While it's possible to use multiple generators (e.g. to compare embedding quality) + // only one generator is used when searching by similarity, and the generator used for search is not in this list. + // - config.DataIngestion.EmbeddingGeneratorTypes => list of generators, embeddings to generate and store in memory DB + // - config.Retrieval.EmbeddingGeneratorType => one embedding generator, used to search, and usually injected into Memory DB constructor + + this.ConfigureIngestionEmbeddingGenerators(builder); + + this.ConfigureSearchClient(builder); + + this.ConfigureRetrievalEmbeddingGenerator(builder); + + // The ingestion Memory DBs is a list of DBs where handlers write records to. While it's possible + // to write to multiple DBs, e.g. for replication purpose, there is only one Memory DB used to + // read/search, and it doesn't come from this list. See "config.Retrieval.MemoryDbType". + // Note: use the aux service collection to avoid mixing ingestion and retrieval dependencies. + + this.ConfigureIngestionMemoryDb(builder); + + this.ConfigureRetrievalMemoryDb(builder); + + this.ConfigureTextGenerator(builder); + + this.ConfigureImageOCR(builder); + + return builder; + } + + private static IConfiguration ReadAppSettings(string? settingsDirectory) + { + var builder = new ConfigurationBuilder(); + builder.AddKMConfigurationSources(settingsDirectory: settingsDirectory); + return builder.Build(); + } + + private void ConfigureQueueDependency(IKernelMemoryBuilder builder) + { + if (string.Equals(this._memoryConfiguration.DataIngestion.OrchestrationType, "Distributed", StringComparison.OrdinalIgnoreCase)) + { + switch (this._memoryConfiguration.DataIngestion.DistributedOrchestration.QueueType) + { + case string y1 when y1.Equals("AzureQueue", StringComparison.OrdinalIgnoreCase): + case string y2 when y2.Equals("AzureQueues", StringComparison.OrdinalIgnoreCase): + // Check 2 keys for backward compatibility + builder.Services.AddAzureQueuesOrchestration(this.GetServiceConfig("AzureQueue")); + break; + + case string y when y.Equals("RabbitMQ", StringComparison.OrdinalIgnoreCase): + // Check 2 keys for backward compatibility + builder.Services.AddRabbitMQOrchestration(this.GetServiceConfig("RabbitMq")); + break; + + case string y when y.Equals("SimpleQueues", StringComparison.OrdinalIgnoreCase): + builder.Services.AddSimpleQueues(this.GetServiceConfig("SimpleQueues")); + break; + + default: + // NOOP - allow custom implementations, via WithCustomIngestionQueueClientFactory() + break; + } + } + } + + private void ConfigureStorageDependency(IKernelMemoryBuilder builder) + { + switch (this._memoryConfiguration.ContentStorageType) + { + case string x1 when x1.Equals("AzureBlob", StringComparison.OrdinalIgnoreCase): + case string x2 when x2.Equals("AzureBlobs", StringComparison.OrdinalIgnoreCase): + // Check 2 keys for backward compatibility + builder.Services.AddAzureBlobsAsContentStorage(this.GetServiceConfig("AzureBlobs") + ?? this.GetServiceConfig("AzureBlob")); + break; + + case string x when x.Equals("SimpleFileStorage", StringComparison.OrdinalIgnoreCase): + builder.Services.AddSimpleFileStorageAsContentStorage(this.GetServiceConfig("SimpleFileStorage")); + break; + + default: + // NOOP - allow custom implementations, via WithCustomStorage() + break; + } + } + + private void ConfigureTextPartitioning(IKernelMemoryBuilder builder) + { + // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract + if (this._memoryConfiguration.DataIngestion.TextPartitioning != null) + { + this._memoryConfiguration.DataIngestion.TextPartitioning.Validate(); + builder.WithCustomTextPartitioningOptions(this._memoryConfiguration.DataIngestion.TextPartitioning); + } + } + + private void ConfigureMimeTypeDetectionDependency(IKernelMemoryBuilder builder) + { + builder.WithDefaultMimeTypeDetection(); + } + + private void ConfigureIngestionEmbeddingGenerators(IKernelMemoryBuilder builder) + { + // Note: using multiple embeddings is not fully supported yet and could cause write errors or incorrect search results + if (this._memoryConfiguration.DataIngestion.EmbeddingGeneratorTypes.Count > 1) + { + throw new NotSupportedException("Using multiple embedding generators is currently unsupported. " + + "You may contact the team if this feature is required, or workaround this exception " + + "using KernelMemoryBuilder methods explicitly."); + } + + foreach (var type in this._memoryConfiguration.DataIngestion.EmbeddingGeneratorTypes) + { + switch (type) + { + case string x when x.Equals("AzureOpenAI", StringComparison.OrdinalIgnoreCase): + case string y when y.Equals("AzureOpenAIEmbedding", StringComparison.OrdinalIgnoreCase): + { + var instance = this.GetServiceInstance(builder, + s => s.AddAzureOpenAIEmbeddingGeneration(this.GetServiceConfig("AzureOpenAIEmbedding"))); + builder.AddIngestionEmbeddingGenerator(instance); + break; + } + + case string x when x.Equals("OpenAI", StringComparison.OrdinalIgnoreCase): + { + var instance = this.GetServiceInstance(builder, + s => s.AddOpenAITextEmbeddingGeneration(this.GetServiceConfig("OpenAI"))); + builder.AddIngestionEmbeddingGenerator(instance); + break; + } + + default: + // NOOP - allow custom implementations, via WithCustomEmbeddingGeneration() + break; + } + } + } + + private void ConfigureIngestionMemoryDb(IKernelMemoryBuilder builder) + { + foreach (var type in this._memoryConfiguration.DataIngestion.MemoryDbTypes) + { + switch (type) + { + default: + throw new ConfigurationException( + $"Unknown Memory DB option '{type}'. " + + "To use a custom Memory DB, set the configuration value to an empty string, " + + "and inject the custom implementation using `IKernelMemoryBuilder.WithCustomMemoryDb(...)`"); + + case "": + // NOOP - allow custom implementations, via WithCustomMemoryDb() + break; + + case string x when x.Equals("AzureAISearch", StringComparison.OrdinalIgnoreCase): + { + var instance = this.GetServiceInstance(builder, + s => s.AddAzureAISearchAsMemoryDb(this.GetServiceConfig("AzureAISearch")) + ); + builder.AddIngestionMemoryDb(instance); + break; + } + + case string x when x.Equals("Qdrant", StringComparison.OrdinalIgnoreCase): + { + var instance = this.GetServiceInstance(builder, + s => s.AddQdrantAsMemoryDb(this.GetServiceConfig("Qdrant")) + ); + builder.AddIngestionMemoryDb(instance); + break; + } + + case string x when x.Equals("Postgres", StringComparison.OrdinalIgnoreCase): + { + var instance = this.GetServiceInstance(builder, + s => s.AddPostgresAsMemoryDb(this.GetServiceConfig("Postgres")) + ); + builder.AddIngestionMemoryDb(instance); + break; + } + + case string x when x.Equals("Redis", StringComparison.OrdinalIgnoreCase): + { + var instance = this.GetServiceInstance(builder, + s => s.AddRedisAsMemoryDb(this.GetServiceConfig("Redis")) + ); + builder.AddIngestionMemoryDb(instance); + break; + } + + case string x when x.Equals("SimpleVectorDb", StringComparison.OrdinalIgnoreCase): + { + var instance = this.GetServiceInstance(builder, + s => s.AddSimpleVectorDbAsMemoryDb(this.GetServiceConfig("SimpleVectorDb")) + ); + builder.AddIngestionMemoryDb(instance); + break; + } + + case string x when x.Equals("SimpleTextDb", StringComparison.OrdinalIgnoreCase): + { + var instance = this.GetServiceInstance(builder, + s => s.AddSimpleTextDbAsMemoryDb(this.GetServiceConfig("SimpleTextDb")) + ); + builder.AddIngestionMemoryDb(instance); + break; + } + } + } + } + + private void ConfigureSearchClient(IKernelMemoryBuilder builder) + { + // Search settings + builder.WithSearchClientConfig(this._memoryConfiguration.Retrieval.SearchClient); + } + + private void ConfigureRetrievalEmbeddingGenerator(IKernelMemoryBuilder builder) + { + // Retrieval embeddings - ITextEmbeddingGeneration interface + switch (this._memoryConfiguration.Retrieval.EmbeddingGeneratorType) + { + case string x when x.Equals("AzureOpenAI", StringComparison.OrdinalIgnoreCase): + case string y when y.Equals("AzureOpenAIEmbedding", StringComparison.OrdinalIgnoreCase): + builder.Services.AddAzureOpenAIEmbeddingGeneration(this.GetServiceConfig("AzureOpenAIEmbedding")); + break; + + case string x when x.Equals("OpenAI", StringComparison.OrdinalIgnoreCase): + builder.Services.AddOpenAITextEmbeddingGeneration(this.GetServiceConfig("OpenAI")); + break; + + default: + // NOOP - allow custom implementations, via WithCustomEmbeddingGeneration() + break; + } + } + + private void ConfigureRetrievalMemoryDb(IKernelMemoryBuilder builder) + { + // Retrieval Memory DB - IMemoryDb interface + switch (this._memoryConfiguration.Retrieval.MemoryDbType) + { + case string x when x.Equals("AzureAISearch", StringComparison.OrdinalIgnoreCase): + builder.Services.AddAzureAISearchAsMemoryDb(this.GetServiceConfig("AzureAISearch")); + break; + + case string x when x.Equals("Qdrant", StringComparison.OrdinalIgnoreCase): + builder.Services.AddQdrantAsMemoryDb(this.GetServiceConfig("Qdrant")); + break; + + case string x when x.Equals("Postgres", StringComparison.OrdinalIgnoreCase): + builder.Services.AddPostgresAsMemoryDb(this.GetServiceConfig("Postgres")); + break; + + case string x when x.Equals("Redis", StringComparison.OrdinalIgnoreCase): + builder.Services.AddRedisAsMemoryDb(this.GetServiceConfig("Redis")); + break; + + case string x when x.Equals("SimpleVectorDb", StringComparison.OrdinalIgnoreCase): + builder.Services.AddSimpleVectorDbAsMemoryDb(this.GetServiceConfig("SimpleVectorDb")); + break; + + case string x when x.Equals("SimpleTextDb", StringComparison.OrdinalIgnoreCase): + builder.Services.AddSimpleTextDbAsMemoryDb(this.GetServiceConfig("SimpleTextDb")); + break; + + default: + // NOOP - allow custom implementations, via WithCustomMemoryDb() + break; + } + } + + private void ConfigureTextGenerator(IKernelMemoryBuilder builder) + { + // Text generation + switch (this._memoryConfiguration.TextGeneratorType) + { + case string x when x.Equals("AzureOpenAI", StringComparison.OrdinalIgnoreCase): + case string y when y.Equals("AzureOpenAIText", StringComparison.OrdinalIgnoreCase): + builder.Services.AddAzureOpenAITextGeneration(this.GetServiceConfig("AzureOpenAIText")); + break; + + case string x when x.Equals("OpenAI", StringComparison.OrdinalIgnoreCase): + builder.Services.AddOpenAITextGeneration(this.GetServiceConfig("OpenAI")); + break; + + default: + // NOOP - allow custom implementations, via WithCustomTextGeneration() + break; + } + } + + private void ConfigureImageOCR(IKernelMemoryBuilder builder) + { + // Image OCR + switch (this._memoryConfiguration.DataIngestion.ImageOcrType) + { + case string y when string.IsNullOrWhiteSpace(y): + case string x when x.Equals("None", StringComparison.OrdinalIgnoreCase): + break; + + case string x when x.Equals("AzureAIDocIntel", StringComparison.OrdinalIgnoreCase): + builder.Services.AddAzureAIDocIntel(this.GetServiceConfig("AzureAIDocIntel")); + break; + + default: + // NOOP - allow custom implementations, via WithCustomImageOCR() + break; + } + } + + /// + /// Check the configuration for minimum requirements + /// + /// Whether to throw or return false when the config is incomplete + /// Whether the configuration is valid + private bool MinimumConfigurationIsAvailable(bool throwOnError) + { + // Check if text generation settings + if (string.IsNullOrEmpty(this._memoryConfiguration.TextGeneratorType)) + { + if (!throwOnError) { return false; } + + throw new ConfigurationException("Text generation (TextGeneratorType) is not configured in Kernel Memory."); + } + + // Check embedding generation ingestion settings + if (this._memoryConfiguration.DataIngestion.EmbeddingGenerationEnabled) + { + if (this._memoryConfiguration.DataIngestion.EmbeddingGeneratorTypes.Count == 0) + { + if (!throwOnError) { return false; } + + throw new ConfigurationException("Data ingestion embedding generation (DataIngestion.EmbeddingGeneratorTypes) is not configured in Kernel Memory."); + } + } + + // Check embedding generation retrieval settings + if (string.IsNullOrEmpty(this._memoryConfiguration.Retrieval.EmbeddingGeneratorType)) + { + if (!throwOnError) { return false; } + + throw new ConfigurationException("Retrieval embedding generation (Retrieval.EmbeddingGeneratorType) is not configured in Kernel Memory."); + } + + return true; + } + + /// + /// Rewrite configuration using OpenAI, if possible. + /// + private void SetupForOpenAI() + { + string openAIKey = Environment.GetEnvironmentVariable(OpenAIEnvVar)?.Trim() ?? string.Empty; + if (string.IsNullOrEmpty(openAIKey)) + { + return; + } + + var inMemoryConfig = new Dictionary + { + { $"{ConfigRoot}:Services:OpenAI:APIKey", openAIKey }, + { $"{ConfigRoot}:TextGeneratorType", "OpenAI" }, + { $"{ConfigRoot}:DataIngestion:EmbeddingGeneratorTypes:0", "OpenAI" }, + { $"{ConfigRoot}:Retrieval:EmbeddingGeneratorType", "OpenAI" } + }; + + var newAppSettings = new ConfigurationBuilder(); + newAppSettings.AddConfiguration(this._rawAppSettings); + newAppSettings.AddInMemoryCollection(inMemoryConfig); + + this._rawAppSettings = newAppSettings.Build(); + this._memoryConfiguration = this._rawAppSettings.GetSection(ConfigRoot).Get()!; + } + + /// + /// Get an instance of T, using dependencies available in the builder, + /// except for existing service descriptors for T. Replace/Use the + /// given action to define T's implementation. + /// Return an instance of T built using the definition provided by + /// the action. + /// + /// KM builder + /// Action used to configure the service collection + /// Target type/interface + private T GetServiceInstance(IKernelMemoryBuilder builder, Action addCustomService) + { + // Clone the list of service descriptors, skipping T descriptor + IServiceCollection services = new ServiceCollection(); + foreach (ServiceDescriptor d in builder.Services) + { + if (d.ServiceType == typeof(T)) { continue; } + + services.Add(d); + } + + // Add the custom T descriptor + addCustomService.Invoke(services); + + // Build and return an instance of T, as defined by `addCustomService` + return services.BuildServiceProvider().GetService() + ?? throw new ConfigurationException($"Unable to build {nameof(T)}"); + } + + /// + /// Read a dependency configuration from IConfiguration + /// Data is usually retrieved from KernelMemory:Services:{serviceName}, e.g. when using appsettings.json + /// { + /// "KernelMemory": { + /// "Services": { + /// "{serviceName}": { + /// ... + /// ... + /// } + /// } + /// } + /// } + /// + /// Name of the dependency + /// Type of configuration to return + /// Configuration instance, settings for the dependency specified + private T GetServiceConfig(string serviceName) + { + return this._memoryConfiguration.GetServiceConfig(this._rawAppSettings, serviceName); + } +} diff --git a/tools/importdocument/ImportDocument.csproj b/tools/importdocument/ImportDocument.csproj index 18a012fb3..243fc414d 100644 --- a/tools/importdocument/ImportDocument.csproj +++ b/tools/importdocument/ImportDocument.csproj @@ -16,9 +16,9 @@ - + - + diff --git a/webapi/Controllers/ChatController.cs b/webapi/Controllers/ChatController.cs index 22de83e09..56fb28216 100644 --- a/webapi/Controllers/ChatController.cs +++ b/webapi/Controllers/ChatController.cs @@ -7,6 +7,7 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Reflection; +using System.Text; using System.Text.Json; using System.Text.RegularExpressions; using System.Threading; @@ -28,14 +29,10 @@ using Microsoft.Extensions.Options; using Microsoft.Graph; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.Diagnostics; -using Microsoft.SemanticKernel.Functions.OpenAPI.Authentication; -using Microsoft.SemanticKernel.Functions.OpenAPI.Extensions; -using Microsoft.SemanticKernel.Functions.OpenAPI.OpenAI; -using Microsoft.SemanticKernel.Orchestration; using Microsoft.SemanticKernel.Plugins.MsGraph; using Microsoft.SemanticKernel.Plugins.MsGraph.Connectors; using Microsoft.SemanticKernel.Plugins.MsGraph.Connectors.Client; +using Microsoft.SemanticKernel.Plugins.OpenApi; namespace CopilotChat.WebApi.Controllers; @@ -50,12 +47,10 @@ public class ChatController : ControllerBase, IDisposable private readonly List _disposables; private readonly ITelemetryService _telemetryService; private readonly ServiceOptions _serviceOptions; - private readonly PlannerOptions _plannerOptions; private readonly IDictionary _plugins; private const string ChatPluginName = nameof(ChatPlugin); private const string ChatFunctionName = "Chat"; - private const string ProcessPlanFunctionName = "ProcessPlan"; private const string GeneratingResponseClientCall = "ReceiveBotResponseStatus"; public ChatController( @@ -63,7 +58,6 @@ public ChatController( IHttpClientFactory httpClientFactory, ITelemetryService telemetryService, IOptions serviceOptions, - IOptions plannerOptions, IDictionary plugins) { this._logger = logger; @@ -71,7 +65,6 @@ public ChatController( this._telemetryService = telemetryService; this._disposables = new List(); this._serviceOptions = serviceOptions.Value; - this._plannerOptions = plannerOptions.Value; this._plugins = plugins; } @@ -80,8 +73,6 @@ public ChatController( /// /// Semantic kernel obtained through dependency injection. /// Message Hub that performs the real time relay service. - /// Planner to use to create function sequences. - /// Converter to use for converting Asks. /// Repository of chat sessions. /// Repository of chat participants. /// Auth info for the current request. @@ -96,9 +87,8 @@ public ChatController( [ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status504GatewayTimeout)] public async Task ChatAsync( - [FromServices] IKernel kernel, + [FromServices] Kernel kernel, [FromServices] IHubContext messageRelayHubContext, - [FromServices] CopilotChatPlanner planner, [FromServices] ChatSessionRepository chatSessionRepository, [FromServices] ChatParticipantRepository chatParticipantRepository, [FromServices] IAuthInfo authInfo, @@ -107,105 +97,35 @@ public async Task ChatAsync( { this._logger.LogDebug("Chat message received."); - return await this.HandleRequest(ChatFunctionName, kernel, messageRelayHubContext, planner, chatSessionRepository, chatParticipantRepository, authInfo, ask, chatId.ToString()); - } + string chatIdString = chatId.ToString(); - /// - /// Invokes the chat function to process and/or execute plan. - /// - /// Semantic kernel obtained through dependency injection. - /// Message Hub that performs the real time relay service. - /// Planner to use to create function sequences. - /// Converter to use for converting Asks. - /// Repository of chat sessions. - /// Repository of chat participants. - /// Auth info for the current request. - /// Prompt along with its parameters. - /// Chat ID. - /// Results containing the response from the model. - [Route("chats/{chatId:guid}/plan")] - [HttpPost] - [ProducesResponseType(StatusCodes.Status200OK)] - [ProducesResponseType(StatusCodes.Status400BadRequest)] - [ProducesResponseType(StatusCodes.Status403Forbidden)] - [ProducesResponseType(StatusCodes.Status404NotFound)] - [ProducesResponseType(StatusCodes.Status504GatewayTimeout)] - public async Task ProcessPlanAsync( - [FromServices] IKernel kernel, - [FromServices] IHubContext messageRelayHubContext, - [FromServices] CopilotChatPlanner planner, - [FromServices] ChatSessionRepository chatSessionRepository, - [FromServices] ChatParticipantRepository chatParticipantRepository, - [FromServices] IAuthInfo authInfo, - [FromBody] ExecutePlanParameters ask, - [FromRoute] Guid chatId) - { - this._logger.LogDebug("plan request received."); - - return await this.HandleRequest(ProcessPlanFunctionName, kernel, messageRelayHubContext, planner, chatSessionRepository, chatParticipantRepository, authInfo, ask, chatId.ToString()); - } - - /// - /// Invokes given function of ChatPlugin. - /// - /// Name of the ChatPlugin function to invoke. - /// Semantic kernel obtained through dependency injection. - /// Message Hub that performs the real time relay service. - /// Planner to use to create function sequences. - /// Converter to use for converting Asks. - /// Repository of chat sessions. - /// Repository of chat participants. - /// Auth info for the current request. - /// Prompt along with its parameters. - /// - /// Results containing the response from the model. - private async Task HandleRequest( - string functionName, - IKernel kernel, - IHubContext messageRelayHubContext, - CopilotChatPlanner planner, - ChatSessionRepository chatSessionRepository, - ChatParticipantRepository chatParticipantRepository, - IAuthInfo authInfo, - Ask ask, - string chatId) - { // Put ask's variables in the context we will use. - var contextVariables = GetContextVariables(ask, authInfo, chatId); + var contextVariables = GetContextVariables(ask, authInfo, chatIdString); // Verify that the chat exists and that the user has access to it. ChatSession? chat = null; - if (!(await chatSessionRepository.TryFindByIdAsync(chatId, callback: c => chat = c))) + if (!(await chatSessionRepository.TryFindByIdAsync(chatIdString, callback: c => chat = c))) { return this.NotFound("Failed to find chat session for the chatId specified in variables."); } - if (!(await chatParticipantRepository.IsUserInChatAsync(authInfo.UserId, chatId))) + if (!(await chatParticipantRepository.IsUserInChatAsync(authInfo.UserId, chatIdString))) { return this.Forbid("User does not have access to the chatId specified in variables."); } // Register plugins that have been enabled var openApiPluginAuthHeaders = this.GetPluginAuthHeaders(this.HttpContext.Request.Headers); - await this.RegisterPlannerFunctionsAsync(planner, openApiPluginAuthHeaders, contextVariables); + await this.RegisterFunctionsAsync(kernel, openApiPluginAuthHeaders, contextVariables); // Register hosted plugins that have been enabled - await this.RegisterPlannerHostedFunctionsUsedAsync(planner, chat!.EnabledPlugins); + await this.RegisterHostedFunctionsAsync(kernel, chat!.EnabledPlugins); // Get the function to invoke - ISKFunction? function = null; - try - { - function = kernel.Functions.GetFunction(ChatPluginName, functionName); - } - catch (SKException ex) - { - this._logger.LogError("Failed to find {PluginName}/{FunctionName} on server: {Exception}", ChatPluginName, functionName, ex); - return this.NotFound($"Failed to find {ChatPluginName}/{functionName} on server"); - } + KernelFunction? chatFunction = kernel.Plugins.GetFunction(ChatPluginName, ChatFunctionName); // Run the function. - KernelResult? result = null; + FunctionResult? result = null; try { using CancellationTokenSource? cts = this._serviceOptions.TimeoutLimitInS is not null @@ -213,30 +133,31 @@ private async Task HandleRequest( ? new CancellationTokenSource(TimeSpan.FromSeconds((double)this._serviceOptions.TimeoutLimitInS)) : null; - result = await kernel.RunAsync(function!, contextVariables, cts?.Token ?? default); - this._telemetryService.TrackPluginFunction(ChatPluginName, functionName, true); + result = await kernel.InvokeAsync(chatFunction!, contextVariables, cts?.Token ?? default); + this._telemetryService.TrackPluginFunction(ChatPluginName, ChatFunctionName, true); } catch (Exception ex) { if (ex is OperationCanceledException || ex.InnerException is OperationCanceledException) { // Log the timeout and return a 504 response - this._logger.LogError("The {FunctionName} operation timed out.", functionName); - return this.StatusCode(StatusCodes.Status504GatewayTimeout, $"The chat {functionName} timed out."); + this._logger.LogError("The {FunctionName} operation timed out.", ChatFunctionName); + return this.StatusCode(StatusCodes.Status504GatewayTimeout, $"The chat {ChatFunctionName} timed out."); } - this._telemetryService.TrackPluginFunction(ChatPluginName, functionName, false); - throw ex; + this._telemetryService.TrackPluginFunction(ChatPluginName, ChatFunctionName, false); + + throw; } AskResult chatAskResult = new() { - Value = result.GetValue() ?? string.Empty, - Variables = contextVariables.Select(v => new KeyValuePair(v.Key, v.Value)) + Value = result.ToString() ?? string.Empty, + Variables = contextVariables.Select(v => new KeyValuePair(v.Key, v.Value)) }; // Broadcast AskResult to all users - await messageRelayHubContext.Clients.Group(chatId).SendAsync(GeneratingResponseClientCall, chatId, null); + await messageRelayHubContext.Clients.Group(chatIdString).SendAsync(GeneratingResponseClientCall, chatIdString, null); return this.Ok(chatAskResult); } @@ -267,93 +188,118 @@ private Dictionary GetPluginAuthHeaders(IHeaderDictionary header } /// - /// Register functions with the planner's kernel. + /// Register functions with the kernel. /// - private async Task RegisterPlannerFunctionsAsync(CopilotChatPlanner planner, Dictionary authHeaders, ContextVariables variables) + private async Task RegisterFunctionsAsync(Kernel kernel, Dictionary authHeaders, KernelArguments variables) { - // Register authenticated functions with the planner's kernel only if the request includes an auth header for the plugin. + // Register authenticated functions with the kernel only if the request includes an auth header for the plugin. + + var tasks = new List(); // GitHub if (authHeaders.TryGetValue("GITHUB", out string? GithubAuthHeader)) { - this._logger.LogInformation("Enabling GitHub plugin."); - BearerAuthenticationProvider authenticationProvider = new(() => Task.FromResult(GithubAuthHeader)); - await planner.Kernel.ImportOpenApiPluginFunctionsAsync( - pluginName: "GitHubPlugin", - filePath: Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "Plugins", "OpenApi/GitHubPlugin/openapi.json"), - new OpenApiFunctionExecutionParameters - { - AuthCallback = authenticationProvider.AuthenticateRequestAsync, - }); + tasks.Add(this.RegisterGithubPlugin(kernel, GithubAuthHeader)); } // Jira if (authHeaders.TryGetValue("JIRA", out string? JiraAuthHeader)) { - this._logger.LogInformation("Registering Jira plugin"); - var authenticationProvider = new BasicAuthenticationProvider(() => { return Task.FromResult(JiraAuthHeader); }); - var hasServerUrlOverride = variables.TryGetValue("jira-server-url", out string? serverUrlOverride); - - await planner.Kernel.ImportOpenApiPluginFunctionsAsync( - pluginName: "JiraPlugin", - filePath: Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "Plugins", "OpenApi/JiraPlugin/openapi.json"), - new OpenApiFunctionExecutionParameters - { - AuthCallback = authenticationProvider.AuthenticateRequestAsync, - ServerUrlOverride = hasServerUrlOverride ? new Uri(serverUrlOverride!) : null, - }); + tasks.Add(this.RegisterJiraPlugin(kernel, JiraAuthHeader, variables)); } // Microsoft Graph if (authHeaders.TryGetValue("GRAPH", out string? GraphAuthHeader)) { - this._logger.LogInformation("Enabling Microsoft Graph plugin(s)."); - BearerAuthenticationProvider authenticationProvider = new(() => Task.FromResult(GraphAuthHeader)); - GraphServiceClient graphServiceClient = this.CreateGraphServiceClient(authenticationProvider.AuthenticateRequestAsync); - - planner.Kernel.ImportFunctions(new TaskListPlugin(new MicrosoftToDoConnector(graphServiceClient)), "todo"); - planner.Kernel.ImportFunctions(new CalendarPlugin(new OutlookCalendarConnector(graphServiceClient)), "calendar"); - planner.Kernel.ImportFunctions(new EmailPlugin(new OutlookMailConnector(graphServiceClient)), "email"); + tasks.Add(this.RegisterMicrosoftGraphPlugins(kernel, GraphAuthHeader)); } - if (variables.TryGetValue("customPlugins", out string? customPluginsString)) + if (variables.TryGetValue("customPlugins", out object? customPluginsString)) { - CustomPlugin[]? customPlugins = JsonSerializer.Deserialize(customPluginsString); + tasks.AddRange(this.RegisterCustomPlugins(kernel, customPluginsString, authHeaders)); + } + + await Task.WhenAll(tasks); + } + + private async Task RegisterGithubPlugin(Kernel kernel, string GithubAuthHeader) + { + this._logger.LogInformation("Enabling GitHub plugin."); + BearerAuthenticationProvider authenticationProvider = new(() => Task.FromResult(GithubAuthHeader)); + await kernel.ImportPluginFromOpenApiAsync( + pluginName: "GitHubPlugin", + filePath: GetPluginFullPath("GitHubPlugin/openapi.json"), + new OpenApiFunctionExecutionParameters + { + AuthCallback = authenticationProvider.AuthenticateRequestAsync, + }); + } + + private async Task RegisterJiraPlugin(Kernel kernel, string JiraAuthHeader, KernelArguments variables) + { + this._logger.LogInformation("Registering Jira plugin"); + var authenticationProvider = new BasicAuthenticationProvider(() => { return Task.FromResult(JiraAuthHeader); }); + var hasServerUrlOverride = variables.TryGetValue("jira-server-url", out object? serverUrlOverride); + + await kernel.ImportPluginFromOpenApiAsync( + pluginName: "JiraPlugin", + filePath: GetPluginFullPath("OpenApi/JiraPlugin/openapi.json"), + new OpenApiFunctionExecutionParameters + { + AuthCallback = authenticationProvider.AuthenticateRequestAsync, + ServerUrlOverride = hasServerUrlOverride ? new Uri(serverUrlOverride!.ToString()!) : null, + }); ; ; + } + + private Task RegisterMicrosoftGraphPlugins(Kernel kernel, string GraphAuthHeader) + { + this._logger.LogInformation("Enabling Microsoft Graph plugin(s)."); + BearerAuthenticationProvider authenticationProvider = new(() => Task.FromResult(GraphAuthHeader)); + GraphServiceClient graphServiceClient = this.CreateGraphServiceClient(authenticationProvider.GraphClientAuthenticateRequestAsync); + + kernel.ImportPluginFromObject(new TaskListPlugin(new MicrosoftToDoConnector(graphServiceClient)), "todo"); + kernel.ImportPluginFromObject(new CalendarPlugin(new OutlookCalendarConnector(graphServiceClient)), "calendar"); + kernel.ImportPluginFromObject(new EmailPlugin(new OutlookMailConnector(graphServiceClient)), "email"); + return Task.CompletedTask; + } + + private IEnumerable RegisterCustomPlugins(Kernel kernel, object? customPluginsString, Dictionary authHeaders) + { + CustomPlugin[]? customPlugins = JsonSerializer.Deserialize(customPluginsString!.ToString()!); - if (customPlugins != null) + if (customPlugins != null) + { + foreach (CustomPlugin plugin in customPlugins) { - foreach (CustomPlugin plugin in customPlugins) + if (authHeaders.TryGetValue(plugin.AuthHeaderTag.ToUpperInvariant(), out string? PluginAuthValue)) { - if (authHeaders.TryGetValue(plugin.AuthHeaderTag.ToUpperInvariant(), out string? PluginAuthValue)) + // Register the ChatGPT plugin with the kernel. + this._logger.LogInformation("Enabling {0} plugin.", plugin.NameForHuman); + + // TODO: [Issue #44] Support other forms of auth. Currently, we only support user PAT or no auth. + var requiresAuth = !plugin.AuthType.Equals("none", StringComparison.OrdinalIgnoreCase); + Task authCallback(HttpRequestMessage request, string _, OpenAIAuthenticationConfig __, CancellationToken ___ = default) { - // Register the ChatGPT plugin with the planner's kernel. - this._logger.LogInformation("Enabling {0} plugin.", plugin.NameForHuman); + request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", PluginAuthValue); - // TODO: [Issue #44] Support other forms of auth. Currently, we only support user PAT or no auth. - var requiresAuth = !plugin.AuthType.Equals("none", StringComparison.OrdinalIgnoreCase); - OpenAIAuthenticateRequestAsyncCallback authCallback = (request, _, _) => - { - request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", PluginAuthValue); - - return Task.CompletedTask; - }; - - await planner.Kernel.ImportOpenAIPluginFunctionsAsync( - $"{plugin.NameForModel}Plugin", - PluginUtils.GetPluginManifestUri(plugin.ManifestDomain), - new OpenAIFunctionExecutionParameters - { - HttpClient = this._httpClientFactory.CreateClient("Plugin"), - IgnoreNonCompliantErrors = true, - AuthCallback = requiresAuth ? authCallback : null - }); + return Task.CompletedTask; } + + yield return kernel.ImportPluginFromOpenAIAsync( + $"{plugin.NameForModel}Plugin", + PluginUtils.GetPluginManifestUri(plugin.ManifestDomain), + new OpenAIFunctionExecutionParameters + { + HttpClient = this._httpClientFactory.CreateClient(), + IgnoreNonCompliantErrors = true, + AuthCallback = requiresAuth ? authCallback : null + }); } } - else - { - this._logger.LogDebug("Failed to deserialize custom plugin details: {0}", customPluginsString); - } + } + else + { + this._logger.LogDebug("Failed to deserialize custom plugin details: {0}", customPluginsString); } } @@ -377,7 +323,7 @@ private GraphServiceClient CreateGraphServiceClient(AuthenticateRequestAsyncDele return graphServiceClient; } - private async Task RegisterPlannerHostedFunctionsUsedAsync(CopilotChatPlanner planner, HashSet enabledPlugins) + private async Task RegisterHostedFunctionsAsync(Kernel kernel, HashSet enabledPlugins) { foreach (string enabledPlugin in enabledPlugins) { @@ -385,20 +331,20 @@ private async Task RegisterPlannerHostedFunctionsUsedAsync(CopilotChatPlanner pl { this._logger.LogDebug("Enabling hosted plugin {0}.", plugin.Name); - OpenAIAuthenticateRequestAsyncCallback authCallback = (request, _, _) => + Task authCallback(HttpRequestMessage request, string _, OpenAIAuthenticationConfig __, CancellationToken ___ = default) { request.Headers.Add("X-Functions-Key", plugin.Key); return Task.CompletedTask; - }; + } - // Register the ChatGPT plugin with the planner's kernel. - await planner.Kernel.ImportOpenAIPluginFunctionsAsync( + // Register the ChatGPT plugin with the kernel. + await kernel.ImportPluginFromOpenAIAsync( PluginUtils.SanitizePluginName(plugin.Name), PluginUtils.GetPluginManifestUri(plugin.ManifestDomain), new OpenAIFunctionExecutionParameters { - HttpClient = this._httpClientFactory.CreateClient("Plugin"), + HttpClient = this._httpClientFactory.CreateClient(), IgnoreNonCompliantErrors = true, AuthCallback = authCallback }); @@ -412,25 +358,32 @@ await planner.Kernel.ImportOpenAIPluginFunctionsAsync( return; } - private static ContextVariables GetContextVariables(Ask ask, IAuthInfo authInfo, string chatId) + private static KernelArguments GetContextVariables(Ask ask, IAuthInfo authInfo, string chatId) { const string UserIdKey = "userId"; const string UserNameKey = "userName"; const string ChatIdKey = "chatId"; + const string MessageKey = "message"; - var contextVariables = new ContextVariables(ask.Input); + var contextVariables = new KernelArguments(); foreach (var variable in ask.Variables) { - contextVariables.Set(variable.Key, variable.Value); + contextVariables[variable.Key] = variable.Value; } - contextVariables.Set(UserIdKey, authInfo.UserId); - contextVariables.Set(UserNameKey, authInfo.Name); - contextVariables.Set(ChatIdKey, chatId); + contextVariables[UserIdKey] = authInfo.UserId; + contextVariables[UserNameKey] = authInfo.Name; + contextVariables[ChatIdKey] = chatId; + contextVariables[MessageKey] = ask.Input; return contextVariables; } + private static string GetPluginFullPath(string pluginPath) + { + return Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "Plugins", pluginPath); + } + /// /// Dispose of the object. /// @@ -453,3 +406,79 @@ public void Dispose() GC.SuppressFinalize(this); } } + +/// +/// Retrieves authentication content (e.g. username/password, API key) via the provided delegate and +/// applies it to HTTP requests using the "basic" authentication scheme. +/// +public class BasicAuthenticationProvider +{ + private readonly Func> _credentialsDelegate; + + /// + /// Creates an instance of the class. + /// + /// Delegate for retrieving credentials. + public BasicAuthenticationProvider(Func> credentialsDelegate) + { + this._credentialsDelegate = credentialsDelegate; + } + + /// + /// Applies the authentication content to the provided HTTP request message. + /// + /// The HTTP request message. + /// The cancellation token. + public async Task AuthenticateRequestAsync(HttpRequestMessage request, CancellationToken cancellationToken = default) + { + // Base64 encode + string encodedContent = Convert.ToBase64String(Encoding.UTF8.GetBytes(await this._credentialsDelegate().ConfigureAwait(false))); + request.Headers.Authorization = new AuthenticationHeaderValue("Basic", encodedContent); + } +} + +/// +/// Retrieves a token via the provided delegate and applies it to HTTP requests using the +/// "bearer" authentication scheme. +/// +public class BearerAuthenticationProvider +{ + private readonly Func> _bearerTokenDelegate; + + /// + /// Creates an instance of the class. + /// + /// Delegate to retrieve the bearer token. + public BearerAuthenticationProvider(Func> bearerTokenDelegate) + { + this._bearerTokenDelegate = bearerTokenDelegate; + } + + /// + /// Applies the token to the provided HTTP request message. + /// + /// The HTTP request message. + public async Task AuthenticateRequestAsync(HttpRequestMessage request, CancellationToken cancellationToken = default) + { + var token = await this._bearerTokenDelegate().ConfigureAwait(false); + request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token); + } + + /// + /// Applies the token to the provided HTTP request message. + /// + /// The HTTP request message. + public async Task GraphClientAuthenticateRequestAsync(HttpRequestMessage request) + { + await this.AuthenticateRequestAsync(request); + } + + /// + /// Applies the token to the provided HTTP request message. + /// + /// The HTTP request message. + public async Task OpenAIAuthenticateRequestAsync(HttpRequestMessage request, string pluginName, OpenAIAuthenticationConfig openAIAuthConfig, CancellationToken cancellationToken = default) + { + await this.AuthenticateRequestAsync(request, cancellationToken); + } +} diff --git a/webapi/Controllers/PluginController.cs b/webapi/Controllers/PluginController.cs index 9c5d3a802..6a795fc31 100644 --- a/webapi/Controllers/PluginController.cs +++ b/webapi/Controllers/PluginController.cs @@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; -using Microsoft.SemanticKernel.Diagnostics; namespace CopilotChat.WebApi.Controllers; @@ -55,9 +54,9 @@ public async Task GetPluginManifest([FromQuery] Uri manifestDomai { using var request = new HttpRequestMessage(HttpMethod.Get, PluginUtils.GetPluginManifestUri(manifestDomain)); // Need to set the user agent to avoid 403s from some sites. - request.Headers.Add("User-Agent", Telemetry.HttpUserAgent); + request.Headers.Add("User-Agent", "Semantic-Kernel"); - using HttpClient client = this._httpClientFactory.CreateClient("Plugin"); + using HttpClient client = this._httpClientFactory.CreateClient(); var response = await client.SendAsync(request); if (!response.IsSuccessStatusCode) { diff --git a/webapi/CopilotChatWebApi.csproj b/webapi/CopilotChatWebApi.csproj index ead1836e4..cf2966778 100644 --- a/webapi/CopilotChatWebApi.csproj +++ b/webapi/CopilotChatWebApi.csproj @@ -1,4 +1,4 @@ - + CopilotChat.WebApi net6.0 @@ -7,6 +7,7 @@ enable disable 5ee045b0-aea3-4f08-8d31-32d1a6f8fed0 + SKEXP0003,SKEXP0011,SKEXP0021,SKEXP0026,SKEXP0042,SKEXP0050,SKEXP0052,SKEXP0053,SKEXP0060 @@ -17,23 +18,19 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -57,17 +54,17 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/webapi/Extensions/ISemanticMemoryClientExtensions.cs b/webapi/Extensions/ISemanticMemoryClientExtensions.cs index 646505a21..59d3d9cbb 100644 --- a/webapi/Extensions/ISemanticMemoryClientExtensions.cs +++ b/webapi/Extensions/ISemanticMemoryClientExtensions.cs @@ -21,7 +21,7 @@ namespace CopilotChat.WebApi.Extensions; /// internal static class ISemanticMemoryClientExtensions { - private static readonly List pipelineSteps = new() { "extract", "partition", "gen_embeddings", "save_embeddings" }; + private static readonly List pipelineSteps = new() { "extract", "partition", "gen_embeddings", "save_records" }; /// /// Inject . @@ -32,7 +32,7 @@ public static void AddSemanticMemoryServices(this WebApplicationBuilder appBuild var memoryConfig = serviceProvider.GetRequiredService>().Value; - var ocrType = memoryConfig.ImageOcrType; + var ocrType = memoryConfig.DataIngestion.ImageOcrType; var hasOcr = !string.IsNullOrWhiteSpace(ocrType) && !ocrType.Equals(MemoryConfiguration.NoneType, StringComparison.OrdinalIgnoreCase); var pipelineType = memoryConfig.DataIngestion.OrchestrationType; @@ -54,7 +54,7 @@ public static void AddSemanticMemoryServices(this WebApplicationBuilder appBuild } } - IKernelMemory memory = memoryBuilder.FromConfiguration( + IKernelMemory memory = memoryBuilder.FromMemoryConfiguration( memoryConfig, appBuilder.Configuration ).Build(); diff --git a/webapi/Extensions/SemanticKernelExtensions.cs b/webapi/Extensions/SemanticKernelExtensions.cs index 884a19c66..0bafb441b 100644 --- a/webapi/Extensions/SemanticKernelExtensions.cs +++ b/webapi/Extensions/SemanticKernelExtensions.cs @@ -20,7 +20,6 @@ using Microsoft.Extensions.Options; using Microsoft.KernelMemory; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.Diagnostics; using Microsoft.SemanticKernel.Plugins.Core; namespace CopilotChat.WebApi.Extensions; @@ -33,19 +32,13 @@ internal static class SemanticKernelExtensions /// /// Delegate to register functions with a Semantic Kernel /// - public delegate Task RegisterFunctionsWithKernel(IServiceProvider sp, IKernel kernel); + public delegate Task RegisterFunctionsWithKernel(IServiceProvider sp, Kernel kernel); /// /// Delegate for any complimentary setup of the kernel, i.e., registering custom plugins, etc. /// See webapi/README.md#Add-Custom-Setup-to-Chat-Copilot's-Kernel for more details. /// - public delegate Task KernelSetupHook(IServiceProvider sp, IKernel kernel); - - /// - /// Delegate to register plugins with the planner's kernel (i.e., omits plugins not required to generate bot response). - /// See webapi/README.md#Add-Custom-Plugin-Registration-to-the-Planner's-Kernel for more details. - /// - public delegate Task RegisterFunctionsWithPlannerHook(IServiceProvider sp, IKernel kernel); + public delegate Task KernelSetupHook(IServiceProvider sp, Kernel kernel); /// /// Add Semantic Kernel services @@ -55,7 +48,7 @@ public static WebApplicationBuilder AddSemanticKernelServices(this WebApplicatio builder.InitializeKernelProvider(); // Semantic Kernel - builder.Services.AddScoped( + builder.Services.AddScoped( sp => { var provider = sp.GetRequiredService(); @@ -82,34 +75,7 @@ public static WebApplicationBuilder AddSemanticKernelServices(this WebApplicatio } /// - /// Add Planner services - /// - public static WebApplicationBuilder AddPlannerServices(this WebApplicationBuilder builder) - { - builder.InitializeKernelProvider(); - - builder.Services.AddScoped(sp => - { - sp.WithBotConfig(builder.Configuration); - var plannerOptions = sp.GetRequiredService>(); - - var provider = sp.GetRequiredService(); - var plannerKernel = provider.GetPlannerKernel(); - - // Invoke custom plugin registration for planner's kernel. - sp.GetService()?.Invoke(sp, plannerKernel); - - return new CopilotChatPlanner(plannerKernel, plannerOptions?.Value, sp.GetRequiredService>()); - }); - - // Register any custom plugins with the planner's kernel. - builder.Services.AddPlannerSetupHook(); - - return builder; - } - - /// - /// Add Planner services + /// Add embedding model /// public static WebApplicationBuilder AddBotConfig(this WebApplicationBuilder builder) { @@ -129,29 +95,13 @@ public static IServiceCollection AddKernelSetupHook(this IServiceCollection serv return services; } - /// - /// Register custom hook for registering plugins with the planner's kernel. - /// These plugins will be persistent and available to the planner on every request. - /// Transient plugins requiring auth or configured by the webapp should be registered in RegisterPlannerFunctionsAsync of ChatController. - /// - /// The delegate to register plugins with the planner's kernel. If null, defaults to local runtime plugin registration using RegisterPluginsAsync. - public static IServiceCollection AddPlannerSetupHook(this IServiceCollection services, RegisterFunctionsWithPlannerHook? registerPluginsHook = null) - { - // Default to local runtime plugin registration. - registerPluginsHook ??= RegisterPluginsAsync; - - // Add the hook to the service collection - services.AddScoped(sp => registerPluginsHook); - return services; - } - /// /// Register the chat plugin with the kernel. /// - public static IKernel RegisterChatPlugin(this IKernel kernel, IServiceProvider sp) + public static Kernel RegisterChatPlugin(this Kernel kernel, IServiceProvider sp) { // Chat plugin - kernel.ImportFunctions( + kernel.ImportPluginFromObject( new ChatPlugin( kernel, memoryClient: sp.GetRequiredService(), @@ -161,7 +111,6 @@ public static IKernel RegisterChatPlugin(this IKernel kernel, IServiceProvider s promptOptions: sp.GetRequiredService>(), documentImportOptions: sp.GetRequiredService>(), contentSafety: sp.GetService(), - planner: sp.GetRequiredService(), logger: sp.GetRequiredService>()), nameof(ChatPlugin)); @@ -176,13 +125,13 @@ private static void InitializeKernelProvider(this WebApplicationBuilder builder) /// /// Register functions with the main kernel responsible for handling Chat Copilot requests. /// - private static Task RegisterChatCopilotFunctionsAsync(IServiceProvider sp, IKernel kernel) + private static Task RegisterChatCopilotFunctionsAsync(IServiceProvider sp, Kernel kernel) { // Chat Copilot functions kernel.RegisterChatPlugin(sp); // Time plugin - kernel.ImportFunctions(new TimePlugin(), nameof(TimePlugin)); + kernel.ImportPluginFromObject(new TimePlugin(), nameof(TimePlugin)); return Task.CompletedTask; } @@ -190,7 +139,7 @@ private static Task RegisterChatCopilotFunctionsAsync(IServiceProvider sp, IKern /// /// Register plugins with a given kernel. /// - private static Task RegisterPluginsAsync(IServiceProvider sp, IKernel kernel) + private static Task RegisterPluginsAsync(IServiceProvider sp, Kernel kernel) { var logger = kernel.LoggerFactory.CreateLogger(nameof(Kernel)); @@ -202,9 +151,9 @@ private static Task RegisterPluginsAsync(IServiceProvider sp, IKernel kernel) { try { - kernel.ImportSemanticFunctionsFromDirectory(options.SemanticPluginsDirectory, Path.GetFileName(subDir)!); + kernel.ImportPluginFromPromptDirectory(options.SemanticPluginsDirectory, Path.GetFileName(subDir)!); } - catch (SKException ex) + catch (KernelException ex) { logger.LogError("Could not load plugin from {Directory}: {Message}", subDir, ex.Message); } @@ -231,9 +180,9 @@ private static Task RegisterPluginsAsync(IServiceProvider sp, IKernel kernel) try { var plugin = Activator.CreateInstance(classType); - kernel.ImportFunctions(plugin!, classType.Name!); + kernel.ImportPluginFromObject(plugin!, classType.Name!); } - catch (SKException ex) + catch (KernelException ex) { logger.LogError("Could not load plugin from file {File}: {Details}", file, ex.Message); } diff --git a/webapi/Extensions/ServiceExtensions.cs b/webapi/Extensions/ServiceExtensions.cs index 76a812a27..ac873a110 100644 --- a/webapi/Extensions/ServiceExtensions.cs +++ b/webapi/Extensions/ServiceExtensions.cs @@ -21,7 +21,7 @@ using Microsoft.Extensions.Options; using Microsoft.Identity.Web; using Microsoft.KernelMemory; -using Microsoft.SemanticKernel.Diagnostics; +using Microsoft.KernelMemory.Diagnostics; namespace CopilotChat.WebApi.Extensions; @@ -53,8 +53,6 @@ public static IServiceCollection AddOptions(this IServiceCollection services, Co // Chat prompt options AddOptions(PromptsOptions.PropertyName); - AddOptions(PlannerOptions.PropertyName); - AddOptions(ContentSafetyOptions.PropertyName); AddOptions(MemoryConfiguration.KernelMemorySection); diff --git a/webapi/Models/Request/ExecutePlanParameters.cs b/webapi/Models/Request/ExecutePlanParameters.cs deleted file mode 100644 index ff0bcb6d7..000000000 --- a/webapi/Models/Request/ExecutePlanParameters.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. - -using CopilotChat.WebApi.Models.Response; - -namespace CopilotChat.WebApi.Models.Request; - -public class ExecutePlanParameters : Ask -{ - public ProposedPlan? Plan { get; set; } -} diff --git a/webapi/Models/Response/AskResult.cs b/webapi/Models/Response/AskResult.cs index c6f4f6175..e7a1a9d06 100644 --- a/webapi/Models/Response/AskResult.cs +++ b/webapi/Models/Response/AskResult.cs @@ -9,5 +9,5 @@ public class AskResult { public string Value { get; set; } = string.Empty; - public IEnumerable>? Variables { get; set; } = Enumerable.Empty>(); + public IEnumerable>? Variables { get; set; } = Enumerable.Empty>(); } diff --git a/webapi/Models/Response/BotResponsePrompt.cs b/webapi/Models/Response/BotResponsePrompt.cs index ccd0d8bb4..4f7cb46c6 100644 --- a/webapi/Models/Response/BotResponsePrompt.cs +++ b/webapi/Models/Response/BotResponsePrompt.cs @@ -1,12 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. using System.Text.Json.Serialization; -using ChatCompletionContextMessages = Microsoft.SemanticKernel.AI.ChatCompletion.ChatHistory; +using Microsoft.SemanticKernel.ChatCompletion; namespace CopilotChat.WebApi.Models.Response; /// -/// The fianl prompt sent to generate bot response. +/// The final prompt sent to generate bot response. /// public class BotResponsePrompt { @@ -40,27 +40,20 @@ public class BotResponsePrompt [JsonPropertyName("chatHistory")] public string ChatHistory { get; set; } = string.Empty; - /// - /// Relevant additional knowledge extracted using a planner. - /// - [JsonPropertyName("externalInformation")] - public SemanticDependency ExternalInformation { get; set; } - /// /// The collection of context messages associated with this chat completions request. /// See https://learn.microsoft.com/en-us/dotnet/api/azure.ai.openai.chatcompletionsoptions.messages?view=azure-dotnet-preview#azure-ai-openai-chatcompletionsoptions-messages. /// [JsonPropertyName("metaPromptTemplate")] - public ChatCompletionContextMessages MetaPromptTemplate { get; set; } = new(); + public ChatHistory MetaPromptTemplate { get; set; } = new(); public BotResponsePrompt( string systemInstructions, string audience, string userIntent, string chatMemories, - SemanticDependency externalInformation, string chatHistory, - ChatCompletionContextMessages metaPromptTemplate + ChatHistory metaPromptTemplate ) { this.SystemPersona = systemInstructions; @@ -68,7 +61,6 @@ ChatCompletionContextMessages metaPromptTemplate this.UserIntent = userIntent; this.PastMemories = chatMemories; this.ChatHistory = chatHistory; - this.ExternalInformation = externalInformation; this.MetaPromptTemplate = metaPromptTemplate; } } diff --git a/webapi/Models/Response/PlanExecutionMetadata.cs b/webapi/Models/Response/PlanExecutionMetadata.cs deleted file mode 100644 index 2c8256330..000000000 --- a/webapi/Models/Response/PlanExecutionMetadata.cs +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. - -using System.Text.Json.Serialization; - -namespace CopilotChat.WebApi.Models.Response; - -/// -/// Metadata about plan execution. -/// -public class PlanExecutionMetadata -{ - /// - /// Steps taken execution stat. - /// - [JsonPropertyName("stepsTaken")] - public string StepsTaken { get; set; } = string.Empty; - - /// - /// Time taken to fulfil the goal. - /// Format: hh:mm:ss - /// - [JsonPropertyName("timeTaken")] - public string TimeTaken { get; set; } = string.Empty; - - /// - /// Functions used execution stat. - /// - [JsonPropertyName("functionsUsed")] - public string FunctionsUsed { get; set; } = string.Empty; - - /// - /// Planner type. - /// - [JsonPropertyName("plannerType")] - public PlanType PlannerType { get; set; } = PlanType.Stepwise; - - /// - /// Raw result of the planner. - /// - [JsonIgnore] - public string RawResult { get; set; } = string.Empty; - - public PlanExecutionMetadata(string stepsTaken, string timeTaken, string functionsUsed, string rawResult) - { - this.StepsTaken = stepsTaken; - this.TimeTaken = timeTaken; - this.FunctionsUsed = functionsUsed; - this.RawResult = rawResult; - } -} diff --git a/webapi/Models/Response/ProposedPlan.cs b/webapi/Models/Response/ProposedPlan.cs deleted file mode 100644 index 37fd5753c..000000000 --- a/webapi/Models/Response/ProposedPlan.cs +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. - -using System.Text.Json.Serialization; -using Microsoft.SemanticKernel.Planning; - -namespace CopilotChat.WebApi.Models.Response; - -// Type of Plan -public enum PlanType -{ - Action, // single-step - Sequential, // multi-step - Stepwise, // MRKL style planning -} - -// State of Plan -public enum PlanState -{ - NoOp, // Plan has not received any user input - Approved, - Rejected, - Derived, // Plan has been derived from a previous plan; used when user wants to re-run a plan. -} - -/// -/// Information about a single proposed plan. -/// -public class ProposedPlan -{ - /// - /// Plan object to be approved, rejected, or executed. - /// - [JsonPropertyName("proposedPlan")] - public Plan Plan { get; set; } - - /// - /// Indicates whether plan is Action (single-step) or Sequential (multi-step). - /// - [JsonPropertyName("type")] - public PlanType Type { get; set; } - - /// - /// State of plan - /// - [JsonPropertyName("state")] - public PlanState State { get; set; } - - /// - /// User intent that serves as goal of plan. - /// - [JsonPropertyName("userIntent")] - public string UserIntent { get; set; } - - /// - /// Original user input that prompted this plan. - /// - [JsonPropertyName("originalUserInput")] - public string OriginalUserInput { get; set; } - - /// - /// Id tracking bot message of plan in chat history when it was first generated. - /// - [JsonPropertyName("generatedPlanMessageId")] - public string? GeneratedPlanMessageId { get; set; } = null; - - /// - /// Create a new proposed plan. - /// - /// Proposed plan object - public ProposedPlan(Plan plan, PlanType type, PlanState state, string userIntent, string originalUserInput, string? generatedPlanMessageId = null) - { - this.Plan = plan; - this.Type = type; - this.State = state; - this.UserIntent = userIntent; - this.OriginalUserInput = originalUserInput; - this.GeneratedPlanMessageId = generatedPlanMessageId; - } -} diff --git a/webapi/Models/Response/SemanticDependency.cs b/webapi/Models/Response/SemanticDependency.cs deleted file mode 100644 index a3ddfaa08..000000000 --- a/webapi/Models/Response/SemanticDependency.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. - -using System.Text.Json.Serialization; - -namespace CopilotChat.WebApi.Models.Response; - -public interface ISemanticDependency -{ - /// - /// Result of the dependency. This is the output that's injected into the prompt. - /// - [JsonPropertyName("result")] - string Result { get; } - - /// - /// Type of dependency, if any. - /// - [JsonPropertyName("type")] - string? Type { get; } -} - -/// -/// Information about semantic dependencies of the prompt. -/// -public class SemanticDependency : ISemanticDependency -{ - /// - [JsonPropertyName("result")] - public string Result { get; set; } = string.Empty; - - /// - [JsonPropertyName("type")] - public string Type { get; set; } = string.Empty; - - /// - /// Context of the dependency. This can be either the prompt template or planner details. - /// - [JsonPropertyName("context")] - public T? Context { get; set; } = default; - - public SemanticDependency(string result, T? context = default, string? type = null) - { - this.Result = result; - this.Context = context; - this.Type = type ?? typeof(T).Name; - } -} diff --git a/webapi/Models/Storage/CopilotChatMessage.cs b/webapi/Models/Storage/CopilotChatMessage.cs index 5316a9f37..c0aa13a98 100644 --- a/webapi/Models/Storage/CopilotChatMessage.cs +++ b/webapi/Models/Storage/CopilotChatMessage.cs @@ -5,7 +5,6 @@ using System.Globalization; using System.Text.Json; using System.Text.Json.Serialization; -using System.Text.RegularExpressions; using CopilotChat.WebApi.Models.Response; using CopilotChat.WebApi.Storage; @@ -161,7 +160,7 @@ public CopilotChatMessage( /// Total token usage of response completion public static CopilotChatMessage CreateBotResponseMessage(string chatId, string content, string prompt, IEnumerable? citations, IDictionary? tokenUsage = null) { - return new CopilotChatMessage("Bot", "Bot", chatId, content, prompt, citations, AuthorRoles.Bot, IsPlan(content) ? ChatMessageType.Plan : ChatMessageType.Message, tokenUsage); + return new CopilotChatMessage("Bot", "Bot", chatId, content, prompt, citations, AuthorRoles.Bot, ChatMessageType.Message, tokenUsage); } /// @@ -185,42 +184,19 @@ public string ToFormattedString() var messagePrefix = $"[{this.Timestamp.ToString("G", CultureInfo.CurrentCulture)}]"; switch (this.Type) { - case ChatMessageType.Plan: - { - var planMessageContent = "proposed a plan."; - if (this.Content.Contains("proposedPlan\":", StringComparison.InvariantCultureIgnoreCase)) - { - // Try to extract user intent from the plan proposal. - string pattern = ".*User Intent:User intent: (.*)(?=\"})"; - Match match = Regex.Match(this.Content, pattern); - if (match.Success) - { - string userIntent = match.Groups[1].Value.Trim(); - planMessageContent = $"proposed a plan to fulfill user intent: {userIntent}"; - } - } - - return $"{messagePrefix} {this.UserName} {planMessageContent}"; - } - case ChatMessageType.Document: - { var documentMessage = DocumentMessageContent.FromString(this.Content); var documentMessageContent = (documentMessage != null) ? documentMessage.ToFormattedString() : "documents"; return $"{messagePrefix} {this.UserName} uploaded: {documentMessageContent}"; - } + case ChatMessageType.Plan: // Fall through case ChatMessageType.Message: - { return $"{messagePrefix} {this.UserName} said: {this.Content}"; - } default: - { // This should never happen. throw new InvalidOperationException($"Unknown message type: {this.Type}"); - } } } @@ -242,16 +218,4 @@ public override string ToString() { return JsonSerializer.Deserialize(json, SerializerSettings); } - - /// - /// Check if the response is a Plan. - /// This is a copy of the `isPlan` function on the frontend. - /// - /// The response from the bot. - /// True if the response represents Plan, false otherwise. - private static bool IsPlan(string response) - { - var planPrefix = "proposedPlan\":"; - return response.Contains(planPrefix, StringComparison.InvariantCulture); - } } diff --git a/webapi/Options/DocumentMemoryOptions.cs b/webapi/Options/DocumentMemoryOptions.cs index f126c31f3..5d50aa6b8 100644 --- a/webapi/Options/DocumentMemoryOptions.cs +++ b/webapi/Options/DocumentMemoryOptions.cs @@ -17,18 +17,6 @@ public class DocumentMemoryOptions /// internal static readonly Guid GlobalDocumentChatId = Guid.Empty; - /// - /// Gets or sets the name of the global document collection. - /// - [Required, NotEmptyOrWhitespace] - public string GlobalDocumentCollectionName { get; set; } = "global-documents"; - - /// - /// Gets or sets the prefix for the chat document collection name. - /// - [Required, NotEmptyOrWhitespace] - public string ChatDocumentCollectionNamePrefix { get; set; } = "chat-documents-"; - /// /// Gets or sets the maximum number of tokens to use when splitting a document into "lines". /// For more details on tokens and how to count them, see: diff --git a/webapi/Options/MemoryStoreType.cs b/webapi/Options/MemoryStoreType.cs index 6d92b3f85..d68152336 100644 --- a/webapi/Options/MemoryStoreType.cs +++ b/webapi/Options/MemoryStoreType.cs @@ -28,9 +28,9 @@ public enum MemoryStoreType Qdrant, /// - /// Azure Cognitive Search persistent memory store. + /// Azure AI Search persistent memory store. /// - AzureCognitiveSearch, + AzureAISearch, } public static class MemoryStoreTypeExtensions @@ -44,10 +44,10 @@ public static class MemoryStoreTypeExtensions /// The memory store type. public static MemoryStoreType GetMemoryStoreType(this KernelMemoryConfig memoryOptions, IConfiguration configuration) { - var type = memoryOptions.Retrieval.VectorDbType; - if (type.Equals("AzureCognitiveSearch", StringComparison.OrdinalIgnoreCase)) + var type = memoryOptions.Retrieval.MemoryDbType; + if (type.Equals("AzureAISearch", StringComparison.OrdinalIgnoreCase)) { - return MemoryStoreType.AzureCognitiveSearch; + return MemoryStoreType.AzureAISearch; } else if (type.Equals("Qdrant", StringComparison.OrdinalIgnoreCase)) { diff --git a/webapi/Options/PlannerOptions.cs b/webapi/Options/PlannerOptions.cs deleted file mode 100644 index 672771049..000000000 --- a/webapi/Options/PlannerOptions.cs +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. -using System.ComponentModel.DataAnnotations; -using CopilotChat.WebApi.Models.Response; -using Microsoft.SemanticKernel.Planners; - -namespace CopilotChat.WebApi.Options; - -/// -/// Configuration options for the planner. -/// -public class PlannerOptions -{ - /// - /// Options to handle planner errors. - /// - public class ErrorOptions - { - /// - /// Whether to allow retries on planner errors. - /// - public bool AllowRetries { get; set; } = true; - - // - // Whether to allow missing functions in the sequential plan on creation. If set to true, the - // plan will be created with missing functions as no-op steps. If set to false (default), - // the plan creation will fail if any functions are missing. - // - public bool AllowMissingFunctions { get; set; } = true; - - /// - /// Max retries allowed. - /// - [Range(1, 5)] - public int MaxRetriesAllowed { get; set; } = 3; - } - - public const string PropertyName = "Planner"; - - /// - /// The model name used by the planner. - /// - [Required] - public string Model { get; set; } = string.Empty; - - /// - /// The type of planner to used to create plan. - /// - [Required] - public PlanType Type { get; set; } = PlanType.Action; - - /// - /// The minimum relevancy score for a function to be considered during plan creation when using SequentialPlanner - /// - [Range(0, 1.0)] - public double? RelevancyThreshold { get; set; } = 0; - - /// - /// The maximum number of seconds to wait for a response from a plugin. - /// If this is not set, timeout limit will be 100s, which is the default timeout setting for HttpClient. - /// - [Range(0, int.MaxValue)] - public double PluginTimeoutLimitInS { get; set; } = 100; - - /// - /// Options on how to handle planner errors. - /// - public ErrorOptions ErrorHandling { get; set; } = new ErrorOptions(); - - /// - /// Optional flag to indicate whether to use the planner result as the bot response. - /// - [RequiredOnPropertyValue(nameof(Type), PlanType.Stepwise)] - public bool UseStepwiseResultAsBotResponse { get; set; } = false; - - /// - /// The configuration for the stepwise planner. - /// - [RequiredOnPropertyValue(nameof(Type), PlanType.Stepwise)] - public StepwisePlannerConfig StepwisePlannerConfig { get; set; } = new StepwisePlannerConfig(); -} diff --git a/webapi/Options/PromptsOptions.cs b/webapi/Options/PromptsOptions.cs index d6be8a336..5dd1edc6a 100644 --- a/webapi/Options/PromptsOptions.cs +++ b/webapi/Options/PromptsOptions.cs @@ -31,12 +31,6 @@ public class PromptsOptions /// internal double MemoriesResponseContextWeight { get; } = 0.6; - /// - /// Weight of information returned from planner (i.e., responses from OpenAPI functions). - /// Contextual prompt excludes all the system commands and user intent. - /// - internal double ExternalInformationContextWeight { get; } = 0.3; - /// /// Upper bound of the relevancy score of a kernel memory to be included in the final prompt. /// The actual relevancy score is determined by the memory balance. @@ -61,21 +55,6 @@ public class PromptsOptions [Required, NotEmptyOrWhitespace] public string SystemDescription { get; set; } = string.Empty; [Required, NotEmptyOrWhitespace] public string SystemResponse { get; set; } = string.Empty; - /// - /// Context bot message for meta prompt when using external information acquired from a plan. - /// - [Required, NotEmptyOrWhitespace] public string ProposedPlanBotMessage { get; set; } = string.Empty; - - /// - /// Supplement to help guide model in using data. - /// - [Required, NotEmptyOrWhitespace] public string PlanResultsDescription { get; set; } = string.Empty; - - /// - /// Supplement to help guide model in using a response from StepwisePlanner. - /// - [Required, NotEmptyOrWhitespace] public string StepwisePlannerSupplement { get; set; } = string.Empty; - internal string[] SystemAudiencePromptComponents => new string[] { this.SystemAudience, diff --git a/webapi/Plugins/Chat/ChatPlugin.cs b/webapi/Plugins/Chat/ChatPlugin.cs index 3e8579650..874fe329f 100644 --- a/webapi/Plugins/Chat/ChatPlugin.cs +++ b/webapi/Plugins/Chat/ChatPlugin.cs @@ -6,7 +6,6 @@ using System.Globalization; using System.Linq; using System.Text.Json; -using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using CopilotChat.WebApi.Auth; @@ -20,17 +19,10 @@ using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Microsoft.IdentityModel.Tokens; using Microsoft.KernelMemory; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.AI.ChatCompletion; -using Microsoft.SemanticKernel.Connectors.AI.OpenAI; -using Microsoft.SemanticKernel.Diagnostics; -using Microsoft.SemanticKernel.Orchestration; -using Microsoft.SemanticKernel.Planning; -using Microsoft.SemanticKernel.TemplateEngine; -using Microsoft.SemanticKernel.TemplateEngine.Basic; -using ChatCompletionContextMessages = Microsoft.SemanticKernel.AI.ChatCompletion.ChatHistory; +using Microsoft.SemanticKernel.ChatCompletion; +using Microsoft.SemanticKernel.Connectors.OpenAI; using CopilotChatMessage = CopilotChat.WebApi.Models.Storage.CopilotChatMessage; namespace CopilotChat.WebApi.Plugins.Chat; @@ -45,7 +37,7 @@ public class ChatPlugin /// A kernel instance to create a completion function since each invocation /// of the function will generate a new prompt dynamically. /// - private readonly IKernel _kernel; + private readonly Kernel _kernel; /// /// Client for the kernel memory service. @@ -82,11 +74,6 @@ public class ChatPlugin /// private readonly SemanticMemoryRetriever _semanticMemoryRetriever; - /// - /// A plugin instance to acquire external information. - /// - private readonly ExternalInformationPlugin _externalInformationPlugin; - /// /// Azure content safety moderator. /// @@ -96,14 +83,13 @@ public class ChatPlugin /// Create a new instance of . /// public ChatPlugin( - IKernel kernel, + Kernel kernel, IKernelMemory memoryClient, ChatMessageRepository chatMessageRepository, ChatSessionRepository chatSessionRepository, IHubContext messageRelayHubContext, IOptions promptOptions, IOptions documentImportOptions, - CopilotChatPlanner planner, ILogger logger, AzureContentSafety? contentSafety = null) { @@ -116,107 +102,18 @@ public ChatPlugin( // Clone the prompt options to avoid modifying the original prompt options. this._promptOptions = promptOptions.Value.Copy(); - this._semanticMemoryRetriever = new SemanticMemoryRetriever( - promptOptions, - chatSessionRepository, - memoryClient, - logger); + this._semanticMemoryRetriever = new SemanticMemoryRetriever(promptOptions, chatSessionRepository, memoryClient, logger); - this._externalInformationPlugin = new ExternalInformationPlugin( - promptOptions, - planner, - logger); this._contentSafety = contentSafety; } - /// - /// Extract user intent from the conversation history. - /// - /// The SKContext. - /// The cancellation token. - private async Task ExtractUserIntentAsync(SKContext context, CancellationToken cancellationToken = default) - { - var tokenLimit = this._promptOptions.CompletionTokenLimit; - var historyTokenBudget = - tokenLimit - - this._promptOptions.ResponseTokenLimit - - TokenUtils.TokenCount(string.Join("\n", new string[] - { - this._promptOptions.SystemDescription, - this._promptOptions.SystemIntent, - this._promptOptions.SystemIntentContinuation - }) - ); - - // Clone the context to avoid modifying the original context variables. - var intentExtractionContext = context.Clone(); - intentExtractionContext.Variables.Set("tokenLimit", historyTokenBudget.ToString(new NumberFormatInfo())); - intentExtractionContext.Variables.Set("knowledgeCutoff", this._promptOptions.KnowledgeCutoffDate); - - var completionFunction = this._kernel.CreateSemanticFunction( - this._promptOptions.SystemIntentExtraction, - pluginName: nameof(ChatPlugin), - description: "Complete the prompt."); - - var result = await completionFunction.InvokeAsync( - intentExtractionContext, - this.CreateIntentCompletionSettings(), - cancellationToken - ); - - // Get token usage from ChatCompletion result and add to context - TokenUtils.GetFunctionTokenUsage(result, context, this._logger, "SystemIntentExtraction"); - - return $"User intent: {result}"; - } - - /// - /// Extract the list of participants from the conversation history. - /// Note that only those who have spoken will be included. - /// - /// The SKContext. - /// The cancellation token. - private async Task ExtractAudienceAsync(SKContext context, CancellationToken cancellationToken = default) - { - var tokenLimit = this._promptOptions.CompletionTokenLimit; - var historyTokenBudget = - tokenLimit - - this._promptOptions.ResponseTokenLimit - - TokenUtils.TokenCount(string.Join("\n", new string[] - { - this._promptOptions.SystemAudience, - this._promptOptions.SystemAudienceContinuation, - }) - ); - - // Clone the context to avoid modifying the original context variables. - var audienceExtractionContext = context.Clone(); - audienceExtractionContext.Variables.Set("tokenLimit", historyTokenBudget.ToString(new NumberFormatInfo())); - - var completionFunction = this._kernel.CreateSemanticFunction( - this._promptOptions.SystemAudienceExtraction, - pluginName: nameof(ChatPlugin), - description: "Complete the prompt."); - - var result = await completionFunction.InvokeAsync( - audienceExtractionContext, - this.CreateIntentCompletionSettings(), - cancellationToken - ); - - // Get token usage from ChatCompletion result and add to context - TokenUtils.GetFunctionTokenUsage(result, context, this._logger, "SystemAudienceExtraction"); - - return $"List of participants: {result}"; - } - /// /// Method that wraps GetAllowedChatHistoryAsync to get allotted history messages as one string. /// GetAllowedChatHistoryAsync optionally updates a ChatHistory object with the allotted messages, /// but the ChatHistory type is not supported when calling from a rendered prompt, so this wrapper bypasses the chatHistory parameter. /// /// The cancellation token. - [SKFunction, Description("Extract chat history")] + [KernelFunction, Description("Extract chat history")] public Task ExtractChatHistory( [Description("Chat ID to extract history from")] string chatId, [Description("Maximum number of tokens")] int tokenLimit, @@ -226,23 +123,23 @@ public Task ExtractChatHistory( } /// - /// Extract chat history within token limit as a formatted string and optionally update the ChatCompletionContextMessages object with the allotted messages + /// Extract chat history within token limit as a formatted string and optionally update the ChatHistory object with the allotted messages /// /// Chat ID to extract history from. /// Maximum number of tokens. - /// Optional ChatCompletionContextMessages object tracking allotted messages. + /// Optional ChatHistory object tracking allotted messages. /// The cancellation token. /// Chat history as a string. private async Task GetAllowedChatHistoryAsync( string chatId, int tokenLimit, - ChatCompletionContextMessages? chatHistory = null, + ChatHistory? chatHistory = null, CancellationToken cancellationToken = default) { var messages = await this._chatMessageRepository.FindByChatIdAsync(chatId); var sortedMessages = messages.OrderByDescending(m => m.Timestamp); - ChatCompletionContextMessages allottedChatHistory = new(); + ChatHistory allottedChatHistory = new(); var remainingToken = tokenLimit; string historyText = string.Empty; @@ -255,25 +152,8 @@ private async Task GetAllowedChatHistoryAsync( continue; } - // Plan object is not meaningful content in generating bot response, so shorten to intent only to save on tokens - if (chatMessage.Type == CopilotChatMessage.ChatMessageType.Plan) - { - formattedMessage = "Bot proposed plan"; - - // Try to extract the user intent for more context - string pattern = @"User intent: (.*)(?=\.""})"; - Match match = Regex.Match(chatMessage.Content, pattern); - if (match.Success) - { - string userIntent = match.Groups[1].Value.Trim(); - formattedMessage = $"Bot proposed plan to help fulfill goal: {userIntent}."; - } - - formattedMessage = $"[{chatMessage.Timestamp.ToString("G", CultureInfo.CurrentCulture)}] {formattedMessage}"; - } - var promptRole = chatMessage.AuthorRole == CopilotChatMessage.AuthorRoles.Bot ? AuthorRole.System : AuthorRole.User; - var tokenCount = chatHistory is not null ? TokenUtils.GetContextMessageTokenCount(promptRole, formattedMessage) : TokenUtils.TokenCount(formattedMessage); + int tokenCount = chatHistory is not null ? TokenUtils.GetContextMessageTokenCount(promptRole, formattedMessage) : TokenUtils.TokenCount(formattedMessage); if (remainingToken - tokenCount >= 0) { @@ -281,8 +161,7 @@ private async Task GetAllowedChatHistoryAsync( if (chatMessage.AuthorRole == CopilotChatMessage.AuthorRoles.Bot) { // Message doesn't have to be formatted for bot. This helps with asserting a natural language response from the LLM (no date or author preamble). - var botMessage = chatMessage.Type == CopilotChatMessage.ChatMessageType.Plan ? formattedMessage : chatMessage.Content; - allottedChatHistory.AddAssistantMessage(botMessage.Trim()); + allottedChatHistory.AddAssistantMessage(chatMessage.Content.Trim()); } else { @@ -301,26 +180,25 @@ private async Task GetAllowedChatHistoryAsync( } } - allottedChatHistory.Reverse(); - chatHistory?.AddRange(allottedChatHistory); + chatHistory?.AddRange(allottedChatHistory.Reverse()); return $"Chat history:\n{historyText.Trim()}"; } /// /// This is the entry point for getting a chat response. It manages the token limit, saves - /// messages to memory, and fill in the necessary context variables for completing the + /// messages to memory, and fills in the necessary context variables for completing the /// prompt that will be rendered by the template engine. /// /// The cancellation token. - [SKFunction, Description("Get chat response")] - public async Task ChatAsync( + [KernelFunction, Description("Get chat response")] + public async Task ChatAsync( [Description("The new message")] string message, [Description("Unique and persistent identifier for the user")] string userId, [Description("Name of the user")] string userName, [Description("Unique and persistent identifier for the chat")] string chatId, [Description("Type of the message")] string messageType, - SKContext context, + KernelArguments context, CancellationToken cancellationToken = default) { // Set the system description in the prompt options @@ -331,15 +209,15 @@ public async Task ChatAsync( var newUserMessage = await this.SaveNewMessageAsync(message, userId, userName, chatId, messageType, cancellationToken); // Clone the context to avoid modifying the original context variables. - var chatContext = context.Clone(); - chatContext.Variables.Set("knowledgeCutoff", this._promptOptions.KnowledgeCutoffDate); + KernelArguments chatContext = new(context); + chatContext["knowledgeCutoff"] = this._promptOptions.KnowledgeCutoffDate; CopilotChatMessage chatMessage = await this.GetChatResponseAsync(chatId, userId, chatContext, newUserMessage, cancellationToken); - context.Variables.Update(chatMessage.Content); + context["input"] = chatMessage.Content; if (chatMessage.TokenUsage != null) { - context.Variables.Set("tokenUsage", JsonSerializer.Serialize(chatMessage.TokenUsage)); + context["tokenUsage"] = JsonSerializer.Serialize(chatMessage.TokenUsage); } else { @@ -349,183 +227,21 @@ public async Task ChatAsync( return context; } - /// - /// This is the entry point for handling a plan, whether the user approves, cancels, or re-runs it. - /// - /// The cancellation token. - [SKFunction, Description("Process a plan")] - public async Task ProcessPlanAsync( - [Description("The new message")] string message, - [Description("Unique and persistent identifier for the user")] string userId, - [Description("Name of the user")] string userName, - [Description("Unique and persistent identifier for the chat")] string chatId, - [Description("Proposed plan object"), DefaultValue(null), SKName("proposedPlan")] string? planJson, - SKContext context, - CancellationToken cancellationToken = default) - { - // Ensure that plan exists in ask's context variables. - // If a plan was returned at this point, that means it is a - // 1. Proposed plan that was approved or cancelled, or - // 2. Saved plan being re-run. - ProposedPlan? deserializedPlan; - if (string.IsNullOrWhiteSpace(planJson) || (deserializedPlan = JsonSerializer.Deserialize(planJson)) == null) - { - throw new ArgumentException("Plan does not exist in request context. Ensure that a valid plan is saved in the ask's variables"); - } - - // Ensure plan is actionable by supported planners. - if (!(deserializedPlan.Type == PlanType.Action || deserializedPlan.Type == PlanType.Sequential)) - { - throw new ArgumentException($"Plan of type {deserializedPlan.Type} cannot be executed. Only Action or Sequential plans can be re-run at this time."); - } - - // Set the system description in the prompt options. - await this.SetSystemDescriptionAsync(chatId, cancellationToken); - - // Clone the context to avoid modifying the original context variables. - var chatContext = context.Clone(); - chatContext.Variables.Set("knowledgeCutoff", this._promptOptions.KnowledgeCutoffDate); - - // Save this new message to memory such that subsequent chat responses can use it - await this.UpdateBotResponseStatusOnClientAsync(chatId, "Saving user message to chat history", cancellationToken); - var newUserMessage = await this.SaveNewMessageAsync(message, userId, userName, chatId, CopilotChatMessage.ChatMessageType.Message.ToString(), cancellationToken); - - // If GeneratedPlanMessageId exists on plan object, update that message with new plan state. - // This signals that this plan was freshly proposed by the model and already saved as a bot response message in chat history. - if (!string.IsNullOrEmpty(deserializedPlan.GeneratedPlanMessageId)) - { - await this.UpdateChatMessageContentAsync(planJson, deserializedPlan.GeneratedPlanMessageId, chatId, cancellationToken); - } - - // If plan was derived from a previous plan, create a new bot message with the plan content and save to chat history. - if (deserializedPlan.State == PlanState.Derived) - { - await this.SaveNewResponseAsync( - planJson, - deserializedPlan.Plan.Description, - chatId, - userId, - cancellationToken - ); - } - - CopilotChatMessage chatMessage; - if (deserializedPlan.State == PlanState.Rejected) - { - // Use a hardcoded response if user cancelled plan - await this.UpdateBotResponseStatusOnClientAsync(chatId, "Cancelling plan", cancellationToken); - chatMessage = await this.SaveNewResponseAsync( - "I am sorry the plan did not meet your goals.", - string.Empty, - chatId, - userId, - cancellationToken, - TokenUtils.EmptyTokenUsages() - ); - } - else if (deserializedPlan.State == PlanState.Approved || deserializedPlan.State == PlanState.Derived) - { - // Render system instruction components and create the meta-prompt template - var systemInstructions = await AsyncUtils.SafeInvokeAsync( - () => this.RenderSystemInstructions(chatId, chatContext, cancellationToken), nameof(RenderSystemInstructions)); - var chatCompletion = this._kernel.GetService(); - var promptTemplate = chatCompletion.CreateNewChat(systemInstructions); - string chatHistoryString = ""; - - // Add original user input that prompted plan template - promptTemplate.AddUserMessage(deserializedPlan.OriginalUserInput); - chatHistoryString += "\n" + PromptUtils.FormatChatHistoryMessage(CopilotChatMessage.AuthorRoles.User, deserializedPlan.OriginalUserInput); - - // Add bot message proposal as prompt context message - chatContext.Variables.Set("planFunctions", this._externalInformationPlugin.FormattedFunctionsString(deserializedPlan.Plan)); - var promptTemplateFactory = new BasicPromptTemplateFactory(); - var proposedPlanTemplate = promptTemplateFactory.Create(this._promptOptions.ProposedPlanBotMessage, new PromptTemplateConfig()); - var proposedPlanBotMessage = await proposedPlanTemplate.RenderAsync(chatContext, cancellationToken); - promptTemplate.AddAssistantMessage(proposedPlanBotMessage); - chatHistoryString += "\n" + PromptUtils.FormatChatHistoryMessage(CopilotChatMessage.AuthorRoles.Bot, proposedPlanBotMessage); - - // Add user approval message as prompt context message - promptTemplate.AddUserMessage("Yes, proceed"); - chatHistoryString += "\n" + PromptUtils.FormatChatHistoryMessage(CopilotChatMessage.AuthorRoles.User, "Yes, proceed"); - - // Add user intent behind plan - // TODO: [Issue #51] Consider regenerating user intent if plan was modified - promptTemplate.AddSystemMessage(deserializedPlan.UserIntent); - - // Render system supplement to help guide model in using data. - var promptSupplementTemplate = promptTemplateFactory.Create(this._promptOptions.PlanResultsDescription, new PromptTemplateConfig()); - var promptSupplement = await promptSupplementTemplate.RenderAsync(chatContext, cancellationToken); - - // Calculate remaining token budget and execute plan - await this.UpdateBotResponseStatusOnClientAsync(chatId, "Executing plan", cancellationToken); - var remainingTokenBudget = this.GetChatContextTokenLimit(promptTemplate) - TokenUtils.GetContextMessageTokenCount(AuthorRole.System, promptSupplement); - - try - { - var planResult = await this.AcquireExternalInformationAsync(chatContext, deserializedPlan.UserIntent, remainingTokenBudget, cancellationToken, deserializedPlan.Plan); - promptTemplate.AddSystemMessage(planResult); - - // Calculate token usage of prompt template - chatContext.Variables.Set(TokenUtils.GetFunctionKey(this._logger, "SystemMetaPrompt")!, TokenUtils.GetContextMessagesTokenCount(promptTemplate).ToString(CultureInfo.CurrentCulture)); - - // TODO: [Issue #150, sk#2106] Accommodate different planner contexts once core team finishes work to return prompt and token usage. - var plannerDetails = new SemanticDependency(planResult, null, deserializedPlan.Type.ToString()); - - // Get bot response and stream to client - var promptView = new BotResponsePrompt(systemInstructions, "", deserializedPlan.UserIntent, "", plannerDetails, chatHistoryString, promptTemplate); - chatMessage = await this.HandleBotResponseAsync(chatId, userId, chatContext, promptView, cancellationToken); - - if (chatMessage.TokenUsage != null) - { - context.Variables.Set("tokenUsage", JsonSerializer.Serialize(chatMessage.TokenUsage)); - } - else - { - this._logger.LogWarning("ChatPlugin.ProcessPlan token usage unknown. Ensure token management has been implemented correctly."); - } - } - catch (Exception ex) - { - // Use a hardcoded response if plan failed. - // TODO: [Issue #150, sk#2106] Check planner token usage, if any, on failure - chatMessage = await this.SaveNewResponseAsync( - $"Oops, I encountered an issue processing your plan. Please review the plan logic and access permissions required for the plan, then try running it again from the Plans tab.\n\nError details: {ex.Message}", - string.Empty, - chatId, - userId, - cancellationToken, - TokenUtils.EmptyTokenUsages() - ); - - throw new SKException("Failed to process plan.", ex); - } - - context.Variables.Update(chatMessage.Content); - } - else - { - throw new ArgumentException($"Plan inactionable in current state: {deserializedPlan.State}"); - } - - return context; - } - /// /// Generate the necessary chat context to create a prompt then invoke the model to get a response. /// /// The chat ID /// The user ID - /// The SKContext. + /// The KernelArguments. /// ChatMessage object representing new user message. /// The cancellation token. /// The created chat message containing the model-generated response. - private async Task GetChatResponseAsync(string chatId, string userId, SKContext chatContext, CopilotChatMessage userMessage, CancellationToken cancellationToken) + private async Task GetChatResponseAsync(string chatId, string userId, KernelArguments chatContext, CopilotChatMessage userMessage, CancellationToken cancellationToken) { // Render system instruction components and create the meta-prompt template var systemInstructions = await AsyncUtils.SafeInvokeAsync( () => this.RenderSystemInstructions(chatId, chatContext, cancellationToken), nameof(RenderSystemInstructions)); - var chatCompletion = this._kernel.GetService(); - var promptTemplate = chatCompletion.CreateNewChat(systemInstructions); + ChatHistory metaPrompt = new(systemInstructions); // Bypass audience extraction if Auth is disabled var audience = string.Empty; @@ -535,143 +251,88 @@ private async Task GetChatResponseAsync(string chatId, strin await this.UpdateBotResponseStatusOnClientAsync(chatId, "Extracting audience", cancellationToken); audience = await AsyncUtils.SafeInvokeAsync( () => this.GetAudienceAsync(chatContext, cancellationToken), nameof(GetAudienceAsync)); - promptTemplate.AddSystemMessage(audience); + metaPrompt.AddSystemMessage(audience); } // Extract user intent from the conversation history. await this.UpdateBotResponseStatusOnClientAsync(chatId, "Extracting user intent", cancellationToken); var userIntent = await AsyncUtils.SafeInvokeAsync( () => this.GetUserIntentAsync(chatContext, cancellationToken), nameof(GetUserIntentAsync)); - promptTemplate.AddSystemMessage(userIntent); - - // Calculate the remaining token budget. - await this.UpdateBotResponseStatusOnClientAsync(chatId, "Calculating remaining token budget", cancellationToken); - var remainingTokenBudget = this.GetChatContextTokenLimit(promptTemplate, userMessage.ToFormattedString()); - - // Acquire external information from planner - await this.UpdateBotResponseStatusOnClientAsync(chatId, "Acquiring external information from planner", cancellationToken); - var externalInformationTokenLimit = (int)(remainingTokenBudget * this._promptOptions.ExternalInformationContextWeight); - var planResult = await AsyncUtils.SafeInvokeAsync( - () => this.AcquireExternalInformationAsync(chatContext, userIntent, externalInformationTokenLimit, cancellationToken: cancellationToken), nameof(AcquireExternalInformationAsync)); - - // Extract additional details about stepwise planner execution in chat context - var plannerDetails = new SemanticDependency( - this._externalInformationPlugin.StepwiseThoughtProcess?.RawResult ?? planResult, - this._externalInformationPlugin.StepwiseThoughtProcess - ); + metaPrompt.AddSystemMessage(userIntent); - // If plan is suggested, send back to user for approval before running - var proposedPlan = this._externalInformationPlugin.ProposedPlan; - if (proposedPlan != null) - { - // Save a new response to the chat history with the proposed plan content - return await this.SaveNewResponseAsync( - JsonSerializer.Serialize(proposedPlan), - proposedPlan.Plan.Description, - chatId, - userId, - cancellationToken, - // TODO: [Issue #2106] Accommodate plan token usage differently - this.GetTokenUsages(chatContext) - ); - } - - // If plan result is to be used as bot response, save the Stepwise result as a new response to the chat history and return. - if (this._externalInformationPlugin.UseStepwiseResultAsBotResponse(planResult)) - { - var promptDetails = new BotResponsePrompt("", "", userIntent, "", plannerDetails, "", new ChatHistory()); - return await this.HandleBotResponseAsync(chatId, userId, chatContext, promptDetails, cancellationToken, null, this._externalInformationPlugin.StepwiseThoughtProcess!.RawResult); - } + // Calculate max amount of tokens to use for memories + int maxRequestTokenBudget = this.GetMaxRequestTokenBudget(); + // Calculate tokens used so far: system instructions, audience extraction and user intent + int tokensUsed = TokenUtils.GetContextMessagesTokenCount(metaPrompt); + int chatMemoryTokenBudget = maxRequestTokenBudget + - tokensUsed + - TokenUtils.GetContextMessageTokenCount(AuthorRole.User, userMessage.ToFormattedString()); + chatMemoryTokenBudget = (int)(chatMemoryTokenBudget * this._promptOptions.MemoriesResponseContextWeight); // Query relevant semantic and document memories await this.UpdateBotResponseStatusOnClientAsync(chatId, "Extracting semantic and document memories", cancellationToken); - var chatMemoriesTokenLimit = (int)(remainingTokenBudget * this._promptOptions.MemoriesResponseContextWeight); - (var memoryText, var citationMap) = await this._semanticMemoryRetriever.QueryMemoriesAsync(userIntent, chatId, chatMemoriesTokenLimit); - + (var memoryText, var citationMap) = await this._semanticMemoryRetriever.QueryMemoriesAsync(userIntent, chatId, chatMemoryTokenBudget); if (!string.IsNullOrWhiteSpace(memoryText)) { - promptTemplate.AddSystemMessage(memoryText); + metaPrompt.AddSystemMessage(memoryText); + tokensUsed += TokenUtils.GetContextMessageTokenCount(AuthorRole.System, memoryText); } - // Fill in the chat history with remaining token budget. - string chatHistory = string.Empty; - var chatHistoryTokenBudget = remainingTokenBudget - TokenUtils.GetContextMessageTokenCount(AuthorRole.System, memoryText) - TokenUtils.GetContextMessageTokenCount(AuthorRole.System, planResult); - - // Append previous messages + // Add as many chat history messages to meta-prompt as the token budget will allow await this.UpdateBotResponseStatusOnClientAsync(chatId, "Extracting chat history", cancellationToken); - chatHistory = await this.GetAllowedChatHistoryAsync(chatId, chatHistoryTokenBudget, promptTemplate, cancellationToken); - - // Append the plan result last, if exists, to imply precedence. - if (!string.IsNullOrWhiteSpace(planResult)) - { - promptTemplate.AddSystemMessage(planResult); - } + string allowedChatHistory = await this.GetAllowedChatHistoryAsync(chatId, maxRequestTokenBudget - tokensUsed, metaPrompt, cancellationToken); - // Calculate token usage of prompt template - chatContext.Variables.Set(TokenUtils.GetFunctionKey(this._logger, "SystemMetaPrompt")!, TokenUtils.GetContextMessagesTokenCount(promptTemplate).ToString(CultureInfo.CurrentCulture)); + // Store token usage of prompt template + chatContext[TokenUtils.GetFunctionKey("SystemMetaPrompt")] = TokenUtils.GetContextMessagesTokenCount(metaPrompt).ToString(CultureInfo.CurrentCulture); // Stream the response to the client - var promptView = new BotResponsePrompt(systemInstructions, audience, userIntent, memoryText, plannerDetails, chatHistory, promptTemplate); - return await this.HandleBotResponseAsync(chatId, userId, chatContext, promptView, cancellationToken, citationMap.Values.AsEnumerable()); + var promptView = new BotResponsePrompt(systemInstructions, audience, userIntent, memoryText, allowedChatHistory, metaPrompt); + + return await this.HandleBotResponseAsync(chatId, userId, chatContext, promptView, citationMap.Values.AsEnumerable(), cancellationToken); } /// /// Helper function to render system instruction components. /// /// The chat ID - /// The SKContext. + /// The KernelArguments. /// The cancellation token. - private async Task RenderSystemInstructions(string chatId, SKContext context, CancellationToken cancellationToken) + private async Task RenderSystemInstructions(string chatId, KernelArguments context, CancellationToken cancellationToken) { // Render system instruction components await this.UpdateBotResponseStatusOnClientAsync(chatId, "Initializing prompt", cancellationToken); - var promptTemplateFactory = new BasicPromptTemplateFactory(); - var template = promptTemplateFactory.Create(this._promptOptions.SystemPersona, new PromptTemplateConfig()); - - return await template.RenderAsync(context, cancellationToken); + var promptTemplateFactory = new KernelPromptTemplateFactory(); + var promptTemplate = promptTemplateFactory.Create(new PromptTemplateConfig(this._promptOptions.SystemPersona)); + return await promptTemplate.RenderAsync(this._kernel, context, cancellationToken); } /// - /// Helper function to handle final steps of bot response generation, including streaming to client, generating semantic text memory, calculating final token usages, and saving to chat history. + /// Helper function to handle final steps of bot response generation, including streaming to client, + /// generating semantic text memory, calculating final token usages, and saving to chat history. /// /// The chat ID /// The user ID /// Chat context. /// The prompt view. + /// Citation sources. /// The cancellation token. private async Task HandleBotResponseAsync( string chatId, string userId, - SKContext chatContext, + KernelArguments chatContext, BotResponsePrompt promptView, - CancellationToken cancellationToken, - IEnumerable? citations = null, - string? responseContent = null) + IEnumerable? citations, + CancellationToken cancellationToken) { - CopilotChatMessage chatMessage; - if (responseContent.IsNullOrEmpty()) - { - // Get bot response and stream to client - await this.UpdateBotResponseStatusOnClientAsync(chatId, "Generating bot response", cancellationToken); - chatMessage = await AsyncUtils.SafeInvokeAsync( - () => this.StreamResponseToClientAsync(chatId, userId, promptView, cancellationToken, citations), nameof(StreamResponseToClientAsync)); - } - else - { - chatMessage = await this.CreateBotMessageOnClient( - chatId, - userId, - JsonSerializer.Serialize(promptView), - responseContent!, - cancellationToken, - citations - ); - } + // Get bot response and stream to client + await this.UpdateBotResponseStatusOnClientAsync(chatId, "Generating bot response", cancellationToken); + CopilotChatMessage chatMessage = await AsyncUtils.SafeInvokeAsync( + () => this.StreamResponseToClientAsync(chatId, userId, promptView, cancellationToken, citations), nameof(StreamResponseToClientAsync)); // Save the message into chat history await this.UpdateBotResponseStatusOnClientAsync(chatId, "Saving message to chat history", cancellationToken); - await this._chatMessageRepository.UpsertAsync(chatMessage!); + await this._chatMessageRepository.UpsertAsync(chatMessage); // Extract semantic chat memory await this.UpdateBotResponseStatusOnClientAsync(chatId, "Generating semantic chat memory", cancellationToken); @@ -686,8 +347,8 @@ await AsyncUtils.SafeInvokeAsync( cancellationToken), nameof(SemanticChatMemoryExtractor.ExtractSemanticChatMemoryAsync)); // Calculate total token usage for dependency functions and prompt template - await this.UpdateBotResponseStatusOnClientAsync(chatId, "Calculating token usage", cancellationToken); - chatMessage!.TokenUsage = this.GetTokenUsages(chatContext, chatMessage.Content); + await this.UpdateBotResponseStatusOnClientAsync(chatId, "Saving token usage", cancellationToken); + chatMessage.TokenUsage = this.GetTokenUsages(chatContext, chatMessage.Content); // Update the message on client and in chat history with final completion token usage await this.UpdateMessageOnClient(chatMessage, cancellationToken); @@ -697,60 +358,93 @@ await AsyncUtils.SafeInvokeAsync( } /// - /// Helper function that creates the correct context variables to - /// extract the audience from a conversation history. + /// Extract the list of participants from the conversation history. + /// Note that only those who have spoken will be included. /// + /// Kernel context variables. /// The cancellation token. - private async Task GetAudienceAsync(SKContext context, CancellationToken cancellationToken) + private async Task GetAudienceAsync(KernelArguments context, CancellationToken cancellationToken) { - SKContext audienceContext = context.Clone(); - var audience = await this.ExtractAudienceAsync(audienceContext, cancellationToken); + // Clone the context to avoid modifying the original context variables + KernelArguments audienceContext = new(context); + int historyTokenBudget = + this._promptOptions.CompletionTokenLimit - + this._promptOptions.ResponseTokenLimit - + TokenUtils.TokenCount(string.Join("\n\n", new string[] + { + this._promptOptions.SystemAudience, + this._promptOptions.SystemAudienceContinuation, + }) + ); - // Copy token usage into original chat context - var functionKey = TokenUtils.GetFunctionKey(this._logger, "SystemAudienceExtraction")!; - if (audienceContext.Variables.TryGetValue(functionKey, out string? tokenUsage)) + audienceContext["tokenLimit"] = historyTokenBudget.ToString(new NumberFormatInfo()); + + var completionFunction = this._kernel.CreateFunctionFromPrompt( + this._promptOptions.SystemAudienceExtraction, + this.CreateIntentCompletionSettings(), + functionName: "SystemAudienceExtraction", + description: "Extract audience"); + + var result = await completionFunction.InvokeAsync(this._kernel, audienceContext, cancellationToken); + + // Get token usage from ChatCompletion result and add to original context + string? tokenUsage = TokenUtils.GetFunctionTokenUsage(result, this._logger); + if (tokenUsage is not null) + { + context[TokenUtils.GetFunctionKey("SystemAudienceExtraction")] = tokenUsage; + } + else { - context.Variables.Set(functionKey, tokenUsage); + this._logger.LogError("Unable to determine token usage for audienceExtraction"); } - return audience; + return $"List of participants: {result}"; } /// - /// Helper function that creates the correct context variables to - /// extract the user intent from the conversation history. + /// Extract user intent from the conversation history. /// + /// Kernel context. /// The cancellation token. - private async Task GetUserIntentAsync(SKContext context, CancellationToken cancellationToken) + private async Task GetUserIntentAsync(KernelArguments context, CancellationToken cancellationToken) { - SKContext intentContext = context.Clone(); - string userIntent = await this.ExtractUserIntentAsync(intentContext, cancellationToken); + // Clone the context to avoid modifying the original context variables + KernelArguments intentContext = new(context); + + int tokenBudget = + this._promptOptions.CompletionTokenLimit - + this._promptOptions.ResponseTokenLimit - + TokenUtils.TokenCount(string.Join("\n", new string[] + { + this._promptOptions.SystemPersona, + this._promptOptions.SystemIntent, + this._promptOptions.SystemIntentContinuation + }) + ); + + intentContext["tokenLimit"] = tokenBudget.ToString(new NumberFormatInfo()); + intentContext["knowledgeCutoff"] = this._promptOptions.KnowledgeCutoffDate; + + var completionFunction = this._kernel.CreateFunctionFromPrompt( + this._promptOptions.SystemIntentExtraction, + this.CreateIntentCompletionSettings(), + functionName: "UserIntentExtraction", + description: "Extract user intent"); + + var result = await completionFunction.InvokeAsync(this._kernel, intentContext, cancellationToken); - // Copy token usage into original chat context - var functionKey = TokenUtils.GetFunctionKey(this._logger, "SystemIntentExtraction")!; - if (intentContext.Variables.TryGetValue(functionKey!, out string? tokenUsage)) + // Get token usage from ChatCompletion result and add to original context + string? tokenUsage = TokenUtils.GetFunctionTokenUsage(result, this._logger); + if (tokenUsage is not null) { - context.Variables.Set(functionKey!, tokenUsage); + context[TokenUtils.GetFunctionKey("SystemIntentExtraction")] = tokenUsage; + } + else + { + this._logger.LogError("Unable to determine token usage for userIntentExtraction"); } - return userIntent; - } - - /// - /// Helper function that creates the correct context variables to acquire external information. - /// - /// The plan. - /// The SKContext. - /// The user intent. - /// Maximum number of tokens. - /// The cancellation token. - private async Task AcquireExternalInformationAsync(SKContext context, string userIntent, int tokenLimit, CancellationToken cancellationToken, Plan? plan = null) - { - SKContext planContext = context.Clone(); - planContext.Variables.Set("tokenLimit", tokenLimit.ToString(new NumberFormatInfo())); - return plan is not null - ? await this._externalInformationPlugin.ExecutePlanAsync(planContext, plan, cancellationToken) - : await this._externalInformationPlugin.InvokePlannerAsync(userIntent, planContext, cancellationToken); + return $"User intent: {result}"; } /// @@ -849,26 +543,27 @@ private async Task UpdateChatMessageContentAsync(string updatedResponse, string } /// - /// Create `OpenAIRequestSettings` for chat response. Parameters are read from the PromptSettings class. + /// Create `OpenAIPromptExecutionSettings` for chat response. Parameters are read from the PromptSettings class. /// - private OpenAIRequestSettings CreateChatRequestSettings() + private OpenAIPromptExecutionSettings CreateChatRequestSettings() { - return new OpenAIRequestSettings + return new OpenAIPromptExecutionSettings { MaxTokens = this._promptOptions.ResponseTokenLimit, Temperature = this._promptOptions.ResponseTemperature, TopP = this._promptOptions.ResponseTopP, FrequencyPenalty = this._promptOptions.ResponseFrequencyPenalty, - PresencePenalty = this._promptOptions.ResponsePresencePenalty + PresencePenalty = this._promptOptions.ResponsePresencePenalty, + ToolCallBehavior = ToolCallBehavior.AutoInvokeKernelFunctions }; } /// - /// Create `OpenAIRequestSettings` for intent response. Parameters are read from the PromptSettings class. + /// Create `OpenAIPromptExecutionSettings` for intent response. Parameters are read from the PromptSettings class. /// - private OpenAIRequestSettings CreateIntentCompletionSettings() + private OpenAIPromptExecutionSettings CreateIntentCompletionSettings() { - return new OpenAIRequestSettings + return new OpenAIPromptExecutionSettings { MaxTokens = this._promptOptions.ResponseTokenLimit, Temperature = this._promptOptions.IntentTemperature, @@ -880,36 +575,39 @@ private OpenAIRequestSettings CreateIntentCompletionSettings() } /// - /// Calculate the remaining token budget for the chat response prompt. - /// This is the token limit minus the token count of the user intent, audience, and the system commands. + /// Calculate the maximum number of tokens that can be sent in a request /// - /// All current messages to use for chat completion - /// The user message. - /// The remaining token limit. - private int GetChatContextTokenLimit(ChatCompletionContextMessages promptTemplate, string userInput = "") + private int GetMaxRequestTokenBudget() { - return this._promptOptions.CompletionTokenLimit - - TokenUtils.GetContextMessagesTokenCount(promptTemplate) - - TokenUtils.GetContextMessageTokenCount(AuthorRole.User, userInput) // User message has to be included in chat history allowance - - this._promptOptions.ResponseTokenLimit; + // OpenAI inserts a message under the hood: + // "content": "Assistant is a large language model.","role": "system" + // This burns just under 20 tokens which need to be accounted for. + const int ExtraOpenAiMessageTokens = 20; + + return this._promptOptions.CompletionTokenLimit // Total token limit + - ExtraOpenAiMessageTokens + - this._promptOptions.ResponseTokenLimit; // Token count reserved for model to generate a response } /// /// Gets token usage totals for each semantic function if not undefined. /// - /// Context maintained during response generation. + /// Context maintained during response generation. /// String representing bot response. If null, response is still being generated or was hardcoded. /// Dictionary containing function to token usage mapping for each total that's defined. - private Dictionary GetTokenUsages(SKContext chatContext, string? content = null) + private Dictionary GetTokenUsages(KernelArguments kernelArguments, string? content = null) { var tokenUsageDict = new Dictionary(StringComparer.OrdinalIgnoreCase); // Total token usage of each semantic function foreach (string function in TokenUtils.semanticFunctions.Values) { - if (chatContext.Variables.TryGetValue($"{function}TokenUsage", out string? tokenUsage)) + if (kernelArguments.TryGetValue($"{function}TokenUsage", out object? tokenUsage)) { - tokenUsageDict.Add(function, int.Parse(tokenUsage, CultureInfo.InvariantCulture)); + if (tokenUsage is string tokenUsageString) + { + tokenUsageDict.Add(function, int.Parse(tokenUsageString, CultureInfo.InvariantCulture)); + } } } @@ -938,11 +636,12 @@ private async Task StreamResponseToClientAsync( IEnumerable? citations = null) { // Create the stream - var chatCompletion = this._kernel.GetService(); + var chatCompletion = this._kernel.GetRequiredService(); var stream = - chatCompletion.GenerateMessageStreamAsync( + chatCompletion.GetStreamingChatMessageContentsAsync( prompt.MetaPromptTemplate, this.CreateChatRequestSettings(), + this._kernel, cancellationToken); // Create message on client @@ -956,7 +655,7 @@ private async Task StreamResponseToClientAsync( ); // Stream the message to the client - await foreach (string contentPiece in stream) + await foreach (var contentPiece in stream) { chatMessage.Content += contentPiece; await this.UpdateMessageOnClient(chatMessage, cancellationToken); diff --git a/webapi/Plugins/Chat/CopilotChatPlanner.cs b/webapi/Plugins/Chat/CopilotChatPlanner.cs deleted file mode 100644 index f88783c3d..000000000 --- a/webapi/Plugins/Chat/CopilotChatPlanner.cs +++ /dev/null @@ -1,231 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text.RegularExpressions; -using System.Threading; -using System.Threading.Tasks; -using CopilotChat.WebApi.Models.Response; -using CopilotChat.WebApi.Options; -using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Tokens; -using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.Diagnostics; -using Microsoft.SemanticKernel.Orchestration; -using Microsoft.SemanticKernel.Planners; -using Microsoft.SemanticKernel.Planning; - -namespace CopilotChat.WebApi.Plugins.Chat; - -/// -/// A lightweight wrapper around a planner to allow for curating which functions are available to it. -/// -public class CopilotChatPlanner -{ - /// - /// High level logger. - /// - private readonly ILogger _logger; - - /// - /// The planner's kernel. - /// - public IKernel Kernel { get; } - - /// - /// Options for the planner. - /// - private readonly PlannerOptions? _plannerOptions; - - /// - /// Gets the pptions for the planner. - /// - public PlannerOptions? PlannerOptions => this._plannerOptions; - - /// - /// Flag to indicate that a variable is unknown and needs to be filled in by the user. - /// This is used to flag any inputs that had dependencies from removed steps. - /// - private const string UnknownVariableFlag = "$???"; - - /// - /// Regex to match variable names from plan parameters. - /// Valid variable names can contain letters, numbers, underscores, and dashes but can't start with a number. - /// Matches: $variableName, $variable_name, $variable-name, $some_variable_Name, $variableName123, $variableName_123, $variableName-123 - /// Does not match: $123variableName, $100 $200 - /// - private const string VariableRegex = @"\$([A-Za-z]+[_-]*[\w]+)"; - - /// - /// Supplemental text to add to the plan goal if PlannerOptions.Type is set to Stepwise. - /// Helps the planner know when to bail out to request additional user input. - /// - private const string StepwisePlannerSupplement = "If you need more information to fulfill this request, return with a request for additional user input."; - - /// - /// Initializes a new instance of the class. - /// - /// The planner's kernel. - public CopilotChatPlanner(IKernel plannerKernel, PlannerOptions? plannerOptions, ILogger logger) - { - this.Kernel = plannerKernel; - this._plannerOptions = plannerOptions; - this._logger = logger; - } - - /// - /// Create a plan for a goal. - /// - /// The goal to create a plan for. - /// Logger from context. - /// The cancellation token. - /// The plan. - public async Task CreatePlanAsync(string goal, ILogger logger, CancellationToken cancellationToken = default) - { - var plannerFunctionsView = this.Kernel.Functions.GetFunctionViews(); - if (plannerFunctionsView.IsNullOrEmpty()) - { - // No functions are available - return an empty plan. - return new Plan(goal); - } - - Plan plan; - - try - { - switch (this._plannerOptions?.Type) - { - case PlanType.Sequential: - plan = await new SequentialPlanner( - this.Kernel, - new SequentialPlannerConfig - { - SemanticMemoryConfig = - { - RelevancyThreshold = this._plannerOptions?.RelevancyThreshold, - }, - // Allow plan to be created with missing functions - AllowMissingFunctions = this._plannerOptions?.ErrorHandling.AllowMissingFunctions ?? false - } - ).CreatePlanAsync(goal, cancellationToken); - break; - default: - plan = await new ActionPlanner(this.Kernel).CreatePlanAsync(goal, cancellationToken); - break; - } - } - catch (SKException) - { - // No relevant functions are available - return an empty plan. - return new Plan(goal); - } - - return this._plannerOptions!.ErrorHandling.AllowMissingFunctions ? this.SanitizePlan(plan, plannerFunctionsView, logger) : plan; - } - - /// - /// Run the stepwise planner. - /// - /// The goal containing user intent and ask context. - /// The context to run the plan in. - /// The cancellation token. - public async Task RunStepwisePlannerAsync(string goal, SKContext context, CancellationToken cancellationToken = default) - { - var config = new StepwisePlannerConfig() - { - MaxTokens = this._plannerOptions?.StepwisePlannerConfig.MaxTokens ?? 2048, - MaxIterations = this._plannerOptions?.StepwisePlannerConfig.MaxIterations ?? 15, - MinIterationTimeMs = this._plannerOptions?.StepwisePlannerConfig.MinIterationTimeMs ?? 1500 - }; - - var sw = Stopwatch.StartNew(); - - try - { - var plan = new StepwisePlanner( - this.Kernel, - config - ).CreatePlan(string.Join("\n", goal, StepwisePlannerSupplement)); - var result = await plan.InvokeAsync(context, cancellationToken: cancellationToken); - - sw.Stop(); - context.Variables.Set("timeTaken", sw.Elapsed.ToString()); - return result; - } - catch (Exception e) - { - this._logger.LogError(e, "Error running stepwise planner"); - throw; - } - } - - /// - /// Scrubs plan of functions not available in planner's kernel - /// and flags any effected input dependencies with '$???' to prompt for user input. - /// Proposed plan object to sanitize. - /// The functions available in the planner's kernel. - /// Logger from context. - /// - private Plan SanitizePlan(Plan plan, IEnumerable availableFunctions, ILogger logger) - { // TODO: [Issue #2256] Re-evaluate this logic once we have a better understanding of how to handle missing functions - List sanitizedSteps = new(); - List availableOutputs = new(); - List unavailableOutputs = new(); - - foreach (var step in plan.Steps) - { - // Check if function exists in planner's kernel - if (this.Kernel.Functions.TryGetFunction(step.PluginName, step.Name, out var function)) - { - availableOutputs.AddRange(step.Outputs); - - // Regex to match variable names - Regex variableRegEx = new(VariableRegex, RegexOptions.Singleline); - - // Check for any inputs that may have dependencies from removed steps - foreach (var input in step.Parameters) - { - // Check if input contains a variable - Match inputVariableMatch = variableRegEx.Match(input.Value); - if (inputVariableMatch.Success) - { - foreach (Capture match in inputVariableMatch.Groups[1].Captures) - { - var inputVariableValue = match.Value; - if (!availableOutputs.Any(output => string.Equals(output, inputVariableValue, StringComparison.OrdinalIgnoreCase))) - { - var overrideValue = - // Use previous step's output if no direct dependency on unavailable functions' outputs - // Else use designated constant for unknowns to prompt for user input - string.Equals("INPUT", input.Key, StringComparison.OrdinalIgnoreCase) - && inputVariableMatch.Groups[1].Captures.Count == 1 - && !unavailableOutputs.Any(output => string.Equals(output, inputVariableValue, StringComparison.OrdinalIgnoreCase)) - ? "$PLAN.RESULT" // TODO: [Issue #2256] Extract constants from Plan class, requires change on kernel team - : UnknownVariableFlag; - step.Parameters.Set(input.Key, Regex.Replace(input.Value, variableRegEx.ToString(), overrideValue)); - } - } - } - } - sanitizedSteps.Add(step); - } - else - { - logger.LogWarning("Function {0} not found in planner's kernel. Removing step from plan.", step.Description); - unavailableOutputs.AddRange(step.Outputs); - } - } - - Plan sanitizedPlan = new(plan.Description, sanitizedSteps.ToArray()); - - // Merge any parameters back into new plan object - foreach (var parameter in plan.Parameters) - { - sanitizedPlan.Parameters[parameter.Key] = parameter.Value; - } - - return sanitizedPlan; - } -} diff --git a/webapi/Plugins/Chat/ExternalInformationPlugin.cs b/webapi/Plugins/Chat/ExternalInformationPlugin.cs deleted file mode 100644 index b76e0936b..000000000 --- a/webapi/Plugins/Chat/ExternalInformationPlugin.cs +++ /dev/null @@ -1,487 +0,0 @@ -// Copyright (c) Microsoft. All rights reserved. - -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text.Json; -using System.Text.Json.Nodes; -using System.Text.RegularExpressions; -using System.Threading; -using System.Threading.Tasks; -using CopilotChat.WebApi.Models.Response; -using CopilotChat.WebApi.Options; -using CopilotChat.WebApi.Plugins.OpenApi.GitHubPlugin.Model; -using CopilotChat.WebApi.Plugins.OpenApi.JiraPlugin.Model; -using CopilotChat.WebApi.Plugins.Utils; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Microsoft.IdentityModel.Tokens; -using Microsoft.SemanticKernel.Orchestration; -using Microsoft.SemanticKernel.Planners; -using Microsoft.SemanticKernel.Planning; -using Microsoft.SemanticKernel.TemplateEngine; -using Microsoft.SemanticKernel.TemplateEngine.Basic; - -namespace CopilotChat.WebApi.Plugins.Chat; - -/// -/// This plugin provides the functions to acquire external information. -/// -public class ExternalInformationPlugin -{ - /// - /// High level logger. - /// - private readonly ILogger _logger; - - /// - /// Prompt settings. - /// - private readonly PromptsOptions _promptOptions; - - /// - /// Chat Copilot's planner to gather additional information for the chat context. - /// - private readonly CopilotChatPlanner _planner; - - /// - /// Options for the planner. - /// - public PlannerOptions? PlannerOptions { get; } - - /// - /// Proposed plan to return for approval. - /// - public ProposedPlan? ProposedPlan { get; private set; } - - /// - /// Stepwise thought process to return for view. - /// - public PlanExecutionMetadata? StepwiseThoughtProcess { get; private set; } - - /// - /// Header to indicate plan results. - /// - private const string ResultHeader = "RESULT: "; - - /// - /// Create a new instance of ExternalInformationPlugin. - /// - public ExternalInformationPlugin( - IOptions promptOptions, - CopilotChatPlanner planner, - ILogger logger) - { - this._promptOptions = promptOptions.Value; - this._planner = planner; - this.PlannerOptions = planner.PlannerOptions; - this._logger = logger; - } - - public string FormattedFunctionsString(Plan plan) { return string.Join("; ", this.GetPlanSteps(plan)); } - - /// - /// Invoke planner to generate a new plan or extract relevant additional knowledge. - /// - public async Task InvokePlannerAsync( - string userIntent, - SKContext context, - CancellationToken cancellationToken = default) - { - // TODO: [Issue #2106] Calculate planner and plan token usage - var functions = this._planner.Kernel.Functions.GetFunctionViews(); - if (functions.IsNullOrEmpty()) - { - return string.Empty; - } - - var contextString = this.GetChatContextString(context); - var goal = $"Given the following context, accomplish the user intent.\nContext:\n{contextString}\n{userIntent}"; - - // Run stepwise planner if PlannerOptions.Type == Stepwise - if (this._planner.PlannerOptions?.Type == PlanType.Stepwise) - { - return await this.RunStepwisePlannerAsync(goal, context, cancellationToken); - } - - // Create a plan and set it in context for approval. - Plan? plan = null; - var plannerOptions = this._planner.PlannerOptions ?? new PlannerOptions(); // Use default planner options if planner options are null. - int retriesAvail = plannerOptions.ErrorHandling.AllowRetries - ? plannerOptions.ErrorHandling.MaxRetriesAllowed : 0; - - do - { // TODO: [Issue #2256] Remove InvalidPlan retry logic once Core team stabilizes planner - try - { - plan = await this._planner.CreatePlanAsync(goal, this._logger, cancellationToken); - } - catch (Exception e) - { - if (--retriesAvail >= 0) - { - this._logger.LogWarning("Retrying CreatePlan on error: {0}", e.Message); - continue; - } - throw; - } - } while (plan == null); - - if (plan.Steps.Count > 0) - { - // Merge any variables from ask context into plan parameters as these will be used on plan execution. - // These context variables come from user input, so they are prioritized. - if (plannerOptions.Type == PlanType.Action) - { - // Parameters stored in plan's top level state - this.MergeContextIntoPlan(context.Variables, plan.Parameters); - } - else - { - foreach (var step in plan.Steps) - { - this.MergeContextIntoPlan(context.Variables, step.Parameters); - } - } - - this.ProposedPlan = new ProposedPlan(plan, plannerOptions.Type, PlanState.NoOp, userIntent, context.Variables.Input); - } - - return string.Empty; - } - - public async Task ExecutePlanAsync( - SKContext context, - Plan plan, - CancellationToken cancellationToken = default) - { - // Reload the plan with the planner's kernel so it has full context to be executed - var newPlanContext = this._planner.Kernel.CreateNewContext(context.Variables, this._planner.Kernel.Functions, this._planner.Kernel.LoggerFactory); - string planJson = JsonSerializer.Serialize(plan); - plan = Plan.FromJson(planJson, this._planner.Kernel.Functions); - - // Invoke plan - var functionResult = await plan.InvokeAsync(newPlanContext, null, cancellationToken); - var functionsUsed = $"FUNCTIONS USED: {this.FormattedFunctionsString(plan)}"; - - // TODO: #2581 Account for planner system instructions - int tokenLimit = int.Parse(context.Variables["tokenLimit"], new NumberFormatInfo()) - - TokenUtils.TokenCount(functionsUsed) - - TokenUtils.TokenCount(ResultHeader); - - // The result of the plan may be from an OpenAPI plugin. Attempt to extract JSON from the response. - bool extractJsonFromOpenApi = - this.TryExtractJsonFromOpenApiPlanResult(newPlanContext, newPlanContext.Result, out string planResult); - if (extractJsonFromOpenApi) - { - planResult = this.OptimizeOpenApiPluginJson(planResult, tokenLimit, plan); - } - else - { - // If not, use result of plan execution directly. - planResult = newPlanContext.Variables.Input; - } - - return $"{functionsUsed}\n{ResultHeader}{planResult.Trim()}"; - } - - /// - /// Determines whether to use the stepwise planner result as the bot response, thereby bypassing meta prompt generation and completion. - /// - /// The result obtained from the stepwise planner. - /// - /// True if the stepwise planner result should be used as the bot response, - /// false otherwise. - /// - /// - /// This method checks the following conditions: - /// 1. The plan result is not null, empty, or whitespace. - /// 2. The planner options are specified, and the plan type is set to Stepwise. - /// 3. The UseStepwiseResultAsBotResponse option is enabled. - /// 4. The StepwiseThoughtProcess is not null. - /// - public bool UseStepwiseResultAsBotResponse(string planResult) - { - return !string.IsNullOrWhiteSpace(planResult) - && this.PlannerOptions?.Type == PlanType.Stepwise - && this.PlannerOptions.UseStepwiseResultAsBotResponse - && this.StepwiseThoughtProcess != null; - } - - /// - /// Executes the stepwise planner with a given goal and context, and returns the result along with descriptive text. - /// Also sets any metadata associated with stepwise planner execution. - /// - /// The goal to be achieved by the stepwise planner. - /// The SKContext containing the necessary information for the planner. - /// A CancellationToken to observe while waiting for the task to complete. - /// - /// A formatted string containing the result of the stepwise planner and a supplementary message to guide the model in using the result. - /// - private async Task RunStepwisePlannerAsync(string goal, SKContext context, CancellationToken cancellationToken) - { - var plannerContext = context.Clone(); - var functionResult = await this._planner.RunStepwisePlannerAsync(goal, context, cancellationToken); - - // Populate the execution metadata. - var plannerResult = functionResult.GetValue()?.Trim() ?? string.Empty; - this.StepwiseThoughtProcess = new PlanExecutionMetadata( - plannerContext.Variables["stepsTaken"], - plannerContext.Variables["timeTaken"], - plannerContext.Variables["pluginCount"], - plannerResult); - - // Return empty string if result was not found so it's omitted from the meta prompt. - if (plannerResult.Contains("Result not found, review 'stepsTaken' to see what happened.", StringComparison.OrdinalIgnoreCase)) - { - return string.Empty; - } - - // Parse the steps taken to determine which functions were used. - if (plannerContext.Variables.TryGetValue("stepsTaken", out var stepsTaken)) - { - var steps = JsonSerializer.Deserialize>(stepsTaken); - var functionsUsed = new HashSet(); - steps?.ForEach(step => - { - if (!step.Action.IsNullOrEmpty()) { functionsUsed.Add(step.Action); } - }); - - var planFunctions = string.Join(", ", functionsUsed); - plannerContext.Variables.Set("planFunctions", functionsUsed.Count > 0 ? planFunctions : "N/A"); - } - - // Render the supplement to guide the model in using the result. - var promptTemplateFactory = new BasicPromptTemplateFactory(); - var promptTemplate = promptTemplateFactory.Create(this._promptOptions.StepwisePlannerSupplement, new PromptTemplateConfig()); - var resultSupplement = await promptTemplate.RenderAsync(plannerContext, cancellationToken); - - return $"{resultSupplement}\n\nResult:\n\"{plannerResult}\""; - } - - /// - /// Merge any variables from context into plan parameters. - /// - private void MergeContextIntoPlan(ContextVariables variables, ContextVariables planParams) - { - foreach (var param in planParams) - { - if (param.Key.Equals("INPUT", StringComparison.OrdinalIgnoreCase)) - { - continue; - } - - if (variables.TryGetValue(param.Key, out string? value)) - { - planParams.Set(param.Key, value); - } - } - } - - /// - /// Try to extract json from the planner response as if it were from an OpenAPI plugin. - /// - private bool TryExtractJsonFromOpenApiPlanResult(SKContext context, string openApiPluginResponse, out string json) - { - try - { - JsonNode? jsonNode = JsonNode.Parse(openApiPluginResponse); - string contentType = jsonNode?["contentType"]?.ToString() ?? string.Empty; - if (contentType.StartsWith("application/json", StringComparison.InvariantCultureIgnoreCase)) - { - var content = jsonNode?["content"]?.ToString() ?? string.Empty; - if (!string.IsNullOrWhiteSpace(content)) - { - json = content; - return true; - } - } - } - catch (JsonException) - { - this._logger.LogDebug("Unable to extract JSON from planner response, it is likely not from an OpenAPI plugin."); - } - catch (InvalidOperationException) - { - this._logger.LogDebug("Unable to extract JSON from planner response, it may already be proper JSON."); - } - - json = string.Empty; - - return false; - } - - /// - /// Try to optimize json from the planner response - /// based on token limit - /// - private string OptimizeOpenApiPluginJson(string jsonContent, int tokenLimit, Plan plan) - { - // Remove all new line characters + leading and trailing white space - jsonContent = Regex.Replace(jsonContent.Trim(), @"[\n\r]", string.Empty); - var document = JsonDocument.Parse(jsonContent); - string lastPluginInvoked = plan.Steps[^1].PluginName; - string lastFunctionInvoked = plan.Steps[^1].Name; - bool trimResponse = false; - - // The json will be deserialized based on the response type of the particular operation that was last invoked by the planner - // The response type can be a custom trimmed down json structure, which is useful in staying within the token limit - Type responseType = this.GetOpenApiFunctionResponseType(ref document, ref lastPluginInvoked, ref lastFunctionInvoked, ref trimResponse); - - if (trimResponse) - { - // Deserializing limits the json content to only the fields defined in the respective OpenApi's Model classes - var functionResponse = JsonSerializer.Deserialize(jsonContent, responseType); - jsonContent = functionResponse != null ? JsonSerializer.Serialize(functionResponse) : string.Empty; - document = JsonDocument.Parse(jsonContent); - } - - int jsonContentTokenCount = TokenUtils.TokenCount(jsonContent); - - // Return the JSON content if it does not exceed the token limit - if (jsonContentTokenCount < tokenLimit) - { - return jsonContent; - } - - List itemList = new(); - - // Some APIs will return a JSON response with one property key representing an embedded answer. - // Extract this value for further processing - string resultsDescriptor = string.Empty; - - if (document.RootElement.ValueKind == JsonValueKind.Object) - { - int propertyCount = 0; - foreach (JsonProperty property in document.RootElement.EnumerateObject()) - { - propertyCount++; - } - - if (propertyCount == 1) - { - // Save property name for result interpolation - JsonProperty firstProperty = document.RootElement.EnumerateObject().First(); - tokenLimit -= TokenUtils.TokenCount(firstProperty.Name); - resultsDescriptor = string.Format(CultureInfo.InvariantCulture, "{0}: ", firstProperty.Name); - - // Extract object to be truncated - JsonElement value = firstProperty.Value; - document = JsonDocument.Parse(value.GetRawText()); - } - } - - // Detail Object - // To stay within token limits, attempt to truncate the list of properties - if (document.RootElement.ValueKind == JsonValueKind.Object) - { - foreach (JsonProperty property in document.RootElement.EnumerateObject()) - { - int propertyTokenCount = TokenUtils.TokenCount(property.ToString()); - - if (tokenLimit - propertyTokenCount > 0) - { - itemList.Add(property); - tokenLimit -= propertyTokenCount; - } - else - { - break; - } - } - } - - // Summary (List) Object - // To stay within token limits, attempt to truncate the list of results - if (document.RootElement.ValueKind == JsonValueKind.Array) - { - foreach (JsonElement item in document.RootElement.EnumerateArray()) - { - int itemTokenCount = TokenUtils.TokenCount(item.ToString()); - - if (tokenLimit - itemTokenCount > 0) - { - itemList.Add(item); - tokenLimit -= itemTokenCount; - } - else - { - break; - } - } - } - - return itemList.Count > 0 - ? string.Format(CultureInfo.InvariantCulture, "{0}{1}", resultsDescriptor, JsonSerializer.Serialize(itemList)) - : string.Format(CultureInfo.InvariantCulture, "JSON response from {0} is too large to be consumed at this time.", this._planner.PlannerOptions?.Type == PlanType.Sequential ? "plan" : lastPluginInvoked); - } - - private Type GetOpenApiFunctionResponseType(ref JsonDocument document, ref string lastPluginInvoked, ref string lastFunctionInvoked, ref bool trimResponse) - { - // TODO: [Issue #93] Find a way to determine response type if multiple steps are invoked - Type responseType = typeof(object); // Use a reasonable default response type - - // Different operations under the plugin will return responses as json structures; - // Prune each operation response according to the most important/contextual fields only to avoid going over the token limit - // Check what the last function invoked was and deserialize the JSON content accordingly - if (string.Equals(lastPluginInvoked, "GitHubPlugin", StringComparison.Ordinal)) - { - trimResponse = true; - responseType = this.GetGithubPluginResponseType(ref document); - } - else if (string.Equals(lastPluginInvoked, "JiraPlugin", StringComparison.Ordinal)) - { - trimResponse = true; - responseType = this.GetJiraPluginResponseType(ref document, ref lastFunctionInvoked); - } - - return responseType; - } - - private Type GetGithubPluginResponseType(ref JsonDocument document) - { - return document.RootElement.ValueKind == JsonValueKind.Array ? typeof(PullRequest[]) : typeof(PullRequest); - } - - private Type GetJiraPluginResponseType(ref JsonDocument document, ref string lastFunctionInvoked) - { - if (lastFunctionInvoked == "GetIssue") - { - return document.RootElement.ValueKind == JsonValueKind.Array ? typeof(IssueResponse[]) : typeof(IssueResponse); - } - - return typeof(IssueResponse); - } - - /// - /// Retrieves the steps in a plan that was executed successfully. - /// - /// The plan object. - /// A list of strings representing the successfully executed steps in the plan. - private List GetPlanSteps(Plan plan) - { - List steps = new(); - foreach (var step in plan.Steps) - { - steps.Add($"{step.PluginName}.{step.Name}"); - } - - return steps; - } - - /// - /// Returns a string representation of the chat context, excluding some variables that are only relevant to the ChatPlugin execution context and should be ignored by the planner. - /// This helps clarify the context that is passed to the planner as well as save on tokens. - /// - /// The chat context object that contains the variables and their values. - /// A string with one line per variable, in the format "key: value", except for variables that contain "TokenUsage", "tokenLimit", or "chatId" in their names, which are skipped. - private string GetChatContextString(SKContext context) - { - return string.Join("\n", context.Variables.Where(v => !( - v.Key.Contains("TokenUsage", StringComparison.CurrentCultureIgnoreCase) - || v.Key.Contains("tokenLimit", StringComparison.CurrentCultureIgnoreCase) - || v.Key.Contains("chatId", StringComparison.CurrentCultureIgnoreCase))) - .Select(v => $"{v.Key}: {v.Value}")); - } -} diff --git a/webapi/Plugins/Chat/SemanticChatMemoryExtractor.cs b/webapi/Plugins/Chat/SemanticChatMemoryExtractor.cs index aa99844fe..6c7f1d90f 100644 --- a/webapi/Plugins/Chat/SemanticChatMemoryExtractor.cs +++ b/webapi/Plugins/Chat/SemanticChatMemoryExtractor.cs @@ -11,8 +11,6 @@ using Microsoft.Extensions.Logging; using Microsoft.KernelMemory; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.Connectors.AI.OpenAI; -using Microsoft.SemanticKernel.Orchestration; namespace CopilotChat.WebApi.Plugins.Chat; @@ -26,15 +24,15 @@ internal static class SemanticChatMemoryExtractor /// /// The Chat ID. /// The semantic kernel. - /// The Semantic Kernel context. + /// The Semantic Kernel context. /// The prompts options. /// The logger. /// The cancellation token. public static async Task ExtractSemanticChatMemoryAsync( string chatId, IKernelMemory memoryClient, - IKernel kernel, - SKContext context, + Kernel kernel, + KernelArguments kernelArguments, PromptsOptions options, ILogger logger, CancellationToken cancellationToken) @@ -80,23 +78,32 @@ async Task ExtractCognitiveMemoryAsync(string memoryType, st options.ResponseTokenLimit - TokenUtils.TokenCount(memoryPrompt); - var memoryExtractionContext = context.Clone(); - memoryExtractionContext.Variables.Set("tokenLimit", remainingToken.ToString(new NumberFormatInfo())); - memoryExtractionContext.Variables.Set("memoryName", memoryName); - memoryExtractionContext.Variables.Set("format", options.MemoryFormat); - memoryExtractionContext.Variables.Set("knowledgeCutoff", options.KnowledgeCutoffDate); + var memoryExtractionArguments = new KernelArguments(kernelArguments); + memoryExtractionArguments["tokenLimit"] = remainingToken.ToString(new NumberFormatInfo()); + memoryExtractionArguments["memoryName"] = memoryName; + memoryExtractionArguments["format"] = options.MemoryFormat; + memoryExtractionArguments["knowledgeCutoff"] = options.KnowledgeCutoffDate; - var completionFunction = kernel.CreateSemanticFunction(memoryPrompt); + var completionFunction = kernel.CreateFunctionFromPrompt(memoryPrompt); var result = await completionFunction.InvokeAsync( - memoryExtractionContext, - options.ToCompletionSettings(), + kernel, + memoryExtractionArguments, cancellationToken); // Get token usage from ChatCompletion result and add to context - // Since there are multiple memory types, total token usage is calculated by cumulating the token usage of each memory type. - TokenUtils.GetFunctionTokenUsage(result, context, logger, $"SystemCognitive_{memoryType}"); + string? tokenUsage = TokenUtils.GetFunctionTokenUsage(result, logger); + if (tokenUsage is not null) + { + // Since there are multiple memory types, total token usage is calculated by cumulating the token usage of each memory type. + kernelArguments[TokenUtils.GetFunctionKey($"SystemCognitive_{memoryType}")] = tokenUsage; + } + else + { + logger.LogError("Unable to determine token usage for {0}", $"SystemCognitive_{memoryType}"); + } SemanticChatMemory memory = SemanticChatMemory.FromJson(result.ToString()); + return memory; } @@ -131,21 +138,4 @@ await memoryClient.SearchMemoryAsync( } } } - - /// - /// Create a completion settings object for chat response. Parameters are read from the PromptSettings class. - /// - private static OpenAIRequestSettings ToCompletionSettings(this PromptsOptions options) - { - var completionSettings = new OpenAIRequestSettings - { - MaxTokens = options.ResponseTokenLimit, - Temperature = options.ResponseTemperature, - TopP = options.ResponseTopP, - FrequencyPenalty = options.ResponseFrequencyPenalty, - PresencePenalty = options.ResponsePresencePenalty - }; - - return completionSettings; - } } diff --git a/webapi/Plugins/Chat/SemanticMemoryRetriever.cs b/webapi/Plugins/Chat/SemanticMemoryRetriever.cs index fca472e7c..f237c97e7 100644 --- a/webapi/Plugins/Chat/SemanticMemoryRetriever.cs +++ b/webapi/Plugins/Chat/SemanticMemoryRetriever.cs @@ -174,7 +174,7 @@ await this._memoryClient.SearchMemoryAsync( var tokenCount = TokenUtils.TokenCount(result.Memory.Text); if (remainingToken - tokenCount > 0) { - if (result.Citation.Tags.TryGetValue(MemoryTags.TagMemory, out var tag) && tag.Count > 0) + if (result.Memory.Tags.TryGetValue(MemoryTags.TagMemory, out var tag) && tag.Count > 0) { var memoryName = tag.Single()!; var citationSource = CitationSource.FromSemanticMemoryCitation( diff --git a/webapi/Plugins/Utils/AsyncUtils.cs b/webapi/Plugins/Utils/AsyncUtils.cs index 7b71e24f0..1bb48f855 100644 --- a/webapi/Plugins/Utils/AsyncUtils.cs +++ b/webapi/Plugins/Utils/AsyncUtils.cs @@ -2,7 +2,7 @@ using System; using System.Threading.Tasks; -using Microsoft.SemanticKernel.Diagnostics; +using Microsoft.SemanticKernel; namespace CopilotChat.WebApi.Plugins.Utils; @@ -27,7 +27,7 @@ public static async Task SafeInvokeAsync(Func> callback, string fu } catch (Exception ex) { - throw new SKException($"{functionName} failed.", ex); + throw new KernelException($"{functionName} failed.", ex); } } @@ -47,7 +47,7 @@ public static async Task SafeInvokeAsync(Func callback, string functionNam } catch (Exception ex) { - throw new SKException($"{functionName} failed.", ex); + throw new KernelException($"{functionName} failed.", ex); } } } diff --git a/webapi/Plugins/Utils/TokenUtils.cs b/webapi/Plugins/Utils/TokenUtils.cs index dca65c09e..f3adad225 100644 --- a/webapi/Plugins/Utils/TokenUtils.cs +++ b/webapi/Plugins/Utils/TokenUtils.cs @@ -1,16 +1,12 @@ // Copyright (c) Microsoft. All rights reserved. -using System; using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Text.Json; using Microsoft.Extensions.Logging; -using Microsoft.IdentityModel.Tokens; -using Microsoft.SemanticKernel.AI; -using Microsoft.SemanticKernel.AI.ChatCompletion; -using Microsoft.SemanticKernel.Connectors.AI.OpenAI.AzureSdk; -using Microsoft.SemanticKernel.Orchestration; -using ChatCompletionContextMessages = Microsoft.SemanticKernel.AI.ChatCompletion.ChatHistory; +using Microsoft.SemanticKernel; +using Microsoft.SemanticKernel.ChatCompletion; namespace CopilotChat.WebApi.Plugins.Utils; @@ -25,9 +21,8 @@ public static class TokenUtils /// Semantic dependencies of ChatPlugin. /// If you add a new semantic dependency, please add it here. /// - public static readonly Dictionary semanticFunctions = new() + internal static readonly Dictionary semanticFunctions = new() { - // TODO: [Issue #2106] Calculate token usage for planner dependencies. { "SystemAudienceExtraction", "audienceExtraction" }, { "SystemIntentExtraction", "userIntentExtraction" }, { "SystemMetaPrompt", "metaPromptTemplate" }, @@ -42,21 +37,19 @@ public static class TokenUtils /// internal static Dictionary EmptyTokenUsages() { - return semanticFunctions.Values.ToDictionary(v => v, v => 0, StringComparer.OrdinalIgnoreCase); + return semanticFunctions.Values.ToDictionary(v => v, v => 0); } /// /// Gets key used to identify function token usage in context variables. /// - /// The logger instance to use for logging errors. /// Name of semantic function. /// The key corresponding to the semantic function name, or null if the function name is unknown. - internal static string? GetFunctionKey(ILogger logger, string? functionName) + internal static string GetFunctionKey(string? functionName) { if (functionName == null || !semanticFunctions.TryGetValue(functionName, out string? key)) { - logger.LogError("Unknown token dependency {0}. Please define function as semanticFunctions entry in TokenUtils.cs", functionName); - return null; + throw new KeyNotFoundException($"Unknown token dependency {functionName}. Please define function as semanticFunctions entry in TokenUtils.cs"); }; return $"{key}TokenUsage"; @@ -66,35 +59,32 @@ internal static Dictionary EmptyTokenUsages() /// Gets the total token usage from a Chat or Text Completion result context and adds it as a variable to response context. /// /// Result context from chat model - /// Context maintained during response generation. - /// The logger instance to use for logging errors. - /// Name of the function that invoked the chat completion. - /// true if token usage is found in result context; otherwise, false. - internal static void GetFunctionTokenUsage(FunctionResult result, SKContext chatContext, ILogger logger, string? functionName = null) + /// The logger instance to use for logging errors. + /// String representation of number of tokens used by function (or null on error) + internal static string? GetFunctionTokenUsage(FunctionResult result, ILogger logger) { + if (result.Metadata is null || + !result.Metadata.TryGetValue("Usage", out object? usageObject) || usageObject is null) + { + logger.LogError("No usage metadata provided"); + + return null; + } + + var tokenUsage = 0; try { - var functionKey = GetFunctionKey(logger, functionName); - if (functionKey == null) - { - return; - } - - var modelResults = result.GetModelResults(); - if (modelResults.IsNullOrEmpty()) - { - logger.LogError("Unable to determine token usage for {0}", functionKey); - return; - } - - var tokenUsage = modelResults!.First().GetResult().Usage.TotalTokens; - chatContext.Variables.Set(functionKey!, tokenUsage.ToString(CultureInfo.InvariantCulture)); + var jsonObject = JsonSerializer.Deserialize(JsonSerializer.Serialize(usageObject)); + tokenUsage = jsonObject.GetProperty("TotalTokens").GetInt32(); } - catch (Exception e) + catch (KeyNotFoundException) { - logger.LogError(e, "Unable to determine token usage for {0}", functionName); - throw e; + logger.LogError("Usage details not found in model result."); + + return null; } + + return tokenUsage.ToString(CultureInfo.InvariantCulture); } /// @@ -110,21 +100,20 @@ internal static int TokenCount(string text) /// /// Rough token costing of ChatHistory's message object. /// Follows the syntax defined by Azure OpenAI's ChatMessage object: https://learn.microsoft.com/en-us/azure/ai-services/openai/reference#chatmessage - /// e.g., "message": {"role":"assistant","content":"Yes } + /// e.g., "message": {"role":"assistant","content":"Yes" } /// /// Author role of the message. /// Content of the message. - internal static int GetContextMessageTokenCount(AuthorRole authorRole, string content) + internal static int GetContextMessageTokenCount(AuthorRole authorRole, string? content) { - var tokenCount = authorRole == AuthorRole.System ? TokenCount("\n") : 0; - return tokenCount + TokenCount($"role:{authorRole.Label}") + TokenCount($"content:{content}"); + return TokenCount($"role:{authorRole.Label}") + TokenCount($"content:{content}\n"); } /// - /// Rough token costing of ChatCompletionContextMessages object. + /// Rough token costing of ChatHistory object. /// - /// ChatCompletionContextMessages object to calculate the number of tokens of. - internal static int GetContextMessagesTokenCount(ChatCompletionContextMessages chatHistory) + /// ChatHistory object to calculate the number of tokens of. + internal static int GetContextMessagesTokenCount(ChatHistory chatHistory) { var tokenCount = 0; foreach (var message in chatHistory) diff --git a/webapi/Program.cs b/webapi/Program.cs index 051e0ddcb..bdbf10638 100644 --- a/webapi/Program.cs +++ b/webapi/Program.cs @@ -2,7 +2,6 @@ using System; using System.Diagnostics; -using System.Globalization; using System.Linq; using System.Text.Json; using System.Threading.Tasks; @@ -52,7 +51,6 @@ public static async Task Main(string[] args) builder .AddBotConfig() .AddSemanticKernelServices() - .AddPlannerServices() .AddSemanticMemoryServices(); // Add SignalR as the real time relay service @@ -70,11 +68,6 @@ public static async Task Main(string[] args) // Add named HTTP clients for IHttpClientFactory builder.Services.AddHttpClient(); - builder.Services.AddHttpClient("Plugin", httpClient => - { - int timeout = int.Parse(builder.Configuration["Planner:PluginTimeoutLimitInS"] ?? "100", CultureInfo.InvariantCulture); - httpClient.Timeout = TimeSpan.FromSeconds(timeout); - }); // Add in the rest of the services. builder.Services diff --git a/webapi/README.md b/webapi/README.md index 6da8c9eed..6f597fc99 100644 --- a/webapi/README.md +++ b/webapi/README.md @@ -58,8 +58,8 @@ Running the memory creation pipeline steps in different processes. This means th 1. In [./webapi/appsettings.json](./appsettings.json) and [../memorypipeline/appsettings.json](../memorypipeline/appsettings.json), set `SemanticMemory:ContentStorageType` to `AzureBlobs`. 2. In [./webapi/appsettings.json](./appsettings.json) and [../memorypipeline/appsettings.json](../memorypipeline/appsettings.json), set `SemanticMemory:DataIngestion:DistributedOrchestration:QueueType` to `AzureQueue`. -3. In [./webapi/appsettings.json](./appsettings.json) and [../memorypipeline/appsettings.json](../memorypipeline/appsettings.json), set `SemanticMemory:DataIngestion:VectorDbTypes:0` to `AzureCognitiveSearch`. -4. In [./webapi/appsettings.json](./appsettings.json) and [../memorypipeline/appsettings.json](../memorypipeline/appsettings.json), set `SemanticMemory:Retrieval:VectorDbType` to `AzureCognitiveSearch`. +3. In [./webapi/appsettings.json](./appsettings.json) and [../memorypipeline/appsettings.json](../memorypipeline/appsettings.json), set `SemanticMemory:DataIngestion:MemoryDbTypes:0` to `AzureAISearch`. +4. In [./webapi/appsettings.json](./appsettings.json) and [../memorypipeline/appsettings.json](../memorypipeline/appsettings.json), set `SemanticMemory:Retrieval:MemoryDbType` to `AzureAISearch`. 5. Run the following to set up the authentication to the resources: ```bash @@ -67,8 +67,8 @@ Running the memory creation pipeline steps in different processes. This means th dotnet user-secrets set SemanticMemory:Services:AzureBlobs:ConnectionString [your secret] dotnet user-secrets set SemanticMemory:Services:AzureQueue:Auth ConnectionString # Only needed when running distributed processing dotnet user-secrets set SemanticMemory:Services:AzureQueue:ConnectionString [your secret] # Only needed when running distributed processing - dotnet user-secrets set SemanticMemory:Services:AzureCognitiveSearch:Endpoint [your secret] - dotnet user-secrets set SemanticMemory:Services:AzureCognitiveSearch:APIKey [your secret] + dotnet user-secrets set SemanticMemory:Services:AzureAISearch:Endpoint [your secret] + dotnet user-secrets set SemanticMemory:Services:AzureAISearch:APIKey [your secret] ``` 6. For more information and other options, please refer to the [memorypipeline](../memorypipeline/README.md). @@ -81,27 +81,6 @@ You can also add OpenAI plugins that will be managed by the webapi (as opposed t Please refer to [here](../plugins/README.md) for more details. -## Enabling Sequential Planner - -If you want to use SequentialPlanner (multi-step) instead ActionPlanner (single-step), we recommend using `gpt-4` or `gpt-3.5-turbo` as the planner model. **SequentialPlanner works best with `gpt-4`.** Using `gpt-3.5-turbo` will require using a relevancy filter. - -To enable sequential planner, - -1. In [./webapi/appsettings.json](appsettings.json), set `"Type": "Sequential"` under the `Planner` section. -1. Then, set your preferred Planner model (`gpt-4` or `gpt-3.5-turbo`) under the `AIService` configuration section. -1. If using `gpt-4`, no other changes are required. -1. If using `gpt-3.5-turbo`: change [CopilotChatPlanner.cs](Plugins/Chat/CopilotChatPlanner.cs) to initialize SequentialPlanner with a RelevancyThreshold\*. - - Add `using` statement to top of file: - ``` - using Microsoft.SemanticKernel.Planning.Sequential; - ``` - - The `CreatePlanAsync` method should return the following line if `this._plannerOptions?.Type == "Sequential"` is true: - ``` - return new SequentialPlanner(this.Kernel, new SequentialPlannerConfig { RelevancyThreshold = 0.75 }).CreatePlanAsync(goal); - ``` - \* The `RelevancyThreshold` is a number from 0 to 1 that represents how similar a goal is to a function's name/description/inputs. You want to tune that value when using SequentialPlanner to help keep things scoped while not missing on on things that are relevant or including too many things that really aren't. `0.75` is an arbitrary threshold and we recommend developers play around with this number to see what best fits their scenarios. -1. Restart the `webapi` - Chat Copilot should be now running locally with SequentialPlanner. - ## (Optional) Enabling Cosmos Chat Store. [Azure Cosmos DB](https://learn.microsoft.com/en-us/azure/cosmos-db/introduction) can be used as a persistent chat store for Chat Copilot. Chat stores are used for storing chat sessions, participants, and messages. @@ -246,7 +225,7 @@ Then use a Time chart on the Visual tab. > Though plugins can contain both semantic and native functions, Chat Copilot currently only supports plugins of isolated types due to import limitations, so you must separate your plugins into respective folders for each. -If you wish to load custom plugins into the kernel or planner: +If you wish to load custom plugins into the kernel: 1. Create two new folders under `./Plugins` directory named `./SemanticPlugins` and `./NativePlugins`. There, you can add your custom plugins (synonymous with plugins). 2. Then, comment out the respective options in `appsettings.json`: @@ -261,7 +240,7 @@ If you wish to load custom plugins into the kernel or planner: }, ``` -3. By default, custom plugins are only loaded into planner's kernel for discovery at runtime. If you want to load the plugins into the core chat Kernel, you'll have to add the plugin registration into the `AddSemanticKernelServices` method of `SemanticKernelExtensions.cs`. Uncomment the line with `services.AddKernelSetupHook` and pass in the `RegisterPluginsAsync` hook: +3. If you want to load the plugins into the core chat Kernel, you'll have to add the plugin registration into the `AddSemanticKernelServices` method of `SemanticKernelExtensions.cs`. Uncomment the line with `services.AddKernelSetupHook` and pass in the `RegisterPluginsAsync` hook: ```c# internal static IServiceCollection AddSemanticKernelServices(this IServiceCollection services) @@ -280,11 +259,11 @@ If you wish to load custom plugins into the kernel or planner: If you want to deploy your custom plugins with the webapi, additional configuration is required. You have the following options: -1. **[Recommended]** Create custom setup hooks to import your plugins into the kernel and planner. +1. **[Recommended]** Create custom setup hooks to import your plugins into the kernel. > The default `RegisterPluginsAsync` function uses reflection to import native functions from your custom plugin files. C# reflection is a powerful but slow mechanism that dynamically inspects and invokes types and methods at runtime. It works well for loading a few plugin files, but it can degrade performance and increase memory usage if you have many plugins or complex types. Therefore, we recommend creating your own import function to load your custom plugins manually. This way, you can avoid reflection overhead and have more control over how and when your plugins are loaded. - Create a function to load your custom plugins at build and pass that function as a hook to `AddKernelSetupHook` or `AddPlannerSetupHook` in `SemanticKernelExtensions.cs`. See the [next two sections](#add-custom-setup-to-chat-copilots-kernel) for details on how to do this. This bypasses the need to load the plugins at runtime, and consequently, there's no need to ship the source files for your custom plugins. Remember to comment out the `NativePluginsDirectory` or `SemanticPluginsDirectory` options in `appsettings.json` to prevent any potential pathing errors. + Create a function to load your custom plugins at build and pass that function as a hook to `AddKernelSetupHook` in `SemanticKernelExtensions.cs`. See the [next two sections](#add-custom-setup-to-chat-copilots-kernel) for details on how to do this. This bypasses the need to load the plugins at runtime, and consequently, there's no need to ship the source files for your custom plugins. Remember to comment out the `NativePluginsDirectory` or `SemanticPluginsDirectory` options in `appsettings.json` to prevent any potential pathing errors. Alternatively, @@ -301,26 +280,18 @@ Alternatively, ``` - You will also need to include a line for each skprompt.txt file you have for you plugins to ensure they are included in the build output. - - ```xml - - Always - - ``` - 3. Change the respective directory option to use an absolute path or a different base path, but make sure that the files are accessible from that location. ### Add Custom Setup to Chat Copilot's Kernel -Chat Copilot's Semantic Kernel can be customized with additional plugins or settings by using a custom hook that performs any complimentary setup of the kernel. A custom hook is a delegate that takes an `IServiceProvider` and an `IKernel` as parameters and performs any desired actions on the kernel, such as registering additional plugins, setting kernel options, adding dependency injections, importing data, etc. To use a custom hook, you can pass it as an argument to the `AddKernelSetupHook` call in the `AddSemanticKernelServices` method of `SemanticKernelExtensions.cs`. +Chat Copilot's Semantic Kernel can be customized with additional plugins or settings by using a custom hook that performs any complimentary setup of the kernel. A custom hook is a delegate that takes an `IServiceProvider` and an `Kernel` as parameters and performs any desired actions on the kernel, such as registering additional plugins, setting kernel options, adding dependency injections, importing data, etc. To use a custom hook, you can pass it as an argument to the `AddKernelSetupHook` call in the `AddSemanticKernelServices` method of `SemanticKernelExtensions.cs`. For example, the following code snippet shows how to create a custom hook that registers a plugin called MyPlugin and passes it to `AddKernelSetupHook`: ```c# // Define a custom hook that registers MyPlugin with the kernel -private static Task MyCustomSetupHook(IServiceProvider sp, IKernel kernel) +private static Task MyCustomSetupHook(IServiceProvider sp, Kernel kernel) { // Import your plugin into the kernel with the name "MyPlugin" kernel.ImportFunctions(new MyPlugin(), nameof(MyPlugin)); @@ -346,30 +317,4 @@ internal static IServiceCollection AddSemanticKernelServices(this IServiceCollec return services; } -``` - -### Add Custom Plugin Registration to the Planner's Kernel - -The planner uses a separate kernel instance that can be configured with plugins that are specific to the planning process. Note that these plugins will be persistent across all chat requests. - -To customize the planner's kernel, you can use a custom hook that registers plugins at build time. A custom hook is a delegate that takes an `IServiceProvider` and an `IKernel` as parameters and performs any desired actions on the kernel. By default, the planner will register plugins using `SemanticKernelExtensions.RegisterPluginsAsync` to load files from the `Service.SemanticPluginsDirectory` and `Service.NativePluginsDirectory` option values in `appsettings.json`. - -To use a custom hook, you can pass it as an argument to the `AddPlannerSetupHook` call in the `AddPlannerServices` method of `SemanticKernelExtensions.cs`, which will invoke the hook after the planner's kernel is created. See section above for an example of a custom hook function. - -> Note: This will override the call to `RegisterPluginsAsync`. - -Then in the `AddPlannerServices` method of `SemanticKernelExtensions.cs`, pass your hook into the `services.AddPlannerSetupHook` call: - -```c# - -internal static IServiceCollection AddPlannerServices(this IServiceCollection services) -{ - ... - - // Register any custom plugins with the planner's kernel. - builder.Services.AddPlannerSetupHook(MyCustomSetupHook); - - return services; -} - -``` +``` \ No newline at end of file diff --git a/webapi/Services/AzureContentSafety.cs b/webapi/Services/AzureContentSafety.cs index 507ed3e51..e16094180 100644 --- a/webapi/Services/AzureContentSafety.cs +++ b/webapi/Services/AzureContentSafety.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using CopilotChat.WebApi.Models.Response; using Microsoft.AspNetCore.Http; -using Microsoft.SemanticKernel.Diagnostics; +using Microsoft.SemanticKernel; namespace CopilotChat.WebApi.Services; @@ -109,13 +109,13 @@ public async Task ImageAnalysisAsync(IFormFile formFile, var body = await response.Content.ReadAsStringAsync(cancellationToken); if (!response.IsSuccessStatusCode || body is null) { - throw new SKException($"[Content Safety] Failed to analyze image. {response.StatusCode}"); + throw new KernelException($"[Content Safety] Failed to analyze image. {response.StatusCode}"); } var result = JsonSerializer.Deserialize(body!); if (result is null) { - throw new SKException($"[Content Safety] Failed to analyze image. Details: {body}"); + throw new KernelException($"[Content Safety] Failed to analyze image. Details: {body}"); } return result; } diff --git a/webapi/Services/MaintenanceMiddleware.cs b/webapi/Services/MaintenanceMiddleware.cs index 6e8983c71..c0e5b5e02 100644 --- a/webapi/Services/MaintenanceMiddleware.cs +++ b/webapi/Services/MaintenanceMiddleware.cs @@ -41,7 +41,7 @@ public MaintenanceMiddleware( this._logger = logger; } - public async Task Invoke(HttpContext ctx, IKernel kernel) + public async Task Invoke(HttpContext ctx, Kernel kernel) { // Skip inspection if _isInMaintenance explicitly false. if (this._isInMaintenance == null || this._isInMaintenance.Value) diff --git a/webapi/Services/SemanticKernelProvider.cs b/webapi/Services/SemanticKernelProvider.cs index 746227d2d..218ed140d 100644 --- a/webapi/Services/SemanticKernelProvider.cs +++ b/webapi/Services/SemanticKernelProvider.cs @@ -2,20 +2,11 @@ using System; using System.Net.Http; -using System.Threading; -using CopilotChat.WebApi.Options; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Microsoft.KernelMemory; -using Microsoft.KernelMemory.MemoryStorage.Qdrant; using Microsoft.SemanticKernel; -using Microsoft.SemanticKernel.Connectors.AI.OpenAI; -using Microsoft.SemanticKernel.Connectors.Memory.AzureCognitiveSearch; -using Microsoft.SemanticKernel.Connectors.Memory.Qdrant; -using Microsoft.SemanticKernel.Memory; -using Microsoft.SemanticKernel.Plugins.Memory; namespace CopilotChat.WebApi.Services; @@ -24,42 +15,26 @@ namespace CopilotChat.WebApi.Services; /// public sealed class SemanticKernelProvider { - private static IMemoryStore? _volatileMemoryStore; - - private readonly KernelBuilder _builderChat; - private readonly KernelBuilder _builderPlanner; - private readonly MemoryBuilder _builderMemory; + private readonly IKernelBuilder _builderChat; public SemanticKernelProvider(IServiceProvider serviceProvider, IConfiguration configuration, IHttpClientFactory httpClientFactory) { this._builderChat = InitializeCompletionKernel(serviceProvider, configuration, httpClientFactory); - this._builderPlanner = InitializePlannerKernel(serviceProvider, configuration, httpClientFactory); - this._builderMemory = InitializeMigrationMemory(serviceProvider, configuration, httpClientFactory); } /// /// Produce semantic-kernel with only completion services for chat. /// - public IKernel GetCompletionKernel() => this._builderChat.Build(); - - /// - /// Produce semantic-kernel with only completion services for planner. - /// - public IKernel GetPlannerKernel() => this._builderPlanner.Build(); + public Kernel GetCompletionKernel() => this._builderChat.Build(); - /// - /// Produce semantic-kernel with kernel memory. - /// - public ISemanticTextMemory GetMigrationMemory() => this._builderMemory.Build(); - - private static KernelBuilder InitializeCompletionKernel( + private static IKernelBuilder InitializeCompletionKernel( IServiceProvider serviceProvider, IConfiguration configuration, IHttpClientFactory httpClientFactory) { - var builder = new KernelBuilder(); + var builder = Kernel.CreateBuilder(); - builder.WithLoggerFactory(serviceProvider.GetRequiredService()); + builder.Services.AddLogging(); var memoryOptions = serviceProvider.GetRequiredService>().Value; @@ -69,18 +44,16 @@ private static KernelBuilder InitializeCompletionKernel( case string y when y.Equals("AzureOpenAIText", StringComparison.OrdinalIgnoreCase): var azureAIOptions = memoryOptions.GetServiceConfig(configuration, "AzureOpenAIText"); #pragma warning disable CA2000 // No need to dispose of HttpClient instances from IHttpClientFactory - builder.WithAzureOpenAIChatCompletionService( + builder.AddAzureOpenAIChatCompletion( azureAIOptions.Deployment, azureAIOptions.Endpoint, azureAIOptions.APIKey, httpClient: httpClientFactory.CreateClient()); -#pragma warning restore CA2000 break; case string x when x.Equals("OpenAI", StringComparison.OrdinalIgnoreCase): var openAIOptions = memoryOptions.GetServiceConfig(configuration, "OpenAI"); -#pragma warning disable CA2000 // No need to dispose of HttpClient instances from IHttpClientFactory - builder.WithOpenAIChatCompletionService( + builder.AddOpenAIChatCompletion( openAIOptions.TextModel, openAIOptions.APIKey, httpClient: httpClientFactory.CreateClient()); @@ -93,125 +66,4 @@ private static KernelBuilder InitializeCompletionKernel( return builder; } - - private static KernelBuilder InitializePlannerKernel( - IServiceProvider serviceProvider, - IConfiguration configuration, - IHttpClientFactory httpClientFactory) - { - var builder = new KernelBuilder(); - - builder.WithLoggerFactory(serviceProvider.GetRequiredService()); - - var memoryOptions = serviceProvider.GetRequiredService>().Value; - var plannerOptions = serviceProvider.GetRequiredService>().Value; - - switch (memoryOptions.TextGeneratorType) - { - case string x when x.Equals("AzureOpenAI", StringComparison.OrdinalIgnoreCase): - case string y when y.Equals("AzureOpenAIText", StringComparison.OrdinalIgnoreCase): - var azureAIOptions = memoryOptions.GetServiceConfig(configuration, "AzureOpenAIText"); -#pragma warning disable CA2000 // No need to dispose of HttpClient instances from IHttpClientFactory - builder.WithAzureOpenAIChatCompletionService( - plannerOptions.Model, - azureAIOptions.Endpoint, - azureAIOptions.APIKey, - httpClient: httpClientFactory.CreateClient()); -#pragma warning restore CA2000 - break; - - case string x when x.Equals("OpenAI", StringComparison.OrdinalIgnoreCase): - var openAIOptions = memoryOptions.GetServiceConfig(configuration, "OpenAI"); -#pragma warning disable CA2000 // No need to dispose of HttpClient instances from IHttpClientFactory - builder.WithOpenAIChatCompletionService( - plannerOptions.Model, - openAIOptions.APIKey, - httpClient: httpClientFactory.CreateClient()); -#pragma warning restore CA2000 - break; - - default: - throw new ArgumentException($"Invalid {nameof(memoryOptions.TextGeneratorType)} value in 'KernelMemory' settings."); - } - - return builder; - } - - private static MemoryBuilder InitializeMigrationMemory( - IServiceProvider serviceProvider, - IConfiguration configuration, - IHttpClientFactory httpClientFactory) - { - var memoryOptions = serviceProvider.GetRequiredService>().Value; - - var builder = new MemoryBuilder(); - - builder.WithLoggerFactory(serviceProvider.GetRequiredService()); - builder.WithMemoryStore(CreateMemoryStore()); - - switch (memoryOptions.Retrieval.EmbeddingGeneratorType) - { - case string x when x.Equals("AzureOpenAI", StringComparison.OrdinalIgnoreCase): - case string y when y.Equals("AzureOpenAIEmbedding", StringComparison.OrdinalIgnoreCase): - var azureAIOptions = memoryOptions.GetServiceConfig(configuration, "AzureOpenAIEmbedding"); -#pragma warning disable CA2000 // No need to dispose of HttpClient instances from IHttpClientFactory - builder.WithAzureOpenAITextEmbeddingGenerationService( - azureAIOptions.Deployment, - azureAIOptions.Endpoint, - azureAIOptions.APIKey, - httpClient: httpClientFactory.CreateClient()); -#pragma warning restore CA2000 - break; - - case string x when x.Equals("OpenAI", StringComparison.OrdinalIgnoreCase): - var openAIOptions = memoryOptions.GetServiceConfig(configuration, "OpenAI"); -#pragma warning disable CA2000 // No need to dispose of HttpClient instances from IHttpClientFactory - builder.WithOpenAITextEmbeddingGenerationService( - openAIOptions.EmbeddingModel, - openAIOptions.APIKey, - httpClient: httpClientFactory.CreateClient()); -#pragma warning restore CA2000 - break; - - default: - throw new ArgumentException($"Invalid {nameof(memoryOptions.Retrieval.EmbeddingGeneratorType)} value in 'KernelMemory' settings."); - } - return builder; - - IMemoryStore CreateMemoryStore() - { - switch (memoryOptions.Retrieval.VectorDbType) - { - case string x when x.Equals("SimpleVectorDb", StringComparison.OrdinalIgnoreCase): - // Maintain single instance of volatile memory. - Interlocked.CompareExchange(ref _volatileMemoryStore, new VolatileMemoryStore(), null); - return _volatileMemoryStore; - - case string x when x.Equals("Qdrant", StringComparison.OrdinalIgnoreCase): - var qdrantConfig = memoryOptions.GetServiceConfig(configuration, "Qdrant"); - -#pragma warning disable CA2000 // Ownership passed to QdrantMemoryStore - HttpClient httpClient = new(new HttpClientHandler { CheckCertificateRevocationList = true }); -#pragma warning restore CA2000 // Ownership passed to QdrantMemoryStore - if (!string.IsNullOrWhiteSpace(qdrantConfig.APIKey)) - { - httpClient.DefaultRequestHeaders.Add("api-key", qdrantConfig.APIKey); - } - - return - new QdrantMemoryStore( - httpClient: httpClient, - 1536, - qdrantConfig.Endpoint, - loggerFactory: serviceProvider.GetRequiredService()); - - case string x when x.Equals("AzureCognitiveSearch", StringComparison.OrdinalIgnoreCase): - var acsConfig = memoryOptions.GetServiceConfig(configuration, "AzureCognitiveSearch"); - return new AzureCognitiveSearchMemoryStore(acsConfig.Endpoint, acsConfig.APIKey); - - default: - throw new InvalidOperationException($"Invalid 'VectorDbType' type '{memoryOptions.Retrieval.VectorDbType}'."); - } - } - } } diff --git a/webapi/Storage/CosmosDbContext.cs b/webapi/Storage/CosmosDbContext.cs index 2162b7c4e..29e43d743 100644 --- a/webapi/Storage/CosmosDbContext.cs +++ b/webapi/Storage/CosmosDbContext.cs @@ -56,7 +56,7 @@ public async Task CreateAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity Id cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity Id cannot be null or empty."); } await this._container.CreateItemAsync(entity, new PartitionKey(entity.Partition)); @@ -67,7 +67,7 @@ public async Task DeleteAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity Id cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity Id cannot be null or empty."); } await this._container.DeleteItemAsync(entity.Id, new PartitionKey(entity.Partition)); @@ -97,7 +97,7 @@ public async Task UpsertAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity Id cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity Id cannot be null or empty."); } await this._container.UpsertItemAsync(entity, new PartitionKey(entity.Partition)); diff --git a/webapi/Storage/FileSystemContext.cs b/webapi/Storage/FileSystemContext.cs index 44803f1b8..a84096c7d 100644 --- a/webapi/Storage/FileSystemContext.cs +++ b/webapi/Storage/FileSystemContext.cs @@ -37,7 +37,7 @@ public Task CreateAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity Id cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity Id cannot be null or empty."); } if (this._entities.TryAdd(entity.Id, entity)) @@ -53,7 +53,7 @@ public Task DeleteAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity Id cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity Id cannot be null or empty."); } if (this._entities.TryRemove(entity.Id, out _)) @@ -85,7 +85,7 @@ public Task UpsertAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity Id cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity Id cannot be null or empty."); } if (this._entities.AddOrUpdate(entity.Id, entity, (key, oldValue) => entity) != null) diff --git a/webapi/Storage/Repository.cs b/webapi/Storage/Repository.cs index cce06ae21..7269ceaff 100644 --- a/webapi/Storage/Repository.cs +++ b/webapi/Storage/Repository.cs @@ -29,7 +29,7 @@ public Task CreateAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity ID cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity ID cannot be null or empty."); } return this.StorageContext.CreateAsync(entity); diff --git a/webapi/Storage/VolatileContext.cs b/webapi/Storage/VolatileContext.cs index 122b639d0..6eed96ea9 100644 --- a/webapi/Storage/VolatileContext.cs +++ b/webapi/Storage/VolatileContext.cs @@ -39,7 +39,7 @@ public Task CreateAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity Id cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity Id cannot be null or empty."); } this._entities.TryAdd(entity.Id, entity); @@ -52,7 +52,7 @@ public Task DeleteAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity Id cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity Id cannot be null or empty."); } this._entities.TryRemove(entity.Id, out _); @@ -81,7 +81,7 @@ public Task UpsertAsync(T entity) { if (string.IsNullOrWhiteSpace(entity.Id)) { - throw new ArgumentOutOfRangeException(nameof(entity.Id), "Entity Id cannot be null or empty."); + throw new ArgumentOutOfRangeException(nameof(entity), "Entity Id cannot be null or empty."); } this._entities.AddOrUpdate(entity.Id, entity, (key, oldValue) => entity); diff --git a/webapi/Utilities/PluginUtils.cs b/webapi/Utilities/PluginUtils.cs index b29c44847..58ac661c3 100644 --- a/webapi/Utilities/PluginUtils.cs +++ b/webapi/Utilities/PluginUtils.cs @@ -2,12 +2,11 @@ using System; using CopilotChat.WebApi.Models.Request; -using Microsoft.SemanticKernel.Orchestration; namespace CopilotChat.WebApi.Utilities; /// -/// Converts variables to , inserting some system variables along the way. +/// Converts variables to , inserting some system variables along the way. /// internal static class PluginUtils { diff --git a/webapi/appsettings.json b/webapi/appsettings.json index 4b0f7194e..ff578880b 100644 --- a/webapi/appsettings.json +++ b/webapi/appsettings.json @@ -41,45 +41,6 @@ "Scopes": "access_as_user" // Scopes that the client app requires to access the API } }, - // - // Planner can determine which plugin functions, if any, need to be used to fulfill a user's request. - // https://learn.microsoft.com/en-us/semantic-kernel/concepts-sk/planner - // - Set Planner:Type to "Action" to use the single-step ActionPlanner - // - Set Planner:Type to "Sequential" to enable the multi-step SequentialPlanner - // Note: SequentialPlanner works best with `gpt-4`. See the "Enabling Sequential Planner" section in webapi/README.md for configuration instructions. - // - Set Planner:Type to "Stepwise" to enable MRKL style planning - // - Set Planner:UseStepwiseResultAsBotResponse to "true" to use the result of the planner as the bot response. If false, planner result will be imbedded in meta prompt. - // - This is helpful because the Stepwise Planner returns a sensical chat response as its result. - // - Set Planner:RelevancyThreshold to a decimal between 0 and 1.0. - // - Set Planner:Model to a chat completion model (e.g., gpt-35-turbo, gpt-4). - // - "Planner": { - "Type": "Sequential", - "UseStepwiseResultAsBotResponse": true, - // The minimum relevancy score for a function to be considered. - // Set RelevancyThreshold to a value between 0 and 1 if using the SequentialPlanner or Stepwise planner with gpt-3.5-turbo. - // Ignored when Planner:Type is "Action" - "RelevancyThreshold": "0.25", - "Model": "gpt-35-turbo", // For OpenAI, change to 'gpt-3.5-turbo' (with a period). - // Configuration for the error handling and retry logic. - // - Set AllowRetries to "true" to enable retries. - // - Set AllowMissingFunctions to "true" to allow missing functions in the sequential plan on creation. - // The plan will be created with missing functions as no-op steps. - // - Set MaxRetriesAllowed to the maximum number of retries allowed. If set to 0, no retries will be attempted. - "ErrorHandling": { - "AllowRetries": "true", - "AllowMissingFunctions": "true", - "MaxRetriesAllowed": "3" // Max retries allowed. If set to 0, no retries will be attempted. - }, - // The maximum number of seconds to wait for a response from a plugin. If this is not set, timeout limit will be 100s, which is default timeout setting for HttpClient - // Note: The Service:TimeoutLimitinS option above will take precedence on the broader request lifespan if set. - "PluginTimeoutLimitInS": 100, - "StepwisePlannerConfig": { - "MaxTokens": "2048", - "MaxIterations": "15", - "MinIterationTimeMs": "1500" - } - }, // A list of plugins that will be loaded by the application. // - Name is the NameForHuman of the plugin. // - ManifestDomain is the root domain of the plugin: https://platform.openai.com/docs/plugins/production/domain-verification-and-security @@ -134,8 +95,6 @@ // https://learn.microsoft.com/en-us/aspnet/core/mvc/models/file-uploads?view=aspnetcore-6.0 // "DocumentMemory": { - "GlobalDocumentCollectionName": "global-documents", // OBSOLETE: Used for legacy migration - "ChatDocumentCollectionNamePrefix": "chat-documents-", // OBSOLETE: Used for legacy migration "DocumentLineSplitMaxTokens": 72, "DocumentChunkMaxTokens": 512, "FileSizeLimit": 4000000, @@ -168,9 +127,6 @@ "SystemDescription": "This is a chat between an intelligent AI bot named Copilot and one or more participants. SK stands for Semantic Kernel, the AI platform used to build the bot. The AI was trained on data through 2021 and is not aware of events that have occurred since then. It also has no ability to access data on the Internet, so it should not claim that it can or say that it will go and look things up. Try to be concise with your answers, though it is not required. Knowledge cutoff: {{$knowledgeCutoff}} / Current date: {{TimePlugin.Now}}.", "SystemResponse": "Either return [silence] or provide a response to the last message. ONLY PROVIDE A RESPONSE IF the last message WAS ADDRESSED TO THE 'BOT' OR 'COPILOT'. If it appears the last message was not for you, send [silence] as the bot response.", "InitialBotMessage": "Hello, thank you for democratizing AI's productivity benefits with open source! How can I help you today?", - "ProposedPlanBotMessage": "As an AI language model, my knowledge is based solely on the data that was used to train me, but I can use the following functions to get fresh information: {{$planFunctions}}. Do you agree to proceed?", - "StepwisePlannerSupplement": "This result was obtained using the Stepwise Planner, which used a series of thoughts and actions to fulfill the user intent. The planner attempted to use the following functions to gather necessary information: {{$planFunctions}}.", - "PlanResultsDescription": "This is the result of invoking the functions listed after \"FUNCTIONS USED:\" to retrieve additional information outside of the data you were trained on. This information was retrieved on {{TimePlugin.Now}}. You can use this data to help answer the user's query.", "KnowledgeCutoffDate": "Saturday, January 1, 2022", "SystemAudience": "Below is a chat history between an intelligent AI bot named Copilot with one or more participants.", "SystemAudienceContinuation": "Using the provided chat history, generate a list of names of the participants of this chat. Do not include 'bot' or 'copilot'.The output should be a single rewritten sentence containing only a comma separated list of names. DO NOT offer additional commentary. DO NOT FABRICATE INFORMATION.\nParticipants:", @@ -179,7 +135,7 @@ "SystemCognitive": "We are building a cognitive architecture and need to extract the various details necessary to serve as the data for simulating a part of our memory system. There will eventually be a lot of these, and we will search over them using the embeddings of the labels and details compared to the new incoming chat requests, so keep that in mind when determining what data to store for this particular type of memory simulation. There are also other types of memory stores for handling different types of memories with differing purposes, levels of detail, and retention, so you don't need to capture everything - just focus on the items needed for {{$memoryName}}. Do not make up or assume information that is not supported by evidence. Perform analysis of the chat history so far and extract the details that you think are important in JSON format: {{$format}}", "MemoryFormat": "{\"items\": [{\"label\": string, \"details\": string }]}", "MemoryAntiHallucination": "IMPORTANT: DO NOT INCLUDE ANY OF THE ABOVE INFORMATION IN THE GENERATED RESPONSE AND ALSO DO NOT MAKE UP OR INFER ANY ADDITIONAL INFORMATION THAT IS NOT INCLUDED BELOW. ALSO DO NOT RESPOND IF THE LAST MESSAGE WAS NOT ADDRESSED TO YOU.", - "MemoryContinuation": "Generate a well-formed JSON of extracted context data. DO NOT include a preamble in the response. DO NOT give a list of possible responses. Only provide a single response of the json block.\nResponse:", + "MemoryContinuation": "Generate a well-formed JSON representation of the extracted context data. DO NOT include a preamble in the response. DO NOT give a list of possible responses. Only provide a single response that consists of NOTHING else but valid JSON.\nResponse:", "WorkingMemoryName": "WorkingMemory", // The name used for the container that stores Working Memory in the Kernel Memory database. This should not be changed once memories are established. "WorkingMemoryExtraction": "Extract information for a short period of time, such as a few seconds or minutes. It should be useful for performing complex cognitive tasks that require attention, concentration, or mental calculation.", "LongTermMemoryName": "LongTermMemory", // The name used for the container that stores Long Term Memory in the Kernel Memory database. This should not be changed once memories are established. @@ -198,7 +154,6 @@ // Kernel Memory configuration - https://github.com/microsoft/kernel-memory // - ContentStorageType is the storage configuration for memory transfer: "AzureBlobs" or "SimpleFileStorage" // - TextGeneratorType is the AI completion service configuration: "AzureOpenAIText", "AzureOpenAI" or "OpenAI" - // - ImageOcrType is the image OCR configuration: "None" or "AzureFormRecognizer" or "Tesseract" // - DataIngestion is the configuration section for data ingestion pipelines. // - Retrieval is the configuration section for memory retrieval. // - Services is the configuration sections for various memory settings. @@ -206,14 +161,13 @@ "KernelMemory": { "ContentStorageType": "SimpleFileStorage", "TextGeneratorType": "AzureOpenAIText", - "ImageOcrType": "None", // Data ingestion pipelines configuration. // - OrchestrationType is the pipeline orchestration configuration : "InProcess" or "Distributed" // InProcess: in process .NET orchestrator, synchronous/no queues // Distributed: asynchronous queue based orchestrator // - DistributedOrchestration is the detailed configuration for OrchestrationType=Distributed // - EmbeddingGeneratorTypes is the list of embedding generator types - // - VectorDbTypes is the list of vector database types + // - MemoryDbTypes is the list of vector database types "DataIngestion": { "OrchestrationType": "InProcess", // @@ -228,17 +182,19 @@ "AzureOpenAIEmbedding" ], // Vectors can be written to multiple storages, e.g. for data migration, A/B testing, etc. - "VectorDbTypes": [ + "MemoryDbTypes": [ "SimpleVectorDb" - ] + ], + // ImageOcrType is the image OCR configuration: "None", "AzureFormRecognizer" or "Tesseract" + "ImageOcrType": "None" }, // // Memory retrieval configuration - A single EmbeddingGenerator and VectorDb. - // - VectorDbType: Vector database configuration: "SimpleVectorDb" or "AzureCognitiveSearch" or "Qdrant" + // - MemoryDbType: Vector database configuration: "SimpleVectorDb" or "AzureAISearch" or "Qdrant" // - EmbeddingGeneratorType: Embedding generator configuration: "AzureOpenAIEmbedding", "AzureOpenAI" or "OpenAI" // "Retrieval": { - "VectorDbType": "SimpleVectorDb", + "MemoryDbType": "SimpleVectorDb", "EmbeddingGeneratorType": "AzureOpenAIEmbedding" }, // @@ -282,7 +238,7 @@ "Auth": "ConnectionString", //"ConnectionString": "", // dotnet user-secrets set "KernelMemory:Services:AzureBlobs:ConnectionString" "MY_AZUREBLOB_CONNECTIONSTRING" //"Account": "", - "Container": "memorypipeline" + "Container": "chatmemory" //"EndpointSuffix": "core.windows.net" }, // @@ -317,9 +273,9 @@ // - APIKey is the key generated to access the service. // - Endpoint is the service endpoint url. // - "AzureCognitiveSearch": { + "AzureAISearch": { "Auth": "ApiKey", - //"APIKey": "", // dotnet user-secrets set "KernelMemory:Services:AzureCognitiveSearch:APIKey" "MY_ACS_KEY" + //"APIKey": "", // dotnet user-secrets set "KernelMemory:Services:AzureAISearch:APIKey" "MY_ACS_KEY" "Endpoint": "" }, // diff --git a/webapp/package.json b/webapp/package.json index eb43a3023..42a28ade0 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -17,14 +17,14 @@ "dependencies": { "@azure/msal-browser": "^2.38.3", "@azure/msal-react": "^1.5.11", - "@fluentui/react-components": "^9.46.4", - "@fluentui/react-icons": "^2.0.224", + "@fluentui/react-components": "^9.47.1", + "@fluentui/react-icons": "^2.0.233", "@fluentui/react-northstar": "^0.66.4", "@microsoft/signalr": "^8.0.0", - "@playwright/test": "^1.41.2", - "@reduxjs/toolkit": "^2.1.0", + "@playwright/test": "^1.42.1", + "@reduxjs/toolkit": "^2.2.2", "debug": "^4.3.4", - "microsoft-cognitiveservices-speech-sdk": "^1.35.0", + "microsoft-cognitiveservices-speech-sdk": "^1.36.0", "react": "^18.2.0", "react-dom": "^18.2.0", "react-markdown": "^9.0.1", @@ -34,16 +34,16 @@ "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@types/debug": "^4.1.12", - "@types/node": "^20.11.16", - "@types/react": "^18.2.55", - "@types/react-dom": "^18.2.18", + "@types/node": "^20.11.30", + "@types/react": "^18.2.56", + "@types/react-dom": "^18.2.22", "@typescript-eslint/eslint-plugin": "^6.13.2", "@typescript-eslint/parser": "^6.21.0", - "eslint": "^8.56.0", + "eslint": "^8.57.0", "prettier": "^3.2.5", "react-scripts": "^5.0.1", "serve": "^14.2.1", - "typescript": "5.3.3" + "typescript": "5.4.3" }, "browserslist": { "production": [ diff --git a/webapp/src/components/chat/prompt-dialog/PromptDialog.tsx b/webapp/src/components/chat/prompt-dialog/PromptDialog.tsx index b94e62cb1..f513825bf 100644 --- a/webapp/src/components/chat/prompt-dialog/PromptDialog.tsx +++ b/webapp/src/components/chat/prompt-dialog/PromptDialog.tsx @@ -81,8 +81,8 @@ export const PromptDialog: React.FC = ({ message }) => { // Backend can be configured to return the raw response from Stepwise Planner. In this case, no meta prompt was generated or completed // and we should show the Stepwise thought process as the raw content view. - if ((prompt as BotResponsePrompt).metaPromptTemplate.length <= 0) { - (prompt as BotResponsePrompt).rawView = ( + if (prompt.metaPromptTemplate.length <= 0) { + prompt.rawView = ( 
                                 {JSON.stringify(JSON.parse(details.stepsTaken), null, 2)}
diff --git a/webapp/src/libs/hooks/useChat.ts b/webapp/src/libs/hooks/useChat.ts index 703486499..05d017607 100644 --- a/webapp/src/libs/hooks/useChat.ts +++ b/webapp/src/libs/hooks/useChat.ts @@ -42,7 +42,7 @@ export interface GetResponseOptions { messageType: ChatMessageType; value: string; chatId: string; - contextVariables?: IAskVariables[]; + kernelArguments?: IAskVariables[]; processPlan?: boolean; } @@ -108,7 +108,7 @@ export const useChat = () => { } }; - const getResponse = async ({ messageType, value, chatId, contextVariables, processPlan }: GetResponseOptions) => { + const getResponse = async ({ messageType, value, chatId, kernelArguments, processPlan }: GetResponseOptions) => { const chatInput: IChatMessage = { chatId: chatId, timestamp: new Date().getTime(), @@ -135,8 +135,8 @@ export const useChat = () => { ], }; - if (contextVariables) { - ask.variables.push(...contextVariables); + if (kernelArguments) { + ask.variables.push(...kernelArguments); } try { @@ -422,7 +422,7 @@ export const useChat = () => { }; const processPlan = async (chatId: string, planState: PlanState, serializedPlan: string, planGoal?: string) => { - const contextVariables: ContextVariable[] = [ + const kernelArguments: ContextVariable[] = [ { key: 'proposedPlan', value: serializedPlan, @@ -442,7 +442,7 @@ export const useChat = () => { // Send plan back for processing or execution await getResponse({ value: message, - contextVariables, + kernelArguments, messageType: ChatMessageType.Message, chatId: chatId, processPlan: true, diff --git a/webapp/src/redux/features/app/AppState.ts b/webapp/src/redux/features/app/AppState.ts index 73ddb47c1..17587e6d0 100644 --- a/webapp/src/redux/features/app/AppState.ts +++ b/webapp/src/redux/features/app/AppState.ts @@ -68,7 +68,7 @@ export enum FeatureKeys { SimplifiedExperience, PluginsPlannersAndPersonas, AzureContentSafety, - AzureCognitiveSearch, + AzureAISearch, BotAsDocs, MultiUserChat, RLHF, // Reinforcement Learning from Human Feedback @@ -96,9 +96,9 @@ export const Features = { label: 'Azure Content Safety', inactive: true, }, - [FeatureKeys.AzureCognitiveSearch]: { + [FeatureKeys.AzureAISearch]: { enabled: false, - label: 'Azure Cognitive Search', + label: 'Azure AI Search', inactive: true, }, [FeatureKeys.BotAsDocs]: { @@ -135,7 +135,7 @@ export const Settings = [ }, { title: 'Azure AI', - features: [FeatureKeys.AzureContentSafety, FeatureKeys.AzureCognitiveSearch], + features: [FeatureKeys.AzureContentSafety, FeatureKeys.AzureAISearch], stackVertically: true, }, { diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 3bb33e114..f376ea309 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1327,10 +1327,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.56.0": - version "8.56.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" - integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== "@floating-ui/core@^1.3.1": version "1.3.1" @@ -1379,77 +1379,77 @@ dependencies: "@swc/helpers" "^0.5.1" -"@fluentui/react-accordion@^9.3.41": - version "9.3.41" - resolved "https://registry.yarnpkg.com/@fluentui/react-accordion/-/react-accordion-9.3.41.tgz#b8f4396900f4133ec39ae1a180bc7e82fb25b6b4" - integrity sha512-0EHoxdVm1HTX1MCk6xrYAfBHVek9PM9aoHsPzblp3CBvrEbFDnsOzTH/9lVKhUD8EZ066aHRCP1LL8WMCVbpsg== +"@fluentui/react-accordion@^9.3.46": + version "9.3.46" + resolved "https://registry.yarnpkg.com/@fluentui/react-accordion/-/react-accordion-9.3.46.tgz#3d17ce7e6fe7db467c3fccd041e181ab7a19cf6c" + integrity sha512-bFOF/uoPYL4AUQEIKFTgx8WZgeC39Vw2FiL6A2A0km0Z9yBgWg7LLsF73/MbgoO0GjH8BvO/2ddpgdd433jIRw== dependencies: - "@fluentui/react-aria" "^9.8.2" - "@fluentui/react-context-selector" "^9.1.51" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-context-selector" "^9.1.56" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-alert@9.0.0-beta.109": - version "9.0.0-beta.109" - resolved "https://registry.yarnpkg.com/@fluentui/react-alert/-/react-alert-9.0.0-beta.109.tgz#4b704ccf0013f780e2cf15457ea20a49ab463544" - integrity sha512-Cy+ZIukM0E/JEjMHGwZJd0t/SnN/o8hvofogedzKkPedFzhT1Enb5gQp9kZZKPHu/aY7CIHdeDN/V4bPvECh/w== +"@fluentui/react-alert@9.0.0-beta.114": + version "9.0.0-beta.114" + resolved "https://registry.yarnpkg.com/@fluentui/react-alert/-/react-alert-9.0.0-beta.114.tgz#20bedf7378edd25a77f149a05360309757a7f5f8" + integrity sha512-ZA55Wf9ZNE2KfKnT9fDqvWqnAKgcrYwYIJoliG+pCLztCitwlv/XUKAWR/DkP02NpA2qEeaiY1D9k/Mwd1haIQ== dependencies: - "@fluentui/react-avatar" "^9.6.14" - "@fluentui/react-button" "^9.3.68" + "@fluentui/react-avatar" "^9.6.19" + "@fluentui/react-button" "^9.3.73" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-aria@^9.8.2": - version "9.8.2" - resolved "https://registry.yarnpkg.com/@fluentui/react-aria/-/react-aria-9.8.2.tgz#7dac95f653d80e75bf9d136a6a165b2dd8f0d27e" - integrity sha512-5zjbbhAQcAvBBpdZZ+IwKhy9faEbj3bW/29ZRectl1sQ/Xu1MTbkC01uq6jgSEYClsyj23RzZv8QlkAMw+h9DA== +"@fluentui/react-aria@^9.10.2": + version "9.10.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-aria/-/react-aria-9.10.2.tgz#8fe01b8fe011de29348e11b33c5896607daa62e8" + integrity sha512-M8wzxPZlMOLr7SlZXlSi/zCbLSsXrJzpMjLkTOPPlMrMu8He38oM6Djc4dCac/cZn8ERpKUDaoAK5JF/kbtLzQ== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-utilities" "^9.18.5" "@swc/helpers" "^0.5.1" -"@fluentui/react-avatar@^9.6.14": - version "9.6.14" - resolved "https://registry.yarnpkg.com/@fluentui/react-avatar/-/react-avatar-9.6.14.tgz#b9e93f09e95f756c15acc4276e079c4e5169118c" - integrity sha512-7Dw08ZKsGc/95OnuK4X3UyofE/+PVoQMijv04M2+CE5L7NVpQJ34Au0NUdOp0Hk994iZTMZVjrPHPvofMj4f+w== +"@fluentui/react-avatar@^9.6.19": + version "9.6.19" + resolved "https://registry.yarnpkg.com/@fluentui/react-avatar/-/react-avatar-9.6.19.tgz#8e9bb7028dd71318cdfe48a6f9b28585e2a9ff23" + integrity sha512-3/8BBoPXNGfcuNVN4+bpwpd124CEdFEm9VKD6hQ6VmIHM6phBWnQc6J7djuKlZTw7B5UEeqEOEZgMJeGUx27SA== dependencies: - "@fluentui/react-badge" "^9.2.24" - "@fluentui/react-context-selector" "^9.1.51" + "@fluentui/react-badge" "^9.2.29" + "@fluentui/react-context-selector" "^9.1.56" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-popover" "^9.8.38" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-tooltip" "^9.4.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-popover" "^9.9.2" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-tooltip" "^9.4.21" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-badge@^9.2.24": - version "9.2.24" - resolved "https://registry.yarnpkg.com/@fluentui/react-badge/-/react-badge-9.2.24.tgz#4a9586d50a44b58ed5edbd1943897b841180d1ff" - integrity sha512-ThGVHf5wO8xpf/JbYSEMK0tGoRqprMDcx+jD7NK5lxjqv4oOxRGSFYfG5GYf4qJZZKbBc2hTOy/BHpts6WBtzw== +"@fluentui/react-badge@^9.2.29": + version "9.2.29" + resolved "https://registry.yarnpkg.com/@fluentui/react-badge/-/react-badge-9.2.29.tgz#3082278bee9a60f063e1cc04717dbb02fcd08267" + integrity sha512-k2CMMzBLPCNq5WAUfkCvWqCPeh8/NsfLxQBre8klxFZS5TT872ViLwmYHXpHWTfFymFrChaedOd7C8ZYqeT4tA== dependencies: "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" @@ -1472,84 +1472,85 @@ prop-types "^15.7.2" react-is "^17.0.2" -"@fluentui/react-breadcrumb@^9.0.14": - version "9.0.14" - resolved "https://registry.yarnpkg.com/@fluentui/react-breadcrumb/-/react-breadcrumb-9.0.14.tgz#3fe429ad524f5eed1ce2b2075250b1b42a265f04" - integrity sha512-4/+GfSfABwXVHYE8ovQRA9q8llUo0Us2YRKl/xD70oqCVGCMwwXkRX3nEYq54eNcduJ9dn+NrCyp/xc84/F4BA== +"@fluentui/react-breadcrumb@^9.0.19": + version "9.0.19" + resolved "https://registry.yarnpkg.com/@fluentui/react-breadcrumb/-/react-breadcrumb-9.0.19.tgz#807f381eb8f535dc5902c0dc80f09a8bc0d408d8" + integrity sha512-12pqa0CAVDaBu16/E/aU9R+wJoBga/4Dm9UoyX4FG5TkoM28kiOGXZ8xhEdOrF4w1J9hFfEx2cyNGSdGFyJfcQ== dependencies: - "@fluentui/react-aria" "^9.8.2" - "@fluentui/react-button" "^9.3.68" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-button" "^9.3.73" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-link" "^9.2.10" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-link" "^9.2.15" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-button@^9.3.68": - version "9.3.68" - resolved "https://registry.yarnpkg.com/@fluentui/react-button/-/react-button-9.3.68.tgz#c60a701781c05d687a208c641454cf0ca71003d0" - integrity sha512-jUY/SGXmaUw6R4lo+QVLly7s5cecc6/oJkRtiujdlB1WIWtI7H90X7Lm0IjnOEfS5TGaQ9wglZeXlsj3SKYL4g== +"@fluentui/react-button@^9.3.73": + version "9.3.73" + resolved "https://registry.yarnpkg.com/@fluentui/react-button/-/react-button-9.3.73.tgz#7874ddd5374faa1fe74db5ca5201f6a9f7551794" + integrity sha512-VsCxj4pKWL1SVj0XlYBRs4kaFUfRVK3JqCWx9mlDuHYzeRzk4aBCBT5vBIzrrPTj3bR2yl/zOf6m5T43kyWZxw== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-aria" "^9.8.2" + "@fluentui/react-aria" "^9.10.2" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-card@^9.0.67": - version "9.0.67" - resolved "https://registry.yarnpkg.com/@fluentui/react-card/-/react-card-9.0.67.tgz#b7d0ea896a1d431c04aba692ca7d34060e443a3f" - integrity sha512-guTFd0BZIot2WufOCjIl0wP1l/tCJAjPHOR0BGqQaONT4NSQYw++a6pyUaq+OccWbFBKOl6hWrZhET+SAGuxJw== +"@fluentui/react-card@^9.0.72": + version "9.0.72" + resolved "https://registry.yarnpkg.com/@fluentui/react-card/-/react-card-9.0.72.tgz#09e8fb00a8a1d68b81c44d1110f645c6f6ff23b7" + integrity sha512-sJQ0T0SOBZ8tTGMxmJhVYDaHsQe/+ECQwhPIb0irDnD3ojTbL/IjxONeBnxVJ5/xG6cA3rV6tfD8WrockIDXOg== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-checkbox@^9.2.12": - version "9.2.12" - resolved "https://registry.yarnpkg.com/@fluentui/react-checkbox/-/react-checkbox-9.2.12.tgz#bba3e4da6b26f9fd8d9bc2078e52fe17cbccede4" - integrity sha512-LW+D6tWCWjR2KMLs0Hi2eIEsNzdWIYwG7tc/GVhk2Wux9fFngGPigmpLlmbKtFy4t8IugdTHyujxk7em0oXjBg== +"@fluentui/react-checkbox@^9.2.17": + version "9.2.17" + resolved "https://registry.yarnpkg.com/@fluentui/react-checkbox/-/react-checkbox-9.2.17.tgz#96941acd8b2cb879c18cd8e5607ba654e9b91684" + integrity sha512-CnernbErbJZOeJAT6LflJlJt41n/nFReq6SHCnwrs6mt8NCZ6L5YU294kSPIHfLiJyRXjxUroDwQTsE+bwgKjw== dependencies: - "@fluentui/react-field" "^9.1.53" + "@fluentui/react-field" "^9.1.58" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-label" "^9.1.61" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-label" "^9.1.66" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-combobox@^9.7.5": - version "9.7.5" - resolved "https://registry.yarnpkg.com/@fluentui/react-combobox/-/react-combobox-9.7.5.tgz#7eea3390a6795f9acba46acd7536fcdd274bc480" - integrity sha512-lTbBD0bC1MWot2n3HL/HWhxxXGlol/3tmq6OVXkAdh4hPjUeFOhNiDuG2HJ2FiW7IBpwcpDhrH3Rfemu8c8hKg== +"@fluentui/react-combobox@^9.9.3": + version "9.9.3" + resolved "https://registry.yarnpkg.com/@fluentui/react-combobox/-/react-combobox-9.9.3.tgz#d3dc7e1213a10b010394b5e823e756004bb90061" + integrity sha512-wkA0a39zCMLmL6TVayRu3YppRzEjBeC+2OQzsM0A1ZH7Y/jRg/BxlIdJnrMVYrpLqcC3vGlPNrpsgVrvNmz25g== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-context-selector" "^9.1.51" - "@fluentui/react-field" "^9.1.53" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-context-selector" "^9.1.56" + "@fluentui/react-field" "^9.1.58" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-portal" "^9.4.13" - "@fluentui/react-positioning" "^9.13.3" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-portal" "^9.4.18" + "@fluentui/react-positioning" "^9.14.2" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" @@ -1576,129 +1577,130 @@ "@babel/runtime" "^7.10.4" react-is "^17.0.2" -"@fluentui/react-components@^9.46.4": - version "9.46.4" - resolved "https://registry.yarnpkg.com/@fluentui/react-components/-/react-components-9.46.4.tgz#af9362a292a0568b799c449a1c780127d94f3b7a" - integrity sha512-NSJsPaOKOzcbyn4v+AkSsNMoTvAv+9cmi6UuvTy070Vd2NXQQ3UOHSNHUH1RF0Y0bhPNSXrSqRP1lefyCU05qA== - dependencies: - "@fluentui/react-accordion" "^9.3.41" - "@fluentui/react-alert" "9.0.0-beta.109" - "@fluentui/react-aria" "^9.8.2" - "@fluentui/react-avatar" "^9.6.14" - "@fluentui/react-badge" "^9.2.24" - "@fluentui/react-breadcrumb" "^9.0.14" - "@fluentui/react-button" "^9.3.68" - "@fluentui/react-card" "^9.0.67" - "@fluentui/react-checkbox" "^9.2.12" - "@fluentui/react-combobox" "^9.7.5" - "@fluentui/react-dialog" "^9.9.10" - "@fluentui/react-divider" "^9.2.60" - "@fluentui/react-drawer" "^9.1.4" - "@fluentui/react-field" "^9.1.53" - "@fluentui/react-image" "^9.1.57" - "@fluentui/react-infobutton" "9.0.0-beta.93" - "@fluentui/react-infolabel" "^9.0.21" - "@fluentui/react-input" "^9.4.63" - "@fluentui/react-label" "^9.1.61" - "@fluentui/react-link" "^9.2.10" - "@fluentui/react-menu" "^9.12.50" - "@fluentui/react-message-bar" "^9.0.19" - "@fluentui/react-overflow" "^9.1.10" - "@fluentui/react-persona" "^9.2.73" - "@fluentui/react-popover" "^9.8.38" - "@fluentui/react-portal" "^9.4.13" - "@fluentui/react-positioning" "^9.13.3" - "@fluentui/react-progress" "^9.1.63" - "@fluentui/react-provider" "^9.13.11" - "@fluentui/react-radio" "^9.2.7" - "@fluentui/react-select" "^9.1.63" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-skeleton" "^9.0.51" - "@fluentui/react-slider" "^9.1.69" - "@fluentui/react-spinbutton" "^9.2.63" - "@fluentui/react-spinner" "^9.3.41" - "@fluentui/react-switch" "^9.1.69" - "@fluentui/react-table" "^9.11.10" - "@fluentui/react-tabs" "^9.4.9" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-tags" "^9.0.27" - "@fluentui/react-text" "^9.4.9" - "@fluentui/react-textarea" "^9.3.63" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-toast" "^9.3.30" - "@fluentui/react-toolbar" "^9.1.70" - "@fluentui/react-tooltip" "^9.4.16" - "@fluentui/react-tree" "^9.4.30" - "@fluentui/react-utilities" "^9.18.0" - "@fluentui/react-virtualizer" "9.0.0-alpha.68" +"@fluentui/react-components@^9.47.1": + version "9.47.1" + resolved "https://registry.yarnpkg.com/@fluentui/react-components/-/react-components-9.47.1.tgz#d310afaf1dac6fdbb35a621fca757d2b25ca9b30" + integrity sha512-GJ83GAy6++VA8CkGDEapua4PYnCBMn8aFYXszw2ck4Jy6ZShK3Sr0O0I81JWd7VDgCRrVKcMpAQy/sEWFutmxQ== + dependencies: + "@fluentui/react-accordion" "^9.3.46" + "@fluentui/react-alert" "9.0.0-beta.114" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-avatar" "^9.6.19" + "@fluentui/react-badge" "^9.2.29" + "@fluentui/react-breadcrumb" "^9.0.19" + "@fluentui/react-button" "^9.3.73" + "@fluentui/react-card" "^9.0.72" + "@fluentui/react-checkbox" "^9.2.17" + "@fluentui/react-combobox" "^9.9.3" + "@fluentui/react-dialog" "^9.9.15" + "@fluentui/react-divider" "^9.2.65" + "@fluentui/react-drawer" "^9.1.9" + "@fluentui/react-field" "^9.1.58" + "@fluentui/react-image" "^9.1.62" + "@fluentui/react-infobutton" "9.0.0-beta.98" + "@fluentui/react-infolabel" "^9.0.26" + "@fluentui/react-input" "^9.4.68" + "@fluentui/react-label" "^9.1.66" + "@fluentui/react-link" "^9.2.15" + "@fluentui/react-menu" "^9.13.4" + "@fluentui/react-message-bar" "^9.0.24" + "@fluentui/react-overflow" "^9.1.15" + "@fluentui/react-persona" "^9.2.78" + "@fluentui/react-popover" "^9.9.2" + "@fluentui/react-portal" "^9.4.18" + "@fluentui/react-positioning" "^9.14.2" + "@fluentui/react-progress" "^9.1.68" + "@fluentui/react-provider" "^9.13.16" + "@fluentui/react-radio" "^9.2.12" + "@fluentui/react-rating" "^9.0.1" + "@fluentui/react-select" "^9.1.68" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-skeleton" "^9.0.56" + "@fluentui/react-slider" "^9.1.74" + "@fluentui/react-spinbutton" "^9.2.68" + "@fluentui/react-spinner" "^9.4.2" + "@fluentui/react-switch" "^9.1.74" + "@fluentui/react-table" "^9.11.15" + "@fluentui/react-tabs" "^9.4.14" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-tags" "^9.1.3" + "@fluentui/react-text" "^9.4.14" + "@fluentui/react-textarea" "^9.3.68" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-toast" "^9.3.35" + "@fluentui/react-toolbar" "^9.1.75" + "@fluentui/react-tooltip" "^9.4.21" + "@fluentui/react-tree" "^9.4.35" + "@fluentui/react-utilities" "^9.18.5" + "@fluentui/react-virtualizer" "9.0.0-alpha.73" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-context-selector@^9.1.51": - version "9.1.51" - resolved "https://registry.yarnpkg.com/@fluentui/react-context-selector/-/react-context-selector-9.1.51.tgz#d08f9c08361926101dfc393f7c9148e606c37ea2" - integrity sha512-AzRC2XH7Ra39CQiGzV8xdfeVGIDqz6s7IjcBtL4HpA7G1g4pzfe2W9QbXOOr8iDwryCdMVbO+QP/sak+vMAcFw== +"@fluentui/react-context-selector@^9.1.56": + version "9.1.56" + resolved "https://registry.yarnpkg.com/@fluentui/react-context-selector/-/react-context-selector-9.1.56.tgz#c5985cb04443c17dfd314d23c2bfec1d84e1ba4e" + integrity sha512-TzDYTvHRuOB3qKiIBB0NU4mwX/fuxW41I1O9yK7C5Dt4RsexNInGLf5HMxYHWufevDSFhRLuAN+ikTHUMkcNzw== dependencies: - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-utilities" "^9.18.5" "@swc/helpers" "^0.5.1" -"@fluentui/react-dialog@^9.9.10": - version "9.9.10" - resolved "https://registry.yarnpkg.com/@fluentui/react-dialog/-/react-dialog-9.9.10.tgz#3e4b23bd3dad1199ef5ff21a8ff0bcb4d683af2c" - integrity sha512-fauPfcxhnuHPnaCI2mLtkxeyQvxWS8ux2fvr61ODQdqUzEmKZdDEXuBpRyuVxBWs+ZX4IBqSQu6KmDjZdcMZsg== +"@fluentui/react-dialog@^9.9.15": + version "9.9.15" + resolved "https://registry.yarnpkg.com/@fluentui/react-dialog/-/react-dialog-9.9.15.tgz#c6cbe04ac8a34a4c1f2981cff1c4c64a979b380c" + integrity sha512-UVjU7ZKq9117A80GQ/cv+YH/Pql4bN8FH3/GbJd8qwOxtlzOWpN8DOu1mwrj5ahxt3b+tpYsmp1QrqX9nujhMA== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-aria" "^9.8.2" - "@fluentui/react-context-selector" "^9.1.51" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-context-selector" "^9.1.56" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-portal" "^9.4.13" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-portal" "^9.4.18" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" react-transition-group "^4.4.1" -"@fluentui/react-divider@^9.2.60": - version "9.2.60" - resolved "https://registry.yarnpkg.com/@fluentui/react-divider/-/react-divider-9.2.60.tgz#868eda9611efcfb878209fb23294b1eded6d466f" - integrity sha512-TdFxSnSAK2SGzfzKsg/6Yfl+UxtirJpXY6B/ibHogLjLqsKm+RnVB8nyO5wd5RUoAQofWkQAAArTEl6UkJf1Kw== +"@fluentui/react-divider@^9.2.65": + version "9.2.65" + resolved "https://registry.yarnpkg.com/@fluentui/react-divider/-/react-divider-9.2.65.tgz#23b1929672783390695a26c76ba792eba9fc14fa" + integrity sha512-jjyvD+GnLACxHhV+eTdn0+X2Yar6NlzNK8q+xdZjuD+yJ5NcWiiD+Dkh5CJUFegkaBTUb2+Fp1pFEEMaCzrHkw== dependencies: - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-drawer@^9.1.4": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@fluentui/react-drawer/-/react-drawer-9.1.4.tgz#5cbf70598fc258a8cfc8138b366f67e1f12aa3de" - integrity sha512-yXMPeyqKiLa3A0H1XRS9RtWGRAq4J2mpVdmY495EzezBQuU/G3bJPIMYSBKzHdYvrJQl6DM+k8F4iA0d2ekUAQ== - dependencies: - "@fluentui/react-dialog" "^9.9.10" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-motion-preview" "^0.5.12" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" +"@fluentui/react-drawer@^9.1.9": + version "9.1.9" + resolved "https://registry.yarnpkg.com/@fluentui/react-drawer/-/react-drawer-9.1.9.tgz#fd9a360f7004e30114c812d95d96c61ccc56d282" + integrity sha512-5KzOVxRPFJa0oDnp+kfCYJezA4JxsQzporNSmVw/i3/w/L9hCJyOuzrI+ps36Xb3tYymaKsAemC4+NAvs4HD+w== + dependencies: + "@fluentui/react-dialog" "^9.9.15" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-motion-preview" "^0.5.17" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-field@^9.1.53": - version "9.1.53" - resolved "https://registry.yarnpkg.com/@fluentui/react-field/-/react-field-9.1.53.tgz#d78910f79e0683fdf18be6b9ca200e213afeb45d" - integrity sha512-u3zd2EjYZIMtCwEMAdb9wLODZWpfpWGWwgBKZMcZ3CpLm68TTcpkjqzUjg60l5aiyPvT8wThEUEHaeJBe0EgEg== +"@fluentui/react-field@^9.1.58": + version "9.1.58" + resolved "https://registry.yarnpkg.com/@fluentui/react-field/-/react-field-9.1.58.tgz#f6c080d79f160696cbfa98e9b5bc4aeb9fabb697" + integrity sha512-FrjgCdFgtlagga/HzHExdkqlgrLNRP2slPA62R2JP8ZorzR6zEmnYyC5+rUAVBY0OXv79Ky957urvJz+4rBBNA== dependencies: - "@fluentui/react-context-selector" "^9.1.51" + "@fluentui/react-context-selector" "^9.1.56" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-label" "^9.1.61" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-label" "^9.1.66" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" @@ -1713,147 +1715,147 @@ "@fluentui/styles" "^0.66.5" classnames "^2.2.6" -"@fluentui/react-icons@^2.0.224": - version "2.0.224" - resolved "https://registry.yarnpkg.com/@fluentui/react-icons/-/react-icons-2.0.224.tgz#fff0f4126b130f206f1efaa7c7e357e3bf29750a" - integrity sha512-ld03dlc1pG7xeTQsK1y5in19jkMtWHNaoktFv+e7NV2xmrgV/SgPyyjEXbMrQHb8Naea/XCoCpNHnUNCy68akw== +"@fluentui/react-icons@^2.0.224", "@fluentui/react-icons@^2.0.233": + version "2.0.233" + resolved "https://registry.yarnpkg.com/@fluentui/react-icons/-/react-icons-2.0.233.tgz#c3bcdee070680bea7739b1b6579f84eac987da36" + integrity sha512-gt3efrmlJFz3LiJknPpnFtGDF4ah+w+D/0klZit6izOwmb3KGnfqVDtSgupApYW717T9vhwgZKWETGipghiOTw== dependencies: "@griffel/react" "^1.0.0" tslib "^2.1.0" -"@fluentui/react-image@^9.1.57": - version "9.1.57" - resolved "https://registry.yarnpkg.com/@fluentui/react-image/-/react-image-9.1.57.tgz#27aed8b52bd72211de1e97fa70d7e772997617bf" - integrity sha512-dB0/NFvYChztwmEnEK5XjCtC5BjhI5zA/kUsdxXXnXyT5SnRsOz4qLIU3z6RN7E2ZXvmtWEgwtzSy6UsmKuICw== +"@fluentui/react-image@^9.1.62": + version "9.1.62" + resolved "https://registry.yarnpkg.com/@fluentui/react-image/-/react-image-9.1.62.tgz#3d76332f44e59a77e430fa06ce14a50dfc8f6ff7" + integrity sha512-j8V9XWdl9otn1kfBqo5EGBD7nvvaabb9H3Wz8I0pMfeC8fMwq6iR8KYO+MbFUSwmekMEoqsP8qPKHUOViMEhPw== dependencies: - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-infobutton@9.0.0-beta.93": - version "9.0.0-beta.93" - resolved "https://registry.yarnpkg.com/@fluentui/react-infobutton/-/react-infobutton-9.0.0-beta.93.tgz#2b703b1aaffc9bc0ddfa3207920609b1f367dbb9" - integrity sha512-tlE/M5p//lMpHGhXL9LRq5diEuw+rBtmy53QvM3r6NPevRl525MlxVZOMfTBh1Q+GXOS7kdvjCzlLxyXPVcA9w== +"@fluentui/react-infobutton@9.0.0-beta.98": + version "9.0.0-beta.98" + resolved "https://registry.yarnpkg.com/@fluentui/react-infobutton/-/react-infobutton-9.0.0-beta.98.tgz#642381f92c7119efa0a8d8b98623fbe534fc8480" + integrity sha512-7IFrKpmv1PnTN7ZrisYE7qrsfY6bRTK5AVnsQVrBX9/6xkLe4ZE52cQtoAnTX1gMIgqDhgoOd/RTzTO07xxPiw== dependencies: "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-label" "^9.1.61" - "@fluentui/react-popover" "^9.8.38" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-label" "^9.1.66" + "@fluentui/react-popover" "^9.9.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-infolabel@^9.0.21": - version "9.0.21" - resolved "https://registry.yarnpkg.com/@fluentui/react-infolabel/-/react-infolabel-9.0.21.tgz#fb0f463729f2950ea73cc4c4d3f5d16b3d0981fb" - integrity sha512-NIQWHFu0/dw5Ow4YTGmoqVmcevcxkbizx+M6ez2m58U0zTP7S+weOgmNcm74eBeP0A9rPnKkqQkSYWzzQcL8iQ== +"@fluentui/react-infolabel@^9.0.26": + version "9.0.26" + resolved "https://registry.yarnpkg.com/@fluentui/react-infolabel/-/react-infolabel-9.0.26.tgz#b093c73019ef37387034c3191df667a4e0923e15" + integrity sha512-mvLRsiS0bP0mLokMmU8Aho8Wea4OE1vBvisuC2uwq584WyDyk8rxjyPNqFo0BrcgwHSB++bHcQpsF4keP1UVQQ== dependencies: "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-label" "^9.1.61" - "@fluentui/react-popover" "^9.8.38" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-label" "^9.1.66" + "@fluentui/react-popover" "^9.9.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-input@^9.4.63": - version "9.4.63" - resolved "https://registry.yarnpkg.com/@fluentui/react-input/-/react-input-9.4.63.tgz#02ccc3dbb059a67a5c3a3cb550163ffa1ed119fd" - integrity sha512-mj54J3w4RUxFEVntU6XKfKM2n5z0A619OplNHBK/C/boWL3vL1llNcWMAbcpB3EqsjeaOR/+MhPVrMwAh4+nPg== +"@fluentui/react-input@^9.4.68": + version "9.4.68" + resolved "https://registry.yarnpkg.com/@fluentui/react-input/-/react-input-9.4.68.tgz#8be2253d767f5060637790184201db4a1f71304a" + integrity sha512-NCnHG/e17TkOW6L28nFQp654vTBvdlfzvpwSqKmzeeC7H71tweqdlgnaRnzyd58FOKe9fQ69bzk/TG9P3qiixg== dependencies: - "@fluentui/react-field" "^9.1.53" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-field" "^9.1.58" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-jsx-runtime@^9.0.29": - version "9.0.29" - resolved "https://registry.yarnpkg.com/@fluentui/react-jsx-runtime/-/react-jsx-runtime-9.0.29.tgz#6dea1692625db5bb60d66c1e69c33f72e969b323" - integrity sha512-C+jurF0i0qaioKOFzpbC3DGER+W/QOW1v0qgEJemu2R2ldSbwgCBVagFysfjxAfnONz4zaDPTMRj58PwyEnBIQ== +"@fluentui/react-jsx-runtime@^9.0.34": + version "9.0.34" + resolved "https://registry.yarnpkg.com/@fluentui/react-jsx-runtime/-/react-jsx-runtime-9.0.34.tgz#b53d575b1f0dcef4834a2051ab0b931614ee0cdc" + integrity sha512-pJ/f/xZ6+19sD3kjyMp2NDmIwexdMbYHeqmr/AgbI+G3Fb2NKA0UA6XylAXlCiAx4nEXdOETJDrrDsdFAV+/Fw== dependencies: - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-utilities" "^9.18.5" "@swc/helpers" "^0.5.1" react-is "^17.0.2" -"@fluentui/react-label@^9.1.61": - version "9.1.61" - resolved "https://registry.yarnpkg.com/@fluentui/react-label/-/react-label-9.1.61.tgz#df9288de009c54b5ac8682de4b9ec6876b608570" - integrity sha512-VTiZ2Y9Nipmsq4YL3qjhZeyRMkj2nKHMOWrvifkG85ss62+PpWUDC8BBQKqbI0vLiFVYImMezCeQUX3qSYqgoA== +"@fluentui/react-label@^9.1.66": + version "9.1.66" + resolved "https://registry.yarnpkg.com/@fluentui/react-label/-/react-label-9.1.66.tgz#4d2134e508b0054674d783d5299c13b8e37cf243" + integrity sha512-N0HOD5Wd6NI3YG7nGIhRhrjNBfNpDyaWxNYGMVnQs0pa6CWXcT6sCVxXxxSYYEnVFIDX7JmzFc4mgombTwnmmg== dependencies: - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-link@^9.2.10": - version "9.2.10" - resolved "https://registry.yarnpkg.com/@fluentui/react-link/-/react-link-9.2.10.tgz#0feff9934814d8f454321a1659eb93aac22caeaf" - integrity sha512-jOmib6CIv8BUUHn8Y/P+ikR1OoQHrk0IdNat7ygCdCNGtCjc3y+yzuNwsin7uYfftdkXBzBX7ZC9fmY4U9Eq4Q== +"@fluentui/react-link@^9.2.15": + version "9.2.15" + resolved "https://registry.yarnpkg.com/@fluentui/react-link/-/react-link-9.2.15.tgz#21d66b6272057bfaa907ae36d6d7a099f8aa3ef6" + integrity sha512-wZzLz3od22wJhmEd5xwOULVAuXXEdBRDa01mojtnU25pBhIErvY2VXU5QNS+Yycjt52NvBElB6Ut+LOKJ9KD2g== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-menu@^9.12.50": - version "9.12.50" - resolved "https://registry.yarnpkg.com/@fluentui/react-menu/-/react-menu-9.12.50.tgz#fbb5df82fcfd99b97338bc1962d267833f6823ed" - integrity sha512-sFxygmIi+V6xjrzaMiGuXx0EpvABHjjrLLd9Zi/dDlCCTP3zWRVBdfTlmWXi1QVh96JUBXP7e8qDD7h+ExY9OA== +"@fluentui/react-menu@^9.13.4": + version "9.13.4" + resolved "https://registry.yarnpkg.com/@fluentui/react-menu/-/react-menu-9.13.4.tgz#26cdf62556df7c364d66890b796b9bf596874332" + integrity sha512-dIcClcBMjxj1eBKHiCdTYI59nnldPQHv+e/JW2YxP6XecJVLa/zoxsMoiwor/uzU2JlGKzKNQj2CIDkok71ivw== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-aria" "^9.8.2" - "@fluentui/react-context-selector" "^9.1.51" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-context-selector" "^9.1.56" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-portal" "^9.4.13" - "@fluentui/react-positioning" "^9.13.3" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-portal" "^9.4.18" + "@fluentui/react-positioning" "^9.14.2" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-message-bar@^9.0.19": - version "9.0.19" - resolved "https://registry.yarnpkg.com/@fluentui/react-message-bar/-/react-message-bar-9.0.19.tgz#85b08ff592383460d5c1143f4801248bbdc4833e" - integrity sha512-aqR38fYfNRLUPgU3+6aBwkLVSs6UWRFe9a+wqElyJsmkU+rADXC5tWPdcn3YT0wg3kWzNmATtWlTtIcH+K4RMw== +"@fluentui/react-message-bar@^9.0.24": + version "9.0.24" + resolved "https://registry.yarnpkg.com/@fluentui/react-message-bar/-/react-message-bar-9.0.24.tgz#a2cac32fecb7fa7ef27ee1372efbeeb867c5444b" + integrity sha512-gcqXRMFDbPc23aDTovwVUepufUJjjtQlnfqkWEwjlV6k1UdAfIzqgSThm81ztFXop1StyOH8gVj7QBGpBDz7+g== dependencies: - "@fluentui/react-button" "^9.3.68" + "@fluentui/react-button" "^9.3.73" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" react-transition-group "^4.4.1" -"@fluentui/react-motion-preview@^0.5.12": - version "0.5.12" - resolved "https://registry.yarnpkg.com/@fluentui/react-motion-preview/-/react-motion-preview-0.5.12.tgz#3f3f153884079843d75e8229ed9d45b9af6db141" - integrity sha512-mZ5Ys4ASWyrDAD1XKZI4rQtmEPLvnYp8Bv59ebINJcdeNJSETSq1TThwIDyfoimO4Kaw/092ydOJyL98dGXA1w== +"@fluentui/react-motion-preview@^0.5.17": + version "0.5.17" + resolved "https://registry.yarnpkg.com/@fluentui/react-motion-preview/-/react-motion-preview-0.5.17.tgz#c3c6186e64dee32b6ba6a4e940f868aca0bd647c" + integrity sha512-7hnFuCpF7el6eQq3xwMKOWUWhfY0/UjHhaKkJ3NWHQuM8H7mzYPTifpphSUvh4DYA5XEUh8n8YEvnNy1kFHsVg== dependencies: - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" @@ -1914,47 +1916,47 @@ react-is "^17.0.2" react-transition-group "^4.4.1" -"@fluentui/react-overflow@^9.1.10": - version "9.1.10" - resolved "https://registry.yarnpkg.com/@fluentui/react-overflow/-/react-overflow-9.1.10.tgz#ba810207c21f64d40cc57625cb48c948540307da" - integrity sha512-llvTkxT63c8vBGo/ihivMMqCth9BYf63VTZgx01Sj+v+ABxnDlZfh8D8vJjijghwL0X3MeG24CYci4FHLdDfjg== +"@fluentui/react-overflow@^9.1.15": + version "9.1.15" + resolved "https://registry.yarnpkg.com/@fluentui/react-overflow/-/react-overflow-9.1.15.tgz#47abad309b8f42f33f72c729a207fdd2d78d5630" + integrity sha512-oIHwP9jLP3vzUlPy2M8shzgwHSvIh3mhc2A5CPTyu+aU906NFV6EFEx03vy62Cof21Ux71KOpPTFTAX0tBQrAA== dependencies: "@fluentui/priority-overflow" "^9.1.11" - "@fluentui/react-context-selector" "^9.1.51" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-context-selector" "^9.1.56" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-persona@^9.2.73": - version "9.2.73" - resolved "https://registry.yarnpkg.com/@fluentui/react-persona/-/react-persona-9.2.73.tgz#edde95d8d78d4b3d532d048505fa8eb09eda1ef4" - integrity sha512-XgVQ5t33LvWNh6zaXScouns3dGRq/cm4z9dwt8MaJbjDAixt95uME6DCqeZghwQIrTD3L2+6iHu0NfEr5YGoSg== - dependencies: - "@fluentui/react-avatar" "^9.6.14" - "@fluentui/react-badge" "^9.2.24" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" +"@fluentui/react-persona@^9.2.78": + version "9.2.78" + resolved "https://registry.yarnpkg.com/@fluentui/react-persona/-/react-persona-9.2.78.tgz#d05c432fdab3a518e4633fbc883a3da8553eed2c" + integrity sha512-pWpyTYtoV7y1vHZv/MMc+h6kbIh9jB69FMXjkNX2uUiEBq0e+RQlkDhivZv58t9y6S8ZqdPZEelJgbH8HfHekw== + dependencies: + "@fluentui/react-avatar" "^9.6.19" + "@fluentui/react-badge" "^9.2.29" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-popover@^9.8.38": - version "9.8.38" - resolved "https://registry.yarnpkg.com/@fluentui/react-popover/-/react-popover-9.8.38.tgz#ce7bba9f1169eae213580da1f5cd9f1d79246acf" - integrity sha512-MOEesK3AEVUGRmOuDDHsSvrxe6ksuRWOwjaKkOEiLiQ8uyy26pAHZKREkQXBXFVIB8/f9FC0rbrDeTq7j8mk8A== +"@fluentui/react-popover@^9.9.2": + version "9.9.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-popover/-/react-popover-9.9.2.tgz#dc1705b499ffd4fdbf6f3678bd690d3c9ad975f2" + integrity sha512-F/7VTPZMVCY/dwqumzrp+wzRNTlsKJ9Gz1nmZPZuO7IMBC8XRIGkjqdjW7oW8SzIrRmOTkAvmsn4UfPL19spiw== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-aria" "^9.8.2" - "@fluentui/react-context-selector" "^9.1.51" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-portal" "^9.4.13" - "@fluentui/react-positioning" "^9.13.3" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-context-selector" "^9.1.56" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-portal" "^9.4.18" + "@fluentui/react-positioning" "^9.14.2" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" @@ -1965,41 +1967,41 @@ dependencies: "@swc/helpers" "^0.4.14" -"@fluentui/react-portal@^9.4.13": - version "9.4.13" - resolved "https://registry.yarnpkg.com/@fluentui/react-portal/-/react-portal-9.4.13.tgz#2dbe9798ed208863f2768a320faf94d95425fdcd" - integrity sha512-pAEz2GReuN13XVhsOP9YkbGIYZF6qWcOYpt9emAHBWNclPT5XLTBx+GrmOyInp1KTetLF7sRkIflyHprxwB0hA== +"@fluentui/react-portal@^9.4.18": + version "9.4.18" + resolved "https://registry.yarnpkg.com/@fluentui/react-portal/-/react-portal-9.4.18.tgz#170a44c0390d96565c801137fd24a4d112398474" + integrity sha512-ShWpbZ2vjA/8yrk34e2n8+B+w034reYaxxfSq9N8csNsMbTInKdn44wTPp1ikcuqzZFJlkVFW4+LbKeQ/DvtZQ== dependencies: - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" use-disposable "^1.0.1" -"@fluentui/react-positioning@^9.13.3": - version "9.13.3" - resolved "https://registry.yarnpkg.com/@fluentui/react-positioning/-/react-positioning-9.13.3.tgz#62b875954316e9043a9cf5685851e486f10a0a2b" - integrity sha512-zOzgz190Bpk6d3Xq5Q9mhkhlDe7CVqD0vHpTUm/v4JhGMl94v5YXuUgOYG6QpZQrqnDtIlFJBqfYJGVS5YhaPw== +"@fluentui/react-positioning@^9.14.2": + version "9.14.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-positioning/-/react-positioning-9.14.2.tgz#30a6369d7ca3fffa14864e77b52a1bfe010c32b1" + integrity sha512-m0buzn3UI7j2WjCGL83YwC064Xe9N/dQJ8aSwhv/xXBgQkxHnHYAs3hLG4Tjb/tliEOobntFlSI7O1NYKiDrFw== dependencies: "@floating-ui/devtools" "0.2.1" "@floating-ui/dom" "^1.2.0" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-progress@^9.1.63": - version "9.1.63" - resolved "https://registry.yarnpkg.com/@fluentui/react-progress/-/react-progress-9.1.63.tgz#c9e8ab94fcf5aa053cf5deb12a1e9f24f95eb5d1" - integrity sha512-dsUbahuDIvCYKJPGVZmz5S5aZjEAWcax1cDF/t51YGhfYCaKhqKeaw70z/5dgQpn3+Tvs1aYnlf4WudT7ThAxQ== +"@fluentui/react-progress@^9.1.68": + version "9.1.68" + resolved "https://registry.yarnpkg.com/@fluentui/react-progress/-/react-progress-9.1.68.tgz#1ce6c30e43c779783e175283f7e1f6500acd37f5" + integrity sha512-6DhpwhSc25dbWJL4DRxEzYw3NSzZkqkY6yJCdQIMwrUGd7Ju8f0wxZ8VdfZFSzJPnVDybU8IESO9kbXDsg5YfQ== dependencies: - "@fluentui/react-field" "^9.1.53" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-field" "^9.1.58" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" @@ -2012,315 +2014,328 @@ lodash "^4.17.15" prop-types "^15.7.2" -"@fluentui/react-provider@^9.13.11": - version "9.13.11" - resolved "https://registry.yarnpkg.com/@fluentui/react-provider/-/react-provider-9.13.11.tgz#95354db204e648e9a3b7dd4c78615991d241bdc2" - integrity sha512-hGlOVquqMhGgseYEIvUliO3rvV6RmZrmHC5XFMvIgTK9WqtA1by1PPWCmgD50YsCFSFT+DNzgvDvJmbQd+j27A== +"@fluentui/react-provider@^9.13.16": + version "9.13.16" + resolved "https://registry.yarnpkg.com/@fluentui/react-provider/-/react-provider-9.13.16.tgz#6ee16e966e9ee9e86197ec76495120d63e5dcde9" + integrity sha512-LHiy/4wefxgx+dneWLCrvTgC3qP2kHm7M1tnx2jXKZsBwpXMhAWqxBN3xs1y+u0fyI3RqhJpJAOmKLtmHW2/Og== dependencies: "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/core" "^1.14.1" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-radio@^9.2.7": - version "9.2.7" - resolved "https://registry.yarnpkg.com/@fluentui/react-radio/-/react-radio-9.2.7.tgz#5fe69d6cae253c433ab65ef78f186c89e661577f" - integrity sha512-8qS6ZbkoesqnPpCUv4mfTVH7xb+2ab6FUmIf+ck+eKCrdsLkETIbAxiRwOF1cMBIeqU47ji7T7aIbuPLsjmTBQ== - dependencies: - "@fluentui/react-field" "^9.1.53" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-label" "^9.1.61" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" +"@fluentui/react-radio@^9.2.12": + version "9.2.12" + resolved "https://registry.yarnpkg.com/@fluentui/react-radio/-/react-radio-9.2.12.tgz#183961e2bd240209d3fa61d7d8edb0458aa2bc68" + integrity sha512-V2FcDzojcqBQiy2sNdEt6Yj8QWoMM9DUvBvXuyjJawtsN5MlB3vkQlst2MpG0Fc1NQgrfnY73XkNAencwPWUYQ== + dependencies: + "@fluentui/react-field" "^9.1.58" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-label" "^9.1.66" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" + "@griffel/react" "^1.5.14" + "@swc/helpers" "^0.5.1" + +"@fluentui/react-rating@^9.0.1": + version "9.0.1" + resolved "https://registry.yarnpkg.com/@fluentui/react-rating/-/react-rating-9.0.1.tgz#a93973c5bef04f2dde11fcbdacc467d2060e7002" + integrity sha512-YNAv95ZnvJPI9Vt7OVmYfEqib4ijqVlXEz/cdVKwQG9s2Qek7jQwrH5lwQ0lFduLfli6Vu5ukxFPettMPp/mLQ== + dependencies: + "@fluentui/react-icons" "^2.0.224" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-select@^9.1.63": - version "9.1.63" - resolved "https://registry.yarnpkg.com/@fluentui/react-select/-/react-select-9.1.63.tgz#c5a028aa92e57cb99e05db0b8129d0469f2874e6" - integrity sha512-6IEUpitDaPuOpxBidKQsgwFfs0ppluKzC3ONAaCVVr3rV6iMkN47t28GHFjJnEHfeYXn6mzfs9vFJTijyhrc/A== +"@fluentui/react-select@^9.1.68": + version "9.1.68" + resolved "https://registry.yarnpkg.com/@fluentui/react-select/-/react-select-9.1.68.tgz#b3fe380258115c5b50566addbb444f5c1556ffbc" + integrity sha512-c5SBSuqWIqBHp5/3LMNIzk/KkIgb3tgJWqwQ0xQ9EYGFJLRbTG7iPE9JMeG/CmBa9zvb1WoFAaKnvdN5/vgSCQ== dependencies: - "@fluentui/react-field" "^9.1.53" + "@fluentui/react-field" "^9.1.58" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-shared-contexts@^9.14.0": - version "9.14.0" - resolved "https://registry.yarnpkg.com/@fluentui/react-shared-contexts/-/react-shared-contexts-9.14.0.tgz#b239bb969bcf26617a02b513d4863a2669242916" - integrity sha512-P9yhg31WYfB1W66/gD3+qVCLBsyIEcOzQvKVaIQvd9UhF67lNW4kMXUB6YVOk5PV0Og4hXnkH/vuHl7YMD9RHw== +"@fluentui/react-shared-contexts@^9.15.2": + version "9.15.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-shared-contexts/-/react-shared-contexts-9.15.2.tgz#e5214436ffc3672ff76e6dc964fd83078b570de5" + integrity sha512-0KEYEYGP4pjMrxZ5EytYqkUe56+tlr46ltxyKdcPcbfN+ptPffC9cevAR+4VIcb4xgmW+c7JT6nxDr5Rd5pvcw== dependencies: - "@fluentui/react-theme" "^9.1.16" + "@fluentui/react-theme" "^9.1.19" "@swc/helpers" "^0.5.1" -"@fluentui/react-skeleton@^9.0.51": - version "9.0.51" - resolved "https://registry.yarnpkg.com/@fluentui/react-skeleton/-/react-skeleton-9.0.51.tgz#7c4e42877de4cf445e940418299e4f8898524a72" - integrity sha512-2HBRXEjAMjiEhT+cotqxuCeRh67ZgXTPgIXvZpzgk2hEsxTcWKBfpVv2dSQpnE4boxmpt8Jg4KlzqtMYV0+T+Q== +"@fluentui/react-skeleton@^9.0.56": + version "9.0.56" + resolved "https://registry.yarnpkg.com/@fluentui/react-skeleton/-/react-skeleton-9.0.56.tgz#964ce3fa73edf60fe049a792d394581c17f2b12e" + integrity sha512-oY+/ZB52dQ6cZ1ll9FE5rqdSQdfAAh2Huw4MxIucm0Oh44dX3gB0+QE3Ar1yb2izVKi7AXLor7EIPaRm1lk1/A== dependencies: - "@fluentui/react-field" "^9.1.53" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-field" "^9.1.58" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-slider@^9.1.69": - version "9.1.69" - resolved "https://registry.yarnpkg.com/@fluentui/react-slider/-/react-slider-9.1.69.tgz#ab0b39bcaf9d6e7d365443b2ee8aae7d9dd0f320" - integrity sha512-vPDbvATWxtdsWB6nEyZ3WoZV9C0VDeUVlq582HlnomMcTPgCUxKFCpeE3lemR4LwY51WDbouOUFQFG0vJ9c/ow== - dependencies: - "@fluentui/react-field" "^9.1.53" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" +"@fluentui/react-slider@^9.1.74": + version "9.1.74" + resolved "https://registry.yarnpkg.com/@fluentui/react-slider/-/react-slider-9.1.74.tgz#a643d67efdb82d71f14e7388b576a66cff3dc628" + integrity sha512-vEbgf0MRzEovwFpptjjX9b5Apq461Iwnro1hxQiQUPqFwVdZqj0OzCJuvuohnbvNlZdtwihGkJ76gIYwMQG4Ag== + dependencies: + "@fluentui/react-field" "^9.1.58" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-spinbutton@^9.2.63": - version "9.2.63" - resolved "https://registry.yarnpkg.com/@fluentui/react-spinbutton/-/react-spinbutton-9.2.63.tgz#111eba44597204b21f8f56667d672c758f666f49" - integrity sha512-/7LnVtaYAz7rDtyqEMgMRftWg7IOEw/9rLFldzBCbUpn1A4/VuzQD2W8QAdpTutpEoIw5ripA3GEAsLYkJBEDA== +"@fluentui/react-spinbutton@^9.2.68": + version "9.2.68" + resolved "https://registry.yarnpkg.com/@fluentui/react-spinbutton/-/react-spinbutton-9.2.68.tgz#0a4fa87bc6d35547f8eb500138b7928c12ad5998" + integrity sha512-NKJ5+Aix9l+YUBQ4Mf8z2cl5yb23QMRbsnK2IJfnDUHviRRPv2pvYu9hsBjHRBeCbrJWh3fBJhy4lA5kf9vWRg== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-field" "^9.1.53" + "@fluentui/react-field" "^9.1.58" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-spinner@^9.3.41": - version "9.3.41" - resolved "https://registry.yarnpkg.com/@fluentui/react-spinner/-/react-spinner-9.3.41.tgz#aa3226756b3781baff1fdcef718bcaba92cd8c22" - integrity sha512-8ojZ+S34p+eLBMsy22zYcZIWibQ1xz44bFaqziV79kuThHe0960W18lOj2PXmGsAhiFVSAEZYwx5Hm+h027qEg== +"@fluentui/react-spinner@^9.4.2": + version "9.4.2" + resolved "https://registry.yarnpkg.com/@fluentui/react-spinner/-/react-spinner-9.4.2.tgz#873be5712e3314b529767e07e2a65c7ab668dcf5" + integrity sha512-fdxB+6FNM1qWNuzAEBGpF+u8esW7KyuVYujdVlIN/7uKRbwWe8sp4UMe7aHuvRtYleG9i1pMYnO3nwmrXYA6IQ== dependencies: - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-label" "^9.1.61" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-label" "^9.1.66" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-switch@^9.1.69": - version "9.1.69" - resolved "https://registry.yarnpkg.com/@fluentui/react-switch/-/react-switch-9.1.69.tgz#30e62887cf6c6eed72e1e32984fe20d97c2be417" - integrity sha512-N7ZHTjcyHYHO7qd2lqd3tW5uCurN5VbKuvq+IUvzOW5VjDHyNWxNfTmg6kRigL39wTrP0ymiiYWn4bl3kOFY2g== +"@fluentui/react-switch@^9.1.74": + version "9.1.74" + resolved "https://registry.yarnpkg.com/@fluentui/react-switch/-/react-switch-9.1.74.tgz#ecee2492a649c46abb9bc79dc2850057b216599e" + integrity sha512-mE+kHOVRXdHSvHVKGoV+8dXlm7nSpC3vVO1sDJW1KtYwE0eJ1a0DV8flfeHe4FW2ThADGIDThgiB/WJR+NwfYw== dependencies: - "@fluentui/react-field" "^9.1.53" + "@fluentui/react-field" "^9.1.58" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-label" "^9.1.61" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-label" "^9.1.66" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-table@^9.11.10": - version "9.11.10" - resolved "https://registry.yarnpkg.com/@fluentui/react-table/-/react-table-9.11.10.tgz#0c761f9775c6c019a73b028c25f6fd36308f0637" - integrity sha512-wWTQV9wqm3diGSpwIIsS4DddjBMf/MTXo5V39WU+NpcpNy2kyAJzcaXBWY5xv6eYbfEuTM1/n0xYp9RIWo7AsA== +"@fluentui/react-table@^9.11.15": + version "9.11.15" + resolved "https://registry.yarnpkg.com/@fluentui/react-table/-/react-table-9.11.15.tgz#31dd361906245869322406e1b2d55e326d191d2b" + integrity sha512-4dMDLmHvGuW2fezO5Mfau1V7K1/7/+rC3PbWMf9K1j6veoE19TIr3jqpoXvnwxQ3UWGmeyut3LhO97vOrPdwyg== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-aria" "^9.8.2" - "@fluentui/react-avatar" "^9.6.14" - "@fluentui/react-checkbox" "^9.2.12" - "@fluentui/react-context-selector" "^9.1.51" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-avatar" "^9.6.19" + "@fluentui/react-checkbox" "^9.2.17" + "@fluentui/react-context-selector" "^9.1.56" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-radio" "^9.2.7" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-radio" "^9.2.12" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-tabs@^9.4.9": - version "9.4.9" - resolved "https://registry.yarnpkg.com/@fluentui/react-tabs/-/react-tabs-9.4.9.tgz#da1719ae184ec5ffda99d660af8d9df7350a2089" - integrity sha512-ZBHwHnuhU6C8r497Z820A3l/bZyj18yy6I4FRCjBD4yxJle+/b2ut9jLyXBhP1PKazZo6/qyDW74R8t7gYnpvQ== - dependencies: - "@fluentui/react-context-selector" "^9.1.51" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" +"@fluentui/react-tabs@^9.4.14": + version "9.4.14" + resolved "https://registry.yarnpkg.com/@fluentui/react-tabs/-/react-tabs-9.4.14.tgz#df4794b09e3ac1b72958944ba4db5621477ecc4e" + integrity sha512-hXcgzQCnmHym5ERlitE1gWU974TT644034FUXoc4x4EoduLQ1FEebHRFZKajGeR+/gGHvBXXnbvdw6dNZwwJkw== + dependencies: + "@fluentui/react-context-selector" "^9.1.56" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-tabster@^9.19.0": - version "9.19.0" - resolved "https://registry.yarnpkg.com/@fluentui/react-tabster/-/react-tabster-9.19.0.tgz#1499379b8a2ca3e0171cdfa069af10ff3508d6cd" - integrity sha512-gHbOHHRLgZ65hW0317ksgM8tDGEy9oahA9iVDnwCv6dKIjR120PzTMHio0XgezRwD2HjHE4/2MLZvNTKLVhXzA== +"@fluentui/react-tabster@^9.19.5": + version "9.19.5" + resolved "https://registry.yarnpkg.com/@fluentui/react-tabster/-/react-tabster-9.19.5.tgz#5c873997d98b4004814698d0300d76c9f88b2ab4" + integrity sha512-bazFB5naT7/I8Q1+cRNvGhhlCQlWvLmCUpj+7tgMrfdX0ghRNI+adygsqKFx1oKkRm5ZBgsVFyk3M6AuDGoAQw== dependencies: - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" keyborg "^2.5.0" - tabster "^6.0.0" + tabster "^6.0.1" -"@fluentui/react-tags@^9.0.27": - version "9.0.27" - resolved "https://registry.yarnpkg.com/@fluentui/react-tags/-/react-tags-9.0.27.tgz#a6dc89332c468f449ad8549d26129d3cd07c5003" - integrity sha512-WfPZz21D7fGpl2x4akzOfJsgDQFn1Byyx46u8nFWZLovX1j2OA3yJXMTOgqFp+/NAMw1t+2lZvcNxZHbtjC/SA== +"@fluentui/react-tags@^9.1.3": + version "9.1.3" + resolved "https://registry.yarnpkg.com/@fluentui/react-tags/-/react-tags-9.1.3.tgz#55e94628e81886a4cb2ac6274a1171597837b7a1" + integrity sha512-gcoBdgESx9doPD1e6RcqCenZv4YEnHgV9tlAnRNYM13YEoAjAXtG8cD5vY5YUNYsS268IY79ZCBD7IV02G4aKQ== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-aria" "^9.8.2" - "@fluentui/react-avatar" "^9.6.14" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-avatar" "^9.6.19" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-text@^9.4.9": - version "9.4.9" - resolved "https://registry.yarnpkg.com/@fluentui/react-text/-/react-text-9.4.9.tgz#4dff1e0a0a688494091a8ee57e53603caa1e2f43" - integrity sha512-vEUnZf4Yj4JJpmMmObXJ7SWVsX10dcEMEola9+UuuNyi7jV6hODdeU6gzAbuOli0lqBTfUcyPlCKOxRyGURMAw== +"@fluentui/react-text@^9.4.14": + version "9.4.14" + resolved "https://registry.yarnpkg.com/@fluentui/react-text/-/react-text-9.4.14.tgz#5bcf4d09764d13bdc15656ce9f6179aaa5062e3d" + integrity sha512-QoWtBYene1NhoDc8ZpZaS5t4CrgbXBrN8UsTNXJY2qVgLKctqx3nEP0ZNc9y3/oGOp1bSQ1rIY2SpVv9voMEaA== dependencies: - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-textarea@^9.3.63": - version "9.3.63" - resolved "https://registry.yarnpkg.com/@fluentui/react-textarea/-/react-textarea-9.3.63.tgz#e811925413e18ccd415466812e43891e9ed353c5" - integrity sha512-MZBhuQzLh9S2gLitM+Szjd8zdb0uUfIxxjqdHrDgJ49xLhYlo3I/4vX4LM4UQmuESVJn5gnK2I+BXX7LXwOjZw== - dependencies: - "@fluentui/react-field" "^9.1.53" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" +"@fluentui/react-textarea@^9.3.68": + version "9.3.68" + resolved "https://registry.yarnpkg.com/@fluentui/react-textarea/-/react-textarea-9.3.68.tgz#f07c53dc4036523977ffb29d11d5f30ec1de3991" + integrity sha512-lMlNlVGFtM0tlqEnwEkSZGOoSQ6wDPaRF9sgqchJTduhVJNXFesibKDyBj970VZyQ6YmgLp+e1SGsbd9xAyRKA== + dependencies: + "@fluentui/react-field" "^9.1.58" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-theme@^9.1.16": - version "9.1.16" - resolved "https://registry.yarnpkg.com/@fluentui/react-theme/-/react-theme-9.1.16.tgz#e00210847863ac8cf5d5d162639fad1c16f85a5b" - integrity sha512-QK2dGE5aQXN1UGdiEmGKpYGP3tHXIchLvFf8DEEOWnF4XBc9SiEPNFYkvLMJjHxZmDz4D670rsOPe0r5jFDEKQ== +"@fluentui/react-theme@^9.1.19": + version "9.1.19" + resolved "https://registry.yarnpkg.com/@fluentui/react-theme/-/react-theme-9.1.19.tgz#46122e65a08d0560af4b2f17dc1e741913e41825" + integrity sha512-mrVhKbr4o9UKERPxgghIRDU59S7gRizrgz3/wwyMt7elkr8Sw+OpwKIeEw9x6P0RTcFDC00nggaMJhBGs7Xo4A== dependencies: - "@fluentui/tokens" "1.0.0-alpha.13" + "@fluentui/tokens" "1.0.0-alpha.16" "@swc/helpers" "^0.5.1" -"@fluentui/react-toast@^9.3.30": - version "9.3.30" - resolved "https://registry.yarnpkg.com/@fluentui/react-toast/-/react-toast-9.3.30.tgz#636d470f5f08855b28fc6a063f422da0c098d218" - integrity sha512-TW5UAWgJuUwkcFM5hYDU8qE42A69BmSJP8WeOckEYGrrnEoPQ2HLObf9ReLHtGBE6NOP55na9rBJAk/FLglK/Q== +"@fluentui/react-toast@^9.3.35": + version "9.3.35" + resolved "https://registry.yarnpkg.com/@fluentui/react-toast/-/react-toast-9.3.35.tgz#bbe7a8744e2316866b1ff93633c9474b2787d01e" + integrity sha512-eBu3ixzcyvRhyLgtWxiYuCWKkeYUZpWqZkRY5m83rJFu+A4yXBpVrCQ/XYdeBe8GuhvxTK7U9AdvMvcY1EBTBg== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-aria" "^9.8.2" + "@fluentui/react-aria" "^9.10.2" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-portal" "^9.4.13" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-portal" "^9.4.18" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" react-transition-group "^4.4.1" -"@fluentui/react-toolbar@^9.1.70": - version "9.1.70" - resolved "https://registry.yarnpkg.com/@fluentui/react-toolbar/-/react-toolbar-9.1.70.tgz#7eb02a718f81beeda0b93b06599f34cdcd69b3eb" - integrity sha512-P1sa7EiedS1AK1PFpo9dLoeuO3XIbmx+UHaOiWZNmWzt88exRHqEGpiSjklFhrYnEKRa8eouerNmKoOOTPaWfA== - dependencies: - "@fluentui/react-button" "^9.3.68" - "@fluentui/react-context-selector" "^9.1.51" - "@fluentui/react-divider" "^9.2.60" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-radio" "^9.2.7" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" +"@fluentui/react-toolbar@^9.1.75": + version "9.1.75" + resolved "https://registry.yarnpkg.com/@fluentui/react-toolbar/-/react-toolbar-9.1.75.tgz#de1f0fe682d4f1c023c6c0fc4e5b9cbbb367f542" + integrity sha512-gUhxzVUet2ersmbX6euFNq4sE7eu7i0wV8mnco+7Rcfh/jmMrRO5k5YfEO7S/1woDa88k3GnKd1JzNDHXUnTkw== + dependencies: + "@fluentui/react-button" "^9.3.73" + "@fluentui/react-context-selector" "^9.1.56" + "@fluentui/react-divider" "^9.2.65" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-radio" "^9.2.12" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-tooltip@^9.4.16": - version "9.4.16" - resolved "https://registry.yarnpkg.com/@fluentui/react-tooltip/-/react-tooltip-9.4.16.tgz#e3921bf7cb9295d995cedbf3f6134d5710f2a6b2" - integrity sha512-eGc2SjbnrN/PVuB1cxPMNytRJxHwdBBvdN9mHB8z4SDrf+EPDGue2oq8EnwNLaIXaww9RFRD0RzrusAkEnk/ow== +"@fluentui/react-tooltip@^9.4.21": + version "9.4.21" + resolved "https://registry.yarnpkg.com/@fluentui/react-tooltip/-/react-tooltip-9.4.21.tgz#8b1a807355703d00827524e26d55720eb13ee878" + integrity sha512-zGfhuOKDmmfFj9hssKAy00xGYzbxUZDQc4s8tNzP3NPRehuMPSY1ZaPIut3Gvrqn+i8kkKTxXsQBFBz3Qvzq6A== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-portal" "^9.4.13" - "@fluentui/react-positioning" "^9.13.3" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-portal" "^9.4.18" + "@fluentui/react-positioning" "^9.14.2" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-tree@^9.4.30": - version "9.4.30" - resolved "https://registry.yarnpkg.com/@fluentui/react-tree/-/react-tree-9.4.30.tgz#a4cb400e344f9089f18031beea5acd5b31346035" - integrity sha512-KR35Nge0gfHOZIgkA6KFiGkj2fi+QZoq1rHHbXtCWNQvJEJ0iQd8/GiEawMxO/VEP+MAXNdUE5QdMnjRdJOQWA== +"@fluentui/react-tree@^9.4.35": + version "9.4.35" + resolved "https://registry.yarnpkg.com/@fluentui/react-tree/-/react-tree-9.4.35.tgz#c4651abd3a18f1cb3fc555f252c4572ac3f1fe39" + integrity sha512-4NlV0xSaFKkjLietCaSS+WGoFoxUBIT2VqdYQDGseqNzo/z9V89rfygWpw6HJpNVdj/AyTJKGEGZhMlCN+VtRA== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-aria" "^9.8.2" - "@fluentui/react-avatar" "^9.6.14" - "@fluentui/react-button" "^9.3.68" - "@fluentui/react-checkbox" "^9.2.12" - "@fluentui/react-context-selector" "^9.1.51" + "@fluentui/react-aria" "^9.10.2" + "@fluentui/react-avatar" "^9.6.19" + "@fluentui/react-button" "^9.3.73" + "@fluentui/react-checkbox" "^9.2.17" + "@fluentui/react-context-selector" "^9.1.56" "@fluentui/react-icons" "^2.0.224" - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-radio" "^9.2.7" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-tabster" "^9.19.0" - "@fluentui/react-theme" "^9.1.16" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-radio" "^9.2.12" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-tabster" "^9.19.5" + "@fluentui/react-theme" "^9.1.19" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" -"@fluentui/react-utilities@^9.18.0": - version "9.18.0" - resolved "https://registry.yarnpkg.com/@fluentui/react-utilities/-/react-utilities-9.18.0.tgz#8dc468838577df64a923bda85740707553b19afe" - integrity sha512-PuuTKm/HReDdLwhpMiEC9SxaCe2NtIL8Ed+kVGBDzqEeVjJylCJWHy4tyOJCJ/+yz1Xyj6thiXr2k8Q5X+m7eg== +"@fluentui/react-utilities@^9.18.5": + version "9.18.5" + resolved "https://registry.yarnpkg.com/@fluentui/react-utilities/-/react-utilities-9.18.5.tgz#484c94c46def2d0f41c0a223218bde79916fd4b5" + integrity sha512-Q3WwuHY2YzZSOEg9KlwVKYUzYiWDAiyuuQHE4qZevoiNn2ly2gXgfbVUc27LPdWAOTLT9HjdddsdoaJuJ/S5Mw== dependencies: "@fluentui/keyboard-keys" "^9.0.7" - "@fluentui/react-shared-contexts" "^9.14.0" + "@fluentui/react-shared-contexts" "^9.15.2" "@swc/helpers" "^0.5.1" -"@fluentui/react-virtualizer@9.0.0-alpha.68": - version "9.0.0-alpha.68" - resolved "https://registry.yarnpkg.com/@fluentui/react-virtualizer/-/react-virtualizer-9.0.0-alpha.68.tgz#c0f232e18ed7ae6fca9a053f5be5938e721b6908" - integrity sha512-01sTPBW1W1FyaJwb1JlV7wyCBBLo+y9NQzPET3LQDJSQ7py1XEd7RL6XPMa/IJ+XbeR8hEPhHEHdtehylliMVw== +"@fluentui/react-virtualizer@9.0.0-alpha.73": + version "9.0.0-alpha.73" + resolved "https://registry.yarnpkg.com/@fluentui/react-virtualizer/-/react-virtualizer-9.0.0-alpha.73.tgz#a9a8f703050661f87635aca326743be80caa65b0" + integrity sha512-owoCcxzinQFZE4161c4V7rWn8PZR1eeO/2jg3taAUUa7nnyFti6u1wxv2fcRNNtn+hjWcaBtc6bOLVHsEZwoZg== dependencies: - "@fluentui/react-jsx-runtime" "^9.0.29" - "@fluentui/react-shared-contexts" "^9.14.0" - "@fluentui/react-utilities" "^9.18.0" + "@fluentui/react-jsx-runtime" "^9.0.34" + "@fluentui/react-shared-contexts" "^9.15.2" + "@fluentui/react-utilities" "^9.18.5" "@griffel/react" "^1.5.14" "@swc/helpers" "^0.5.1" @@ -2340,10 +2355,10 @@ csstype "^3.0.2" lodash "^4.17.15" -"@fluentui/tokens@1.0.0-alpha.13": - version "1.0.0-alpha.13" - resolved "https://registry.yarnpkg.com/@fluentui/tokens/-/tokens-1.0.0-alpha.13.tgz#15c0b006bebbd587ff22589f7e48572a28f842d8" - integrity sha512-IzYysTTBkAH7tQZxYKpzhxYnTJkvwXhjhTOpmERgnqTFifHTP8/vaQjJAAm7dI/9zlDx1oN+y/I+KzL9bDLHZQ== +"@fluentui/tokens@1.0.0-alpha.16": + version "1.0.0-alpha.16" + resolved "https://registry.yarnpkg.com/@fluentui/tokens/-/tokens-1.0.0-alpha.16.tgz#57adedcb926e7649c46e77e079f0b92cbb43bb54" + integrity sha512-Gr9G8LIlUhZYX5j6CfDQrofQqsWAz/q54KabWn1tWV/1083WwyoTZXiG1k6b37NnK7Feye7D7Nz+4MNqoKpXGw== dependencies: "@swc/helpers" "^0.5.1" @@ -2374,13 +2389,13 @@ dependencies: csstype "^3.1.2" -"@humanwhocodes/config-array@^0.11.13": - version "0.11.13" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" - integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ== +"@humanwhocodes/config-array@^0.11.14": + version "0.11.14" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" + integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== dependencies: - "@humanwhocodes/object-schema" "^2.0.1" - debug "^4.1.1" + "@humanwhocodes/object-schema" "^2.0.2" + debug "^4.3.1" minimatch "^3.0.5" "@humanwhocodes/module-importer@^1.0.1": @@ -2388,10 +2403,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" - integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== +"@humanwhocodes/object-schema@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" + integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" @@ -2708,12 +2723,12 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@playwright/test@^1.41.2": - version "1.41.2" - resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.41.2.tgz#bd9db40177f8fd442e16e14e0389d23751cdfc54" - integrity sha512-qQB9h7KbibJzrDpkXkYvsmiDJK14FULCCZgEcoe2AvFAS64oCirWTwzTlAYEbKaRxWs5TFesE1Na6izMv3HfGg== +"@playwright/test@^1.42.1": + version "1.42.1" + resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.42.1.tgz#9eff7417bcaa770e9e9a00439e078284b301f31c" + integrity sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ== dependencies: - playwright "1.41.2" + playwright "1.42.1" "@pmmmwh/react-refresh-webpack-plugin@^0.5.3": version "0.5.10" @@ -2735,10 +2750,10 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.4.tgz#11d5db19bd178936ec89cd84519c4de439574398" integrity sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg== -"@reduxjs/toolkit@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.1.0.tgz#b613226669557080d5d683f3dbbd95462f94b965" - integrity sha512-nfJ/b4ZhzUevQ1ZPKjlDL6CMYxO4o7ZL7OSsvSOxzT/EN11LsBDgTqP7aedHtBrFSVoK7oTP1SbMWUwGb30NLg== +"@reduxjs/toolkit@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.2.2.tgz#952fc8f8315d7274e28f6e4608b7ec66fce7e94e" + integrity sha512-454GZrEx3G6QSYwIx9ROaso1HR6sTH8qyZBe3KEsdWVGU3ayV8jYCwdaEJV3vl9V6+pi3GRl+7Xl7AeDna6qwQ== dependencies: immer "^10.0.3" redux "^5.0.1" @@ -3141,10 +3156,10 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node@*", "@types/node@^20.11.16": - version "20.11.16" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.16.tgz#4411f79411514eb8e2926f036c86c9f0e4ec6708" - integrity sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ== +"@types/node@*", "@types/node@^20.11.30": + version "20.11.30" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.30.tgz#9c33467fc23167a347e73834f788f4b9f399d66f" + integrity sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw== dependencies: undici-types "~5.26.4" @@ -3178,17 +3193,17 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@^18.2.18": - version "18.2.18" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.18.tgz#16946e6cd43971256d874bc3d0a72074bb8571dd" - integrity sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw== +"@types/react-dom@^18.2.22": + version "18.2.22" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.22.tgz#d332febf0815403de6da8a97e5fe282cbe609bae" + integrity sha512-fHkBXPeNtfvri6gdsMYyW+dW7RXFo6Ad09nLFK0VQWR7yGLai/Cyvyj696gbwYvBnhGtevUG9cET0pmUbMtoPQ== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.2.55": - version "18.2.55" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.55.tgz#38141821b7084404b5013742bc4ae08e44da7a67" - integrity sha512-Y2Tz5P4yz23brwm2d7jNon39qoAtMMmalOQv6+fEFt1mT+FcM3D841wDpoUvFXhaYenuROCy3FZYqdTjM7qVyA== +"@types/react@*", "@types/react@^18.2.56": + version "18.2.56" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.56.tgz#2d3e9021a0b6eb5bfc227761cc61b1c6dc6e0cd8" + integrity sha512-NpwHDMkS/EFZF2dONFQHgkPRwhvgq/OAvIaGQzxGSBmaeR++kTg6njr15Vatz0/2VcCEwJQFi6Jf4Q0qBu0rLA== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -4975,7 +4990,7 @@ debug@2.6.9, debug@^2.6.0: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -5609,16 +5624,16 @@ eslint-webpack-plugin@^3.1.1: normalize-path "^3.0.0" schema-utils "^4.0.0" -eslint@^8.3.0, eslint@^8.56.0: - version "8.56.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" - integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== +eslint@^8.3.0, eslint@^8.57.0: + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.56.0" - "@humanwhocodes/config-array" "^0.11.13" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" "@ungap/structured-clone" "^1.2.0" @@ -6044,9 +6059,9 @@ flatted@^3.1.0: integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== follow-redirects@^1.0.0: - version "1.15.4" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" - integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== for-each@^0.3.3: version "0.3.3" @@ -8214,10 +8229,10 @@ micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: braces "^3.0.2" picomatch "^2.3.1" -microsoft-cognitiveservices-speech-sdk@^1.35.0: - version "1.35.0" - resolved "https://registry.yarnpkg.com/microsoft-cognitiveservices-speech-sdk/-/microsoft-cognitiveservices-speech-sdk-1.35.0.tgz#b548f86a2c5674c7ce95e98291570c940fde977c" - integrity sha512-useWm6DsbcTCjlqCwXaChMvU1NyDZyeq1PgV0oGZutNNQ6ID2FuZyaxWt2RuVmmqGko6Cbk7gSyZsMs5fxrXzw== +microsoft-cognitiveservices-speech-sdk@^1.36.0: + version "1.36.0" + resolved "https://registry.yarnpkg.com/microsoft-cognitiveservices-speech-sdk/-/microsoft-cognitiveservices-speech-sdk-1.36.0.tgz#c47ac95c2bd8c67585105eb1159b15f9c4ca2a3b" + integrity sha512-wPxuEXgjLdqMMIrdBtl8jquGahLV19LQE0ie8MI/PcBcNLG5buVzwS2rQEyHMsRGx+C/4OdBo1ROdNIUzCm4Lg== dependencies: "@types/webrtc" "^0.0.37" agent-base "^6.0.1" @@ -8741,17 +8756,17 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -playwright-core@1.41.2: - version "1.41.2" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.41.2.tgz#db22372c708926c697acc261f0ef8406606802d9" - integrity sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA== +playwright-core@1.42.1: + version "1.42.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.42.1.tgz#13c150b93c940a3280ab1d3fbc945bc855c9459e" + integrity sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA== -playwright@1.41.2: - version "1.41.2" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.41.2.tgz#4e760b1c79f33d9129a8c65cc27953be6dd35042" - integrity sha512-v0bOa6H2GJChDL8pAeLa/LZC4feoAMbSQm1/jF/ySsWWoaNItvrMP7GEkvEEFyCTUYKMxjQKaTSg5up7nR6/8A== +playwright@1.42.1: + version "1.42.1" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.42.1.tgz#79c828b51fe3830211137550542426111dc8239f" + integrity sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg== dependencies: - playwright-core "1.41.2" + playwright-core "1.42.1" optionalDependencies: fsevents "2.3.2" @@ -10609,10 +10624,10 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -tabster@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/tabster/-/tabster-6.0.0.tgz#7fbea44c1e59f636cd3837c63491fdcb60974a2c" - integrity sha512-Dvrzv4wG+Qjw9wmC7bKOTVXDn24h8XZLNPmc+XfuEv4pGiTxg+EZ5fp265ccqu00E2om8Wznp9jFftWVu624aQ== +tabster@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/tabster/-/tabster-6.1.0.tgz#6dd5edcc6d1fec3c6a0434bc72fce8b00c58d972" + integrity sha512-wTPy2d6WVmU/YjT0ERY9jc+et1P/B8FoSQ4qhr1xi7liwTezRbRV6yA1pKx8kdPWmLdIOBA4fn07x9c0x/wnow== dependencies: keyborg "2.5.0" tslib "^2.3.1" @@ -10926,10 +10941,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typescript@5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== +typescript@5.4.3: + version "5.4.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.3.tgz#5c6fedd4c87bee01cd7a528a30145521f8e0feff" + integrity sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg== unbox-primitive@^1.0.2: version "1.0.2" @@ -11216,9 +11231,9 @@ webidl-conversions@^6.1.0: integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== webpack-dev-middleware@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" - integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA== + version "5.3.4" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517" + integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q== dependencies: colorette "^2.0.10" memfs "^3.4.3"