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.

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

Already on GitHub? Sign in to your account

Refactor Core nuget + new Microsoft.KernelMemory nuget #847

Merged
merged 7 commits into from
Oct 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<!-- Central version prefix - applies to all nuget packages. -->
<Version>0.80.0</Version>
<Version>0.90.0</Version>

<!-- C# lang version, https://learn.microsoft.com/dotnet/csharp/whats-new -->
<LangVersion>12</LangVersion>
Expand Down
20 changes: 12 additions & 8 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.4.0" />
<PackageVersion Include="Microsoft.ML.Tokenizers" Version="0.22.0-preview.24378.1" />
<PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.79.241014.2" />
<PackageVersion Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.79.241014.2" />
<PackageVersion Include="MongoDB.Driver.GridFS" Version="2.30.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
Expand All @@ -51,19 +49,25 @@
<PackageVersion Include="NRedisStack" Version="0.13.0" />
<PackageVersion Include="ReadLine" Version="2.0.1" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
<PackageVersion Include="System.IO.Packaging" Version="8.0.1" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Memory.Data" Version="8.0.1" />
<PackageVersion Include="System.Numerics.Tensors" Version="8.0.0" />
</ItemGroup>
<!-- Security fixes -->
<ItemGroup>
<PackageVersion Include="System.Runtime.Caching" Version="8.0.1" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
</ItemGroup>
<!-- KM examples -->
<ItemGroup>
<PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.80.241017.2" />
<PackageVersion Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.80.241017.2" />
</ItemGroup>
<!-- Semantic Kernel -->
<ItemGroup>
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.23.0" />
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.23.0" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.23.0" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.23.0" />
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.24.1" />
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.24.1" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.24.1" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.24.1" />
</ItemGroup>
<!-- Documentation -->
<ItemGroup>
Expand Down
9 changes: 8 additions & 1 deletion KernelMemory.sln
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "201-dotnet-serverless-custo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "202-dotnet-custom-handler-as-a-service", "examples\202-dotnet-custom-handler-as-a-service\202-dotnet-custom-handler-as-a-service.csproj", "{DE115127-C77F-40FF-BA5A-E888A32F2289}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "203-dotnet-using-core-nuget", "examples\203-dotnet-using-core-nuget\203-dotnet-using-core-nuget.csproj", "{1B41A9A1-0B57-4297-B579-D04FC0BA3227}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "203-dotnet-using-KM-nuget", "examples\203-dotnet-using-KM-nuget\203-dotnet-using-KM-nuget.csproj", "{1B41A9A1-0B57-4297-B579-D04FC0BA3227}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "204-dotnet-ASP.NET-MVC-integration", "examples\204-dotnet-ASP.NET-MVC-integration\204-dotnet-ASP.NET-MVC-integration.csproj", "{10A6C940-AECC-4CEF-963E-9908DDA816B2}"
EndProject
Expand Down Expand Up @@ -331,6 +331,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.TestApplication",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureAIContentSafety", "extensions\AzureAIContentSafety\AzureAIContentSafety\AzureAIContentSafety.csproj", "{58E65B3F-EFF0-401A-AC76-A49835AE0220}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KernelMemory", "extensions\KM\KernelMemory\KernelMemory.csproj", "{AB097B62-5A0B-4D74-9F8B-A41FE8241447}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -613,6 +615,10 @@ Global
{58E65B3F-EFF0-401A-AC76-A49835AE0220}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58E65B3F-EFF0-401A-AC76-A49835AE0220}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58E65B3F-EFF0-401A-AC76-A49835AE0220}.Release|Any CPU.Build.0 = Release|Any CPU
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -711,6 +717,7 @@ Global
{345DEF9B-6EE1-49DF-B46A-25E38CE9B151} = {155DA079-E267-49AF-973A-D1D44681970F}
{82670921-FDCD-4672-84BD-4353F5AC24A0} = {3C17F42B-CFC8-4900-8CFB-88936311E919}
{58E65B3F-EFF0-401A-AC76-A49835AE0220} = {155DA079-E267-49AF-973A-D1D44681970F}
{AB097B62-5A0B-4D74-9F8B-A41FE8241447} = {155DA079-E267-49AF-973A-D1D44681970F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CC136C62-115C-41D1-B414-F9473EFF6EA8}
Expand Down
15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ Examples and Tools
15. [Creating a Memory instance without KernelMemoryBuilder](examples/210-KM-without-builder)
16. [Intent Detection](examples/211-dotnet-WebClient-Intent-Detection)
17. [Fetching data from Discord](examples/301-discord-test-application)
18. [Test project using KM package from nuget.org](examples/203-dotnet-using-core-nuget)
18. [Test project using KM package from nuget.org](examples/203-dotnet-using-KM-nuget)

## Tools

Expand All @@ -468,12 +468,14 @@ Examples and Tools
[![Nuget package](https://img.shields.io/nuget/vpre/Microsoft.KernelMemory.WebClient)](https://www.nuget.org/packages/Microsoft.KernelMemory.WebClient/)
[![Example code](https://img.shields.io/badge/example-code-blue)](examples/001-dotnet-WebClient)

- **Microsoft.KernelMemory.Core:** Kernel Memory core library including all extensions, can be used
to build custom pipelines and handlers, contains also the serverless client to use memory in a
synchronous way without the web service.
- **Microsoft.KernelMemory:** Kernel Memory library including all extensions and clients, it can be
used to build custom pipelines and handlers. It contains also the serverless client to use memory
in a synchronous way without the web service.

[![Nuget package](https://img.shields.io/nuget/vpre/Microsoft.KernelMemory.Core)](https://www.nuget.org/packages/Microsoft.KernelMemory.Core/)
[![Example code](https://img.shields.io/badge/example-code-blue)](examples/002-dotnet-Serverless)
[![Serverless example](https://img.shields.io/badge/example-code-blue)](examples/002-dotnet-Serverless)
[![Custom pipeline example](https://img.shields.io/badge/example-code-blue)](examples/004-dotnet-serverless-custom-pipeline)
[![Custom pipeline example](https://img.shields.io/badge/example-code-blue)](examples/005-dotnet-async-memory-custom-pipeline)

- **Microsoft.KernelMemory.Service.AspNetCore:** an extension to load Kernel Memory into your
ASP.NET apps.
Expand All @@ -487,6 +489,9 @@ Examples and Tools
[![Nuget package](https://img.shields.io/nuget/vpre/Microsoft.KernelMemory.SemanticKernelPlugin)](https://www.nuget.org/packages/Microsoft.KernelMemory.SemanticKernelPlugin/)
[![Example code](https://img.shields.io/badge/example-code-blue)](examples/003-dotnet-SemanticKernel-plugin)

- [**Microsoft.KernelMemory.\*** packages](https://www.nuget.org/packages?q=microsoft.kernelmemory):
Kernel Memory Core and all KM extensions split into distinct packages.

### Packages for Python, Java and other languages

Kernel Memory service offers a **Web API** out of the box, including the
Expand Down
1 change: 1 addition & 0 deletions applications/evaluation/Evaluation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\extensions\OpenAI\OpenAI\OpenAI.csproj" />
<ProjectReference Include="..\..\service\Core\Core.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\extensions\AzureOpenAI\AzureOpenAI.csproj" />
<ProjectReference Include="..\..\evaluation\Evaluation.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\clients\dotnet\SemanticKernelPlugin\SemanticKernelPlugin.csproj" />
<ProjectReference Include="..\..\clients\dotnet\WebClient\WebClient.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\LlamaSharp\LlamaSharp\LlamaSharp.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\clients\dotnet\WebClient\WebClient.csproj" />
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.KernelMemory.Core" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/208-dotnet-lmstudio/208-dotnet-lmstudio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\clients\dotnet\WebClient\WebClient.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\clients\dotnet\WebClient\WebClient.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion examples/212-dotnet-ollama/212-dotnet-ollama.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion examples/401-evaluation/401-evaluation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\..\applications\evaluation\Evaluation.csproj" />
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
</ItemGroup>

</Project>
Loading
Loading