From 43691e95256f39ffaa7f7ac47f771e12d6c761e7 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Tue, 23 Sep 2025 13:27:04 -0500 Subject: [PATCH] rename --- .../Utilities/{AiModelUtility.cs => LlmUtility.cs} | 2 +- .../BotSharp.Core/Session/BotSharpRealtimeSession.cs | 2 +- .../BotSharp.Core/Session/LlmRealtimeSession.cs | 2 +- .../Providers/Audio/AudioTranscriptionProvider.cs | 4 ++-- .../Providers/Image/ImageCompletionProvider.Edit.cs | 6 +++--- .../Image/ImageCompletionProvider.Generation.cs | 10 +++++----- .../Image/ImageCompletionProvider.Variation.cs | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) rename src/Infrastructure/BotSharp.Abstraction/MLTasks/Utilities/{AiModelUtility.cs => LlmUtility.cs} (91%) diff --git a/src/Infrastructure/BotSharp.Abstraction/MLTasks/Utilities/AiModelUtility.cs b/src/Infrastructure/BotSharp.Abstraction/MLTasks/Utilities/LlmUtility.cs similarity index 91% rename from src/Infrastructure/BotSharp.Abstraction/MLTasks/Utilities/AiModelUtility.cs rename to src/Infrastructure/BotSharp.Abstraction/MLTasks/Utilities/LlmUtility.cs index ad40e5fa..0303f6e2 100644 --- a/src/Infrastructure/BotSharp.Abstraction/MLTasks/Utilities/AiModelUtility.cs +++ b/src/Infrastructure/BotSharp.Abstraction/MLTasks/Utilities/LlmUtility.cs @@ -1,6 +1,6 @@ namespace BotSharp.Abstraction.MLTasks.Utilities; -public static class AiModelUtility +public static class LlmUtility { public static string? VerifyModelParameter(string? curVal, string? defaultVal, IEnumerable? options = null) { diff --git a/src/Infrastructure/BotSharp.Core/Session/BotSharpRealtimeSession.cs b/src/Infrastructure/BotSharp.Core/Session/BotSharpRealtimeSession.cs index 7dcc8fa8..da91e215 100644 --- a/src/Infrastructure/BotSharp.Core/Session/BotSharpRealtimeSession.cs +++ b/src/Infrastructure/BotSharp.Core/Session/BotSharpRealtimeSession.cs @@ -74,7 +74,7 @@ public class BotSharpRealtimeSession : IDisposable return; } - await _websocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Normal Closure", CancellationToken.None); + await _websocket.CloseAsync(WebSocketCloseStatus.NormalClosure, $"Normal Closure from {nameof(BotSharpRealtimeSession)}-{_sessionOptions?.Provider}", CancellationToken.None); } public void Dispose() diff --git a/src/Infrastructure/BotSharp.Core/Session/LlmRealtimeSession.cs b/src/Infrastructure/BotSharp.Core/Session/LlmRealtimeSession.cs index 1cb3fbb5..8aa5fa31 100644 --- a/src/Infrastructure/BotSharp.Core/Session/LlmRealtimeSession.cs +++ b/src/Infrastructure/BotSharp.Core/Session/LlmRealtimeSession.cs @@ -111,7 +111,7 @@ public class LlmRealtimeSession : IDisposable if (_webSocket.State == WebSocketState.Open) { - await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Normal Closure", CancellationToken.None); + await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, $"Normal Closure from {nameof(LlmRealtimeSession)}-{_sessionOptions?.Provider}", CancellationToken.None); } } diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Audio/AudioTranscriptionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Audio/AudioTranscriptionProvider.cs index 9b980900..006a41b8 100644 --- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Audio/AudioTranscriptionProvider.cs +++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Audio/AudioTranscriptionProvider.cs @@ -47,8 +47,8 @@ public class AudioTranscriptionProvider : IAudioTranscription temperature = $"{settings.Temperature}"; } - responseFormat = settings?.ResponseFormat != null ? AiModelUtility.VerifyModelParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null; - granularity = settings?.Granularity != null ? AiModelUtility.VerifyModelParameter(granularity, settings.Granularity.Default, settings.Granularity.Options) : null; + responseFormat = settings?.ResponseFormat != null ? LlmUtility.VerifyModelParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null; + granularity = settings?.Granularity != null ? LlmUtility.VerifyModelParameter(granularity, settings.Granularity.Default, settings.Granularity.Options) : null; var options = new AudioTranscriptionOptions { diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Edit.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Edit.cs index d11bf20e..732cc7a9 100644 --- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Edit.cs +++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Edit.cs @@ -61,9 +61,9 @@ public partial class ImageCompletionProvider var settings = settingsService.GetSetting(Provider, _model)?.Image?.Edit; - size = settings?.Size != null ? AiModelUtility.VerifyModelParameter(size, settings.Size.Default, settings.Size.Options) : null; - responseFormat = settings?.ResponseFormat != null ? AiModelUtility.VerifyModelParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null; - background = settings?.Background != null ? AiModelUtility.VerifyModelParameter(background, settings.Background.Default, settings.Background.Options) : null; + size = settings?.Size != null ? LlmUtility.VerifyModelParameter(size, settings.Size.Default, settings.Size.Options) : null; + responseFormat = settings?.ResponseFormat != null ? LlmUtility.VerifyModelParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null; + background = settings?.Background != null ? LlmUtility.VerifyModelParameter(background, settings.Background.Default, settings.Background.Options) : null; var options = new ImageEditOptions(); if (!string.IsNullOrEmpty(size)) diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs index eb8bb50d..c1ad30d1 100644 --- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs +++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Generation.cs @@ -42,11 +42,11 @@ public partial class ImageCompletionProvider var settings = settingsService.GetSetting(Provider, _model)?.Image?.Generation; - size = settings?.Size != null ? AiModelUtility.VerifyModelParameter(size, settings.Size.Default, settings.Size.Options) : null; - quality = settings?.Quality != null ? AiModelUtility.VerifyModelParameter(quality, settings.Quality.Default, settings.Quality.Options) : null; - style = settings?.Style != null ? AiModelUtility.VerifyModelParameter(style, settings.Style.Default, settings.Style.Options) : null; - responseFormat = settings?.ResponseFormat != null ? AiModelUtility.VerifyModelParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null; - background = settings?.Background != null ? AiModelUtility.VerifyModelParameter(background, settings.Background.Default, settings.Background.Options) : null; + size = settings?.Size != null ? LlmUtility.VerifyModelParameter(size, settings.Size.Default, settings.Size.Options) : null; + quality = settings?.Quality != null ? LlmUtility.VerifyModelParameter(quality, settings.Quality.Default, settings.Quality.Options) : null; + style = settings?.Style != null ? LlmUtility.VerifyModelParameter(style, settings.Style.Default, settings.Style.Options) : null; + responseFormat = settings?.ResponseFormat != null ? LlmUtility.VerifyModelParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null; + background = settings?.Background != null ? LlmUtility.VerifyModelParameter(background, settings.Background.Default, settings.Background.Options) : null; var options = new ImageGenerationOptions(); if (!string.IsNullOrEmpty(size)) diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Variation.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Variation.cs index 1d732fab..22d8f2a5 100644 --- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Variation.cs +++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Image/ImageCompletionProvider.Variation.cs @@ -35,8 +35,8 @@ public partial class ImageCompletionProvider var settings = settingsService.GetSetting(Provider, _model)?.Image?.Variation; - size = settings?.Size != null ? AiModelUtility.VerifyModelParameter(size, settings.Size.Default, settings.Size.Options) : null; - responseFormat = settings?.ResponseFormat != null ? AiModelUtility.VerifyModelParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null; + size = settings?.Size != null ? LlmUtility.VerifyModelParameter(size, settings.Size.Default, settings.Size.Options) : null; + responseFormat = settings?.ResponseFormat != null ? LlmUtility.VerifyModelParameter(responseFormat, settings.ResponseFormat.Default, settings.ResponseFormat.Options) : null; var options = new ImageVariationOptions(); if (!string.IsNullOrEmpty(size))