Merge pull request #871 from iceljc/master

add max output token

src/Infrastructure/BotSharp.Abstraction/Agents/Constants/LlmConstant.cs

@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Agents.Constants;
+
+public static class LlmConstant
+{
+    public const int DEFAULT_MAX_OUTPUT_TOKEN = 1024;
+}

src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentLlmConfig.cs

@@ -22,6 +22,16 @@ public class AgentLlmConfig
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? Model { get; set; }
 
+    /// <summary>
+    /// Max recursion depth
+    /// </summary>
     [JsonPropertyName("max_recursion_depth")]
     public int MaxRecursionDepth { get; set; } = 3;
+
+    /// <summary>
+    /// Max output token
+    /// </summary>
+    [JsonPropertyName("max_output_tokens")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public int? MaxOutputTokens { get; set; }
 }

src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStats.cs

@@ -52,7 +52,7 @@ public class BotSharpStats
     public static (DateTime, DateTime) BuildTimeInterval(DateTime recordTime, StatsInterval interval)
     {
         DateTime startTime = recordTime;
-        DateTime endTime = DateTime.UtcNow;
+        DateTime endTime = startTime;
 
         switch (interval)
         {
@@ -70,6 +70,7 @@ public class BotSharpStats
                 break;
         }
 
+        endTime = endTime.AddSeconds(-1);
         startTime = DateTime.SpecifyKind(startTime, DateTimeKind.Utc);
         endTime = DateTime.SpecifyKind(endTime, DateTimeKind.Utc);
         return (startTime, endTime);

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentCreationModel.cs

@@ -80,7 +80,7 @@ public class AgentCreationModel
             MaxMessageCount = MaxMessageCount,
             Profiles = Profiles,
             Labels = Labels,
-            LlmConfig = LlmConfig,
+            LlmConfig = LlmConfig ?? new(),
             KnowledgeBases = KnowledgeBases,
             Rules = Rules,
             RoutingRules = RoutingRules?.Select(x => RoutingRuleUpdateModel.ToDomainElement(x))?.ToList() ?? [],

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentUpdateModel.cs

@@ -105,7 +105,7 @@ public class AgentUpdateModel
             Utilities = Utilities ?? [],
             KnowledgeBases = KnowledgeBases ?? [],
             Rules = Rules ?? [],
-            LlmConfig = LlmConfig
+            LlmConfig = LlmConfig ?? new()
         };
 
         return agent;

src/Plugins/BotSharp.Plugin.AnthropicAI/Providers/ChatCompletionProvider.cs

@@ -170,12 +170,14 @@ public class ChatCompletionProvider : IChatCompletion
 
         var state = _services.GetRequiredService<IConversationStateService>();
         var temperature = decimal.Parse(state.GetState("temperature", "0.0"));
-        var maxToken = int.Parse(state.GetState("max_tokens", "512"));
+        var maxTokens = int.TryParse(state.GetState("max_tokens"), out var tokens)
+                            ? tokens
+                            : agent.LlmConfig?.MaxOutputTokens ?? LlmConstant.DEFAULT_MAX_OUTPUT_TOKEN;
 
         var parameters = new MessageParameters()
         {
             Messages = messages,
-            MaxTokens = maxToken,
+            MaxTokens = maxTokens,
             Model = settings.Name,
             Stream = false,
             Temperature = temperature,

src/Plugins/BotSharp.Plugin.AnthropicAI/Using.cs

@@ -8,6 +8,7 @@ global using Anthropic.SDK;
 global using Anthropic.SDK.Constants;
 global using Anthropic.SDK.Messaging;
 global using BotSharp.Abstraction.Agents;
+global using BotSharp.Abstraction.Agents.Constants;
 global using BotSharp.Abstraction.Agents.Enums;
 global using BotSharp.Abstraction.Agents.Models;
 global using BotSharp.Abstraction.Conversations.Models;

src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs

@@ -225,7 +225,10 @@ public class ChatCompletionProvider : IChatCompletion
         var messages = new List<ChatMessage>();
 
         var temperature = float.Parse(state.GetState("temperature", "0.0"));
-        var maxTokens = int.Parse(state.GetState("max_tokens", "1024"));
+        var maxTokens = int.TryParse(state.GetState("max_tokens"), out var tokens)
+                            ? tokens
+                            : agent.LlmConfig?.MaxOutputTokens ?? LlmConstant.DEFAULT_MAX_OUTPUT_TOKEN;
+
         var options = new ChatCompletionOptions()
         {
             Temperature = temperature,

src/Plugins/BotSharp.Plugin.AzureOpenAI/Using.cs

@@ -5,6 +5,7 @@ global using System.IO;
 global using System.Threading.Tasks;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Logging;
+global using BotSharp.Abstraction.Agents.Constants;
 global using BotSharp.Abstraction.Agents.Enums;
 global using BotSharp.Abstraction.Agents.Models;
 global using BotSharp.Abstraction.Conversations;

src/Plugins/BotSharp.Plugin.DeepSeekAI/Providers/Chat/ChatCompletionProvider.cs

@@ -201,7 +201,9 @@ public class ChatCompletionProvider : IChatCompletion
         var messages = new List<ChatMessage>();
 
         var temperature = float.Parse(state.GetState("temperature", "0.0"));
-        var maxTokens = int.Parse(state.GetState("max_tokens", "1024"));
+        var maxTokens = int.TryParse(state.GetState("max_tokens"), out var tokens)
+                            ? tokens
+                            : agent.LlmConfig?.MaxOutputTokens ?? LlmConstant.DEFAULT_MAX_OUTPUT_TOKEN;
         var options = new ChatCompletionOptions()
         {
             Temperature = temperature,

src/Plugins/BotSharp.Plugin.DeepSeekAI/Using.cs

@@ -10,6 +10,7 @@ global using BotSharp.Abstraction.Conversations.Models;
 global using BotSharp.Abstraction.Agents.Models;
 global using BotSharp.Abstraction.MLTasks;
 global using BotSharp.Abstraction.Agents;
+global using BotSharp.Abstraction.Agents.Constants;
 global using BotSharp.Abstraction.Agents.Enums;
 global using BotSharp.Abstraction.Conversations;
 global using BotSharp.Abstraction.Loggers;

src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Agents;
 using BotSharp.Abstraction.Agents.Enums;
+using BotSharp.Abstraction.Conversations;
 using BotSharp.Abstraction.Loggers;
 using Google.Protobuf.WellKnownTypes;
 using Microsoft.Extensions.Logging;
@@ -188,10 +189,20 @@ public class GeminiChatCompletionProvider : IChatCompletion
             }
         }
 
+        var state = _services.GetRequiredService<IConversationStateService>();
+        var temperature = float.Parse(state.GetState("temperature", "0.0"));
+        var maxTokens = int.TryParse(state.GetState("max_tokens"), out var tokens)
+                            ? tokens
+                            : agent.LlmConfig?.MaxOutputTokens ?? LlmConstant.DEFAULT_MAX_OUTPUT_TOKEN;
         var request = new GenerateContentRequest
         {
             Contents = contents,
-            Tools = tools
+            Tools = tools,
+            GenerationConfig = new()
+            {
+                Temperature = temperature,
+                MaxOutputTokens = maxTokens
+            }
         };
 
         var prompt = GetPrompt(systemPrompts, funcPrompts, convPrompts);

src/Plugins/BotSharp.Plugin.GoogleAI/Using.cs

@@ -5,6 +5,7 @@ global using System.Threading.Tasks;
 global using System.Linq;
 global using System.Text.Json;
 global using BotSharp.Abstraction.Conversations.Models;
+global using BotSharp.Abstraction.Agents.Constants;
 global using BotSharp.Abstraction.Agents.Models;
 global using BotSharp.Abstraction.MLTasks;
 global using Microsoft.Extensions.Configuration;

src/Plugins/BotSharp.Plugin.MongoStorage/Models/AgentLlmConfigMongoElement.cs

@@ -8,6 +8,7 @@ public class AgentLlmConfigMongoElement
     public string? Model { get; set; }
     public bool IsInherit { get; set; }
     public int MaxRecursionDepth { get; set; }
+    public int? MaxOutputTokens { get; set; }
 
     public static AgentLlmConfigMongoElement? ToMongoElement(AgentLlmConfig? config)
     {
@@ -19,6 +20,7 @@ public class AgentLlmConfigMongoElement
             Model = config.Model,
             IsInherit = config.IsInherit,
             MaxRecursionDepth = config.MaxRecursionDepth,
+            MaxOutputTokens = config.MaxOutputTokens,
         };
     }
 
@@ -32,6 +34,7 @@ public class AgentLlmConfigMongoElement
             Model = config.Model,
             IsInherit = config.IsInherit,
             MaxRecursionDepth = config.MaxRecursionDepth,
+            MaxOutputTokens = config.MaxOutputTokens,
         };
     }
 }

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs

@@ -202,7 +202,9 @@ public class ChatCompletionProvider : IChatCompletion
         var messages = new List<ChatMessage>();
 
         var temperature = float.Parse(state.GetState("temperature", "0.0"));
-        var maxTokens = int.Parse(state.GetState("max_tokens", "1024"));
+        var maxTokens = int.TryParse(state.GetState("max_tokens"), out var tokens)
+                            ? tokens
+                            : agent.LlmConfig?.MaxOutputTokens ?? LlmConstant.DEFAULT_MAX_OUTPUT_TOKEN;
         var options = new ChatCompletionOptions()
         {
             Temperature = temperature,

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs

@@ -70,7 +70,9 @@ public class RealTimeCompletionProvider : IRealTimeCompletion
         var messages = new List<ChatMessage>();
 
         var temperature = float.Parse(state.GetState("temperature", "0.0"));
-        var maxTokens = int.Parse(state.GetState("max_tokens", "1024"));
+        var maxTokens = int.TryParse(state.GetState("max_tokens"), out var tokens)
+                            ? tokens
+                            : agent.LlmConfig?.MaxOutputTokens ?? LlmConstant.DEFAULT_MAX_OUTPUT_TOKEN;
         var options = new ChatCompletionOptions()
         {
             ToolChoice = ChatToolChoice.CreateAutoChoice(),

src/Plugins/BotSharp.Plugin.OpenAI/Using.cs

@@ -6,6 +6,7 @@ global using System.Threading.Tasks;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Logging;
 global using BotSharp.Abstraction.Agents.Enums;
+global using BotSharp.Abstraction.Agents.Constants;
 global using BotSharp.Abstraction.Agents.Models;
 global using BotSharp.Abstraction.Conversations;
 global using BotSharp.Abstraction.Conversations.Models;