From d1f79f0f1e8427cae9b987d2e332b04f13236b93 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Sun, 5 Jan 2025 13:00:35 +0100 Subject: [PATCH] Use absolute namespaces --- .../Agents/AgentTextContentCleaner.cs | 2 +- .../Components/ChatComponent.razor.cs | 4 ++-- .../Components/ProviderSelection.razor.cs | 10 +++++----- .../Components/ReadWebContent.razor.cs | 4 ++-- app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs | 2 +- .../Provider/LLMProvidersExtensions.cs | 2 +- .../DataModel/PreviousModels/ProviderV4Extensions.cs | 4 ++-- app/MindWork AI Studio/Tools/ComponentsExtensions.cs | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/MindWork AI Studio/Agents/AgentTextContentCleaner.cs b/app/MindWork AI Studio/Agents/AgentTextContentCleaner.cs index f98b80eb..e8d19aa8 100644 --- a/app/MindWork AI Studio/Agents/AgentTextContentCleaner.cs +++ b/app/MindWork AI Studio/Agents/AgentTextContentCleaner.cs @@ -18,7 +18,7 @@ public sealed class AgentTextContentCleaner(ILogger logger, SettingsM #region Overrides of AgentBase - public override Settings.Provider? ProviderSettings { get; set; } + public override AIStudio.Settings.Provider? ProviderSettings { get; set; } protected override Type Type => Type.SYSTEM; diff --git a/app/MindWork AI Studio/Components/ChatComponent.razor.cs b/app/MindWork AI Studio/Components/ChatComponent.razor.cs index 72bbe01c..5ca0ebdd 100644 --- a/app/MindWork AI Studio/Components/ChatComponent.razor.cs +++ b/app/MindWork AI Studio/Components/ChatComponent.razor.cs @@ -20,10 +20,10 @@ public partial class ChatComponent : MSGComponentBase, IAsyncDisposable public EventCallback ChatThreadChanged { get; set; } [Parameter] - public Settings.Provider Provider { get; set; } + public AIStudio.Settings.Provider Provider { get; set; } [Parameter] - public EventCallback ProviderChanged { get; set; } + public EventCallback ProviderChanged { get; set; } [Parameter] public Action WorkspaceName { get; set; } = _ => { }; diff --git a/app/MindWork AI Studio/Components/ProviderSelection.razor.cs b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs index a5e39e5c..927c1d62 100644 --- a/app/MindWork AI Studio/Components/ProviderSelection.razor.cs +++ b/app/MindWork AI Studio/Components/ProviderSelection.razor.cs @@ -12,24 +12,24 @@ public partial class ProviderSelection : ComponentBase public AssistantBase? AssistantBase { get; set; } [Parameter] - public Settings.Provider ProviderSettings { get; set; } + public AIStudio.Settings.Provider ProviderSettings { get; set; } [Parameter] - public EventCallback ProviderSettingsChanged { get; set; } + public EventCallback ProviderSettingsChanged { get; set; } [Parameter] - public Func ValidateProvider { get; set; } = _ => null; + public Func ValidateProvider { get; set; } = _ => null; [Inject] private SettingsManager SettingsManager { get; init; } = null!; - private async Task SelectionChanged(Settings.Provider provider) + private async Task SelectionChanged(AIStudio.Settings.Provider provider) { this.ProviderSettings = provider; await this.ProviderSettingsChanged.InvokeAsync(provider); } - private IEnumerable GetAvailableProviders() + private IEnumerable GetAvailableProviders() { var minimumLevel = this.SettingsManager.GetMinimumConfidenceLevel(this.AssistantBase?.Component ?? Tools.Components.NONE); foreach (var provider in this.SettingsManager.ConfigurationData.Providers) diff --git a/app/MindWork AI Studio/Components/ReadWebContent.razor.cs b/app/MindWork AI Studio/Components/ReadWebContent.razor.cs index b1511b3f..aebe7ef4 100644 --- a/app/MindWork AI Studio/Components/ReadWebContent.razor.cs +++ b/app/MindWork AI Studio/Components/ReadWebContent.razor.cs @@ -24,7 +24,7 @@ public partial class ReadWebContent : ComponentBase public EventCallback ContentChanged { get; set; } [Parameter] - public Settings.Provider ProviderSettings { get; set; } + public AIStudio.Settings.Provider ProviderSettings { get; set; } [Parameter] public bool AgentIsRunning { get; set; } @@ -47,7 +47,7 @@ public partial class ReadWebContent : ComponentBase private bool urlIsValid; private bool isProviderValid; - private Settings.Provider providerSettings; + private AIStudio.Settings.Provider providerSettings; #region Overrides of ComponentBase diff --git a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs index 9e5fcb6e..87e5569e 100644 --- a/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs +++ b/app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs @@ -113,7 +113,7 @@ public partial class ProviderDialog : ComponentBase, ISecretId }; } - private Settings.Provider CreateProviderSettings() + private AIStudio.Settings.Provider CreateProviderSettings() { var cleanedHostname = this.DataHostname.Trim(); return new() diff --git a/app/MindWork AI Studio/Provider/LLMProvidersExtensions.cs b/app/MindWork AI Studio/Provider/LLMProvidersExtensions.cs index d2921c98..f9addf8d 100644 --- a/app/MindWork AI Studio/Provider/LLMProvidersExtensions.cs +++ b/app/MindWork AI Studio/Provider/LLMProvidersExtensions.cs @@ -107,7 +107,7 @@ public static class LLMProvidersExtensions /// The provider settings. /// The logger to use. /// The provider instance. - public static IProvider CreateProvider(this Settings.Provider providerSettings, ILogger logger) + public static IProvider CreateProvider(this AIStudio.Settings.Provider providerSettings, ILogger logger) { return providerSettings.UsedLLMProvider.CreateProvider(providerSettings.InstanceName, providerSettings.Host, providerSettings.Hostname, logger); } diff --git a/app/MindWork AI Studio/Settings/DataModel/PreviousModels/ProviderV4Extensions.cs b/app/MindWork AI Studio/Settings/DataModel/PreviousModels/ProviderV4Extensions.cs index 50be6989..4699f7bb 100644 --- a/app/MindWork AI Studio/Settings/DataModel/PreviousModels/ProviderV4Extensions.cs +++ b/app/MindWork AI Studio/Settings/DataModel/PreviousModels/ProviderV4Extensions.cs @@ -2,12 +2,12 @@ namespace AIStudio.Settings.DataModel.PreviousModels; public static class ProviderV4Extensions { - public static List MigrateFromV4ToV5(this IEnumerable providers) + public static List MigrateFromV4ToV5(this IEnumerable providers) { return providers.Select(provider => provider.MigrateFromV4ToV5()).ToList(); } - public static Settings.Provider MigrateFromV4ToV5(this Provider provider) => new() + public static AIStudio.Settings.Provider MigrateFromV4ToV5(this Provider provider) => new() { Num = provider.Num, Id = provider.Id, diff --git a/app/MindWork AI Studio/Tools/ComponentsExtensions.cs b/app/MindWork AI Studio/Tools/ComponentsExtensions.cs index 4374b270..0f8107cc 100644 --- a/app/MindWork AI Studio/Tools/ComponentsExtensions.cs +++ b/app/MindWork AI Studio/Tools/ComponentsExtensions.cs @@ -75,7 +75,7 @@ public static class ComponentsExtensions _ => default, }; - public static Settings.Provider PreselectedProvider(this Components component, SettingsManager settingsManager) => component switch + public static AIStudio.Settings.Provider PreselectedProvider(this Components component, SettingsManager settingsManager) => component switch { Components.GRAMMAR_SPELLING_ASSISTANT => settingsManager.ConfigurationData.GrammarSpelling.PreselectOptions ? settingsManager.ConfigurationData.Providers.FirstOrDefault(x => x.Id == settingsManager.ConfigurationData.GrammarSpelling.PreselectedProvider) : default, Components.ICON_FINDER_ASSISTANT => settingsManager.ConfigurationData.IconFinder.PreselectOptions ? settingsManager.ConfigurationData.Providers.FirstOrDefault(x => x.Id == settingsManager.ConfigurationData.IconFinder.PreselectedProvider) : default,