MindWorkAI/AI-Studio
MindWorkAI/AI-Studio
1
0
Fork 0
mirror of https://github.com/MindWorkAI/AI-Studio.git synced 2025-04-28 21:39:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored secret handling

Browse Source
This commit is contained in:
Thorsten Sommer 2024-12-02 19:52:41 +01:00
parent dc1f9efd1f
commit d65e9c5786
Signed by: tsommer
GPG Key ID: 371BBA77A02C0108
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/MindWork AI Studio/Dialogs/ProviderDialog.razor.cs
View File

@ -11,7 +11,7 @@ namespace AIStudio.Dialogs;
/// <summary> /// <summary>
/// The provider settings dialog. /// The provider settings dialog.
/// </summary> /// </summary>
public partial class ProviderDialog : ComponentBase public partial class ProviderDialog : ComponentBase, ISecretId
{ {
[CascadingParameter] [CascadingParameter]
private MudDialogInstance MudDialog { get; set; } = null!; private MudDialogInstance MudDialog { get; set; } = null!;
@ -144,23 +144,10 @@ public partial class ProviderDialog : ComponentBase
return; return;
} }
var loadedProviderSettings = this.CreateProviderSettings();
var provider = loadedProviderSettings.CreateProvider(this.Logger);
if(provider is NoProvider)
{
await base.OnInitializedAsync();
return;
}
// Load the API key: // Load the API key:
var requestedSecret = await this.RustService.GetAPIKey(provider, isTrying: this.DataLLMProvider is LLMProviders.SELF_HOSTED); var requestedSecret = await this.RustService.GetAPIKey(this, isTrying: this.DataLLMProvider is LLMProviders.SELF_HOSTED);
if(requestedSecret.Success) if (requestedSecret.Success)
{
this.dataAPIKey = await requestedSecret.Secret.Decrypt(this.encryption); this.dataAPIKey = await requestedSecret.Secret.Decrypt(this.encryption);
// Now, we try to load the list of available models:
await this.ReloadModels();
}
else else
{ {
this.dataAPIKey = string.Empty; this.dataAPIKey = string.Empty;
@ -169,10 +156,9 @@ public partial class ProviderDialog : ComponentBase
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."; 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 this.form.Validate();
} }
// We still try to load the models. Some local hosts don't need an API key:
await this.ReloadModels();
} }
await this.ReloadModels();
} }
await base.OnInitializedAsync(); await base.OnInitializedAsync();
@ -189,7 +175,15 @@ public partial class ProviderDialog : ComponentBase
} }
#endregion #endregion
#region Implementation of ISecretId
public string SecretId => this.DataLLMProvider.ToName();
public string SecretName => this.DataInstanceName;
#endregion
private async Task Store() private async Task Store()
{ {
await this.form.Validate(); await this.form.Validate();
@ -205,11 +199,8 @@ public partial class ProviderDialog : ComponentBase
var addedProviderSettings = this.CreateProviderSettings(); var addedProviderSettings = this.CreateProviderSettings();
if (!string.IsNullOrWhiteSpace(this.dataAPIKey)) if (!string.IsNullOrWhiteSpace(this.dataAPIKey))
{ {
// We need to instantiate the provider to store the API key:
var provider = addedProviderSettings.CreateProvider(this.Logger);
// Store the API key in the OS secure storage: // Store the API key in the OS secure storage:
var storeResponse = await this.RustService.SetAPIKey(provider, this.dataAPIKey); var storeResponse = await this.RustService.SetAPIKey(this, this.dataAPIKey);
if (!storeResponse.Success) if (!storeResponse.Success)
{ {
this.dataAPIKeyStorageIssue = $"Failed to store the API key in the operating system. The message was: {storeResponse.Issue}. Please try again."; this.dataAPIKeyStorageIssue = $"Failed to store the API key in the operating system. The message was: {storeResponse.Issue}. Please try again.";

3
app/MindWork AI Studio/Pages/Settings.razor.cs
View File

@ -114,8 +114,7 @@ public partial class Settings : ComponentBase, IMessageBusReceiver, IDisposable
if (dialogResult is null || dialogResult.Canceled) if (dialogResult is null || dialogResult.Canceled)
return; return;
var providerInstance = provider.CreateProvider(this.Logger); var deleteSecretResponse = await this.RustService.DeleteAPIKey(provider);
var deleteSecretResponse = await this.RustService.DeleteAPIKey(providerInstance);
if(deleteSecretResponse.Success) if(deleteSecretResponse.Success)
{ {
this.SettingsManager.ConfigurationData.Providers.Remove(provider); this.SettingsManager.ConfigurationData.Providers.Remove(provider);