From f0527f385284ad6552a862897c3c7a561e907273 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Wed, 12 Aug 2026 20:30:28 +0200 Subject: [PATCH] Read providers through the settings manager everywhere --- .../DocumentAnalysisAssistant.razor.cs | 9 +++---- .../ConfigurationProviderSelection.razor.cs | 25 ++++++------------- .../Components/ProviderSelection.razor.cs | 25 ++++++------------- .../Settings/SettingsPanelProviders.razor | 4 +-- .../Settings/SettingsPanelProviders.razor.cs | 9 +++---- .../Dialogs/ProviderDialog.razor.cs | 4 +-- .../Dialogs/Settings/SettingsDialogBase.cs | 5 +--- 7 files changed, 26 insertions(+), 55 deletions(-) diff --git a/app/MindWork AI Studio/Assistants/DocumentAnalysis/DocumentAnalysisAssistant.razor.cs b/app/MindWork AI Studio/Assistants/DocumentAnalysis/DocumentAnalysisAssistant.razor.cs index 22c71381..6da79ad5 100644 --- a/app/MindWork AI Studio/Assistants/DocumentAnalysis/DocumentAnalysisAssistant.razor.cs +++ b/app/MindWork AI Studio/Assistants/DocumentAnalysis/DocumentAnalysisAssistant.razor.cs @@ -1,5 +1,4 @@ using System.Text; -using System.Diagnostics.CodeAnalysis; using AIStudio.Chat; using AIStudio.Dialogs; @@ -371,11 +370,10 @@ public partial class DocumentAnalysisAssistant : AssistantBaseCore(provider.InstanceName, provider.Id)); } @@ -459,7 +457,6 @@ public partial class DocumentAnalysisAssistant : AssistantBaseCore x.Id == this.selectedPolicy.PreselectedProvider); - if (policyProvider is not null && policyProvider.UsedLLMProvider.GetConfidence(this.SettingsManager).Level >= minimumLevel) + var policyProvider = this.SettingsManager.GetProviderById(this.selectedPolicy.PreselectedProvider); + if (policyProvider != Settings.Provider.NONE && policyProvider.UsedLLMProvider.GetConfidence(this.SettingsManager).Level >= minimumLevel) { this.ProviderSettings = policyProvider; this.CurrentProfile = this.ResolveProfileSelection(); diff --git a/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs b/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs index 8267219c..722ad15f 100644 --- a/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs +++ b/app/MindWork AI Studio/Components/ConfigurationProviderSelection.razor.cs @@ -1,5 +1,3 @@ -using System.Diagnostics.CodeAnalysis; - using AIStudio.Provider; using AIStudio.Settings; using AIStudio.Tools.PluginSystem; @@ -35,27 +33,20 @@ public partial class ConfigurationProviderSelection : MSGComponentBase [Parameter] public Func IsLocked { get; set; } = () => false; - [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed")] private IEnumerable> FilteredData() { if(this.Component is not Tools.Components.NONE and not Tools.Components.APP_SETTINGS) yield return new(T("Use app default"), string.Empty); - - // Get the minimum confidence level for this component, and/or the enforced global minimum confidence level: - var minimumLevel = this.SettingsManager.GetMinimumConfidenceLevel(this.Component); - - // Apply the explicit minimum confidence level if set and higher than the current minimum level: - if (this.ExplicitMinimumConfidence is not ConfidenceLevel.UNKNOWN && this.ExplicitMinimumConfidence > minimumLevel) - minimumLevel = this.ExplicitMinimumConfidence; - - // Filter the providers based on the minimum confidence level: + + // + // Filter the providers based on the minimum confidence level of this component, the enforced + // global minimum, and the explicit minimum level when it is higher. Providers which no longer + // exist resolve to `Provider.NONE` and are dropped by the confidence check as well: + // foreach (var providerId in this.Data) { - var provider = this.SettingsManager.ConfigurationData.Providers.FirstOrDefault(x => x.Id == providerId.Value); - if (provider is null) - continue; - - if (provider.UsedLLMProvider.GetConfidence(this.SettingsManager).Level >= minimumLevel) + var provider = this.SettingsManager.GetProviderById(providerId.Value); + if (this.SettingsManager.IsProviderConfident(provider, this.Component, this.ExplicitMinimumConfidence)) yield return providerId; } } diff --git a/app/MindWork AI Studio/Components/ProviderSelection.razor.cs b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs index de7b668c..20313116 100644 --- a/app/MindWork AI Studio/Components/ProviderSelection.razor.cs +++ b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs @@ -1,5 +1,3 @@ -using System.Diagnostics.CodeAnalysis; - using AIStudio.Provider; using AIStudio.Settings; @@ -83,7 +81,6 @@ public partial class ProviderSelection : MSGComponentBase _ => this.T("Uses reasoning (thinking)"), }; - [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed")] private IEnumerable GetAvailableProviders() { switch (this.Component) @@ -91,25 +88,17 @@ public partial class ProviderSelection : MSGComponentBase case null: this.Logger.LogError("Component is null! Cannot filter providers based on component settings. Missed CascadingParameter?"); yield break; - + case Tools.Components.NONE: this.Logger.LogError("Component is NONE! Cannot filter providers based on component settings. Used wrong component?"); yield break; - + case { } component: - - // Get the minimum confidence level for this component, and/or the global minimum if enforced: - var minimumLevel = this.SettingsManager.GetMinimumConfidenceLevel(component); - - // Override with the explicit minimum level if set and higher: - if (this.ExplicitMinimumConfidence is not ConfidenceLevel.UNKNOWN && this.ExplicitMinimumConfidence > minimumLevel) - minimumLevel = this.ExplicitMinimumConfidence; - - // Filter providers based on the minimum confidence level: - foreach (var provider in this.SettingsManager.ConfigurationData.Providers) - if (provider.UsedLLMProvider != LLMProviders.NONE) - if (provider.UsedLLMProvider.GetConfidence(this.SettingsManager).Level >= minimumLevel) - yield return provider; + + // Filter providers based on the minimum confidence level of this component, the + // enforced global minimum, and the explicit minimum level when it is higher: + foreach (var provider in this.SettingsManager.GetConfidentProviders(component, this.ExplicitMinimumConfidence)) + yield return provider; break; } } diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor index 5ec93e3e..92030f3f 100644 --- a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor +++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor @@ -9,7 +9,7 @@ @T("What we call a provider is the combination of an LLM provider such as OpenAI and a model like GPT-4o. You can configure as many providers as you want. This way, you can use the appropriate model for each task. As an LLM provider, you can also choose local providers. However, to use this app, you must configure at least one provider.") - + @@ -66,7 +66,7 @@ - @if(this.SettingsManager.ConfigurationData.Providers.Count == 0) + @if(this.SettingsManager.GetAllProviders().Count == 0) { @T("No providers configured yet.") diff --git a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor.cs b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor.cs index 4e86eed9..9e073563 100644 --- a/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor.cs +++ b/app/MindWork AI Studio/Components/Settings/SettingsPanelProviders.razor.cs @@ -27,7 +27,7 @@ public partial class SettingsPanelProviders : SettingsPanelProviderBase #endregion - [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed")] + [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed", Justification = "Managing the provider list is the purpose of this settings panel. Reading providers goes through the settings manager, but adding, editing, and removing them stays here on purpose.")] private async Task AddLLMProvider() { var dialogParameters = new DialogParameters @@ -50,7 +50,7 @@ public partial class SettingsPanelProviders : SettingsPanelProviderBase await this.MessageBus.SendMessage(this, Event.CONFIGURATION_CHANGED); } - [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed")] + [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed", Justification = "Managing the provider list is the purpose of this settings panel. Reading providers goes through the settings manager, but adding, editing, and removing them stays here on purpose.")] private async Task EditLLMProvider(AIStudio.Settings.Provider provider) { if(provider == AIStudio.Settings.Provider.NONE) @@ -94,7 +94,7 @@ public partial class SettingsPanelProviders : SettingsPanelProviderBase await this.MessageBus.SendMessage(this, Event.CONFIGURATION_CHANGED); } - [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed")] + [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed", Justification = "Managing the provider list is the purpose of this settings panel. Reading providers goes through the settings manager, but adding, editing, and removing them stays here on purpose.")] private async Task DeleteLLMProvider(AIStudio.Settings.Provider provider) { var dialogParameters = new DialogParameters @@ -156,11 +156,10 @@ public partial class SettingsPanelProviders : SettingsPanelProviderBase return modelName.Length > MAX_LENGTH ? "[...] " + modelName[^Math.Min(MAX_LENGTH, modelName.Length)..] : modelName; } - [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed")] private async Task UpdateProviders() { this.AvailableLLMProviders.Clear(); - foreach (var provider in this.SettingsManager.ConfigurationData.Providers) + foreach (var provider in this.SettingsManager.GetAllProviders()) this.AvailableLLMProviders.Add(new (provider.InstanceName, provider.Id)); await this.AvailableLLMProvidersChanged.InvokeAsync(this.AvailableLLMProviders); diff --git a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs index efa32f91..bd88ba21 100644 --- a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs +++ b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs @@ -201,9 +201,7 @@ public partial class ProviderDialog : MSGComponentBase, ISecretId this.SettingsManager.InjectSpellchecking(SPELLCHECK_ATTRIBUTES); // Load the used instance names: - #pragma warning disable MWAIS0001 - this.UsedInstanceNames = this.SettingsManager.ConfigurationData.Providers.Select(x => x.InstanceName.ToLowerInvariant()).ToList(); - #pragma warning restore MWAIS0001 + this.UsedInstanceNames = this.SettingsManager.GetAllProviders().Select(x => x.InstanceName.ToLowerInvariant()).ToList(); this.capabilityOverrides = this.DataCapabilityOverrides ?? new(); this.showExpertSettings = !string.IsNullOrWhiteSpace(this.AdditionalJsonApiParameters) || this.capabilityOverrides.HasOverrides; diff --git a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs index bb214e1f..d93a0263 100644 --- a/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs +++ b/app/MindWork AI Studio/Dialogs/Settings/SettingsDialogBase.cs @@ -1,5 +1,3 @@ -using System.Diagnostics.CodeAnalysis; - using AIStudio.Components; using AIStudio.Settings; using AIStudio.Tools.Services; @@ -40,11 +38,10 @@ public abstract class SettingsDialogBase : MSGComponentBase protected void Close() => this.MudDialog.Cancel(); - [SuppressMessage("Usage", "MWAIS0001:Direct access to `Providers` is not allowed")] private void UpdateProviders() { this.AvailableLLMProviders.Clear(); - foreach (var provider in this.SettingsManager.ConfigurationData.Providers) + foreach (var provider in this.SettingsManager.GetAllProviders()) this.AvailableLLMProviders.Add(new (provider.InstanceName, provider.Id)); }