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

app/MindWork AI Studio/Settings/ConfigMeta.cs

@@ -151,7 +151,7 @@ public record ConfigMeta<TClass, TValue> : ConfigMetaBase
     /// </summary>
     private void Reset()
     {
-        var configInstance = this.ConfigSelection.Compile().Invoke(SETTINGS_MANAGER.ConfigurationData);
+        var configInstance = this.ConfigSelection.Compile().Invoke(SettingsManagerAccess.ConfigurationData);
         var memberExpression = this.PropertyExpression.GetMemberExpression();
         if (memberExpression.Member is System.Reflection.PropertyInfo propertyInfo)
             propertyInfo.SetValue(configInstance, this.Default);
@@ -163,7 +163,7 @@ public record ConfigMeta<TClass, TValue> : ConfigMetaBase
     /// <param name="value">The value to set for the configuration property.</param>
     public void SetValue(TValue value)
     {
-        var configInstance = this.ConfigSelection.Compile().Invoke(SETTINGS_MANAGER.ConfigurationData);
+        var configInstance = this.ConfigSelection.Compile().Invoke(SettingsManagerAccess.ConfigurationData);
         var memberExpression = this.PropertyExpression.GetMemberExpression();
         if (memberExpression.Member is System.Reflection.PropertyInfo propertyInfo)
             propertyInfo.SetValue(configInstance, value);
@@ -174,7 +174,7 @@ public record ConfigMeta<TClass, TValue> : ConfigMetaBase
     /// </summary>
     public TValue GetValue()
     {
-        var configInstance = this.ConfigSelection.Compile().Invoke(SETTINGS_MANAGER.ConfigurationData);
+        var configInstance = this.ConfigSelection.Compile().Invoke(SettingsManagerAccess.ConfigurationData);
         var memberExpression = this.PropertyExpression.GetMemberExpression();
         if (memberExpression.Member is System.Reflection.PropertyInfo propertyInfo && propertyInfo.GetValue(configInstance) is TValue value)
             return value;

app/MindWork AI Studio/Settings/ConfigMetaBase.cs

@@ -2,5 +2,5 @@ namespace AIStudio.Settings;
 
 public abstract record ConfigMetaBase : IConfig
 {
-    protected static readonly SettingsManager SETTINGS_MANAGER = Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
+    protected static SettingsManager SettingsManagerAccess => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
 }

app/MindWork AI Studio/Settings/ManagedConfiguration.Parsing.cs

@@ -654,7 +654,7 @@ public static partial class ManagedConfiguration
 
         if (successful)
         {
-            var configInstance = configSelection.Compile().Invoke(SETTINGS_MANAGER.ConfigurationData);
+            var configInstance = configSelection.Compile().Invoke(SettingsManagerAccess.ConfigurationData);
             var currentValue = propertyExpression.Compile().Invoke(configInstance);
             var merged = new HashSet<TValue>(currentValue);
             merged.UnionWith(configuredValue);

app/MindWork AI Studio/Settings/ManagedConfiguration.cs

@@ -9,7 +9,7 @@ namespace AIStudio.Settings;
 public static partial class ManagedConfiguration
 {
     private static readonly ConcurrentDictionary<string, IConfig> METADATA = new();
-    private static readonly SettingsManager SETTINGS_MANAGER = Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
+    private static SettingsManager SettingsManagerAccess => Program.SERVICE_PROVIDER.GetRequiredService<SettingsManager>();
 
     /// <summary>
     /// Attempts to retrieve the configuration metadata for a given configuration selection and
@@ -418,19 +418,19 @@ public static partial class ManagedConfiguration
 
     private static bool TryGetEditableDefaultState(string settingName, out ManagedEditableDefaultState editableDefaultState)
     {
-        return SETTINGS_MANAGER.ConfigurationData.ManagedEditableDefaults.TryGetValue(settingName, out editableDefaultState!);
+        return SettingsManagerAccess.ConfigurationData.ManagedEditableDefaults.TryGetValue(settingName, out editableDefaultState!);
     }
 
     private static void SetEditableDefaultState(string settingName, Guid pluginId, string lastAppliedValue)
     {
-        SETTINGS_MANAGER.ConfigurationData.ManagedEditableDefaults[settingName] = new()
+        SettingsManagerAccess.ConfigurationData.ManagedEditableDefaults[settingName] = new()
         {
             ConfigPluginId = pluginId,
             LastAppliedValue = lastAppliedValue,
         };
     }
 
-    private static bool ClearEditableDefaultState(string settingName) => SETTINGS_MANAGER.ConfigurationData.ManagedEditableDefaults.Remove(settingName);
+    private static bool ClearEditableDefaultState(string settingName) => SettingsManagerAccess.ConfigurationData.ManagedEditableDefaults.Remove(settingName);
 
     private static bool CleanupEditableDefaultState<TClass, TValue>(
         ConfigMeta<TClass, TValue> configMeta,

app/MindWork AI Studio/Settings/SettingsManager.cs

@@ -348,17 +348,13 @@ public sealed class SettingsManager
             return Profile.NO_PROFILE;
 
         if (preselection.UseSpecificProfile)
-        {
-            var componentProfile = this.ConfigurationData.Profiles.FirstOrDefault(x => x.Id.Equals(preselection.SpecificProfileId, StringComparison.OrdinalIgnoreCase));
-            return componentProfile ?? Profile.NO_PROFILE;
-        }
+            return this.GetProfileById(preselection.SpecificProfileId);
 
         var appPreselection = ProfilePreselection.FromStoredValue(this.ConfigurationData.App.PreselectedProfile);
         if (appPreselection.DoNotPreselectProfile || !appPreselection.UseSpecificProfile)
             return Profile.NO_PROFILE;
 
-        var appProfile = this.ConfigurationData.Profiles.FirstOrDefault(x => x.Id.Equals(appPreselection.SpecificProfileId, StringComparison.OrdinalIgnoreCase));
-        return appProfile ?? Profile.NO_PROFILE;
+        return this.GetProfileById(appPreselection.SpecificProfileId);
     }
 
     public Profile GetAppPreselectedProfile()
@@ -367,8 +363,7 @@ public sealed class SettingsManager
         if (appPreselection.DoNotPreselectProfile || !appPreselection.UseSpecificProfile)
             return Profile.NO_PROFILE;
 
-        var appProfile = this.ConfigurationData.Profiles.FirstOrDefault(x => x.Id.Equals(appPreselection.SpecificProfileId, StringComparison.OrdinalIgnoreCase));
-        return appProfile ?? Profile.NO_PROFILE;
+        return this.GetProfileById(appPreselection.SpecificProfileId);
     }
     
     public ChatTemplate GetPreselectedChatTemplate(Tools.Components component)
@@ -377,8 +372,29 @@ public sealed class SettingsManager
         if (preselection != ChatTemplate.NO_CHAT_TEMPLATE)
             return preselection;
         
-        preselection = this.ConfigurationData.ChatTemplates.FirstOrDefault(x => x.Id.Equals(this.ConfigurationData.App.PreselectedChatTemplate, StringComparison.OrdinalIgnoreCase));
-        return preselection ?? ChatTemplate.NO_CHAT_TEMPLATE;
+        return this.GetChatTemplateById(this.ConfigurationData.App.PreselectedChatTemplate);
+    }
+
+    public Profile GetProfileById(string? profileId)
+    {
+        if (string.IsNullOrWhiteSpace(profileId))
+            return Profile.NO_PROFILE;
+
+        if (string.Equals(profileId, Profile.NO_PROFILE.Id, StringComparison.OrdinalIgnoreCase))
+            return Profile.NO_PROFILE;
+
+        return this.ConfigurationData.Profiles.FirstOrDefault(x => x.Id.Equals(profileId, StringComparison.OrdinalIgnoreCase)) ?? Profile.NO_PROFILE;
+    }
+
+    public ChatTemplate GetChatTemplateById(string? chatTemplateId)
+    {
+        if (string.IsNullOrWhiteSpace(chatTemplateId))
+            return ChatTemplate.NO_CHAT_TEMPLATE;
+
+        if (string.Equals(chatTemplateId, ChatTemplate.NO_CHAT_TEMPLATE.Id, StringComparison.OrdinalIgnoreCase))
+            return ChatTemplate.NO_CHAT_TEMPLATE;
+
+        return this.ConfigurationData.ChatTemplates.FirstOrDefault(x => x.Id.Equals(chatTemplateId, StringComparison.OrdinalIgnoreCase)) ?? ChatTemplate.NO_CHAT_TEMPLATE;
     }
 
     public ConfidenceLevel GetConfiguredConfidenceLevel(LLMProviders llmProvider)