.Net: Update samples to use SK 0.18 (microsoft#2255)

### Motivation and Context Time marches on, ### Description Updated samples to use SK 0.18 and modified code when necessary due to that upgrade. ### Contribution Checklist - [ ] The code builds clean without any errors or warnings - [ ] The PR follows the [SK Contribution Guidelines](https://github.com/microsoft/semantic-kernel/blob/main/CONTRIBUTING.md) and the [pre-submission formatting script](https://github.com/microsoft/semantic-kernel/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 😄
teresaqhoang · Aug 2, 2023 · 738360a · 738360a
1 parent bfb8b9c
commit 738360a
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 36 deletions.
diff --git a/dotnet/samples/KernelSyntaxExamples/Example48_GroundednessChecks.cs b/dotnet/samples/KernelSyntaxExamples/Example48_GroundednessChecks.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Microsoft.SemanticKernel;
 using Microsoft.SemanticKernel.Planning;
-using Microsoft.SemanticKernel.Planning.Sequential;
 using Microsoft.SemanticKernel.Skills.Core;
 using RepoUtils;
 
@@ -138,8 +137,7 @@ which are not grounded in the original.
 
         kernel.ImportSkill(new TextSkill());
 
-        var plannerConfig = new SequentialPlannerConfig { };
-        var planner = new SequentialPlanner(kernel, plannerConfig);
+        var planner = new SequentialPlanner(kernel);
         var plan = await planner.CreatePlanAsync(ask);
         Console.WriteLine(plan.ToPlanWithGoalString());
 

diff --git a/...c/Extensions/Extensions.UnitTests/Planning/SequentialPlanner/SequentialPlanParserTests.cs b/...c/Extensions/Extensions.UnitTests/Planning/SequentialPlanner/SequentialPlanParserTests.cs
@@ -4,7 +4,6 @@
 using System.Threading;
 using Microsoft.Extensions.Logging;
 using Microsoft.SemanticKernel;
-using Microsoft.SemanticKernel.Memory;
 using Microsoft.SemanticKernel.Orchestration;
 using Microsoft.SemanticKernel.Planning;
 using Microsoft.SemanticKernel.Planning.Sequential;
@@ -26,18 +25,15 @@ public SequentialPlanParserTests(ITestOutputHelper testOutputHelper)
     }
 
     private Mock<IKernel> CreateKernelMock(
-        out Mock<ISemanticTextMemory> semanticMemoryMock,
         out Mock<IReadOnlySkillCollection> mockSkillCollection,
         out Mock<ILogger> mockLogger)
     {
-        semanticMemoryMock = new Mock<ISemanticTextMemory>();
         mockSkillCollection = new Mock<IReadOnlySkillCollection>();
         mockLogger = new Mock<ILogger>();
 
         var kernelMock = new Mock<IKernel>();
         kernelMock.SetupGet(k => k.Skills).Returns(mockSkillCollection.Object);
         kernelMock.SetupGet(k => k.Logger).Returns(mockLogger.Object);
-        kernelMock.SetupGet(k => k.Memory).Returns(semanticMemoryMock.Object);
 
         return kernelMock;
     }
@@ -61,7 +57,7 @@ private static Mock<ISKFunction> CreateMockFunction(FunctionView functionView, s
     private void CreateKernelAndFunctionCreateMocks(List<(string name, string skillName, string description, bool isSemantic, string result)> functions,
         out IKernel kernel)
     {
-        var kernelMock = this.CreateKernelMock(out _, out var skills, out _);
+        var kernelMock = this.CreateKernelMock(out var skills, out _);
         kernel = kernelMock.Object;
 
         // For Create

diff --git a/.../src/Extensions/Extensions.UnitTests/Planning/SequentialPlanner/SequentialPlannerTests.cs b/.../src/Extensions/Extensions.UnitTests/Planning/SequentialPlanner/SequentialPlannerTests.cs
@@ -136,7 +136,6 @@ public async Task EmptyGoalThrowsAsync()
     {
         // Arrange
         var kernel = new Mock<IKernel>();
-        // kernel.Setup(x => x.Logger).Returns(new Mock<ILogger>().Object);
 
         var planner = new Microsoft.SemanticKernel.Planning.SequentialPlanner(kernel.Object);
 

diff --git a/dotnet/src/Extensions/Planning.SequentialPlanner/SKContextSequentialPlannerExtensions.cs b/dotnet/src/Extensions/Planning.SequentialPlanner/SKContextSequentialPlannerExtensions.cs
@@ -130,7 +130,7 @@ private static async Task<IEnumerable<FunctionView>> GetRelevantFunctionsAsync(
     /// Saves all available functions to memory.
     /// </summary>
     /// <param name="context">The SKContext to save the functions to.</param>
-    /// <param name="memory">The memory provide to store the functions to..</param>
+    /// <param name="memory">The memory provided to store the functions to.</param>
     /// <param name="availableFunctions">The available functions to save.</param>
     /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
     internal static async Task RememberFunctionsAsync(

diff --git a/samples/dotnet/KernelHttpServer/Extensions.cs b/samples/dotnet/KernelHttpServer/Extensions.cs
@@ -132,7 +132,7 @@ internal static void RegisterNativeGraphSkills(this IKernel kernel, string graph
 
     internal static void RegisterTextMemory(this IKernel kernel)
     {
-        _ = kernel.ImportSkill(new TextMemorySkill(), nameof(TextMemorySkill));
+        _ = kernel.ImportSkill(new TextMemorySkill(kernel.Memory), nameof(TextMemorySkill));
     }
 
     [SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope",

diff --git a/samples/dotnet/KernelHttpServer/KernelHttpServer.csproj b/samples/dotnet/KernelHttpServer/KernelHttpServer.csproj
@@ -15,10 +15,10 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.13.0" OutputItemType="Analyzer" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.18.0" />
     <PackageReference Include="Microsoft.Graph" Version="4.54.0" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="0.17.230704.3-preview" />
-    <PackageReference Include="Microsoft.SemanticKernel.Skills.Document" Version="0.17.230704.3-preview" />
-    <PackageReference Include="Microsoft.SemanticKernel.Skills.MsGraph" Version="0.17.230704.3-preview" />
-    <PackageReference Include="Microsoft.SemanticKernel.Skills.Web" Version="0.17.230704.3-preview" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="0.18.230725.3-preview" />
+    <PackageReference Include="Microsoft.SemanticKernel.Skills.Document" Version="0.18.230725.3-preview" />
+    <PackageReference Include="Microsoft.SemanticKernel.Skills.MsGraph" Version="0.18.230725.3-preview" />
+    <PackageReference Include="Microsoft.SemanticKernel.Skills.Web" Version="0.18.230725.3-preview" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/dotnet/graph-api-skills/MsGraphSkillsExample.csproj b/samples/dotnet/graph-api-skills/MsGraphSkillsExample.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="Microsoft.SemanticKernel.Skills.MsGraph" Version="0.17.230704.3-preview" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="0.17.230704.3-preview" />
+    <PackageReference Include="Microsoft.SemanticKernel.Skills.MsGraph" Version="0.18.230725.3-preview" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="0.18.230725.3-preview" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/dotnet/openapi-skills/OpenApiSkillsExample.csproj b/samples/dotnet/openapi-skills/OpenApiSkillsExample.csproj
@@ -31,8 +31,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="0.17.230704.3-preview" />
-    <PackageReference Include="Microsoft.SemanticKernel.Skills.OpenAPI" Version="0.17.230704.3-preview" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="0.18.230725.3-preview" />
+    <PackageReference Include="Microsoft.SemanticKernel.Skills.OpenAPI" Version="0.18.230725.3-preview" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/dotnet/openapi-skills/README.md b/samples/dotnet/openapi-skills/README.md
@@ -1,7 +1,8 @@
 # Open API Skills Example
-The chat example below is meant to demonstrate the use of an OpenAPI-based skill (e.g., GitHub), a planner (e.g., ActionPlanner) and chat completions to create a conversational experience with additional information from a skill when needed.
+The chat example below is meant to demonstrate the use of an OpenAPI-based skill (e.g., GitHub), a planner (e.g., ActionPlanner)
+and chat completions to create a conversational experience with additional information from a skill when needed.
 
-The GitHub OpenAPI specific used is a reduced definition supporting viewing of pull requests. 
+The specific GitHub OpenAPI used is a reduced definition supporting viewing of pull requests. 
 
 ## Preparing your environment
 Before you get started, make sure you have the following requirements in place:

diff --git a/samples/notebooks/dotnet/00-getting-started.ipynb b/samples/notebooks/dotnet/00-getting-started.ipynb
@@ -61,7 +61,7 @@
    "outputs": [],
    "source": [
     "// Import Semantic Kernel\n",
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\""
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\""
    ]
   },
   {

diff --git a/samples/notebooks/dotnet/01-basic-loading-the-kernel.ipynb b/samples/notebooks/dotnet/01-basic-loading-the-kernel.ipynb
@@ -32,7 +32,7 @@
    },
    "outputs": [],
    "source": [
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\""
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\""
    ]
   },
   {

diff --git a/samples/notebooks/dotnet/02-running-prompts-from-file.ipynb b/samples/notebooks/dotnet/02-running-prompts-from-file.ipynb
@@ -90,7 +90,7 @@
    },
    "outputs": [],
    "source": [
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\"\n",
     "\n",
     "#!import config/Settings.cs\n",
     "\n",

diff --git a/samples/notebooks/dotnet/03-semantic-function-inline.ipynb b/samples/notebooks/dotnet/03-semantic-function-inline.ipynb
@@ -51,7 +51,7 @@
    },
    "outputs": [],
    "source": [
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\"\n",
     "\n",
     "#!import config/Settings.cs\n",
     "\n",

diff --git a/samples/notebooks/dotnet/04-context-variables-chat.ipynb b/samples/notebooks/dotnet/04-context-variables-chat.ipynb
@@ -34,7 +34,7 @@
    },
    "outputs": [],
    "source": [
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\"\n",
     "#!import config/Settings.cs\n",
     "\n",
     "using Microsoft.SemanticKernel;\n",

diff --git a/samples/notebooks/dotnet/05-using-the-planner.ipynb b/samples/notebooks/dotnet/05-using-the-planner.ipynb
@@ -25,7 +25,7 @@
    },
    "outputs": [],
    "source": [
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\"\n",
     "\n",
     "#!import config/Settings.cs\n",
     "#!import config/Utils.cs\n",

diff --git a/samples/notebooks/dotnet/06-memory-and-embeddings.ipynb b/samples/notebooks/dotnet/06-memory-and-embeddings.ipynb
@@ -33,7 +33,7 @@
    },
    "outputs": [],
    "source": [
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\"\n",
     "#r \"nuget: System.Linq.Async, 6.0.1\"\n",
     "\n",
     "#!import config/Settings.cs\n",
@@ -216,7 +216,7 @@
     "using Microsoft.SemanticKernel.Skills.Core;\n",
     "\n",
     "// TextMemorySkill provides the \"recall\" function\n",
-    "kernel.ImportSkill(new TextMemorySkill());"
+    "kernel.ImportSkill(new TextMemorySkill(kernel.Memory));"
    ]
   },
   {

diff --git a/samples/notebooks/dotnet/07-DALL-E-2.ipynb b/samples/notebooks/dotnet/07-DALL-E-2.ipynb
@@ -33,7 +33,7 @@
    "source": [
     "// Usual setup: importing Semantic Kernel SDK and SkiaSharp, used to display images inline.\n",
     "\n",
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\"\n",
     "#r \"nuget: SkiaSharp, 2.88.3\"\n",
     "\n",
     "#!import config/Settings.cs\n",

diff --git a/samples/notebooks/dotnet/08-chatGPT-with-DALL-E-2.ipynb b/samples/notebooks/dotnet/08-chatGPT-with-DALL-E-2.ipynb
@@ -56,7 +56,7 @@
    "source": [
     "// Usual setup: importing Semantic Kernel SDK and SkiaSharp, used to display images inline.\n",
     "\n",
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\"\n",
     "#r \"nuget: SkiaSharp, 2.88.3\"\n",
     "\n",
     "#!import config/Settings.cs\n",

diff --git a/samples/notebooks/dotnet/09-memory-with-chroma.ipynb b/samples/notebooks/dotnet/09-memory-with-chroma.ipynb
@@ -38,16 +38,16 @@
     {
      "data": {
       "text/html": [
-       "<div><div></div><div></div><div><strong>Installed Packages</strong><ul><li><span>Microsoft.SemanticKernel, 0.17.230629.1-preview</span></li><li><span>Microsoft.SemanticKernel.Connectors.Memory.Chroma, 0.17.230629.1-preview</span></li><li><span>System.Linq.Async, 6.0.1</span></li></ul></div></div>"
+       "<div><div></div><div></div><div><strong>Installed Packages</strong><ul><li><span>Microsoft.SemanticKernel, 0.18.230725.3-preview</span></li><li><span>Microsoft.SemanticKernel.Connectors.Memory.Chroma, 0.18.230725.3-preview</span></li><li><span>System.Linq.Async, 6.0.1</span></li></ul></div></div>"
       ]
      },
      "metadata": {},
      "output_type": "display_data"
     }
    ],
    "source": [
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230629.1-preview\"\n",
-    "#r \"nuget: Microsoft.SemanticKernel.Connectors.Memory.Chroma, 0.17.230629.1-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel.Connectors.Memory.Chroma, 0.18.230725.3-preview\"\n",
     "#r \"nuget: System.Linq.Async, 6.0.1\"\n",
     "\n",
     "#!import config/Settings.cs\n",

diff --git a/samples/notebooks/dotnet/10-BingSearch-using-kernel.ipynb b/samples/notebooks/dotnet/10-BingSearch-using-kernel.ipynb
@@ -35,8 +35,8 @@
    },
    "outputs": [],
    "source": [
-    "#r \"nuget: Microsoft.SemanticKernel, 0.17.230626.1-preview\"\n",
-    "#r \"nuget: Microsoft.SemanticKernel.Skills.Web, 0.17.230626.1-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel, 0.18.230725.3-preview\"\n",
+    "#r \"nuget: Microsoft.SemanticKernel.Skills.Web, 0.18.230725.3-preview\"\n",
     "\n",
     "#!import config/Settings.cs\n",
     "#!import config/Utils.cs\n",