Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Update CC to SK 1.0.0 Beta 6 #609

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Update CC to SK 1.0.0 Beta 6 #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions memorypipeline/CopilotChatMemoryPipeline.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.8.231108.1-preview" />
<PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.8.231113.1-preview" />
<PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-beta6" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion shared/CopilotChatShared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.8.231108.1-preview" />
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.8.231113.1-preview" />
<PackageReference Include="Tesseract" Version="5.2.0" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions webapi/Controllers/ChatController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ private async Task RegisterPlannerFunctionsAsync(CopilotChatPlanner planner, Dic
{
this._logger.LogInformation("Enabling GitHub plugin.");
BearerAuthenticationProvider authenticationProvider = new(() => Task.FromResult(GithubAuthHeader));
await planner.Kernel.ImportPluginFunctionsAsync(
await planner.Kernel.ImportOpenApiPluginFunctionsAsync(
pluginName: "GitHubPlugin",
filePath: Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "Plugins", "OpenApi/GitHubPlugin/openapi.json"),
new OpenApiFunctionExecutionParameters
Expand All @@ -295,7 +295,7 @@ private async Task RegisterPlannerFunctionsAsync(CopilotChatPlanner planner, Dic
var authenticationProvider = new BasicAuthenticationProvider(() => { return Task.FromResult(JiraAuthHeader); });
var hasServerUrlOverride = variables.TryGetValue("jira-server-url", out string? serverUrlOverride);

await planner.Kernel.ImportPluginFunctionsAsync(
await planner.Kernel.ImportOpenApiPluginFunctionsAsync(
pluginName: "JiraPlugin",
filePath: Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "Plugins", "OpenApi/JiraPlugin/openapi.json"),
new OpenApiFunctionExecutionParameters
Expand Down Expand Up @@ -334,7 +334,7 @@ private async Task RegisterPlannerFunctionsAsync(CopilotChatPlanner planner, Dic
var requiresAuth = !plugin.AuthType.Equals("none", StringComparison.OrdinalIgnoreCase);
BearerAuthenticationProvider authenticationProvider = new(() => Task.FromResult(PluginAuthValue));

await planner.Kernel.ImportPluginFunctionsAsync(
await planner.Kernel.ImportOpenApiPluginFunctionsAsync(
$"{plugin.NameForModel}Plugin",
PluginUtils.GetPluginManifestUri(plugin.ManifestDomain),
new OpenApiFunctionExecutionParameters
Expand Down Expand Up @@ -386,7 +386,7 @@ private async Task RegisterPlannerHostedFunctionsUsedAsync(CopilotChatPlanner pl
() => Task.FromResult(plugin.Key));

// Register the ChatGPT plugin with the planner's kernel.
await planner.Kernel.ImportPluginFunctionsAsync(
await planner.Kernel.ImportOpenApiPluginFunctionsAsync(
PluginUtils.SanitizePluginName(plugin.Name),
PluginUtils.GetPluginManifestUri(plugin.ManifestDomain),
new OpenApiFunctionExecutionParameters
Expand Down
30 changes: 15 additions & 15 deletions webapi/CopilotChatWebApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.36.0" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.15.3" />
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.8.231108.1-preview" />
<PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.AI.OpenAI" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Memory.AzureCognitiveSearch" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Memory.Qdrant" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.Functions.OpenAPI" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.Planners.Core" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.Plugins.MsGraph" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Web" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.SemanticKernel.TemplateEngine.Basic" Version="1.0.0-beta5" />
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.8.231113.1-preview" />
<PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.AI.OpenAI" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Memory.AzureCognitiveSearch" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Memory.Qdrant" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.Functions.OpenAPI" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.Planners.Core" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.Plugins.MsGraph" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Web" Version="1.0.0-beta6" />
<PackageReference Include="Microsoft.SemanticKernel.TemplateEngine.Basic" Version="1.0.0-beta6" />
<PackageReference Include="SharpToken" Version="1.2.12" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
Expand All @@ -57,17 +57,17 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Roslynator.Analyzers" Version="4.6.1">
<PackageReference Include="Roslynator.Analyzers" Version="4.6.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.6.1">
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.6.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.6.1">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.6.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions webapi/Services/SemanticKernelProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public SemanticKernelProvider(IServiceProvider serviceProvider, IConfiguration c
case string y when y.Equals("AzureOpenAIText", StringComparison.OrdinalIgnoreCase):
var azureAIOptions = memoryOptions.GetServiceConfig<AzureOpenAIConfig>(configuration, "AzureOpenAIText");
#pragma warning disable CA2000 // No need to dispose of HttpClient instances from IHttpClientFactory
builder.WithAzureChatCompletionService(
builder.WithAzureOpenAIChatCompletionService(
azureAIOptions.Deployment,
azureAIOptions.Endpoint,
azureAIOptions.APIKey,
Expand Down Expand Up @@ -112,7 +112,7 @@ public SemanticKernelProvider(IServiceProvider serviceProvider, IConfiguration c
case string y when y.Equals("AzureOpenAIText", StringComparison.OrdinalIgnoreCase):
var azureAIOptions = memoryOptions.GetServiceConfig<AzureOpenAIConfig>(configuration, "AzureOpenAIText");
#pragma warning disable CA2000 // No need to dispose of HttpClient instances from IHttpClientFactory
builder.WithAzureChatCompletionService(
builder.WithAzureOpenAIChatCompletionService(
plannerOptions.Model,
azureAIOptions.Endpoint,
azureAIOptions.APIKey,
Expand Down Expand Up @@ -155,7 +155,7 @@ public SemanticKernelProvider(IServiceProvider serviceProvider, IConfiguration c
case string y when y.Equals("AzureOpenAIEmbedding", StringComparison.OrdinalIgnoreCase):
var azureAIOptions = memoryOptions.GetServiceConfig<AzureOpenAIConfig>(configuration, "AzureOpenAIEmbedding");
#pragma warning disable CA2000 // No need to dispose of HttpClient instances from IHttpClientFactory
builder.WithAzureTextEmbeddingGenerationService(
builder.WithAzureOpenAITextEmbeddingGenerationService(
azureAIOptions.Deployment,
azureAIOptions.Endpoint,
azureAIOptions.APIKey,
Expand Down
Loading