Finished provider settings

This commit is contained in:
Thorsten Sommer 2024-04-20 17:06:50 +02:00
parent 7748c6611b
commit c3fd6b81a8
Signed by: tsommer
GPG Key ID: 371BBA77A02C0108
8 changed files with 293 additions and 51 deletions

View File

@ -4,7 +4,7 @@
<MudPaper Class="pa-3">
<MudText Typo="Typo.h4" Class="mb-3">Configured Providers</MudText>
<MudTable Items="@this.Providers">
<MudTable Items="@this.SettingsManager.ConfigurationData.Providers">
<ColGroup>
<col style="width: 3em;"/>
<col style="width: 6em;"/>
@ -22,17 +22,17 @@
<MudTd>@context.UsedProvider</MudTd>
<MudTd>@context.InstanceName</MudTd>
<MudTd Style="text-align: left;">
<MudButton Variant="Variant.Filled" Color="Color.Info" StartIcon="@Icons.Material.Filled.Edit" Class="mr-2">
<MudButton Variant="Variant.Filled" Color="Color.Info" StartIcon="@Icons.Material.Filled.Edit" Class="mr-2" OnClick="() => this.EditProvider(context)">
Edit
</MudButton>
<MudButton Variant="Variant.Filled" Color="Color.Error" StartIcon="@Icons.Material.Filled.Delete" Class="mr-2">
<MudButton Variant="Variant.Filled" Color="Color.Error" StartIcon="@Icons.Material.Filled.Delete" Class="mr-2" OnClick="() => this.DeleteProvider(context)">
Delete
</MudButton>
</MudTd>
</RowTemplate>
</MudTable>
@if(this.Providers.Count == 0)
@if(this.SettingsManager.ConfigurationData.Providers.Count == 0)
{
<MudText Typo="Typo.h6" Class="mt-3">No providers configured yet.</MudText>
}

View File

@ -1,5 +1,8 @@
using AIStudio.Components.CommonDialogs;
using AIStudio.Provider;
using AIStudio.Settings;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MudBlazor;
@ -15,15 +18,20 @@ public partial class Settings : ComponentBase
[Inject]
public IDialogService DialogService { get; init; } = null!;
private List<global::AIStudio.Settings.Provider> Providers { get; set; } = new();
[Inject]
public IJSRuntime JsRuntime { get; init; } = null!;
private static readonly DialogOptions DIALOG_OPTIONS = new()
{
CloseOnEscapeKey = true,
FullWidth = true, MaxWidth = MaxWidth.Medium,
};
#region Overrides of ComponentBase
protected override async Task OnInitializedAsync()
{
var settings = await this.SettingsManager.LoadSettings();
this.Providers = settings.Providers;
await this.SettingsManager.LoadSettings();
await base.OnInitializedAsync();
}
@ -33,16 +41,59 @@ public partial class Settings : ComponentBase
{
var dialogParameters = new DialogParameters<ProviderDialog>
{
{ x => x.UsedInstanceNames, this.Providers.Select(x => x.InstanceName.ToLowerInvariant()).ToList() },
{ x => x.IsEditing, false },
};
var dialogOptions = new DialogOptions { CloseOnEscapeKey = true, FullWidth = true, MaxWidth = MaxWidth.Medium };
var dialogReference = await this.DialogService.ShowAsync<ProviderDialog>("Add Provider", dialogParameters, dialogOptions);
var dialogReference = await this.DialogService.ShowAsync<ProviderDialog>("Add Provider", dialogParameters, DIALOG_OPTIONS);
var dialogResult = await dialogReference.Result;
if (dialogResult.Canceled)
return;
var addedProvider = (AIStudio.Settings.Provider)dialogResult.Data;
this.Providers.Add(addedProvider);
this.SettingsManager.ConfigurationData.Providers.Add(addedProvider);
await this.SettingsManager.StoreSettings();
}
private async Task EditProvider(global::AIStudio.Settings.Provider provider)
{
var dialogParameters = new DialogParameters<ProviderDialog>
{
{ x => x.DataId, provider.Id },
{ x => x.DataInstanceName, provider.InstanceName },
{ x => x.DataProvider, provider.UsedProvider },
{ x => x.IsEditing, true },
};
var dialogReference = await this.DialogService.ShowAsync<ProviderDialog>("Edit Provider", dialogParameters, DIALOG_OPTIONS);
var dialogResult = await dialogReference.Result;
if (dialogResult.Canceled)
return;
var editedProvider = (AIStudio.Settings.Provider)dialogResult.Data;
this.SettingsManager.ConfigurationData.Providers[this.SettingsManager.ConfigurationData.Providers.IndexOf(provider)] = editedProvider;
await this.SettingsManager.StoreSettings();
}
private async Task DeleteProvider(global::AIStudio.Settings.Provider provider)
{
var dialogParameters = new DialogParameters
{
{ "Message", $"Are you sure you want to delete the provider '{provider.InstanceName}'?" },
};
var dialogReference = await this.DialogService.ShowAsync<ConfirmDialog>("Delete Provider", dialogParameters, DIALOG_OPTIONS);
var dialogResult = await dialogReference.Result;
if (dialogResult.Canceled)
return;
var providerInstance = provider.UsedProvider.CreateProvider();
providerInstance.InstanceName = provider.InstanceName;
var deleteSecretResponse = await this.SettingsManager.DeleteAPIKey(this.JsRuntime, providerInstance);
if(deleteSecretResponse.Success)
{
this.SettingsManager.ConfigurationData.Providers.Remove(provider);
await this.SettingsManager.StoreSettings();
}
}
}

View File

@ -0,0 +1,15 @@
using AIStudio.Settings;
using Microsoft.JSInterop;
namespace AIStudio.Provider;
public interface IProvider
{
public string Id { get; }
public string InstanceName { get; set; }
public IAsyncEnumerable<string> GetChatCompletion(IJSRuntime jsRuntime, SettingsManager settings, Model chatModel, Thread chatThread);
public Task<IList<Model>> GetModels(IJSRuntime jsRuntime, SettingsManager settings);
}

View File

@ -0,0 +1,20 @@
using AIStudio.Settings;
using Microsoft.JSInterop;
namespace AIStudio.Provider;
public class NoProvider : IProvider
{
#region Implementation of IProvider
public string Id => "none";
public string InstanceName { get; set; } = "None";
public IAsyncEnumerable<string> GetChatCompletion(IJSRuntime jsRuntime, SettingsManager settings, Model chatModel, Thread chatThread) => throw new NotImplementedException();
public Task<IList<Model>> GetModels(IJSRuntime jsRuntime, SettingsManager settings) => throw new NotImplementedException();
#endregion
}

View File

@ -0,0 +1,26 @@
using AIStudio.Provider.OpenAI;
namespace AIStudio.Provider;
public enum Providers
{
NONE,
OPEN_AI,
}
public static class ExtensionsProvider
{
public static string ToName(this Providers provider) => provider switch
{
Providers.OPEN_AI => "OpenAI",
_ => "Unknown",
};
public static IProvider CreateProvider(this Providers provider) => provider switch
{
Providers.OPEN_AI => new ProviderOpenAI(),
_ => new NoProvider(),
};
}

View File

@ -7,23 +7,33 @@
@* ReSharper disable once CSharpWarnings::CS8974 *@
<MudTextField
T="string"
@bind-Text="@this.dataInstanceName"
@bind-Text="@this.DataInstanceName"
Label="Instance Name"
Adornment="Adornment.Start"
AdornmentIcon="@Icons.Material.Filled.Lightbulb"
AdornmentColor="Color.Info"
Required="@true"
RequiredError="Please enter an instance name."
Validation="@this.ValidatingInstanceName"
/>
@* ReSharper disable once CSharpWarnings::CS8974 *@
<MudSelect @bind-Value="@this.dataProvider" Label="Provider" OpenIcon="@Icons.Material.Filled.AccountBalance" AdornmentColor="Color.Info" Adornment="Adornment.Start" Validation="@this.ValidatingProvider">
<MudSelect @bind-Value="@this.DataProvider" Label="Provider" OpenIcon="@Icons.Material.Filled.AccountBalance" AdornmentColor="Color.Info" Adornment="Adornment.Start" Validation="@this.ValidatingProvider">
@foreach (Providers provider in Enum.GetValues(typeof(Providers)))
{
<MudSelectItem Value="@provider">@provider</MudSelectItem>
}
</MudSelect>
@* ReSharper disable once CSharpWarnings::CS8974 *@
<MudTextField
T="string"
@bind-Text="@this.dataAPIKey"
Label="API Key"
Adornment="Adornment.Start"
AdornmentIcon="@Icons.Material.Filled.VpnKey"
AdornmentColor="Color.Info"
InputType="InputType.Password"
Validation="@this.ValidatingAPIKey"
/>
</MudForm>
@if (this.dataIssues.Any())
@ -42,7 +52,16 @@
}
</DialogContent>
<DialogActions>
<MudButton OnClick="@this.Cancel">Cancel</MudButton>
<MudButton OnClick="@this.Add" Color="Color.Primary">Add</MudButton>
<MudButton OnClick="@this.Cancel" Variant="Variant.Filled">Cancel</MudButton>
<MudButton OnClick="@this.Store" Variant="Variant.Filled" Color="Color.Primary">
@if(this.IsEditing)
{
@:Update
}
else
{
@:Add
}
</MudButton>
</DialogActions>
</MudDialog>

View File

@ -3,6 +3,7 @@ using System.Text.RegularExpressions;
using AIStudio.Provider;
using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop;
using MudBlazor;
@ -14,28 +15,98 @@ public partial class ProviderDialog : ComponentBase
private MudDialogInstance MudDialog { get; set; } = null!;
[Parameter]
public IList<string> UsedInstanceNames { get; set; } = new List<string>();
public string DataId { get; set; } = Guid.NewGuid().ToString();
[Parameter]
public string DataInstanceName { get; set; } = string.Empty;
[Parameter]
public Providers DataProvider { get; set; } = Providers.NONE;
[Parameter]
public bool IsEditing { get; init; }
[Inject]
private SettingsManager SettingsManager { get; set; } = null!;
[Inject]
private IJSRuntime JsRuntime { get; set; } = null!;
private List<string> usedInstanceNames { get; set; } = [];
private bool dataIsValid;
private string[] dataIssues = [];
private string dataInstanceName = string.Empty;
private Providers dataProvider = Providers.NONE;
private string dataAPIKey = string.Empty;
private string dataAPIKeyStorageIssue = string.Empty;
private string dataEditingPreviousInstanceName = string.Empty;
private MudForm form = null!;
private async Task Add()
#region Overrides of ComponentBase
protected override async Task OnInitializedAsync()
{
this.usedInstanceNames = this.SettingsManager.ConfigurationData.Providers.Select(x => x.InstanceName.ToLowerInvariant()).ToList();
if(this.IsEditing)
{
this.dataEditingPreviousInstanceName = this.DataInstanceName.ToLowerInvariant();
var provider = this.DataProvider.CreateProvider();
if(provider is NoProvider)
return;
provider.InstanceName = this.DataInstanceName;
var requestedSecret = await this.SettingsManager.GetAPIKey(this.JsRuntime, provider);
if(requestedSecret.Success)
this.dataAPIKey = requestedSecret.Secret;
else
{
this.dataAPIKeyStorageIssue = $"Failed to load the API key from the operating system. The message was: {requestedSecret.Issue}. You might ignore this message and provide the API key again.";
await this.form.Validate();
}
}
await base.OnInitializedAsync();
}
protected override async Task OnAfterRenderAsync(bool firstRender)
{
if(!this.IsEditing && firstRender)
this.form.ResetValidation();
await base.OnAfterRenderAsync(firstRender);
}
#endregion
private async Task Store()
{
await this.form.Validate();
if (!string.IsNullOrWhiteSpace(this.dataAPIKeyStorageIssue))
this.dataAPIKeyStorageIssue = string.Empty;
if (!this.dataIsValid)
return;
var addedProvider = new Provider
{
Id = Guid.NewGuid().ToString(),
InstanceName = this.dataInstanceName,
UsedProvider = this.dataProvider,
Id = this.DataId,
InstanceName = this.DataInstanceName,
UsedProvider = this.DataProvider,
};
var provider = this.DataProvider.CreateProvider();
provider.InstanceName = this.DataInstanceName;
var storeResponse = await this.SettingsManager.SetAPIKey(this.JsRuntime, provider, this.dataAPIKey);
if (!storeResponse.Success)
{
this.dataAPIKeyStorageIssue = $"Failed to store the API key in the operating system. The message was: {storeResponse.Issue}. Please try again.";
await this.form.Validate();
return;
}
this.MudDialog.Close(DialogResult.Ok(addedProvider));
}
@ -47,8 +118,14 @@ public partial class ProviderDialog : ComponentBase
return null;
}
[GeneratedRegex("^[a-zA-Z0-9 ]+$")]
private static partial Regex InstanceNameRegex();
private string? ValidatingInstanceName(string instanceName)
{
if(string.IsNullOrWhiteSpace(instanceName))
return "Please enter an instance name.";
if(instanceName.StartsWith(' '))
return "The instance name must not start with a space.";
@ -63,14 +140,23 @@ public partial class ProviderDialog : ComponentBase
return "The instance name must not contain consecutive spaces.";
// The instance name must be unique:
if (this.UsedInstanceNames.Contains(instanceName.ToLowerInvariant()))
var lowerInstanceName = instanceName.ToLowerInvariant();
if (lowerInstanceName != this.dataEditingPreviousInstanceName && this.usedInstanceNames.Contains(lowerInstanceName))
return "The instance name must be unique; the chosen name is already in use.";
return null;
}
private void Cancel() => this.MudDialog.Cancel();
private string? ValidatingAPIKey(string apiKey)
{
if(!string.IsNullOrWhiteSpace(this.dataAPIKeyStorageIssue))
return this.dataAPIKeyStorageIssue;
[GeneratedRegex("^[a-zA-Z0-9 ]+$")]
private static partial Regex InstanceNameRegex();
if(string.IsNullOrWhiteSpace(apiKey))
return "Please enter an API key.";
return null;
}
private void Cancel() => this.MudDialog.Cancel();
}

View File

@ -2,6 +2,8 @@ using System.Text.Json;
using AIStudio.Provider;
using Microsoft.JSInterop;
// ReSharper disable NotAccessedPositionalProperty.Local
namespace AIStudio.Settings;
public sealed class SettingsManager
@ -12,36 +14,59 @@ public sealed class SettingsManager
public static string? DataDirectory { get; set; }
public bool IsSetUp => !string.IsNullOrWhiteSpace(ConfigDirectory) && !string.IsNullOrWhiteSpace(DataDirectory);
public Data ConfigurationData { get; private set; } = new();
private bool IsSetUp => !string.IsNullOrWhiteSpace(ConfigDirectory) && !string.IsNullOrWhiteSpace(DataDirectory);
#region API Key Handling
private readonly record struct GetSecretRequest(string Destination, string UserName);
public async Task<string> GetAPIKey(IJSRuntime jsRuntime, IProvider provider) => await jsRuntime.InvokeAsync<string>("window.__TAURI__.invoke", "get_secret", new GetSecretRequest($"provider::{provider.Id}::{provider.InstanceName}::api_key", Environment.UserName));
public readonly record struct RequestedSecret(bool Success, string Secret, string Issue);
public async Task<RequestedSecret> GetAPIKey(IJSRuntime jsRuntime, IProvider provider) => await jsRuntime.InvokeAsync<RequestedSecret>("window.__TAURI__.invoke", "get_secret", new GetSecretRequest($"provider::{provider.Id}::{provider.InstanceName}::api_key", Environment.UserName));
private readonly record struct StoreSecretRequest(string Destination, string UserName, string Secret);
public async Task SetAPIKey(IJSRuntime jsRuntime, IProvider provider, string key) => await jsRuntime.InvokeVoidAsync("window.__TAURI__.invoke", "store_secret", new StoreSecretRequest($"provider::{provider.Id}::{provider.InstanceName}::api_key", Environment.UserName, key));
public readonly record struct StoreSecretResponse(bool Success, string Issue);
public async Task<Data> LoadSettings()
{
if(!this.IsSetUp)
return new Data();
public async Task<StoreSecretResponse> SetAPIKey(IJSRuntime jsRuntime, IProvider provider, string key) => await jsRuntime.InvokeAsync<StoreSecretResponse>("window.__TAURI__.invoke", "store_secret", new StoreSecretRequest($"provider::{provider.Id}::{provider.InstanceName}::api_key", Environment.UserName, key));
var settingsPath = Path.Combine(ConfigDirectory!, SETTINGS_FILENAME);
if(!File.Exists(settingsPath))
return new Data();
private readonly record struct DeleteSecretRequest(string Destination, string UserName);
var settingsJson = await File.ReadAllTextAsync(settingsPath);
return JsonSerializer.Deserialize<Data>(settingsJson) ?? new Data();
}
public readonly record struct DeleteSecretResponse(bool Success, string Issue);
public async Task StoreSettings(Data data)
public async Task<DeleteSecretResponse> DeleteAPIKey(IJSRuntime jsRuntime, IProvider provider) => await jsRuntime.InvokeAsync<DeleteSecretResponse>("window.__TAURI__.invoke", "delete_secret", new DeleteSecretRequest($"provider::{provider.Id}::{provider.InstanceName}::api_key", Environment.UserName));
#endregion
public async Task LoadSettings()
{
if(!this.IsSetUp)
return;
var settingsPath = Path.Combine(ConfigDirectory!, SETTINGS_FILENAME);
var settingsJson = JsonSerializer.Serialize(data);
if(!File.Exists(settingsPath))
return;
var settingsJson = await File.ReadAllTextAsync(settingsPath);
var loadedConfiguration = JsonSerializer.Deserialize<Data>(settingsJson);
if(loadedConfiguration is null)
return;
this.ConfigurationData = loadedConfiguration;
}
public async Task StoreSettings()
{
if(!this.IsSetUp)
return;
var settingsPath = Path.Combine(ConfigDirectory!, SETTINGS_FILENAME);
if(!Directory.Exists(ConfigDirectory))
Directory.CreateDirectory(ConfigDirectory!);
var settingsJson = JsonSerializer.Serialize(this.ConfigurationData);
await File.WriteAllTextAsync(settingsPath, settingsJson);
}
}