Skip to content

Commit d762e9a

Browse files
dlucdluc
authored
Refactor Core nuget + new Microsoft.KernelMemory nuget (#847)
* New Microsoft.KernelMemory nuget, including all other nugets * Refactor Microsoft.KernelMemory.Core nuget to not include other packages
1 parent 2119cd7 commit d762e9a

File tree

51 files changed

+135
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+135
-88
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<!-- Central version prefix - applies to all nuget packages. -->
5-
<Version>0.80.0</Version>
5+
<Version>0.90.0</Version>
66

77
<!-- C# lang version, https://learn.microsoft.com/dotnet/csharp/whats-new -->
88
<LangVersion>12</LangVersion>

‎Directory.Packages.props‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
3939
<PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.4.0" />
4040
<PackageVersion Include="Microsoft.ML.Tokenizers" Version="0.22.0-preview.24378.1" />
41-
<PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.79.241014.2" />
42-
<PackageVersion Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.79.241014.2" />
4341
<PackageVersion Include="MongoDB.Driver.GridFS" Version="2.30.0" />
4442
<PackageVersion Include="Moq" Version="4.20.72" />
4543
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -51,19 +49,25 @@
5149
<PackageVersion Include="NRedisStack" Version="0.13.0" />
5250
<PackageVersion Include="ReadLine" Version="2.0.1" />
5351
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
54-
<PackageVersion Include="System.IO.Packaging" Version="8.0.1" />
5552
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
5653
<PackageVersion Include="System.Memory.Data" Version="8.0.1" />
5754
<PackageVersion Include="System.Numerics.Tensors" Version="8.0.0" />
55+
</ItemGroup>
56+
<!-- Security fixes -->
57+
<ItemGroup>
5858
<PackageVersion Include="System.Runtime.Caching" Version="8.0.1" />
59-
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
59+
</ItemGroup>
60+
<!-- KM examples -->
61+
<ItemGroup>
62+
<PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.80.241017.2" />
63+
<PackageVersion Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.80.241017.2" />
6064
</ItemGroup>
6165
<!-- Semantic Kernel -->
6266
<ItemGroup>
63-
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.23.0" />
64-
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.23.0" />
65-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.23.0" />
66-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.23.0" />
67+
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.24.1" />
68+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.24.1" />
69+
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.24.1" />
70+
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureOpenAI" Version="1.24.1" />
6771
</ItemGroup>
6872
<!-- Documentation -->
6973
<ItemGroup>

‎KernelMemory.sln‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "201-dotnet-serverless-custo
171171
EndProject
172172
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}"
173173
EndProject
174-
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}"
174+
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}"
175175
EndProject
176176
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}"
177177
EndProject
@@ -331,6 +331,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.TestApplication",
331331
EndProject
332332
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureAIContentSafety", "extensions\AzureAIContentSafety\AzureAIContentSafety\AzureAIContentSafety.csproj", "{58E65B3F-EFF0-401A-AC76-A49835AE0220}"
333333
EndProject
334+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KernelMemory", "extensions\KM\KernelMemory\KernelMemory.csproj", "{AB097B62-5A0B-4D74-9F8B-A41FE8241447}"
335+
EndProject
334336
Global
335337
GlobalSection(SolutionConfigurationPlatforms) = preSolution
336338
Debug|Any CPU = Debug|Any CPU
@@ -613,6 +615,10 @@ Global
613615
{58E65B3F-EFF0-401A-AC76-A49835AE0220}.Debug|Any CPU.Build.0 = Debug|Any CPU
614616
{58E65B3F-EFF0-401A-AC76-A49835AE0220}.Release|Any CPU.ActiveCfg = Release|Any CPU
615617
{58E65B3F-EFF0-401A-AC76-A49835AE0220}.Release|Any CPU.Build.0 = Release|Any CPU
618+
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
619+
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Debug|Any CPU.Build.0 = Debug|Any CPU
620+
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Release|Any CPU.ActiveCfg = Release|Any CPU
621+
{AB097B62-5A0B-4D74-9F8B-A41FE8241447}.Release|Any CPU.Build.0 = Release|Any CPU
616622
EndGlobalSection
617623
GlobalSection(SolutionProperties) = preSolution
618624
HideSolutionNode = FALSE
@@ -711,6 +717,7 @@ Global
711717
{345DEF9B-6EE1-49DF-B46A-25E38CE9B151} = {155DA079-E267-49AF-973A-D1D44681970F}
712718
{82670921-FDCD-4672-84BD-4353F5AC24A0} = {3C17F42B-CFC8-4900-8CFB-88936311E919}
713719
{58E65B3F-EFF0-401A-AC76-A49835AE0220} = {155DA079-E267-49AF-973A-D1D44681970F}
720+
{AB097B62-5A0B-4D74-9F8B-A41FE8241447} = {155DA079-E267-49AF-973A-D1D44681970F}
714721
EndGlobalSection
715722
GlobalSection(ExtensibilityGlobals) = postSolution
716723
SolutionGuid = {CC136C62-115C-41D1-B414-F9473EFF6EA8}

‎README.md‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ Examples and Tools
445445
15. [Creating a Memory instance without KernelMemoryBuilder](examples/210-KM-without-builder)
446446
16. [Intent Detection](examples/211-dotnet-WebClient-Intent-Detection)
447447
17. [Fetching data from Discord](examples/301-discord-test-application)
448-
18. [Test project using KM package from nuget.org](examples/203-dotnet-using-core-nuget)
448+
18. [Test project using KM package from nuget.org](examples/203-dotnet-using-KM-nuget)
449449
450450
## Tools
451451
@@ -468,12 +468,14 @@ Examples and Tools
468468
[![Nuget package](https://img.shields.io/nuget/vpre/Microsoft.KernelMemory.WebClient)](https://www.nuget.org/packages/Microsoft.KernelMemory.WebClient/)
469469
[![Example code](https://img.shields.io/badge/example-code-blue)](examples/001-dotnet-WebClient)
470470
471-
- **Microsoft.KernelMemory.Core:** Kernel Memory core library including all extensions, can be used
472-
to build custom pipelines and handlers, contains also the serverless client to use memory in a
473-
synchronous way without the web service.
471+
- **Microsoft.KernelMemory:** Kernel Memory library including all extensions and clients, it can be
472+
used to build custom pipelines and handlers. It contains also the serverless client to use memory
473+
in a synchronous way without the web service.
474474
475475
[![Nuget package](https://img.shields.io/nuget/vpre/Microsoft.KernelMemory.Core)](https://www.nuget.org/packages/Microsoft.KernelMemory.Core/)
476-
[![Example code](https://img.shields.io/badge/example-code-blue)](examples/002-dotnet-Serverless)
476+
[![Serverless example](https://img.shields.io/badge/example-code-blue)](examples/002-dotnet-Serverless)
477+
[![Custom pipeline example](https://img.shields.io/badge/example-code-blue)](examples/004-dotnet-serverless-custom-pipeline)
478+
[![Custom pipeline example](https://img.shields.io/badge/example-code-blue)](examples/005-dotnet-async-memory-custom-pipeline)
477479
478480
- **Microsoft.KernelMemory.Service.AspNetCore:** an extension to load Kernel Memory into your
479481
ASP.NET apps.
@@ -487,6 +489,9 @@ Examples and Tools
487489
[![Nuget package](https://img.shields.io/nuget/vpre/Microsoft.KernelMemory.SemanticKernelPlugin)](https://www.nuget.org/packages/Microsoft.KernelMemory.SemanticKernelPlugin/)
488490
[![Example code](https://img.shields.io/badge/example-code-blue)](examples/003-dotnet-SemanticKernel-plugin)
489491
492+
- [**Microsoft.KernelMemory.\*** packages](https://www.nuget.org/packages?q=microsoft.kernelmemory):
493+
Kernel Memory Core and all KM extensions split into distinct packages.
494+
490495
### Packages for Python, Java and other languages
491496
492497
Kernel Memory service offers a **Web API** out of the box, including the

‎applications/evaluation/Evaluation.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20+
<ProjectReference Include="..\..\extensions\OpenAI\OpenAI\OpenAI.csproj" />
2021
<ProjectReference Include="..\..\service\Core\Core.csproj" />
2122
</ItemGroup>
2223

‎applications/tests/Evaluation.Tests/Evaluation.FunctionalTests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36+
<ProjectReference Include="..\..\..\extensions\AzureOpenAI\AzureOpenAI.csproj" />
3637
<ProjectReference Include="..\..\evaluation\Evaluation.csproj" />
3738
</ItemGroup>
3839

‎examples/002-dotnet-Serverless/002-dotnet-Serverless.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\..\service\Core\Core.csproj" />
9+
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎examples/003-dotnet-SemanticKernel-plugin/003-dotnet-SemanticKernel-plugin.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\..\clients\dotnet\SemanticKernelPlugin\SemanticKernelPlugin.csproj" />
10-
<ProjectReference Include="..\..\clients\dotnet\WebClient\WebClient.csproj" />
9+
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
1110
</ItemGroup>
1211

1312
<ItemGroup>

‎examples/004-dotnet-serverless-custom-pipeline/004-dotnet-serverless-custom-pipeline.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\..\service\Core\Core.csproj" />
9+
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎examples/005-dotnet-async-memory-custom-pipeline/005-dotnet-async-memory-custom-pipeline.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\..\service\Core\Core.csproj" />
9+
<ProjectReference Include="..\..\extensions\KM\KernelMemory\KernelMemory.csproj" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

0 commit comments

Comments
 (0)