Fixed issues with the DI system and singletons (#802)

app/MindWork AI Studio/Tools/ComponentsExtensions.cs

@@ -169,7 +169,7 @@ public static class ComponentsExtensions
     
     public static ChatTemplate PreselectedChatTemplate(this Components component, SettingsManager settingsManager) => component switch
     {
-        Components.CHAT => settingsManager.ConfigurationData.Chat.PreselectOptions ? settingsManager.ConfigurationData.ChatTemplates.FirstOrDefault(x => x.Id == settingsManager.ConfigurationData.Chat.PreselectedChatTemplate) ?? ChatTemplate.NO_CHAT_TEMPLATE : ChatTemplate.NO_CHAT_TEMPLATE,
+        Components.CHAT => settingsManager.ConfigurationData.Chat.PreselectOptions ? settingsManager.GetChatTemplateById(settingsManager.ConfigurationData.Chat.PreselectedChatTemplate) : ChatTemplate.NO_CHAT_TEMPLATE,
         
         _ => ChatTemplate.NO_CHAT_TEMPLATE,
     };

app/MindWork AI Studio/Tools/ExternalHttpClientTimeout.cs

@@ -26,7 +26,7 @@ public static class ExternalHttpClientTimeout
 
     private static string TB(string fallbackEN) => PluginSystem.I18N.I.T(fallbackEN, typeof(ExternalHttpClientTimeout).Namespace, nameof(ExternalHttpClientTimeout));
     private static readonly Lazy<ILogger> LOGGER = new(() => Program.LOGGER_FACTORY.CreateLogger(nameof(ExternalHttpClientTimeout)));
-    private static readonly Lazy<SettingsManager> SETTINGS_MANAGER = new(() => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>());
+    private static SettingsManager SettingsManagerAccess => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
     private static readonly Lock CUSTOM_ROOT_CERTIFICATE_LOCK = new();
     private static CustomRootCertificateCache? CUSTOM_ROOT_CERTIFICATE_CACHE;
 
@@ -91,7 +91,7 @@ public static class ExternalHttpClientTimeout
     
     private static TimeSpan GetTimeout()
     {
-        var seconds = SETTINGS_MANAGER.Value.ConfigurationData.App.HttpClientTimeoutSeconds;
+        var seconds = SettingsManagerAccess.ConfigurationData.App.HttpClientTimeoutSeconds;
         if (seconds <= 0)
             seconds = DEFAULT_HTTP_CLIENT_TIMEOUT_SECONDS;
 
@@ -129,11 +129,11 @@ public static class ExternalHttpClientTimeout
 
         var enabled = TryParseBooleanEnvironmentValue(envEnabled, out var parsedEnvEnabled)
             ? parsedEnvEnabled
-            : SETTINGS_MANAGER.Value.ConfigurationData.App.ExternalHttpCustomRootCertificatesEnabled;
+            : SettingsManagerAccess.ConfigurationData.App.ExternalHttpCustomRootCertificatesEnabled;
 
         var bundlePath = !string.IsNullOrWhiteSpace(envBundlePath)
             ? envBundlePath.Trim()
-            : SETTINGS_MANAGER.Value.ConfigurationData.App.ExternalHttpCustomRootCertificateBundlePath.Trim();
+            : SettingsManagerAccess.ConfigurationData.App.ExternalHttpCustomRootCertificateBundlePath.Trim();
 
         var allowedHostPatterns = ReadAllowedHostPatterns(envAllowedHosts);
         var source = ReadCustomRootCertificateConfigurationSource(envEnabled, envBundlePath, envAllowedHosts);
@@ -158,7 +158,7 @@ public static class ExternalHttpClientTimeout
     {
         IEnumerable<string> rawPatterns = !string.IsNullOrWhiteSpace(envAllowedHosts)
             ? envAllowedHosts.Split([';', ','], StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
-            : SETTINGS_MANAGER.Value.ConfigurationData.App.ExternalHttpCustomRootCertificateAllowedHosts;
+            : SettingsManagerAccess.ConfigurationData.App.ExternalHttpCustomRootCertificateAllowedHosts;
 
         var patterns = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         foreach (var rawPattern in rawPatterns)

app/MindWork AI Studio/Tools/PluginSystem/PluginConfiguration.cs

@@ -9,7 +9,7 @@ namespace AIStudio.Tools.PluginSystem;
 public sealed class PluginConfiguration(bool isInternal, LuaState state, PluginType type) : PluginBase(isInternal, state, type)
 {
     private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(PluginConfiguration).Namespace, nameof(PluginConfiguration));
-    private static readonly SettingsManager SETTINGS_MANAGER = Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
+    private static SettingsManager SettingsManagerAccess => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
     private static readonly ILogger LOG = Program.LOGGER_FACTORY.CreateLogger(nameof(PluginConfiguration));
 
     private List<PluginConfigurationObject> configObjects = [];
@@ -41,7 +41,7 @@ public sealed class PluginConfiguration(bool isInternal, LuaState state, PluginT
             await StoreEnterpriseApiKeysAsync();
             await StoreEnterpriseSecretsAsync();
 
-            await SETTINGS_MANAGER.StoreSettings();
+            await SettingsManagerAccess.StoreSettings();
             await MessageBus.INSTANCE.SendMessage<bool>(null, Event.CONFIGURATION_CHANGED);
         }
     }

app/MindWork AI Studio/Tools/PluginSystem/PluginConfigurationObject.cs

@@ -14,8 +14,9 @@ namespace AIStudio.Tools.PluginSystem;
 /// </summary>
 public sealed record PluginConfigurationObject
 {
-    private static readonly RustService RUST_SERVICE = Program.SERVICE_PROVIDER.GetRequiredService<RustService>();
-    private static readonly SettingsManager SETTINGS_MANAGER = Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
+    private static RustService RustService => Program.SERVICE_PROVIDER.GetRequiredService<RustService>();
+    private static SettingsManager SettingsManagerAccess => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
+    private static ThreadSafeRandom Rng => Program.SERVICE_PROVIDER.GetRequiredService<ThreadSafeRandom>();
     private static readonly ILogger LOG = Program.LOGGER_FACTORY.CreateLogger<PluginConfigurationObject>();
     
     /// <summary>
@@ -91,7 +92,8 @@ public sealed record PluginConfigurationObject
             return false;
         }
 
-        var storedObjects = configObjectSelection.Compile()(SETTINGS_MANAGER.ConfigurationData);
+        var localSettingsManager = SettingsManagerAccess;
+        var storedObjects = configObjectSelection.Compile()(localSettingsManager.ConfigurationData);
         var numberObjects = luaTable.ArrayLength;
         ThreadSafeRandom? random = null;
         for (var i = 1; i <= numberObjects; i++)
@@ -141,7 +143,7 @@ public sealed record PluginConfigurationObject
                 // Case: The object does not exist, we have to add it
                 else
                 {
-                    if (nextConfigObjectNumSelection.TryIncrement(SETTINGS_MANAGER.ConfigurationData, IncrementType.POST) is { Success: true, UpdatedValue: var nextNum })
+                    if (nextConfigObjectNumSelection.TryIncrement(localSettingsManager.ConfigurationData, IncrementType.POST) is { Success: true, UpdatedValue: var nextNum })
                     {
                         // Case: Increment the next number was successful
                         configObject = configObject with { Num = nextNum };
@@ -150,7 +152,7 @@ public sealed record PluginConfigurationObject
                     else
                     {
                         // Case: The next number could not be incremented, we use a random number
-                        random ??= new ThreadSafeRandom();
+                        random ??= Rng;
                         configObject = configObject with { Num = (uint)random.Next(500_000, 1_000_000) };
                         storedObjects.Add((TClass)configObject);
                         LOG.LogWarning("The next number for the configuration object '{ConfigObjectName}' (id={ConfigObjectId}) could not be incremented. Using a random number instead (config plugin id: {ConfigPluginId}).", configObject.Name, configObject.Id, configPluginId);
@@ -185,7 +187,8 @@ public sealed record PluginConfigurationObject
             return false;
         }
 
-        var storedObjects = SETTINGS_MANAGER.ConfigurationData.DataSources;
+        var localSettingsManager = SettingsManagerAccess;
+        var storedObjects = localSettingsManager.ConfigurationData.DataSources;
         var numberObjects = luaTable.ArrayLength;
         ThreadSafeRandom? random = null;
         for (var i = 1; i <= numberObjects; i++)
@@ -222,14 +225,14 @@ public sealed record PluginConfigurationObject
             }
             else
             {
-                if (IncrementDataSourceNum() is { Success: true, UpdatedValue: var nextNum })
+                if (IncrementDataSourceNum(localSettingsManager.ConfigurationData) is { Success: true, UpdatedValue: var nextNum })
                 {
                     configObject = configObject with { Num = nextNum };
                     storedObjects.Add(configObject);
                 }
                 else
                 {
-                    random ??= new ThreadSafeRandom();
+                    random ??= Rng;
                     configObject = configObject with { Num = (uint)random.Next(500_000, 1_000_000) };
                     storedObjects.Add(configObject);
                     LOG.LogWarning("The next number for the data source '{ConfigObjectName}' (id={ConfigObjectId}) could not be incremented. Using a random number instead (config plugin id: {ConfigPluginId}).", configObject.Name, configObject.Id, configPluginId);
@@ -239,9 +242,9 @@ public sealed record PluginConfigurationObject
 
         return true;
 
-        static IncrementResult<uint> IncrementDataSourceNum()
+        static IncrementResult<uint> IncrementDataSourceNum(Data data)
         {
-            return ((Expression<Func<Data, uint>>)(x => x.NextDataSourceNum)).TryIncrement(SETTINGS_MANAGER.ConfigurationData, IncrementType.POST);
+            return ((Expression<Func<Data, uint>>)(x => x.NextDataSourceNum)).TryIncrement(data, IncrementType.POST);
         }
     }
 
@@ -264,7 +267,8 @@ public sealed record PluginConfigurationObject
         SecretStoreType? secretStoreType = null,
         bool deleteSecret = false) where TClass : IConfigurationObject
     {
-        var configuredObjects = configObjectSelection.Compile()(SETTINGS_MANAGER.ConfigurationData);
+        var localSettingsManager = SettingsManagerAccess;
+        var configuredObjects = configObjectSelection.Compile()(localSettingsManager.ConfigurationData);
         var leftOverObjects = new List<TClass>();
         foreach (var configuredObject in configuredObjects)
         {
@@ -307,7 +311,7 @@ public sealed record PluginConfigurationObject
             // Delete the API key from the OS keyring if the removed object has one:
             if(deleteSecret && item is ISecretId regularSecretId)
             {
-                var deleteResult = await RUST_SERVICE.DeleteSecret(regularSecretId, secretStoreType ?? SecretStoreType.DATA_SOURCE);
+                var deleteResult = await RustService.DeleteSecret(regularSecretId, secretStoreType ?? SecretStoreType.DATA_SOURCE);
                 if (deleteResult.Success)
                     LOG.LogInformation($"Successfully deleted secret for removed enterprise object '{item.Name}' from the OS keyring.");
                 else
@@ -315,7 +319,7 @@ public sealed record PluginConfigurationObject
             }
             else if(secretStoreType is not null && item is ISecretId secretId)
             {
-                var deleteResult = await RUST_SERVICE.DeleteAPIKey(secretId, secretStoreType.Value);
+                var deleteResult = await RustService.DeleteAPIKey(secretId, secretStoreType.Value);
                 if (deleteResult.Success)
                     LOG.LogInformation($"Successfully deleted API key for removed enterprise provider '{item.Name}' from the OS keyring.");
                 else

app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Loading.cs

@@ -191,7 +191,7 @@ public static partial class PluginFactory
             wasConfigurationChanged = true;
 
         // Check left-over mandatory info acceptances:
-        if (SETTINGS_MANAGER.ConfigurationData.MandatoryInformation.RemoveLeftOverAcceptances(GetMandatoryInfos()))
+        if (SettingsManagerAccess.ConfigurationData.MandatoryInformation.RemoveLeftOverAcceptances(GetMandatoryInfos()))
             wasConfigurationChanged = true;
         
         // Check for a preselected provider:
@@ -285,7 +285,7 @@ public static partial class PluginFactory
         
         if (wasConfigurationChanged)
         {
-            await SETTINGS_MANAGER.StoreSettings();
+            await SettingsManagerAccess.StoreSettings();
             await MessageBus.INSTANCE.SendMessage<bool>(null, Event.CONFIGURATION_CHANGED);
         }
     }

app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.Starting.cs

@@ -64,7 +64,7 @@ public static partial class PluginFactory
 
             try
             {
-                if (availablePlugin.IsInternal || SETTINGS_MANAGER.IsPluginEnabled(availablePlugin) || availablePlugin.Type == PluginType.CONFIGURATION || availablePlugin.Type == PluginType.ASSISTANT)
+                if (availablePlugin.IsInternal || SettingsManagerAccess.IsPluginEnabled(availablePlugin) || availablePlugin.Type == PluginType.CONFIGURATION || availablePlugin.Type == PluginType.ASSISTANT)
                     if(await Start(availablePlugin, cancellationToken) is { IsValid: true } plugin)
                     {
                         if (plugin is PluginConfiguration configPlugin)

app/MindWork AI Studio/Tools/PluginSystem/PluginFactory.cs

@@ -6,7 +6,7 @@ namespace AIStudio.Tools.PluginSystem;
 public static partial class PluginFactory
 {
     private static readonly ILogger LOG = Program.LOGGER_FACTORY.CreateLogger(nameof(PluginFactory));
-    private static readonly SettingsManager SETTINGS_MANAGER = Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
+    private static SettingsManager SettingsManagerAccess => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
 
     private static string DATA_DIR = string.Empty;
     private static string PLUGINS_ROOT = string.Empty;

app/MindWork AI Studio/Tools/RAG/IRetrievalContextExtensions.cs

@@ -6,7 +6,7 @@ namespace AIStudio.Tools.RAG;
 
 public static class IRetrievalContextExtensions
 {
-    private static readonly ILogger<IRetrievalContext> LOGGER = Program.SERVICE_PROVIDER.GetService<ILogger<IRetrievalContext>>()!;
+    private static readonly ILogger<IRetrievalContext> LOGGER = Program.LOGGER_FACTORY.CreateLogger<IRetrievalContext>();
     
     public static async Task<string> AsMarkdown(this IReadOnlyList<IRetrievalContext> retrievalContexts, StringBuilder? sb = null, CancellationToken token = default)
     {

app/MindWork AI Studio/Tools/Services/TemporaryChatService.cs

@@ -17,7 +17,6 @@ public sealed class TemporaryChatService(ILogger<TemporaryChatService> logger, S
 
         logger.LogInformation("The temporary chat maintenance service was initialized.");
         
-        await settingsManager.LoadSettings();
         if(settingsManager.ConfigurationData.Workspace.StorageTemporaryMaintenancePolicy is WorkspaceStorageTemporaryMaintenancePolicy.NO_AUTOMATIC_MAINTENANCE)
         {
             logger.LogWarning("Automatic maintenance of temporary chat storage is disabled. Exiting maintenance service.");