From bdc1529686d7a906b5295067fd24b524e2d308a7 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Fri, 21 Mar 2025 17:34:00 -0500 Subject: [PATCH] minor change --- .../Conversations/Models/TokenStatsModel.cs | 2 +- .../Conversations/Services/TokenStatistics.cs | 8 ++++---- .../Providers/Chat/ChatCompletionProvider.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/TokenStatsModel.cs b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/TokenStatsModel.cs index 67c560a1..ca55e385 100644 --- a/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/TokenStatsModel.cs +++ b/src/Infrastructure/BotSharp.Abstraction/Conversations/Models/TokenStatsModel.cs @@ -6,7 +6,7 @@ public class TokenStatsModel public string Model { get; set; } public string Prompt { get; set; } public int PromptCount { get; set; } - public int CachedTokenCount { get; set; } + public int CachedPromptCount { get; set; } public int CompletionCount { get; set; } public AgentLlmConfig LlmConfig { get; set; } } diff --git a/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs b/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs index 3fb9dc0e..5a0614ed 100644 --- a/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs +++ b/src/Infrastructure/BotSharp.Core/Conversations/Services/TokenStatistics.cs @@ -41,8 +41,8 @@ public class TokenStatistics : ITokenStatistics var settingsService = _services.GetRequiredService(); var settings = settingsService.GetSetting(stats.Provider, _model); - var deltaPromptCost = (stats.PromptCount - stats.CachedTokenCount) / 1000f * settings.PromptCost; - var deltaCachedPromptCost = stats.CachedTokenCount / 1000f * (settings.AdditionalCost?.CachedPromptCost ?? 0f); + var deltaPromptCost = (stats.PromptCount - stats.CachedPromptCount) / 1000f * settings.PromptCost; + var deltaCachedPromptCost = stats.CachedPromptCount / 1000f * (settings.AdditionalCost?.CachedPromptCost ?? 0f); var deltaCompletionCost = stats.CompletionCount / 1000f * settings.CompletionCost; var deltaTotal = deltaPromptCost + deltaCachedPromptCost + deltaCompletionCost; @@ -55,8 +55,8 @@ public class TokenStatistics : ITokenStatistics stat.SetState("prompt_total", stats.PromptCount + inputCount, isNeedVersion: false, source: StateSource.Application); var outputCount = int.Parse(stat.GetState("completion_total", "0")); stat.SetState("completion_total", stats.CompletionCount + outputCount, isNeedVersion: false, source: StateSource.Application); - var cachedCount = int.Parse(stat.GetState("cached_token_total", "0")); - stat.SetState("cached_token_total", stats.CachedTokenCount + cachedCount, isNeedVersion: false, source: StateSource.Application); + var cachedCount = int.Parse(stat.GetState("cached_prompt_total", "0")); + stat.SetState("cached_prompt_total", stats.CachedPromptCount + cachedCount, isNeedVersion: false, source: StateSource.Application); // Total cost var total_cost = float.Parse(stat.GetState("llm_total_cost", "0")); diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs index 5550d7f0..7d6bdcea 100644 --- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs +++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs @@ -84,7 +84,7 @@ public class ChatCompletionProvider : IChatCompletion Provider = Provider, Model = _model, PromptCount = response.Value?.Usage?.InputTokenCount ?? 0, - CachedTokenCount = response.Value?.Usage?.InputTokenDetails?.CachedTokenCount ?? 0, + CachedPromptCount = response.Value?.Usage?.InputTokenDetails?.CachedTokenCount ?? 0, CompletionCount = response.Value?.Usage?.OutputTokenCount ?? 0 }); }