Merge pull request #868 from iceljc/master

iceljc · web-flow · commit 2fd6a8e43dd3 · 2025-02-04T15:34:18.000-06:00
refine global stats
diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
@@ -200,7 +200,7 @@ List<ConversationStateLogModel> GetConversationStateLogs(string conversationId)
     #endregion
 
     #region Statistics
-    BotSharpStats? GetGlobalStats(string metric, string dimension, string value, DateTime recordTime, StatsInterval interval)
+    BotSharpStats? GetGlobalStats(string metric, string dimension, string dimRefVal, DateTime recordTime, StatsInterval interval)
         => throw new NotImplementedException();
     bool SaveGlobalStats(BotSharpStats body)
         => throw new NotImplementedException();
diff --git a/src/Infrastructure/BotSharp.Abstraction/Statistics/Enums/StatsInterval.cs b/src/Infrastructure/BotSharp.Abstraction/Statistics/Enums/StatsInterval.cs
@@ -2,8 +2,7 @@ namespace BotSharp.Abstraction.Statistics.Enums;
 
 public enum StatsInterval
 {
-    Hour = 1,
-    Day = 2,
-    Week = 3,
-    Month = 4
+    Minute = 1,
+    Hour = 2,
+    Day = 3
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Statistics/Enums/StatsMetric.cs b/src/Infrastructure/BotSharp.Abstraction/Statistics/Enums/StatsMetric.cs
@@ -1,6 +1,6 @@
 namespace BotSharp.Abstraction.Statistics.Enums;
 
-public static class StatsCategory
+public static class StatsMetric
 {
     public static string AgentLlmCost = "agent-llm-cost";
     public static string AgentCall = "agent-call";
diff --git a/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStats.cs b/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStats.cs
@@ -10,8 +10,8 @@ public class BotSharpStats
     [JsonPropertyName("dimension")]
     public string Dimension { get; set; } = null!;
 
-    [JsonPropertyName("value")]
-    public string Value { get; set; } = null!;
+    [JsonPropertyName("dim_ref_val")]
+    public string DimRefVal { get; set; } = null!;
 
     [JsonPropertyName("data")]
     public IDictionary<string, double> Data { get; set; } = new Dictionary<string, double>();
@@ -46,7 +46,7 @@ public string Interval
 
     public override string ToString()
     {
-        return $"{Metric}-{Dimension}-{Value} ({Interval}): {Data?.Count ?? 0}";
+        return $"{Metric}-{Dimension}-{DimRefVal} ({Interval}): {Data?.Count ?? 0}";
     }
 
     public static (DateTime, DateTime) BuildTimeInterval(DateTime recordTime, StatsInterval interval)
@@ -56,20 +56,14 @@ public static (DateTime, DateTime) BuildTimeInterval(DateTime recordTime, StatsI
 
         switch (interval)
         {
+            case StatsInterval.Minute:
+                startTime = new DateTime(recordTime.Year, recordTime.Month, recordTime.Day, recordTime.Hour, recordTime.Minute, 0);
+                endTime = startTime.AddMinutes(1);
+                break;
             case StatsInterval.Hour:
                 startTime = new DateTime(recordTime.Year, recordTime.Month, recordTime.Day, recordTime.Hour, 0, 0);
                 endTime = startTime.AddHours(1);
                 break;
-            case StatsInterval.Week:
-                var dayOfWeek = startTime.DayOfWeek;
-                var firstDayOfWeek = startTime.AddDays(-(int)dayOfWeek);
-                startTime = new DateTime(firstDayOfWeek.Year, firstDayOfWeek.Month, firstDayOfWeek.Day, 0, 0, 0);
-                endTime = startTime.AddDays(7);
-                break;
-            case StatsInterval.Month:
-                startTime = new DateTime(recordTime.Year, recordTime.Month, 1);
-                endTime = startTime.AddMonths(1);
-                break;
             default:
                 startTime = new DateTime(recordTime.Year, recordTime.Month, recordTime.Day, 0, 0, 0);
                 endTime = startTime.AddDays(1);
diff --git a/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStatsInput.cs b/src/Infrastructure/BotSharp.Abstraction/Statistics/Models/BotSharpStatsInput.cs
@@ -6,7 +6,7 @@ public class BotSharpStatsInput
 {
     public string Metric { get; set; }
     public string Dimension { get; set; }
-    public string Value { get; set; }
+    public string DimRefVal { get; set; }
     public List<StatsKeyValuePair> Data { get; set; } = [];
     public DateTime RecordTime { get; set; } = DateTime.UtcNow;
     public StatsInterval IntervalType { get; set; } = StatsInterval.Day;
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs
@@ -63,9 +63,9 @@ public void AddToken(TokenStatsModel stats, RoleDialogModel message)
         var globalStats = _services.GetRequiredService<IBotSharpStatsService>();
         var body = new BotSharpStatsInput
         {
-            Metric = StatsCategory.AgentLlmCost,
+            Metric = StatsMetric.AgentLlmCost,
             Dimension = "agent",
-            Value = message.CurrentAgentId,
+            DimRefVal = message.CurrentAgentId,
             RecordTime = DateTime.UtcNow,
             IntervalType = StatsInterval.Day,
             Data = [
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Stats.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Stats.cs
@@ -4,7 +4,7 @@ namespace BotSharp.Core.Repository;
 
 public partial class FileRepository
 {
-    public BotSharpStats? GetGlobalStats(string metric, string dimension, string value, DateTime recordTime, StatsInterval interval)
+    public BotSharpStats? GetGlobalStats(string metric, string dimension, string dimRefVal, DateTime recordTime, StatsInterval interval)
     {
         var baseDir = Path.Combine(_dbSettings.FileRepository, STATS_FOLDER);
         var (startTime, endTime) = BotSharpStats.BuildTimeInterval(recordTime, interval);
@@ -18,7 +18,7 @@ public partial class FileRepository
         var list = JsonSerializer.Deserialize<List<BotSharpStats>>(text, _options);
         var found = list?.FirstOrDefault(x => x.Metric.IsEqualTo(metric)
                                             && x.Dimension.IsEqualTo(dimension)
-                                            && x.Value.IsEqualTo(value)
+                                            && x.DimRefVal.IsEqualTo(dimRefVal)
                                             && x.StartTime == startTime
                                             && x.EndTime == endTime);
 
@@ -50,15 +50,15 @@ public bool SaveGlobalStats(BotSharpStats body)
             var list = JsonSerializer.Deserialize<List<BotSharpStats>>(text, _options);
             var found = list?.FirstOrDefault(x => x.Metric.IsEqualTo(body.Metric)
                                                 && x.Dimension.IsEqualTo(body.Dimension)
-                                                && x.Value.IsEqualTo(body.Value)
+                                                && x.DimRefVal.IsEqualTo(body.DimRefVal)
                                                 && x.StartTime == startTime
                                                 && x.EndTime == endTime);
 
             if (found != null)
             {
                 found.Metric = body.Metric;
                 found.Dimension = body.Dimension;
-                found.Value = body.Value;
+                found.DimRefVal = body.DimRefVal;
                 found.Data = body.Data;
                 found.RecordTime = body.RecordTime;
                 found.StartTime = body.StartTime;
diff --git a/src/Infrastructure/BotSharp.Core/Statistics/Services/BotSharpStatsService.cs b/src/Infrastructure/BotSharp.Core/Statistics/Services/BotSharpStatsService.cs
@@ -31,7 +31,7 @@ public bool UpdateStats(string resourceKey, BotSharpStatsInput input)
                 || input == null
                 || string.IsNullOrEmpty(input.Metric)
                 || string.IsNullOrEmpty(input.Dimension)
-                || string.IsNullOrEmpty(input.Value)
+                || string.IsNullOrEmpty(input.DimRefVal)
                 || input.Data.IsNullOrEmpty())
             {
                 return false;
@@ -41,14 +41,14 @@ public bool UpdateStats(string resourceKey, BotSharpStatsInput input)
             var res = locker.Lock(resourceKey, () =>
             {
                 var db = _services.GetRequiredService<IBotSharpRepository>();
-                var body = db.GetGlobalStats(input.Metric, input.Dimension, input.Value, input.RecordTime, input.IntervalType);
+                var body = db.GetGlobalStats(input.Metric, input.Dimension, input.DimRefVal, input.RecordTime, input.IntervalType);
                 if (body == null)
                 {
                     var stats = new BotSharpStats
                     {
                         Metric = input.Metric,
                         Dimension = input.Dimension,
-                        Value = input.Value,
+                        DimRefVal = input.DimRefVal,
                         RecordTime = input.RecordTime,
                         IntervalType = input.IntervalType,
                         Data = input.Data.ToDictionary(x => x.Key, x => x.Value)
@@ -89,7 +89,7 @@ public bool UpdateStats(string resourceKey, BotSharpStatsInput input)
         }
         catch (Exception ex)
         {
-            _logger.LogError($"Error when updating global stats {input.Metric}-{input.Dimension}-{input.Value}. {ex.Message}\r\n{ex.InnerException}");
+            _logger.LogError($"Error when updating global stats {input.Metric}-{input.Dimension}-{input.DimRefVal}. {ex.Message}\r\n{ex.InnerException}");
             return false;
         }
     }
diff --git a/src/Infrastructure/BotSharp.Logger/Hooks/GlobalStatsConversationHook.cs b/src/Infrastructure/BotSharp.Logger/Hooks/GlobalStatsConversationHook.cs
@@ -31,9 +31,9 @@ private void UpdateAgentCall(RoleDialogModel message)
 
         var body = new BotSharpStatsInput
         {
-            Metric = StatsCategory.AgentCall,
+            Metric = StatsMetric.AgentCall,
             Dimension = "agent",
-            Value = message.CurrentAgentId,
+            DimRefVal = message.CurrentAgentId,
             RecordTime = DateTime.UtcNow,
             IntervalType = StatsInterval.Day,
             Data = [
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/GlobalStatisticsDocument.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/GlobalStatisticsDocument.cs
@@ -4,7 +4,7 @@ public class GlobalStatisticsDocument : MongoBase
 {
     public string Metric { get; set; }
     public string Dimension { get; set; }
-    public string Value { get; set; }
+    public string DimRefVal { get; set; }
     public IDictionary<string, double> Data { get; set; } = new Dictionary<string, double>();
     public DateTime RecordTime { get; set; }
     public DateTime StartTime { get; set; }
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Stats.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Stats.cs
@@ -5,7 +5,7 @@ namespace BotSharp.Plugin.MongoStorage.Repository;
 
 public partial class MongoRepository
 {
-    public BotSharpStats? GetGlobalStats(string metric, string dimension, string value, DateTime recordTime, StatsInterval interval)
+    public BotSharpStats? GetGlobalStats(string metric, string dimension, string dimRefVal, DateTime recordTime, StatsInterval interval)
     {
         var (startTime, endTime) = BotSharpStats.BuildTimeInterval(recordTime, interval);
 
@@ -14,7 +14,7 @@ public partial class MongoRepository
         {
             builder.Eq(x => x.Metric, metric),
             builder.Eq(x => x.Dimension, dimension),
-            builder.Eq(x => x.Value, value),
+            builder.Eq(x => x.DimRefVal, dimRefVal),
             builder.Eq(x => x.StartTime, startTime),
             builder.Eq(x => x.EndTime, endTime)
         };
@@ -27,7 +27,7 @@ public partial class MongoRepository
         {
             Metric = found.Metric,
             Dimension = found.Dimension,
-            Value = found.Value,
+            DimRefVal = found.DimRefVal,
             Data = found.Data,
             RecordTime = found.RecordTime,
             StartTime = startTime,
@@ -48,7 +48,7 @@ public bool SaveGlobalStats(BotSharpStats body)
         {
             builder.Eq(x => x.Metric, body.Metric),
             builder.Eq(x => x.Dimension, body.Dimension),
-            builder.Eq(x => x.Value, body.Value),
+            builder.Eq(x => x.DimRefVal, body.DimRefVal),
             builder.Eq(x => x.StartTime, startTime),
             builder.Eq(x => x.EndTime, endTime)
         };
@@ -58,7 +58,7 @@ public bool SaveGlobalStats(BotSharpStats body)
                             .SetOnInsert(x => x.Id, Guid.NewGuid().ToString())
                             .Set(x => x.Metric, body.Metric)
                             .Set(x => x.Dimension, body.Dimension)
-                            .Set(x => x.Value, body.Value)
+                            .Set(x => x.DimRefVal, body.DimRefVal)
                             .Set(x => x.Data, body.Data)
                             .Set(x => x.StartTime, body.StartTime)
                             .Set(x => x.EndTime, body.EndTime)

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@ namespace BotSharp.Abstraction.Statistics.Enums;`
`2`	`2`
`3`	`3`	`public enum StatsInterval`
`4`	`4`	`{`
`5`		`- Hour = 1,`
`6`		`- Day = 2,`
`7`		`- Week = 3,`
`8`		`- Month = 4`
	`5`	`+ Minute = 1,`
	`6`	`+ Hour = 2,`
	`7`	`+ Day = 3`
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace BotSharp.Abstraction.Statistics.Enums;`
`2`	`2`
`3`		`-public static class StatsCategory`
	`3`	`+public static class StatsMetric`
`4`	`4`	`{`
`5`	`5`	`public static string AgentLlmCost = "agent-llm-cost";`
`6`	`6`	`public static string AgentCall = "agent-call";`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class BotSharpStatsInput`
`6`	`6`	`{`
`7`	`7`	`public string Metric { get; set; }`
`8`	`8`	`public string Dimension { get; set; }`
`9`		`- public string Value { get; set; }`
	`9`	`+ public string DimRefVal { get; set; }`
`10`	`10`	`public List<StatsKeyValuePair> Data { get; set; } = [];`
`11`	`11`	`public DateTime RecordTime { get; set; } = DateTime.UtcNow;`
`12`	`12`	`public StatsInterval IntervalType { get; set; } = StatsInterval.Day;`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public bool UpdateStats(string resourceKey, BotSharpStatsInput input)`
`31`	`31`	`\|\| input == null`
`32`	`32`	`\|\| string.IsNullOrEmpty(input.Metric)`
`33`	`33`	`\|\| string.IsNullOrEmpty(input.Dimension)`
`34`		`- \|\| string.IsNullOrEmpty(input.Value)`
	`34`	`+ \|\| string.IsNullOrEmpty(input.DimRefVal)`
`35`	`35`	`\|\| input.Data.IsNullOrEmpty())`
`36`	`36`	`{`
`37`	`37`	`return false;`
`@@ -41,14 +41,14 @@ public bool UpdateStats(string resourceKey, BotSharpStatsInput input)`
`41`	`41`	`var res = locker.Lock(resourceKey, () =>`
`42`	`42`	`{`
`43`	`43`	`var db = _services.GetRequiredService<IBotSharpRepository>();`
`44`		`- var body = db.GetGlobalStats(input.Metric, input.Dimension, input.Value, input.RecordTime, input.IntervalType);`
	`44`	`+ var body = db.GetGlobalStats(input.Metric, input.Dimension, input.DimRefVal, input.RecordTime, input.IntervalType);`
`45`	`45`	`if (body == null)`
`46`	`46`	`{`
`47`	`47`	`var stats = new BotSharpStats`
`48`	`48`	`{`
`49`	`49`	`Metric = input.Metric,`
`50`	`50`	`Dimension = input.Dimension,`
`51`		`- Value = input.Value,`
	`51`	`+ DimRefVal = input.DimRefVal,`
`52`	`52`	`RecordTime = input.RecordTime,`
`53`	`53`	`IntervalType = input.IntervalType,`
`54`	`54`	`Data = input.Data.ToDictionary(x => x.Key, x => x.Value)`
`@@ -89,7 +89,7 @@ public bool UpdateStats(string resourceKey, BotSharpStatsInput input)`
`89`	`89`	`}`
`90`	`90`	`catch (Exception ex)`
`91`	`91`	`{`
`92`		`- _logger.LogError($"Error when updating global stats {input.Metric}-{input.Dimension}-{input.Value}. {ex.Message}\r\n{ex.InnerException}");`
	`92`	`+ _logger.LogError($"Error when updating global stats {input.Metric}-{input.Dimension}-{input.DimRefVal}. {ex.Message}\r\n{ex.InnerException}");`
`93`	`93`	`return false;`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public class GlobalStatisticsDocument : MongoBase`
`4`	`4`	`{`
`5`	`5`	`public string Metric { get; set; }`
`6`	`6`	`public string Dimension { get; set; }`
`7`		`- public string Value { get; set; }`
	`7`	`+ public string DimRefVal { get; set; }`
`8`	`8`	`public IDictionary<string, double> Data { get; set; } = new Dictionary<string, double>();`
`9`	`9`	`public DateTime RecordTime { get; set; }`
`10`	`10`	`public DateTime StartTime { get; set; }`