From 722c7e943deaea0259b96834d29639ebd5978c2b Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Sun, 19 May 2024 16:14:05 +0200 Subject: [PATCH] Mode model loading returning enumerable list of data --- app/MindWork AI Studio/Provider/IProvider.cs | 4 ++-- app/MindWork AI Studio/Provider/NoProvider.cs | 4 ++-- app/MindWork AI Studio/Provider/OpenAI/ProviderOpenAI.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/MindWork AI Studio/Provider/IProvider.cs b/app/MindWork AI Studio/Provider/IProvider.cs index 15403bf..7c5baeb 100644 --- a/app/MindWork AI Studio/Provider/IProvider.cs +++ b/app/MindWork AI Studio/Provider/IProvider.cs @@ -53,7 +53,7 @@ public interface IProvider /// The settings manager to access the API key. /// The cancellation token. /// The list of text models. - public Task> GetTextModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default); + public Task> GetTextModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default); /// /// Load all possible image models that can be used with this provider. @@ -62,5 +62,5 @@ public interface IProvider /// The settings manager to access the API key. /// The cancellation token. /// The list of image models. - public Task> GetImageModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default); + public Task> GetImageModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default); } \ No newline at end of file diff --git a/app/MindWork AI Studio/Provider/NoProvider.cs b/app/MindWork AI Studio/Provider/NoProvider.cs index e505395..d65ea57 100644 --- a/app/MindWork AI Studio/Provider/NoProvider.cs +++ b/app/MindWork AI Studio/Provider/NoProvider.cs @@ -17,9 +17,9 @@ public class NoProvider : IProvider public string InstanceName { get; set; } = "None"; - public Task> GetTextModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default) => Task.FromResult>(new List()); + public Task> GetTextModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default) => Task.FromResult>([]); - public Task> GetImageModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default) => Task.FromResult>(new List()); + public Task> GetImageModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default) => Task.FromResult>([]); public async IAsyncEnumerable StreamChatCompletion(IJSRuntime jsRuntime, SettingsManager settings, Model chatModel, ChatThread chatChatThread, [EnumeratorCancellation] CancellationToken token = default) { diff --git a/app/MindWork AI Studio/Provider/OpenAI/ProviderOpenAI.cs b/app/MindWork AI Studio/Provider/OpenAI/ProviderOpenAI.cs index ed5abfe..cee36af 100644 --- a/app/MindWork AI Studio/Provider/OpenAI/ProviderOpenAI.cs +++ b/app/MindWork AI Studio/Provider/OpenAI/ProviderOpenAI.cs @@ -155,20 +155,20 @@ public sealed class ProviderOpenAI() : BaseProvider("https://api.openai.com/v1/" #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously /// - public async Task> GetTextModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default) + public Task> GetTextModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default) { return await this.LoadModels(jsRuntime, settings, "gpt-", token); } /// - public async Task> GetImageModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default) + public Task> GetImageModels(IJSRuntime jsRuntime, SettingsManager settings, CancellationToken token = default) { return await this.LoadModels(jsRuntime, settings, "dall-e-", token); } #endregion - private async Task> LoadModels(IJSRuntime jsRuntime, SettingsManager settings, string prefix, CancellationToken token) + private async Task> LoadModels(IJSRuntime jsRuntime, SettingsManager settings, string prefix, CancellationToken token) { var requestedSecret = await settings.GetAPIKey(jsRuntime, this); if(!requestedSecret.Success)