Updated Amazon Bedrock models.

updated Calculate method and usedSettings

src/Directory.Packages.props

@@ -24,6 +24,7 @@
     <PackageVersion Include="LeonardoAi" Version="0.1.0" />
     <PackageVersion Include="LLamaSharp" Version="0.10.0" />
     <PackageVersion Include="LLamaSharp.Backend.Cpu" Version="0.10.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="8.0.2" />

src/Providers/Amazon.Bedrock/src/Chat/Ai21LabsJurassic2ChatModel.cs

@@ -1,4 +1,6 @@
 using System.Diagnostics;
+using System.Linq;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using LangChain.Providers.Amazon.Bedrock.Internal;
 
@@ -10,15 +12,13 @@ public class Ai21LabsJurassic2ChatModel(
     string id)
     : ChatModel(id)
 {
-    public override int ContextLength => 4096;
-
     public override async Task<ChatResponse> GenerateAsync(
         ChatRequest request,
         ChatSettings? settings = null,
         CancellationToken cancellationToken = default)
     {
         request = request ?? throw new ArgumentNullException(nameof(request));
-        
+
         var watch = Stopwatch.StartNew();
         var prompt = request.Messages.ToSimplePrompt();
 
@@ -30,20 +30,21 @@ public override async Task<ChatResponse> GenerateAsync(
             Id,
             new JsonObject
             {
-                { "prompt", prompt },
-                { "maxTokens", usedSettings.MaxTokens!.Value },
-                { "temperature", usedSettings.Temperature!.Value }
+                ["prompt"] = prompt,
+                ["maxTokens"] = usedSettings.MaxTokens!.Value,
+                ["temperature"] = usedSettings.Temperature!.Value,
+                ["topP"] = usedSettings.TopP!.Value,
+                ["stopSequences"] = usedSettings.StopSequences!.AsArray()
             },
             cancellationToken).ConfigureAwait(false);
 
         var generatedText = response?["completions"]?
             .AsArray()[0]?["data"]?
             .AsObject()["text"]?.GetValue<string>() ?? "";
-        
+
         var result = request.Messages.ToList();
         result.Add(generatedText.AsAiMessage());
 
-        // Unsupported
         var usage = Usage.Empty with
         {
             Time = watch.Elapsed,

src/Providers/Amazon.Bedrock/src/Chat/AmazonTitanChatModel.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Linq;
 using System.Text.Json.Nodes;
 using LangChain.Providers.Amazon.Bedrock.Internal;
 
@@ -18,7 +19,7 @@ public override async Task<ChatResponse> GenerateAsync(
         CancellationToken cancellationToken = default)
     {
         request = request ?? throw new ArgumentNullException(nameof(request));
-        
+
         var watch = Stopwatch.StartNew();
         var prompt = request.Messages.ToSimplePrompt();
 
@@ -35,13 +36,14 @@ public override async Task<ChatResponse> GenerateAsync(
                 {
                     ["maxTokenCount"] = usedSettings.MaxTokens!.Value,
                     ["temperature"] = usedSettings.Temperature!.Value,
-                    ["topP"] = 0.9
+                    ["topP"] = usedSettings.TopP!.Value,
+                    ["stopSequences"] = usedSettings.StopSequences!.AsArray()
                 }
             },
             cancellationToken).ConfigureAwait(false);
 
         var generatedText = response?["results"]?[0]?["outputText"]?.GetValue<string>() ?? string.Empty;
-        
+
         var result = request.Messages.ToList();
         result.Add(generatedText.AsAiMessage());
 

src/Providers/Amazon.Bedrock/src/Chat/AnthropicClaudeChatModel.cs

@@ -10,15 +10,13 @@ public class AnthropicClaudeChatModel(
     string id)
     : ChatModel(id)
 {
-    public override int ContextLength => 4096;
-
     public override async Task<ChatResponse> GenerateAsync(
         ChatRequest request,
         ChatSettings? settings = null,
         CancellationToken cancellationToken = default)
     {
         request = request ?? throw new ArgumentNullException(nameof(request));
-        
+
         var watch = Stopwatch.StartNew();
         var prompt = request.Messages.ToRolePrompt();
 
@@ -30,10 +28,12 @@ public override async Task<ChatResponse> GenerateAsync(
             Id,
             new JsonObject
             {
-                { "prompt", prompt },
-                { "max_tokens_to_sample", usedSettings.MaxTokens!.Value },
-                { "temperature", usedSettings.Temperature!.Value },
-                { "stop_sequences", new JsonArray("\n\nHuman:") }
+                ["prompt"] = prompt,
+                ["max_tokens_to_sample"] = usedSettings.MaxTokens!.Value,
+                ["temperature"] = usedSettings.Temperature!.Value,
+                ["top_p"] = usedSettings.TopP!.Value,
+                ["top_k"] = usedSettings.TopK!.Value,
+                ["stop_sequences"] = new JsonArray("\n\nHuman:")
             },
             cancellationToken).ConfigureAwait(false);
 

src/Providers/Amazon.Bedrock/src/Chat/BedrockChatSettings.cs

@@ -9,18 +9,32 @@ public class BedrockChatSettings : ChatSettings
         User = ChatSettings.Default.User,
         Temperature = 0.7,
         MaxTokens = 4096,
+        TopP = 0.9,
+        TopK = 0.0
     };
 
     /// <summary>
     /// Sampling temperature
     /// </summary>
     public double? Temperature { get; init; }
-    
+
     /// <summary>
     /// 
     /// </summary>
     public int? MaxTokens { get; init; }
 
+    /// <summary>
+    /// The cumulative probability cutoff for token selection.
+    /// Lower values mean sampling from a smaller, more top-weighted nucleus
+    /// </summary>
+    public double? TopP { get; init; }
+
+    /// <summary>
+    /// Sample from the k most likely next tokens at each step.
+    /// Lower k focuses on higher probability tokens.
+    /// </summary>
+    public double? TopK { get; init; }
+
     /// <summary>
     /// Calculate the settings to use for the request.
     /// </summary>
@@ -37,33 +51,45 @@ public class BedrockChatSettings : ChatSettings
         var requestSettingsCasted = requestSettings as BedrockChatSettings;
         var modelSettingsCasted = modelSettings as BedrockChatSettings;
         var providerSettingsCasted = providerSettings as BedrockChatSettings;
-        
+
         return new BedrockChatSettings
         {
-            StopSequences = 
+            StopSequences =
                 requestSettingsCasted?.StopSequences ??
                 modelSettingsCasted?.StopSequences ??
                 providerSettingsCasted?.StopSequences ??
                 Default.StopSequences ??
                 throw new InvalidOperationException("Default StopSequences is not set."),
-            User = 
+            User =
                 requestSettingsCasted?.User ??
                 modelSettingsCasted?.User ??
                 providerSettingsCasted?.User ??
                 Default.User ??
                 throw new InvalidOperationException("Default User is not set."),
-            Temperature = 
+            Temperature =
                 requestSettingsCasted?.Temperature ??
                 modelSettingsCasted?.Temperature ??
                 providerSettingsCasted?.Temperature ??
                 Default.Temperature ??
                 throw new InvalidOperationException("Default Temperature is not set."),
-            MaxTokens = 
+            MaxTokens =
                 requestSettingsCasted?.MaxTokens ??
                 modelSettingsCasted?.MaxTokens ??
                 providerSettingsCasted?.MaxTokens ??
                 Default.MaxTokens ??
                 throw new InvalidOperationException("Default MaxTokens is not set."),
+            TopP =
+                requestSettingsCasted?.TopP ??
+                modelSettingsCasted?.TopP ??
+                providerSettingsCasted?.TopP ??
+                Default.TopP ??
+                throw new InvalidOperationException("Default TopP is not set."),
+            TopK =
+                requestSettingsCasted?.TopK ??
+                modelSettingsCasted?.TopK ??
+                providerSettingsCasted?.TopK ??
+                Default.TopK ??
+                throw new InvalidOperationException("Default TopK is not set."),
         };
     }
 }

src/Providers/Amazon.Bedrock/src/Chat/CohereCommandChatModel.cs

@@ -10,15 +10,13 @@ public abstract class CohereCommandChatModel(
     string id)
     : ChatModel(id)
 {
-    public override int ContextLength => 4096;
-
     public override async Task<ChatResponse> GenerateAsync(
         ChatRequest request,
         ChatSettings? settings = null,
         CancellationToken cancellationToken = default)
     {
         request = request ?? throw new ArgumentNullException(nameof(request));
-        
+
         var watch = Stopwatch.StartNew();
         var prompt = request.Messages.ToSimplePrompt();
 
@@ -30,20 +28,19 @@ public override async Task<ChatResponse> GenerateAsync(
             Id,
             new JsonObject
             {
-                { "prompt", prompt },
-                { "max_tokens", usedSettings.MaxTokens!.Value },
-                { "temperature", usedSettings.Temperature!.Value },
-                { "p",1  },
-                { "k",0  },
+                ["prompt"] = prompt,
+                ["max_tokens"] = usedSettings.MaxTokens!.Value,
+                ["temperature"] = usedSettings.Temperature!.Value,
+                ["p"] = usedSettings.TopP!.Value,
+                ["k"] = usedSettings.TopK!.Value,
             },
             cancellationToken).ConfigureAwait(false);
 
         var generatedText = response?["generations"]?[0]?["text"]?.GetValue<string>() ?? string.Empty;
-        
+
         var result = request.Messages.ToList();
         result.Add(generatedText.AsAiMessage());
 
-        // Unsupported
         var usage = Usage.Empty with
         {
             Time = watch.Elapsed,

src/Providers/Amazon.Bedrock/src/Chat/MetaLlama2ChatModel.cs

@@ -11,30 +11,29 @@ public class MetaLlama2ChatModel(
     : ChatModel(id)
 {
     public override int ContextLength => 4096;
-    
+
     public override async Task<ChatResponse> GenerateAsync(
         ChatRequest request,
         ChatSettings? settings = null,
         CancellationToken cancellationToken = default)
     {
         request = request ?? throw new ArgumentNullException(nameof(request));
-        
+
         var watch = Stopwatch.StartNew();
         var prompt = request.Messages.ToSimplePrompt();
 
-        // TODO: implement settings
-        // var usedSettings = MetaLlama2ChatSettings.Calculate(
-        //     requestSettings: settings,
-        //     modelSettings: Settings,
-        //     providerSettings: provider.ChatSettings);
+        var usedSettings = BedrockChatSettings.Calculate(
+            requestSettings: settings,
+            modelSettings: Settings,
+            providerSettings: provider.ChatSettings);
         var response = await provider.Api.InvokeModelAsync(
             Id,
             new JsonObject
             {
-                { "prompt", prompt },
-                { "max_gen_len", 512 },
-                { "temperature", 0.5 },
-                { "top_p", 0.9 },
+                ["prompt"] = prompt,
+                ["max_gen_len"] = usedSettings.MaxTokens!.Value,
+                ["temperature"] = usedSettings.Temperature!.Value,
+                ["topP"] = usedSettings.TopP!.Value,
             },
             cancellationToken).ConfigureAwait(false);
 
@@ -44,7 +43,6 @@ public override async Task<ChatResponse> GenerateAsync(
         var result = request.Messages.ToList();
         result.Add(generatedText.AsAiMessage());
 
-        // Unsupported
         var usage = Usage.Empty with
         {
             Time = watch.Elapsed,
@@ -55,7 +53,7 @@ public override async Task<ChatResponse> GenerateAsync(
         return new ChatResponse
         {
             Messages = result,
-            UsedSettings = ChatSettings.Default,
+            UsedSettings = usedSettings,
             Usage = usage,
         };
     }

src/Providers/Amazon.Bedrock/src/StringArrayExtensions.cs

@@ -0,0 +1,24 @@
+using System.Text.Json.Nodes;
+
+namespace LangChain.Providers.Amazon.Bedrock;
+
+/// <summary>
+/// 
+/// </summary>
+public static class StringArrayExtensions
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="stringArray"></param>
+    /// <returns></returns>
+    public static JsonArray AsArray(this IReadOnlyList<string> stringArray)
+    {
+        var jsonArray = new JsonArray();
+        foreach (var arr in stringArray)
+        {
+            jsonArray.Add(arr);
+        }
+        return jsonArray;
+    }
+}

src/Providers/Amazon.Bedrock/test/BedrockTests.cs

@@ -1,4 +1,3 @@
-using LangChain.Base;
 using System.Diagnostics;
 using LangChain.Chains.LLM;
 using LangChain.Chains.Sequentials;
@@ -9,26 +8,25 @@
 using LangChain.Prompts;
 using LangChain.Providers.Amazon.Bedrock.Predefined.Ai21Labs;
 using LangChain.Providers.Amazon.Bedrock.Predefined.Amazon;
+using LangChain.Providers.Amazon.Bedrock.Predefined.Anthropic;
 using LangChain.Providers.Amazon.Bedrock.Predefined.Meta;
 using LangChain.Providers.Amazon.Bedrock.Predefined.Stability;
 using LangChain.Schema;
 using LangChain.Sources;
-using LangChain.Splitters;
-using LangChain.Splitters.Text;
 using static LangChain.Chains.Chain;
 
-namespace LangChain.Providers.Amazon.Bedrock.IntegrationTests;
+namespace LangChain.Providers.Amazon.Bedrock.Tests;
 
 [TestFixture, Explicit]
 public class BedrockTests
 {
+
     [Test]
     public async Task Chains()
     {
         var provider = new BedrockProvider();
         //var llm = new Jurassic2MidModel(provider);
-        //var llm = new ClaudeV21Model(provider);
-        var llm = new Llama2With13BModel(provider);
+        var llm = new ClaudeV21Model(provider);
         //var modelId = "amazon.titan-text-express-v1";
         // var modelId = "cohere.command-light-text-v14";