Text Generation and Chat Completion

dotnet/Directory.Packages.props

@@ -5,6 +5,8 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="AWSSDK.BedrockRuntime" Version="3.7.306.1" />
+    <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
     <PackageVersion Include="Azure.AI.ContentSafety" Version="1.0.0" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
     <PackageVersion Include="Azure.AI.OpenAI.Assistants" Version="1.0.0-beta.3" />
@@ -30,6 +32,7 @@
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
     <PackageVersion Include="Microsoft.ML.OnnxRuntime" Version="1.18.0" />
     <PackageVersion Include="FastBertTokenizer" Version="1.0.28" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.1" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Memory.Data" Version="8.0.0" />

dotnet/SK-dotnet.sln

@@ -314,6 +314,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimePlugin", "samples\Demos
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connectors.Memory.AzureCosmosDBNoSQL", "src\Connectors\Connectors.Memory.AzureCosmosDBNoSQL\Connectors.Memory.AzureCosmosDBNoSQL.csproj", "{B0B3901E-AF56-432B-8FAA-858468E5D0DF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connectors.Amazon", "src\Connectors\Connectors.Amazon\Connectors.Amazon.csproj", "{E059E9B0-1302-474D-B1B5-10A6E0F1A769}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BedrockTest", "samples\Demos\BedrockTest\BedrockTest.csproj", "{ABEAACCD-CF63-4850-8ED5-E01379DBFC46}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connectors.Amazon.UnitTests", "src\Connectors\Connectors.Amazon.UnitTests\Connectors.Amazon.UnitTests.csproj", "{CCC6DC57-2AC1-4C8E-A448-2CC0537A288E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -771,6 +777,24 @@ Global
 		{B0B3901E-AF56-432B-8FAA-858468E5D0DF}.Publish|Any CPU.Build.0 = Publish|Any CPU
 		{B0B3901E-AF56-432B-8FAA-858468E5D0DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0B3901E-AF56-432B-8FAA-858468E5D0DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E059E9B0-1302-474D-B1B5-10A6E0F1A769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E059E9B0-1302-474D-B1B5-10A6E0F1A769}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E059E9B0-1302-474D-B1B5-10A6E0F1A769}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{E059E9B0-1302-474D-B1B5-10A6E0F1A769}.Publish|Any CPU.Build.0 = Debug|Any CPU
+		{E059E9B0-1302-474D-B1B5-10A6E0F1A769}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E059E9B0-1302-474D-B1B5-10A6E0F1A769}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABEAACCD-CF63-4850-8ED5-E01379DBFC46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABEAACCD-CF63-4850-8ED5-E01379DBFC46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABEAACCD-CF63-4850-8ED5-E01379DBFC46}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABEAACCD-CF63-4850-8ED5-E01379DBFC46}.Publish|Any CPU.Build.0 = Debug|Any CPU
+		{ABEAACCD-CF63-4850-8ED5-E01379DBFC46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABEAACCD-CF63-4850-8ED5-E01379DBFC46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCC6DC57-2AC1-4C8E-A448-2CC0537A288E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCC6DC57-2AC1-4C8E-A448-2CC0537A288E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCC6DC57-2AC1-4C8E-A448-2CC0537A288E}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCC6DC57-2AC1-4C8E-A448-2CC0537A288E}.Publish|Any CPU.Build.0 = Debug|Any CPU
+		{CCC6DC57-2AC1-4C8E-A448-2CC0537A288E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCC6DC57-2AC1-4C8E-A448-2CC0537A288E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -877,6 +901,9 @@ Global
 		{1D3EEB5B-0E06-4700-80D5-164956E43D0A} = {5D4C0700-BBB5-418F-A7B2-F392B9A18263}
 		{F312FCE1-12D7-4DEF-BC29-2FF6618509F3} = {5D4C0700-BBB5-418F-A7B2-F392B9A18263}
 		{B0B3901E-AF56-432B-8FAA-858468E5D0DF} = {24503383-A8C4-4255-9998-28D70FE8E99A}
+		{E059E9B0-1302-474D-B1B5-10A6E0F1A769} = {1B4CBDE0-10C2-4E7D-9CD0-FE7586C96ED1}
+		{ABEAACCD-CF63-4850-8ED5-E01379DBFC46} = {5D4C0700-BBB5-418F-A7B2-F392B9A18263}
+		{CCC6DC57-2AC1-4C8E-A448-2CC0537A288E} = {1B4CBDE0-10C2-4E7D-9CD0-FE7586C96ED1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBDC56A3-86AD-4323-AA0F-201E59123B83}

dotnet/samples/Demos/BedrockTest/BedrockTest.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="AWSSDK.BedrockRuntime" />
+      <PackageReference Include="Microsoft.SemanticKernel"/>
+    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Connectors\Connectors.Amazon\Connectors.Amazon.csproj"/>
+  </ItemGroup>
+
+</Project>

dotnet/samples/Demos/BedrockTest/Program.cs

@@ -0,0 +1,233 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Connectors.Amazon.Extensions;
+using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.ChatCompletion;
+using Microsoft.SemanticKernel.TextGeneration;
+
+// Display the available options
+Console.WriteLine("Choose an option:");
+Console.WriteLine("1. Chat Completion");
+Console.WriteLine("2. Text Generation");
+Console.WriteLine("3. Stream Chat Completion");
+Console.WriteLine("4. Stream Text Generation");
+
+Console.Write("Enter your choice (1-4): ");
+int choice;
+while (!int.TryParse(Console.ReadLine(), out choice) || choice < 1 || choice > 4)
+{
+    Console.WriteLine("Invalid input. Please enter a valid number from the list.");
+    Console.Write("Enter your choice (1-4): ");
+}
+
+switch (choice)
+{
+    case 1:
+        // ----------------------------CHAT COMPLETION----------------------------
+        string userInput;
+        ChatHistory chatHistory = new();
+
+        // List of available models
+        Dictionary<int, string> modelOptions = new()
+        {
+            { 1, "amazon.titan-text-premier-v1:0" },
+            { 2, "anthropic.claude-3-sonnet-20240229-v1:0" },
+            { 3, "anthropic.claude-3-haiku-20240307-v1:0" },
+            { 4, "anthropic.claude-v2:1" },
+            { 5, "ai21.jamba-instruct-v1:0" },
+            { 6, "cohere.command-r-plus-v1:0" },
+            { 7, "meta.llama3-8b-instruct-v1:0" },
+            { 8, "mistral.mistral-7b-instruct-v0:2" }
+        };
+
+        // Display the model options
+        Console.WriteLine("Available models:");
+        foreach (var option in modelOptions)
+        {
+            Console.WriteLine($"{option.Key}. {option.Value}");
+        }
+
+        Console.Write("Enter the number of the model you want to use for chat completion: ");
+        int chosenModel;
+        while (!int.TryParse(Console.ReadLine(), out chosenModel) || !modelOptions.ContainsKey(chosenModel))
+        {
+            Console.WriteLine("Invalid input. Please enter a valid number from the list.");
+            Console.Write("Enter the number of the model you want to use: ");
+        }
+
+        var kernel = Kernel.CreateBuilder().AddBedrockChatCompletionService(modelOptions[chosenModel]).Build();
+        var chatCompletionService = kernel.GetRequiredService<IChatCompletionService>();
+
+        do
+        {
+            Console.Write("Enter a prompt (or 'exit' to quit): ");
+            userInput = Console.ReadLine() ?? "exit";
+
+            if (!string.Equals(userInput, "exit", StringComparison.OrdinalIgnoreCase))
+            {
+                chatHistory.AddMessage(AuthorRole.User, userInput);
+                var result = await chatCompletionService.GetChatMessageContentsAsync(chatHistory).ConfigureAwait(false);
+                string output = "";
+                foreach (var message in result)
+                {
+                    output += message.Content;
+                    Console.WriteLine($"Chat Completion Answer: {message.Content}");
+                    Console.WriteLine();
+                }
+                chatHistory.AddMessage(AuthorRole.Assistant, output);
+            }
+        } while (!string.Equals(userInput, "exit", StringComparison.OrdinalIgnoreCase));
+        break;
+    case 2:
+        // ----------------------------TEXT GENERATION----------------------------
+        // List of available text generation models
+        Dictionary<int, string> textGenerationModelOptions = new()
+        {
+            { 1, "amazon.titan-text-premier-v1:0" },
+            { 2, "mistral.mistral-7b-instruct-v0:2" },
+            { 3, "ai21.jamba-instruct-v1:0" },
+            { 4, "anthropic.claude-v2:1" },
+            { 5, "cohere.command-text-v14" },
+            { 6, "meta.llama3-8b-instruct-v1:0" },
+            { 7, "cohere.command-r-plus-v1:0" },
+            { 8, "ai21.j2-ultra-v1" }
+        };
+
+        // Display the text generation model options
+        Console.WriteLine("Available text generation models:");
+        foreach (var option in textGenerationModelOptions)
+        {
+            Console.WriteLine($"{option.Key}. {option.Value}");
+        }
+
+        Console.Write("Enter the number of the text generation model you want to use: ");
+        int chosenTextGenerationModel;
+        while (!int.TryParse(Console.ReadLine(), out chosenTextGenerationModel) || !textGenerationModelOptions.ContainsKey(chosenTextGenerationModel))
+        {
+            Console.WriteLine("Invalid input. Please enter a valid number from the list.");
+            Console.Write("Enter the number of the text generation model you want to use: ");
+        }
+
+        Console.Write("Text Generation Prompt: ");
+        string UserPrompt2 = Console.ReadLine() ?? "";
+
+        var kernel2 = Kernel.CreateBuilder().AddBedrockTextGenerationService(textGenerationModelOptions[chosenTextGenerationModel]).Build();
+
+        var textGenerationService = kernel2.GetRequiredService<ITextGenerationService>();
+        var textGeneration = await textGenerationService.GetTextContentsAsync(UserPrompt2).ConfigureAwait(false);
+        if (textGeneration.Count > 0)
+        {
+            var firstTextContent = textGeneration[0];
+            if (firstTextContent != null)
+            {
+                Console.WriteLine("Text Generation Answer: " + firstTextContent.Text);
+            }
+            else
+            {
+                Console.WriteLine("Text Generation Answer: (none)");
+            }
+        }
+        else
+        {
+            Console.WriteLine("Text Generation Answer: (No output text)");
+        }
+        break;
+    case 3:
+        // ----------------------------STREAM CHAT COMPLETION----------------------------
+        string userInput2;
+        ChatHistory chatHistory2 = new();
+
+        // List of available stream chat completion models
+        Dictionary<int, string> streamChatCompletionModelOptions = new()
+        {
+            { 1, "mistral.mistral-7b-instruct-v0:2" },
+            { 2, "amazon.titan-text-premier-v1:0" },
+            { 3, "anthropic.claude-v2" },
+            { 4, "anthropic.claude-3-sonnet-20240229-v1:0" },
+            { 5, "cohere.command-r-plus-v1:0" },
+            { 6, "meta.llama3-8b-instruct-v1:0" }
+        };
+
+        // Display the stream chat completion model options
+        Console.WriteLine("Available stream chat completion models:");
+        foreach (var option in streamChatCompletionModelOptions)
+        {
+            Console.WriteLine($"{option.Key}. {option.Value}");
+        }
+
+        Console.Write("Enter the number of the stream chat completion model you want to use: ");
+        int chosenStreamChatCompletionModel;
+        while (!int.TryParse(Console.ReadLine(), out chosenStreamChatCompletionModel) || !streamChatCompletionModelOptions.ContainsKey(chosenStreamChatCompletionModel))
+        {
+            Console.WriteLine("Invalid input. Please enter a valid number from the list.");
+            Console.Write("Enter the number of the stream chat completion model you want to use: ");
+        }
+
+        var kernel4 = Kernel.CreateBuilder().AddBedrockChatCompletionService(streamChatCompletionModelOptions[chosenStreamChatCompletionModel]).Build();
+        var chatStreamCompletionService = kernel4.GetRequiredService<IChatCompletionService>();
+
+        do
+        {
+            Console.Write("Enter a prompt (or 'exit' to quit): ");
+            userInput2 = Console.ReadLine() ?? "exit";
+
+            if (!string.Equals(userInput2, "exit", StringComparison.OrdinalIgnoreCase))
+            {
+                chatHistory2.AddMessage(AuthorRole.User, userInput2);
+                var result = chatStreamCompletionService.GetStreamingChatMessageContentsAsync(chatHistory2).ConfigureAwait(false);
+                string output = "";
+                await foreach (var message in result)
+                {
+                    Console.Write($"{message.Content}");
+                    Thread.Sleep(50);
+                    output += message.Content;
+                }
+                Console.WriteLine();
+                chatHistory2.AddMessage(AuthorRole.Assistant, output);
+            }
+        } while (!string.Equals(userInput2, "exit", StringComparison.OrdinalIgnoreCase));
+        break;
+    case 4:
+        // ----------------------------STREAM TEXT GENERATION----------------------------
+        // List of available stream text generation models
+        Dictionary<int, string> streamTextGenerationModelOptions = new()
+        {
+            { 1, "amazon.titan-text-premier-v1:0" },
+            { 2, "anthropic.claude-v2" },
+            { 3, "mistral.mistral-7b-instruct-v0:2" },
+            { 4, "cohere.command-text-v14" },
+            { 5, "cohere.command-r-plus-v1:0" },
+            { 6, "meta.llama3-8b-instruct-v1:0" }
+        };
+
+        // Display the stream text generation model options
+        Console.WriteLine("Available stream text generation models:");
+        foreach (var option in streamTextGenerationModelOptions)
+        {
+            Console.WriteLine($"{option.Key}. {option.Value}");
+        }
+
+        Console.Write("Enter the number of the stream text generation model you want to use: ");
+        int chosenStreamTextGenerationModel;
+        while (!int.TryParse(Console.ReadLine(), out chosenStreamTextGenerationModel) || !streamTextGenerationModelOptions.ContainsKey(chosenStreamTextGenerationModel))
+        {
+            Console.WriteLine("Invalid input. Please enter a valid number from the list.");
+            Console.Write("Enter the number of the stream text generation model you want to use: ");
+        }
+
+        Console.Write("Stream Text Generation Prompt: ");
+        string UserPrompt3 = Console.ReadLine() ?? "";
+
+        var kernel3 = Kernel.CreateBuilder().AddBedrockTextGenerationService(streamTextGenerationModelOptions[chosenStreamTextGenerationModel]).Build();
+
+        var streamTextGenerationService = kernel3.GetRequiredService<ITextGenerationService>();
+        var streamTextGeneration = streamTextGenerationService.GetStreamingTextContentsAsync(UserPrompt3).ConfigureAwait(true);
+        await foreach (var textContent in streamTextGeneration)
+        {
+            Console.Write(textContent.Text);
+            Thread.Sleep(50);
+        }
+
+        Console.WriteLine();
+        break;
+}

dotnet/src/Connectors/Connectors.Amazon.UnitTests/BedrockKernelBuilderExtensionTests.cs

@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft. All rights reserved.
+
+using Connectors.Amazon.Extensions;
+using Connectors.Amazon.Services;
+using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.ChatCompletion;
+using Microsoft.SemanticKernel.Connectors.Amazon.Services;
+using Microsoft.SemanticKernel.TextGeneration;
+using Xunit;
+
+namespace Connectors.Amazon.UnitTests;
+
+/// <summary>
+/// Kernel Builder Extension Tests for Bedrock.
+/// </summary>
+public class BedrockKernelBuilderExtensionTests
+{
+    /// <summary>
+    /// Checks that AddBedrockTextGenerationService builds a proper kernel.
+    /// </summary>
+    [Fact]
+    public void AddBedrockTextGenerationCreatesService()
+    {
+        // Arrange
+        var builder = Kernel.CreateBuilder();
+        builder.AddBedrockTextGenerationService("amazon.titan-text-premier-v1:0");
+
+        // Act
+        var kernel = builder.Build();
+        var service = kernel.GetRequiredService<ITextGenerationService>();
+
+        // Assert
+        Assert.NotNull(kernel);
+        Assert.NotNull(service);
+        Assert.IsType<BedrockTextGenerationService>(service);
+    }
+    /// <summary>
+    /// Checks that AddBedrockChatCompletionService builds a proper kernel.
+    /// </summary>
+    [Fact]
+    public void AddBedrockChatCompletionCreatesService()
+    {
+        // Arrange
+        var builder = Kernel.CreateBuilder();
+        builder.AddBedrockChatCompletionService("amazon.titan-text-premier-v1:0");
+
+        // Act
+        var kernel = builder.Build();
+        var service = kernel.GetRequiredService<IChatCompletionService>();
+
+        // Assert
+        Assert.NotNull(kernel);
+        Assert.NotNull(service);
+        Assert.IsType<BedrockChatCompletionService>(service);
+    }
+}

dotnet/src/Connectors/Connectors.Amazon.UnitTests/Connectors.Amazon.UnitTests.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <IsTestProject>true</IsTestProject>
+        <IsPackable>false</IsPackable>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="AWSSDK.BedrockRuntime" />
+      <PackageReference Include="Microsoft.SemanticKernel" />
+      <PackageReference Include="Moq"/>
+      <PackageReference Include="xunit"/>
+      <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\SemanticKernel.Core\SemanticKernel.Core.csproj"/>
+    <ProjectReference Include="..\Connectors.Amazon\Connectors.Amazon.csproj"/>
+  </ItemGroup>
+
+</Project>