Oceania2018 · May 8, 2025 · May 8, 2025 · May 8, 2025 · May 8, 2025
diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
@@ -187,9 +187,9 @@ List<string> GetInstructionLogSearchKeys(InstructLogKeysFilter filter)
     #endregion
 
     #region Statistics
-    BotSharpStats? GetGlobalStats(string metric, string dimension, string dimRefVal, DateTime recordTime, StatsInterval interval)
+    BotSharpStats? GetGlobalStats(string agentId, DateTime recordTime, StatsInterval interval)
         => throw new NotImplementedException();
-    bool SaveGlobalStats(BotSharpStats body)
+    bool SaveGlobalStats(BotSharpStatsDelta delta)
         => throw new NotImplementedException();
 
     #endregion

diff --git a/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStats.cs b/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStats.cs
@@ -4,17 +4,14 @@ namespace BotSharp.Abstraction.Statistics.Models;
 
 public class BotSharpStats
 {
-    [JsonPropertyName("metric")]
-    public string Metric { get; set; } = null!;
+    [JsonPropertyName("agent_id")]
+    public string AgentId { get; set; } = null!;
 
-    [JsonPropertyName("dimension")]
-    public string Dimension { get; set; } = null!;
+    [JsonPropertyName("count")]
+    public StatsCount Count { get; set; } = new();
 
-    [JsonPropertyName("dim_ref_val")]
-    public string DimRefVal { get; set; } = null!;
-
-    [JsonPropertyName("data")]
-    public IDictionary<string, double> Data { get; set; } = new Dictionary<string, double>();
+    [JsonPropertyName("llm_cost")]
+    public StatsLlmCost LlmCost { get; set; } = new();
 
     [JsonPropertyName("record_time")]
     public DateTime RecordTime { get; set; } = DateTime.UtcNow;
@@ -44,11 +41,13 @@ public string Interval
     [JsonPropertyName("end_time")]
     public DateTime EndTime { get; set; }
 
+
     public override string ToString()
     {
-        return $"{Metric}-{Dimension}-{DimRefVal} ({Interval}): {Data?.Count ?? 0}";
+        return $"Stats: {AgentId}-{IntervalType}";
     }
 
+
     public static (DateTime, DateTime) BuildTimeInterval(DateTime recordTime, StatsInterval interval)
     {
         DateTime startTime = recordTime;
@@ -75,4 +74,25 @@ public static (DateTime, DateTime) BuildTimeInterval(DateTime recordTime, StatsI
         endTime = DateTime.SpecifyKind(endTime, DateTimeKind.Utc);
         return (startTime, endTime);
     }
+}
+
+public class StatsCount
+{
+    [JsonPropertyName("agent_call_count")]
+    public long AgentCallCount { get; set; }
+}
+
+public class StatsLlmCost
+{
+    [JsonPropertyName("prompt_tokens")]
+    public long PromptTokens { get; set; }
+
+    [JsonPropertyName("completion_tokens")]
+    public long CompletionTokens { get; set; }
+
+    [JsonPropertyName("prompt_total_cost")]
+    public float PromptTotalCost { get; set; }
+
+    [JsonPropertyName("completion_total_cost")]
+    public float CompletionTotalCost { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStatsDelta.cs b/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStatsDelta.cs
@@ -0,0 +1,40 @@
+using BotSharp.Abstraction.Statistics.Enums;
+
+namespace BotSharp.Abstraction.Statistics.Models;
+
+public class BotSharpStatsDelta
+{
+    public string AgentId { get; set; } = null!;
+    public StatsCountDelta CountDelta { get; set; } = new();
+    public StatsLlmCostDelta LlmCostDelta { get; set; } = new();
+    public DateTime RecordTime { get; set; } = DateTime.UtcNow;
+    public StatsInterval IntervalType { get; set; } = StatsInterval.Day;
+
+    public string Interval
+    {
+        get
+        {
+            return IntervalType.ToString();
+        }
+        set
+        {
+            if (Enum.TryParse(value, out StatsInterval type))
+            {
+                IntervalType = type;
+            }
+        }
+    }
+}
+
+public class StatsCountDelta
+{
+    public int AgentCallCountDelta { get; set; }
+}
+
+public class StatsLlmCostDelta
+{
+    public int PromptTokensDelta { get; set; }
+    public int CompletionTokensDelta { get; set; }
+    public float PromptTotalCostDelta { get; set; }
+    public float CompletionTotalCostDelta { get; set; }
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStatsInput.cs b/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStatsInput.cs
diff --git a/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/StatsKeyValuePair.cs b/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/StatsKeyValuePair.cs
diff --git a/src/Infrastructure/BotSharp.Abstraction/Statistics/Services/IBotSharpStatsService.cs b/src/Infrastructure/BotSharp.Abstraction/Statistics/Services/IBotSharpStatsService.cs
@@ -4,5 +4,5 @@ namespace BotSharp.Abstraction.Statistics.Services;
 
 public interface IBotSharpStatsService
 {
-    bool UpdateStats(string resourceKey, BotSharpStatsInput input);
+    bool UpdateStats(string @event, BotSharpStatsDelta delta);
 }
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs
@@ -73,21 +73,20 @@ public void AddToken(TokenStatsModel stats, RoleDialogModel message)
         var dim = "agent";
         var agentId = message.CurrentAgentId ?? string.Empty;
         var globalStats = _services.GetRequiredService<IBotSharpStatsService>();
-        var body = new BotSharpStatsInput
+        var delta = new BotSharpStatsDelta
         {
-            Metric = metric,
-            Dimension = dim,
-            DimRefVal = agentId,
+            AgentId = agentId,
             RecordTime = DateTime.UtcNow,
             IntervalType = StatsInterval.Day,
-            Data = [
-                new StatsKeyValuePair("prompt_token_count_total", stats.TotalInputTokens),
-                new StatsKeyValuePair("completion_token_count_total", stats.TotalOutputTokens),
-                new StatsKeyValuePair("prompt_cost_total", deltaPromptCost),
-                new StatsKeyValuePair("completion_cost_total", deltaCompletionCost)
-            ]
+            LlmCostDelta = new()
+            {
+                PromptTokensDelta = stats.TotalInputTokens,
+                CompletionTokensDelta = stats.TotalOutputTokens,
+                PromptTotalCostDelta = deltaPromptCost,
+                CompletionTotalCostDelta = deltaCompletionCost
+            }
         };
-        globalStats.UpdateStats($"global-{metric}-{dim}-{agentId}", body);
+        globalStats.UpdateStats($"global-{metric}-{dim}-{agentId}", delta);
     }
 
     public void PrintStatistics()

diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Stats.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Stats.cs
@@ -4,74 +4,106 @@ namespace BotSharp.Core.Repository;
 
 public partial class FileRepository
 {
-    public BotSharpStats? GetGlobalStats(string metric, string dimension, string dimRefVal, DateTime recordTime, StatsInterval interval)
+    public BotSharpStats? GetGlobalStats(string agentId, DateTime recordTime, StatsInterval interval)
     {
+        if (string.IsNullOrWhiteSpace(agentId))
+        {
+            return null;
+        }
+
         var baseDir = Path.Combine(_dbSettings.FileRepository, STATS_FOLDER);
         var (startTime, endTime) = BotSharpStats.BuildTimeInterval(recordTime, interval);
-        var dir = Path.Combine(baseDir, metric, startTime.Year.ToString(), startTime.Month.ToString("D2"));
-        if (!Directory.Exists(dir)) return null;
+        var dir = Path.Combine(baseDir, agentId, startTime.Year.ToString(), startTime.Month.ToString("D2"));
+        if (!Directory.Exists(dir))
+        {
+            return null;
+        }
 
         var file = Directory.GetFiles(dir).FirstOrDefault(x => Path.GetFileName(x) == STATS_FILE);
-        if (file == null) return null;
+        if (file == null)
+        {
+            return null;
+        }
 
         var text = File.ReadAllText(file);
         var list = JsonSerializer.Deserialize<List<BotSharpStats>>(text, _options);
-        var found = list?.FirstOrDefault(x => x.Metric.IsEqualTo(metric)
-                                            && x.Dimension.IsEqualTo(dimension)
-                                            && x.DimRefVal.IsEqualTo(dimRefVal)
+        var found = list?.FirstOrDefault(x => x.AgentId.IsEqualTo(agentId)
                                             && x.StartTime == startTime
                                             && x.EndTime == endTime);
 
         return found;
     }
 
-    public bool SaveGlobalStats(BotSharpStats body)
+    public bool SaveGlobalStats(BotSharpStatsDelta delta)
     {
+        if (delta == null || string.IsNullOrWhiteSpace(delta.AgentId))
+        {
+            return false;
+        }
+
         var baseDir = Path.Combine(_dbSettings.FileRepository, STATS_FOLDER);
-        var (startTime, endTime) = BotSharpStats.BuildTimeInterval(body.RecordTime, body.IntervalType);
-        body.StartTime = startTime;
-        body.EndTime = endTime;
+        var (startTime, endTime) = BotSharpStats.BuildTimeInterval(delta.RecordTime, delta.IntervalType);
 
-        var dir = Path.Combine(baseDir, body.Metric, startTime.Year.ToString(), startTime.Month.ToString("D2"));
+        var dir = Path.Combine(baseDir, delta.AgentId, startTime.Year.ToString(), startTime.Month.ToString("D2"));
         if (!Directory.Exists(dir))
         {
             Directory.CreateDirectory(dir);
         }
 
+        var newItem = new BotSharpStats
+        {
+            AgentId = delta.AgentId,
+            Count = new()
+            {
+                AgentCallCount = delta.CountDelta.AgentCallCountDelta
+            },
+            LlmCost = new()
+            {
+                PromptTokens = delta.LlmCostDelta.PromptTokensDelta,
+                CompletionTokens = delta.LlmCostDelta.CompletionTokensDelta,
+                PromptTotalCost = delta.LlmCostDelta.PromptTotalCostDelta,
+                CompletionTotalCost = delta.LlmCostDelta.CompletionTotalCostDelta,
+            },
+            RecordTime = delta.RecordTime,
+            StartTime = startTime,
+            EndTime = endTime,
+            Interval = delta.Interval
+        };
+
         var file = Path.Combine(dir, STATS_FILE);
         if (!File.Exists(file))
         {
-            var list = new List<BotSharpStats> { body };
+            var list = new List<BotSharpStats> { newItem };
             File.WriteAllText(file, JsonSerializer.Serialize(list, _options));
         }
         else
         {
             var text = File.ReadAllText(file);
             var list = JsonSerializer.Deserialize<List<BotSharpStats>>(text, _options);
-            var found = list?.FirstOrDefault(x => x.Metric.IsEqualTo(body.Metric)
-                                                && x.Dimension.IsEqualTo(body.Dimension)
-                                                && x.DimRefVal.IsEqualTo(body.DimRefVal)
+            var found = list?.FirstOrDefault(x => x.AgentId.IsEqualTo(delta.AgentId)
                                                 && x.StartTime == startTime
                                                 && x.EndTime == endTime);
 
             if (found != null)
             {
-                found.Metric = body.Metric;
-                found.Dimension = body.Dimension;
-                found.DimRefVal = body.DimRefVal;
-                found.Data = body.Data;
-                found.RecordTime = body.RecordTime;
-                found.StartTime = body.StartTime;
-                found.EndTime = body.EndTime;
-                found.Interval = body.Interval;
+                found.AgentId = delta.AgentId;
+                found.RecordTime = delta.RecordTime;
+                found.Count.AgentCallCount += delta.CountDelta.AgentCallCountDelta;
+                found.LlmCost.PromptTokens += delta.LlmCostDelta.PromptTokensDelta;
+                found.LlmCost.CompletionTokens += delta.LlmCostDelta.CompletionTokensDelta;
+                found.LlmCost.PromptTotalCost += delta.LlmCostDelta.PromptTotalCostDelta;
+                found.LlmCost.CompletionTotalCost += delta.LlmCostDelta.CompletionTotalCostDelta;
+                found.StartTime = startTime;
+                found.EndTime = endTime;
+                found.Interval = delta.Interval;
             }
             else if (list != null)
             {
-                list.Add(body);
+                list.Add(newItem);
             }
             else if (list == null)
             {
-                list = new List<BotSharpStats> { body };
+                list = [newItem];
             }
 
             File.WriteAllText(file, JsonSerializer.Serialize(list, _options));