Merge branch 'SciSharp:master' into master

Author: adenchen123

Directory.Packages.props

@@ -6,8 +6,8 @@
     <PackageVersion Include="A2A" Version="0.3.3-preview" />
     <PackageVersion Include="CsvHelper" Version="33.1.0" />
     <PackageVersion Include="FuzzySharp" Version="2.0.2" />
-    <PackageVersion Include="Google_GenerativeAI" Version="3.4.1" />
-    <PackageVersion Include="Google_GenerativeAI.Live" Version="3.4.1" />
+    <PackageVersion Include="Google_GenerativeAI" Version="3.6.3" />
+    <PackageVersion Include="Google_GenerativeAI.Live" Version="3.6.3" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Polly" Version="8.4.2" />
     <PackageVersion Include="SharpFuzz" Version="2.2.0" />
@@ -25,14 +25,14 @@
     <PackageVersion Include="DistributedLock.Redis" Version="1.1.1" />
     <PackageVersion Include="Fluid.Core" Version="2.11.1" />
     <PackageVersion Include="Nanoid" Version="3.1.0" />
-    <PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
+    <PackageVersion Include="Anthropic.SDK" Version="5.10.0" />
     <PackageVersion Include="NAudio" Version="2.2.1" />
     <PackageVersion Include="NAudio.Core" Version="2.2.1" />
     <PackageVersion Include="Whisper.net" Version="1.8.1" />
     <PackageVersion Include="Whisper.net.Runtime" Version="1.8.1" />
     <PackageVersion Include="NCrontab" Version="3.3.3" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="2.7.0-beta.1" />
-    <PackageVersion Include="OpenAI" Version="2.8.0" />
+    <PackageVersion Include="OpenAI" Version="2.9.1" />
     <PackageVersion Include="MailKit" Version="4.14.1" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.0" />
     <PackageVersion Include="MySql.Data" Version="9.5.0" />

src/Infrastructure/BotSharp.Abstraction/Conversations/ITokenStatistics.cs

@@ -2,7 +2,7 @@ namespace BotSharp.Abstraction.Conversations;
 
 public interface ITokenStatistics
 {
-    int Total { get; }
+    long Total { get; }
     float AccumulatedCost { get; }
     float Cost { get; }
     void StartTimer();

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/TokenStatsModel.cs

@@ -7,9 +7,9 @@ public class TokenStatsModel
     public string Prompt { get; set; }
 
     #region Text token
-    public int TextInputTokens { get; set; }
-    public int CachedTextInputTokens { get; set; }
-    public int TextOutputTokens { get; set; }
+    public long TextInputTokens { get; set; }
+    public long CachedTextInputTokens { get; set; }
+    public long TextOutputTokens { get; set; }
     #endregion
 
     #region Audio token
@@ -19,18 +19,18 @@ public class TokenStatsModel
     #endregion
 
     #region Image token
-    public int ImageInputTokens { get; set; }
-    public int CachedImageInputTokens { get; set; }
-    public int ImageOutputTokens { get; set; }
+    public long ImageInputTokens { get; set; }
+    public long CachedImageInputTokens { get; set; }
+    public long ImageOutputTokens { get; set; }
     #endregion
 
     #region Image
     public int ImageGenerationCount { get; set; }
     public float ImageGenerationUnitCost { get; set; }
     #endregion
 
-    public int TotalInputTokens => TextInputTokens + CachedTextInputTokens 
+    public long TotalInputTokens => TextInputTokens + CachedTextInputTokens 
                                 + AudioInputTokens + CachedAudioInputTokens
                                 + ImageInputTokens + CachedImageInputTokens;
-    public int TotalOutputTokens => TextOutputTokens + AudioOutputTokens + ImageOutputTokens;
+    public long TotalOutputTokens => TextOutputTokens + AudioOutputTokens + ImageOutputTokens;
 }

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

@@ -34,8 +34,8 @@ public class StatsCountDelta
 
 public class StatsLlmCostDelta
 {
-    public int PromptTokensDelta { get; set; }
-    public int CompletionTokensDelta { get; set; }
+    public long PromptTokensDelta { get; set; }
+    public long CompletionTokensDelta { get; set; }
     public float PromptTotalCostDelta { get; set; }
     public float CompletionTotalCostDelta { get; set; }
     public float ImageGenerationTotalCostDelta { get; set; }

src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs

@@ -5,13 +5,13 @@ namespace BotSharp.Core.Conversations.Services;
 
 public class TokenStatistics : ITokenStatistics
 {
-    private int _promptTokenCount = 0;
+    private long _promptTokenCount = 0;
     private float _promptCost = 0f;
-    private int _completionTokenCount = 0;
+    private long _completionTokenCount = 0;
     private float _completionCost = 0f;
     private readonly IServiceProvider _services;
     private readonly ILogger _logger;
-    public int Total => _promptTokenCount + _completionTokenCount;
+    public long Total => _promptTokenCount + _completionTokenCount;
     public string _model;
     private Stopwatch _timer;
 
@@ -150,7 +150,7 @@ public void StopTimer()
         _timer.Stop();
     }
 
-    private float GetDeltaCost(int tokens, float? unitCost)
+    private float GetDeltaCost(long tokens, float? unitCost)
     {
         return tokens / 1000f * (unitCost ?? 0f);
     }

src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.cs

@@ -105,10 +105,10 @@ private GeneratedImageQuality GetImageQuality(string? quality)
         switch (value)
         {
             case "low":
-                retQuality = GeneratedImageQuality.Low;
+                retQuality = GeneratedImageQuality.LowQuality;
                 break;
             case "medium":
-                retQuality = GeneratedImageQuality.Medium;
+                retQuality = GeneratedImageQuality.MediumQuality;
                 break;
             case "high":
                 retQuality = GeneratedImageQuality.High;