add session logging and crontab settings

Jicheng Lu · Jicheng Lu · commit aab468f41005 · 2025-05-20T10:59:42.000-05:00
diff --git a/src/Infrastructure/BotSharp.Abstraction/Crontab/Settings/CrontabSettings.cs b/src/Infrastructure/BotSharp.Abstraction/Crontab/Settings/CrontabSettings.cs
@@ -0,0 +1,12 @@
+namespace BotSharp.Abstraction.Crontab.Settings;
+
+public class CrontabSettings
+{
+    public CrontabBaseSetting EventSubscriber { get; set; } = new();
+    public CrontabBaseSetting Watcher { get; set; } = new();
+}
+
+public class CrontabBaseSetting
+{
+    public bool Enabled { get; set; } = true;
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/Session/ChatSessionOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Realtime/Models/Session/ChatSessionOptions.cs
@@ -1,9 +1,12 @@
+using Microsoft.Extensions.Logging;
 using System.Text.Json;
 
 namespace BotSharp.Abstraction.Realtime.Models.Session;
 
 public class ChatSessionOptions
 {
+    public string Provider { get; set; }
     public int? BufferSize { get; set; }
     public JsonSerializerOptions? JsonOptions { get; set; }
+    public ILogger? Logger { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/Settings/BotSharpDatabaseSettings.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/Settings/BotSharpDatabaseSettings.cs
@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Repositories;
+namespace BotSharp.Abstraction.Repositories.Settings;
 
 public class BotSharpDatabaseSettings : DatabaseBasicSettings
 {
diff --git a/src/Infrastructure/BotSharp.Core.Crontab/CrontabPlugin.cs b/src/Infrastructure/BotSharp.Core.Crontab/CrontabPlugin.cs
@@ -32,11 +32,22 @@ public class CrontabPlugin : IBotSharpPlugin
 
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
+        var settings = new CrontabSettings();
+        config.Bind("Crontab", settings);
+        services.AddSingleton(settings);
+
         services.AddScoped<IAgentUtilityHook, CrontabUtilityHook>();
         services.AddScoped<ICrontabService, CrontabService>();
         services.AddScoped<ITaskFeeder, CrontabService>();
 
-        services.AddHostedService<CrontabWatcher>();
-        services.AddHostedService<CrontabEventSubscription>();
+        if (settings.Watcher?.Enabled == true)
+        {
+            services.AddHostedService<CrontabWatcher>();
+        }
+
+        if (settings.EventSubscriber?.Enabled == true)
+        {
+            services.AddHostedService<CrontabEventSubscription>();
+        }
     }
 }
diff --git a/src/Infrastructure/BotSharp.Core.Crontab/Using.cs b/src/Infrastructure/BotSharp.Core.Crontab/Using.cs
@@ -6,6 +6,7 @@
 global using BotSharp.Abstraction.Agents.Enums;
 global using BotSharp.Abstraction.Crontab;
 global using BotSharp.Abstraction.Crontab.Models;
+global using BotSharp.Abstraction.Crontab.Settings;
 global using BotSharp.Abstraction.Agents;
 global using BotSharp.Abstraction.Plugins;
 global using BotSharp.Abstraction.Conversations.Models;
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Repositories.Settings;
 using BotSharp.Abstraction.Tasks.Models;
 using BotSharp.Abstraction.Users.Enums;
 using System.IO;
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.RefreshAgents.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Repositories.Enums;
+using BotSharp.Abstraction.Repositories.Settings;
 using System.IO;
 
 namespace BotSharp.Core.Agents.Services;
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Repositories.Enums;
+using BotSharp.Abstraction.Repositories.Settings;
 using BotSharp.Abstraction.Users.Enums;
 using BotSharp.Abstraction.Users.Models;
 using System.IO;
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Repositories.Settings;
 using System.IO;
 using System.Reflection;
 
diff --git a/src/Infrastructure/BotSharp.Core/BotSharpCoreExtensions.cs b/src/Infrastructure/BotSharp.Core/BotSharpCoreExtensions.cs
@@ -16,6 +16,7 @@
 using BotSharp.Core.Templating;
 using BotSharp.Abstraction.Infrastructures.Enums;
 using BotSharp.Abstraction.Realtime;
+using BotSharp.Abstraction.Repositories.Settings;
 
 namespace BotSharp.Core;
 
@@ -71,17 +72,6 @@ public static IServiceCollection UsingSqlServer(this IServiceCollection services
         return services;
     }
 
-    //public static IServiceCollection UsingFileRepository(this IServiceCollection services, IConfiguration config)
-    //{
-    //    services.AddScoped<IBotSharpRepository>(sp =>
-    //    {
-    //        var myDatabaseSettings = sp.GetRequiredService<BotSharpDatabaseSettings>();
-    //        return new FileRepository(myDatabaseSettings, sp);
-    //    });
-
-    //    return services;
-    //}
-
     public static IApplicationBuilder UseBotSharp(this IApplicationBuilder app)
     {
         if (app == null)
diff --git a/src/Infrastructure/BotSharp.Core/Files/Services/Storage/LocalFileStorageService.cs b/src/Infrastructure/BotSharp.Core/Files/Services/Storage/LocalFileStorageService.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Repositories.Settings;
 using System.IO;
 
 namespace BotSharp.Core.Files.Services;
diff --git a/src/Infrastructure/BotSharp.Core/Infrastructures/DistributedLocker.cs b/src/Infrastructure/BotSharp.Core/Infrastructures/DistributedLocker.cs
@@ -24,7 +24,9 @@ public async Task<bool> LockAsync(string resource, Func<Task> action, int timeou
         var redis = _services.GetService<IConnectionMultiplexer>();
         if (redis == null)
         {
+#if !DEBUG
             _logger.LogInformation($"The Redis server is experiencing issues and is not functioning as expected.");
+#endif
             await action();
             return true;
         }
@@ -50,7 +52,9 @@ public bool Lock(string resource, Action action, int timeoutInSeconds = 30)
         var redis = _services.GetRequiredService<IConnectionMultiplexer>();
         if (redis == null)
         {
+#if !DEBUG
             _logger.LogWarning($"The Redis server is experiencing issues and is not functioning as expected.");
+#endif
             action();
             return false;
         }
diff --git a/src/Infrastructure/BotSharp.Core/Infrastructures/Websocket/AsyncWebsocketDataCollectionResult.cs b/src/Infrastructure/BotSharp.Core/Infrastructures/Websocket/AsyncWebsocketDataCollectionResult.cs
@@ -1,4 +1,3 @@
-using BotSharp.Abstraction.Realtime.Models.Session;
 using System.ClientModel;
 using System.Net.WebSockets;
 
@@ -7,16 +6,16 @@ namespace BotSharp.Core.Infrastructures.Websocket;
 internal class AsyncWebsocketDataCollectionResult : AsyncCollectionResult<ClientResult>
 {
     private readonly WebSocket _webSocket;
-    private readonly ChatSessionOptions? _sessionOptions;
+    private readonly ChatSessionOptions? _options;
     private readonly CancellationToken _cancellationToken;
 
     public AsyncWebsocketDataCollectionResult(
         WebSocket webSocket,
-        ChatSessionOptions? sessionOptions,
+        ChatSessionOptions? options,
         CancellationToken cancellationToken)
     {
         _webSocket = webSocket;
-        _sessionOptions = sessionOptions;
+        _options = options;
         _cancellationToken = cancellationToken;
     }
 
@@ -27,7 +26,7 @@ public AsyncWebsocketDataCollectionResult(
 
     public override async IAsyncEnumerable<ClientResult> GetRawPagesAsync()
     {
-        await using var enumerator = new AsyncWebsocketDataResultEnumerator(_webSocket, _sessionOptions, _cancellationToken);
+        await using var enumerator = new AsyncWebsocketDataResultEnumerator(_webSocket, _options, _cancellationToken);
         while (await enumerator.MoveNextAsync().ConfigureAwait(false))
         {
             yield return enumerator.Current;
diff --git a/src/Infrastructure/BotSharp.Core/Infrastructures/Websocket/AsyncWebsocketDataResultEnumerator.cs b/src/Infrastructure/BotSharp.Core/Infrastructures/Websocket/AsyncWebsocketDataResultEnumerator.cs
@@ -1,3 +1,4 @@
+using Microsoft.AspNetCore.Builder;
 using System.Buffers;
 using System.ClientModel;
 using System.Net.WebSockets;
@@ -7,21 +8,21 @@ namespace BotSharp.Core.Infrastructures.Websocket;
 internal class AsyncWebsocketDataResultEnumerator : IAsyncEnumerator<ClientResult>
 {
     private readonly WebSocket _webSocket;
-    private readonly ChatSessionOptions? _sessionOptions;
+    private readonly ChatSessionOptions? _options;
     private readonly CancellationToken _cancellationToken;
     private readonly byte[] _buffer;
 
     private const int DEFAULT_BUFFER_SIZE = 1024 * 32;
 
     public AsyncWebsocketDataResultEnumerator(
         WebSocket webSocket,
-        ChatSessionOptions? sessionOptions,
+        ChatSessionOptions? options,
         CancellationToken cancellationToken)
     {
         _webSocket = webSocket;
-        _sessionOptions = sessionOptions;
+        _options = options;
         _cancellationToken = cancellationToken;
-        var bufferSize = sessionOptions?.BufferSize > 0 ? sessionOptions.BufferSize.Value : DEFAULT_BUFFER_SIZE;
+        var bufferSize = options?.BufferSize > 0 ? options.BufferSize.Value : DEFAULT_BUFFER_SIZE;
         _buffer = ArrayPool<byte>.Shared.Rent(bufferSize);
     }
 
@@ -44,7 +45,10 @@ public async ValueTask<bool> MoveNextAsync()
             if (receivedResult.CloseStatus.HasValue)
             {
 #if DEBUG
-                Console.WriteLine($"Websocket close: {receivedResult.CloseStatus} {receivedResult.CloseStatusDescription}");
+                if (_options?.Logger != null)
+                {
+                    _options.Logger.LogWarning($"{_options?.Provider} Websocket close: ({receivedResult.CloseStatus}) {receivedResult.CloseStatusDescription}");
+                }
 #endif
                 Current = null;
                 return false;
diff --git a/src/Infrastructure/BotSharp.Core/Repository/DataContextHelper.cs b/src/Infrastructure/BotSharp.Core/Repository/DataContextHelper.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Repositories.Settings;
 using Microsoft.Data.SqlClient;
 using System.Data.Common;
 
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.cs
@@ -5,6 +5,7 @@
 using BotSharp.Abstraction.Users.Models;
 using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Tasks.Models;
+using BotSharp.Abstraction.Repositories.Settings;
 
 namespace BotSharp.Core.Repository;
 
diff --git a/src/Infrastructure/BotSharp.Core/Repository/RepositoryPlugin.cs b/src/Infrastructure/BotSharp.Core/Repository/RepositoryPlugin.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Repositories.Enums;
+using BotSharp.Abstraction.Repositories.Settings;
 using BotSharp.Abstraction.Settings;
 using Microsoft.Extensions.Configuration;
 
diff --git a/src/Plugins/BotSharp.Plugin.AudioHandler/Provider/NativeWhisperProvider.cs b/src/Plugins/BotSharp.Plugin.AudioHandler/Provider/NativeWhisperProvider.cs
@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Repositories.Settings;
 using Whisper.net;
 using Whisper.net.Ggml;
 
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs b/src/Plugins/BotSharp.Plugin.ChatHub/ChatStreamMiddleware.cs
@@ -54,6 +54,7 @@ private async Task HandleWebSocket(IServiceProvider services, string agentId, st
         _session?.Dispose();
         _session = new BotSharpRealtimeSession(services, webSocket, new ChatSessionOptions
         {
+            Provider = "BotSharp Chat Stream",
             BufferSize = 1024 * 16,
             JsonOptions = BotSharpOptions.defaultJsonOptions
         });
diff --git a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs
@@ -97,7 +97,9 @@ public async Task Connect(
         _outputStream = new();
         _session = new LlmRealtimeSession(_services, new ChatSessionOptions
         {
-            JsonOptions = _jsonOptions
+            Provider = Provider,
+            JsonOptions = _jsonOptions,
+            Logger = _logger
         });
 
         var uri = BuildWebsocketUri(modelSettings.ApiKey, "v1beta");
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/MongoDbContext.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/MongoDbContext.cs
@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Repositories.Settings;
+
 namespace BotSharp.Plugin.MongoStorage;
 
 public class MongoDbContext
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/MongoStoragePlugin.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/MongoStoragePlugin.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Repositories.Enums;
+using BotSharp.Abstraction.Repositories.Settings;
 using BotSharp.Plugin.MongoStorage.Repository;
 
 namespace BotSharp.Plugin.MongoStorage;
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Realtime/RealTimeCompletionProvider.cs
@@ -72,7 +72,9 @@ public async Task Connect(
         _session?.Dispose();
         _session = new LlmRealtimeSession(_services, new ChatSessionOptions
         {
-            JsonOptions = _botsharpOptions.JsonSerializerOptions
+            Provider = Provider,
+            JsonOptions = _botsharpOptions.JsonSerializerOptions,
+            Logger = _logger
         });
 
         await _session.ConnectAsync(
diff --git a/src/WebStarter/appsettings.json b/src/WebStarter/appsettings.json
@@ -325,6 +325,15 @@
     "Enabled": false
   },
 
+  "Crontab": {
+    "Watcher": {
+      "Enabled": false
+    },
+    "EventSubscriber": {
+      "Enabled": false
+    }
+  },
+
   "Instruction": {
     "Logging": {
       "Enabled": true,
@@ -427,6 +436,7 @@
     "BucketName": "",
     "Region": ""
   },
+
   "Qdrant": {
     "Url": "",
     "ApiKey": ""
@@ -468,6 +478,7 @@
     "ApiSecret": "",
     "ModelVersion": "V3_5"
   },
+
   "MetaGLM": {
     "ApiKey": "6b6c8b3fca3e5da21d633e350980744d.938gruOqrK4BDqW8",
     "BaseAddress": "http://localhost:8100/v1/",

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,12 @@`
	`1`	`+using Microsoft.Extensions.Logging;`
`1`	`2`	`using System.Text.Json;`
`2`	`3`
`3`	`4`	`namespace BotSharp.Abstraction.Realtime.Models.Session;`
`4`	`5`
`5`	`6`	`public class ChatSessionOptions`
`6`	`7`	`{`
	`8`	`+ public string Provider { get; set; }`
`7`	`9`	`public int? BufferSize { get; set; }`
`8`	`10`	`public JsonSerializerOptions? JsonOptions { get; set; }`
	`11`	`+ public ILogger? Logger { get; set; }`
`9`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace BotSharp.Abstraction.Repositories;`
	`1`	`+namespace BotSharp.Abstraction.Repositories.Settings;`
`2`	`2`
`3`	`3`	`public class BotSharpDatabaseSettings : DatabaseBasicSettings`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using BotSharp.Abstraction.Repositories.Settings;`
`1`	`2`	`using BotSharp.Abstraction.Tasks.Models;`
`2`	`3`	`using BotSharp.Abstraction.Users.Enums;`
`3`	`4`	`using System.IO;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using BotSharp.Abstraction.Repositories.Enums;`
	`2`	`+using BotSharp.Abstraction.Repositories.Settings;`
`2`	`3`	`using System.IO;`
`3`	`4`
`4`	`5`	`namespace BotSharp.Core.Agents.Services;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@ public async Task<bool> LockAsync(string resource, Func<Task> action, int timeou`
`24`	`24`	`var redis = _services.GetService<IConnectionMultiplexer>();`
`25`	`25`	`if (redis == null)`
`26`	`26`	`{`
	`27`	`+#if !DEBUG`
`27`	`28`	`_logger.LogInformation($"The Redis server is experiencing issues and is not functioning as expected.");`
	`29`	`+#endif`
`28`	`30`	`await action();`
`29`	`31`	`return true;`
`30`	`32`	`}`
`@@ -50,7 +52,9 @@ public bool Lock(string resource, Action action, int timeoutInSeconds = 30)`
`50`	`52`	`var redis = _services.GetRequiredService<IConnectionMultiplexer>();`
`51`	`53`	`if (redis == null)`
`52`	`54`	`{`
	`55`	`+#if !DEBUG`
`53`	`56`	`_logger.LogWarning($"The Redis server is experiencing issues and is not functioning as expected.");`
	`57`	`+#endif`
`54`	`58`	`action();`
`55`	`59`	`return false;`
`56`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using BotSharp.Abstraction.Realtime.Models.Session;`
`2`	`1`	`using System.ClientModel;`
`3`	`2`	`using System.Net.WebSockets;`
`4`	`3`
`@@ -7,16 +6,16 @@ namespace BotSharp.Core.Infrastructures.Websocket;`
`7`	`6`	`internal class AsyncWebsocketDataCollectionResult : AsyncCollectionResult<ClientResult>`
`8`	`7`	`{`
`9`	`8`	`private readonly WebSocket _webSocket;`
`10`		`- private readonly ChatSessionOptions? _sessionOptions;`
	`9`	`+ private readonly ChatSessionOptions? _options;`
`11`	`10`	`private readonly CancellationToken _cancellationToken;`
`12`	`11`
`13`	`12`	`public AsyncWebsocketDataCollectionResult(`
`14`	`13`	`WebSocket webSocket,`
`15`		`- ChatSessionOptions? sessionOptions,`
	`14`	`+ ChatSessionOptions? options,`
`16`	`15`	`CancellationToken cancellationToken)`
`17`	`16`	`{`
`18`	`17`	`_webSocket = webSocket;`
`19`		`- _sessionOptions = sessionOptions;`
	`18`	`+ _options = options;`
`20`	`19`	`_cancellationToken = cancellationToken;`
`21`	`20`	`}`
`22`	`21`
`@@ -27,7 +26,7 @@ public AsyncWebsocketDataCollectionResult(`
`27`	`26`
`28`	`27`	`public override async IAsyncEnumerable<ClientResult> GetRawPagesAsync()`
`29`	`28`	`{`
`30`		`- await using var enumerator = new AsyncWebsocketDataResultEnumerator(_webSocket, _sessionOptions, _cancellationToken);`
	`29`	`+ await using var enumerator = new AsyncWebsocketDataResultEnumerator(_webSocket, _options, _cancellationToken);`
`31`	`30`	`while (await enumerator.MoveNextAsync().ConfigureAwait(false))`
`32`	`31`	`{`
`33`	`32`	`yield return enumerator.Current;`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using BotSharp.Abstraction.Repositories.Settings;`
`1`	`2`	`using Microsoft.Data.SqlClient;`
`2`	`3`	`using System.Data.Common;`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using BotSharp.Abstraction.Repositories.Settings;`
`1`	`2`	`using Whisper.net;`
`2`	`3`	`using Whisper.net.Ggml;`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ private async Task HandleWebSocket(IServiceProvider services, string agentId, st`
`54`	`54`	`_session?.Dispose();`
`55`	`55`	`_session = new BotSharpRealtimeSession(services, webSocket, new ChatSessionOptions`
`56`	`56`	`{`
	`57`	`+ Provider = "BotSharp Chat Stream",`
`57`	`58`	`BufferSize = 1024 * 16,`
`58`	`59`	`JsonOptions = BotSharpOptions.defaultJsonOptions`
`59`	`60`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using BotSharp.Abstraction.Repositories.Settings;`
	`2`	`+`
`1`	`3`	`namespace BotSharp.Plugin.MongoStorage;`
`2`	`4`
`3`	`5`	`public class MongoDbContext`