From 95640e2d940d9149c5c19fb5cbac119b6fe90098 Mon Sep 17 00:00:00 2001 From: Gil LaHaye Date: Mon, 20 Nov 2023 09:29:32 -0800 Subject: [PATCH] Update to SK 1 beta 7 (#626) ### Motivation and Context Getting the latest and greatest ### Description Update nugets ### Contribution Checklist - [ ] The code builds clean without any errors or warnings - [ ] The PR follows the [Contribution Guidelines](https://github.com/microsoft/chat-copilot/blob/main/CONTRIBUTING.md) and the [pre-submission formatting script](https://github.com/microsoft/chat-copilot/blob/main/CONTRIBUTING.md#development-scripts) raises no violations - [ ] All unit tests pass, and I have added new tests where possible - [ ] I didn't break anyone :smile: --- README.md | 6 ++--- .../ChatCopilotIntegrationTests.csproj | 10 +++---- .../CopilotChatMemoryPipeline.csproj | 4 +-- plugins/README.md | 2 +- plugins/shared/PluginManifest.cs | 2 +- shared/CopilotChatShared.csproj | 2 +- tools/importdocument/ImportDocument.csproj | 4 +-- webapi/CopilotChatWebApi.csproj | 26 +++++++++---------- webapi/Models/Storage/ChatMessage.cs | 2 +- webapi/Utilities/PluginUtils.cs | 2 +- .../plugin-wizard/steps/EnterManifestStep.tsx | 2 +- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 2f2bfb323..b131c9344 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -**NOTE**: This is a **sample** application to help you understand how Semantic Kernel and AI can work in Web Applications. This sample is **NOT FOR PRODUCTION** deployments. +**NOTE**: This is a **sample** application to help you understand how Semantic Kernel and AI can work in Web Applications. This sample is **NOT FOR PRODUCTION** deployments. # Chat Copilot Sample Application @@ -30,7 +30,7 @@ You will need the following items to run the sample: | AI Service | Requirement | | ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | Azure OpenAI | - [Access](https://aka.ms/oai/access)
- [Resource](https://learn.microsoft.com/azure/ai-services/openai/how-to/create-resource?pivots=web-portal#create-a-resource)
- [Deployed models](https://learn.microsoft.com/azure/ai-services/openai/how-to/create-resource?pivots=web-portal#deploy-a-model) (`gpt-35-turbo` and `text-embedding-ada-002`)
- [Endpoint](https://learn.microsoft.com/azure/ai-services/openai/tutorials/embeddings?tabs=command-line#retrieve-key-and-endpoint)
- [API key](https://learn.microsoft.com/azure/ai-services/openai/tutorials/embeddings?tabs=command-line#retrieve-key-and-endpoint) | -| OpenAI | - [Account](https://platform.openai.com)
- [API key](https://platform.openai.com/account/api-keys) | +| OpenAI | - [Account](https://platform.openai.com/docs/overview)
- [API key](https://platform.openai.com/api-keys) | # Instructions @@ -280,7 +280,7 @@ By default, Chat Copilot runs locally without authentication, using a guest user 2. **_Issue:_**: Challenges using text completion models, such as `text-davinci-003` - _Solution_: For OpenAI, see [model endpoint compatibility](https://platform.openai.com/docs/models/model-endpoint-compatibility) for + _Solution_: For OpenAI, see [model endpoint compatibility](https://platform.openai.com/docs/models/) for the complete list of current models supporting chat completions. For Azure OpenAI, see [model summary table and region availability](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#model-summary-table-and-region-availability). 3. **_Issue:_** Localhost SSL certificate errors / CORS errors diff --git a/integration-tests/ChatCopilotIntegrationTests.csproj b/integration-tests/ChatCopilotIntegrationTests.csproj index 637e7fd88..a622775e5 100644 --- a/integration-tests/ChatCopilotIntegrationTests.csproj +++ b/integration-tests/ChatCopilotIntegrationTests.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/memorypipeline/CopilotChatMemoryPipeline.csproj b/memorypipeline/CopilotChatMemoryPipeline.csproj index 8f9e4ffa0..6ac29afdb 100644 --- a/memorypipeline/CopilotChatMemoryPipeline.csproj +++ b/memorypipeline/CopilotChatMemoryPipeline.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/plugins/README.md b/plugins/README.md index 28ce8162a..937c884be 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -28,7 +28,7 @@ Read more about plugin authentication here: [Plugin authentication](https://plat ### Prerequisites 1. The name of your plugin. This should be identical to the `NameForHuman` in your plugin manifest. - > Please refer to OpenAI for the [manifest requirements](https://platform.openai.com/docs/plugins/getting-started/plugin-manifest). + > Please refer to OpenAI for the [manifest requirements](https://platform.openai.com/docs/plugins/getting-started/). 2. Url of your plugin. > This should be the root url to your API. Not the manifest url nor the OpenAPI spec url. 3. (Optional) Key of the plugin if it requires one. diff --git a/plugins/shared/PluginManifest.cs b/plugins/shared/PluginManifest.cs index 0223233df..8ddb72998 100644 --- a/plugins/shared/PluginManifest.cs +++ b/plugins/shared/PluginManifest.cs @@ -6,7 +6,7 @@ namespace Plugins.PluginShared; /// /// This class represents the OpenAI plugin manifest: -/// https://platform.openai.com/docs/plugins/getting-started/plugin-manifest +/// https://platform.openai.com/docs/plugins/getting-started /// public class PluginManifest { diff --git a/shared/CopilotChatShared.csproj b/shared/CopilotChatShared.csproj index 6a46f5134..ec4f16fe2 100644 --- a/shared/CopilotChatShared.csproj +++ b/shared/CopilotChatShared.csproj @@ -9,7 +9,7 @@ - + diff --git a/tools/importdocument/ImportDocument.csproj b/tools/importdocument/ImportDocument.csproj index ec3b20313..18a012fb3 100644 --- a/tools/importdocument/ImportDocument.csproj +++ b/tools/importdocument/ImportDocument.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/webapi/CopilotChatWebApi.csproj b/webapi/CopilotChatWebApi.csproj index b2ad3f4b3..28f0cd0c3 100644 --- a/webapi/CopilotChatWebApi.csproj +++ b/webapi/CopilotChatWebApi.csproj @@ -21,18 +21,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -52,7 +52,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/webapi/Models/Storage/ChatMessage.cs b/webapi/Models/Storage/ChatMessage.cs index 881818203..79b69bb59 100644 --- a/webapi/Models/Storage/ChatMessage.cs +++ b/webapi/Models/Storage/ChatMessage.cs @@ -257,6 +257,6 @@ public override string ToString() private static bool IsPlan(string response) { var planPrefix = "proposedPlan\":"; - return response.IndexOf(planPrefix, StringComparison.Ordinal) != -1; + return response.Contains(planPrefix, StringComparison.InvariantCulture); } } diff --git a/webapi/Utilities/PluginUtils.cs b/webapi/Utilities/PluginUtils.cs index b29c44847..247ef0e31 100644 --- a/webapi/Utilities/PluginUtils.cs +++ b/webapi/Utilities/PluginUtils.cs @@ -31,7 +31,7 @@ public static Uri GetPluginManifestUri(Uri manifestDomain) { UriBuilder uriBuilder = new(manifestDomain); - // Expected manifest path as defined by OpenAI: https://platform.openai.com/docs/plugins/getting-started/plugin-manifest + // Expected manifest path as defined by OpenAI: https://platform.openai.com/docs/plugins/getting-started uriBuilder.Path = "/.well-known/ai-plugin.json"; return uriBuilder.Uri; } diff --git a/webapp/src/components/open-api-plugins/plugin-wizard/steps/EnterManifestStep.tsx b/webapp/src/components/open-api-plugins/plugin-wizard/steps/EnterManifestStep.tsx index 4a2d2ee11..3c24578ce 100644 --- a/webapp/src/components/open-api-plugins/plugin-wizard/steps/EnterManifestStep.tsx +++ b/webapp/src/components/open-api-plugins/plugin-wizard/steps/EnterManifestStep.tsx @@ -54,7 +54,7 @@ export const EnterManifestStep: React.FC = ({ To connect a plugin, provide the website domain where your{' '}