current main is now successfully merged into branch

app/MindWork AI Studio/Pages/Information.razor

@@ -21,11 +21,11 @@
                     <MudListItem T="string" Icon="@Icons.Material.Outlined.Build" Text="@this.VersionRust"/>
                     <MudListItem T="string" Icon="@Icons.Material.Outlined.Storage">
                         <MudText Typo="Typo.body1">
-                            @this.VersionDatabase
+                            @this.VersionVectorStore
                         </MudText>
-                        <MudCollapse Expanded="@this.showDatabaseDetails">
+                        <MudCollapse Expanded="@this.showVectorStoreDetails">
                             <MudText Typo="Typo.body1" Class="mt-2 mb-2">
-                                @foreach (var item in this.databaseDisplayInfo)
+                                @foreach (var item in this.vectorStoreDisplayInfo)
                                 {
                                     <div style="display: flex; align-items: center; gap: 8px;">
                                         <MudIcon Icon="@Icons.Material.Filled.ArrowRightAlt"/>
@@ -35,11 +35,11 @@
                                 }
                             </MudText>
                         </MudCollapse>
-                        <MudButton StartIcon="@(this.showDatabaseDetails ? Icons.Material.Filled.ExpandLess : Icons.Material.Filled.ExpandMore)"
+                        <MudButton StartIcon="@(this.showVectorStoreDetails ? Icons.Material.Filled.ExpandLess : Icons.Material.Filled.ExpandMore)"
                                    Size="Size.Small"
                                    Variant="Variant.Text"
-                                   OnClick="@this.ToggleDatabaseDetails">
-                            @(this.showDatabaseDetails ? T("Hide Details") : T("Show Details"))
+                                   OnClick="@this.ToggleVectorStoreDetails">
+                            @(this.showVectorStoreDetails ? T("Hide Details") : T("Show Details"))
                         </MudButton>
                     </MudListItem>
                     <MudListItem T="string" Icon="@Icons.Material.Outlined.DocumentScanner" Text="@this.VersionPdfium"/>

app/MindWork AI Studio/Pages/Information.razor.cs

@@ -29,13 +29,13 @@ public partial class Information : MSGComponentBase
     private ISnackbar Snackbar { get; init; } = null!;
     
     [Inject]
-    private DatabaseClient DatabaseClient { get; init; } = null!;
+    private DatabaseClientProvider DatabaseClientProvider { get; init; } = null!;
     
     private static readonly Assembly ASSEMBLY = Assembly.GetExecutingAssembly();
     private static readonly MetaDataAttribute META_DATA = ASSEMBLY.GetCustomAttribute<MetaDataAttribute>()!;
     private static readonly MetaDataArchitectureAttribute META_DATA_ARCH = ASSEMBLY.GetCustomAttribute<MetaDataArchitectureAttribute>()!;
     private static readonly MetaDataLibrariesAttribute META_DATA_LIBRARIES = ASSEMBLY.GetCustomAttribute<MetaDataLibrariesAttribute>()!;
-    private static readonly MetaDataEmbeddingStoreAttribute META_DATA_EMBEDDING_STORE = ASSEMBLY.GetCustomAttribute<MetaDataEmbeddingStoreAttribute>()!;
+    private static readonly MetaDataVectorStoreAttribute META_DATA_VECTOR_STORE = ASSEMBLY.GetCustomAttribute<MetaDataVectorStoreAttribute>()!;
     
     private static string TB(string fallbackEN) => I18N.I.T(fallbackEN, typeof(Information).Namespace, nameof(Information));
 
@@ -62,18 +62,18 @@ public partial class Information : MSGComponentBase
     
     private string VersionPdfium => $"{T("Used PDFium version")}: v{META_DATA_LIBRARIES.PdfiumVersion}";
     
-    private string VersionEmbeddingStore
+    private string VersionVectorStore
     {
         get
         {
-            if (this.embeddingStore is null)
-                return $"{T("Embedding store")}: {T("checking availability")}";
+            if (this.vectorStore is null)
+                return $"{T("Vector store")}: {T("checking availability")}";
 
-            return this.embeddingStore.Status switch
+            return this.vectorStore.Status switch
             {
-                EmbeddingStoreStatus.AVAILABLE => $"{T("Embedding store version")}: {this.embeddingStore.Name} v{META_DATA_EMBEDDING_STORE.DatabaseVersion}",
-                EmbeddingStoreStatus.STARTING => $"{T("Embedding store")}: {this.embeddingStore.Name} - {T("starting")}",
-                _ => $"{T("Embedding store")}: {this.embeddingStore.Name} - {T("not available")}"
+                DatabaseClientStatus.AVAILABLE => $"{T("Vector store version")}: {this.vectorStore.Name} v{META_DATA_VECTOR_STORE.VectorStoreVersion}",
+                DatabaseClientStatus.STARTING => $"{T("Vector store")}: {this.vectorStore.Name} - {T("starting")}",
+                _ => $"{T("Vector store")}: {this.vectorStore.Name} - {T("not available")}"
             };
         }
     }
@@ -85,7 +85,7 @@ public partial class Information : MSGComponentBase
     
     private bool showEnterpriseConfigDetails;
 
-    private bool showEmbeddingStoreDetails;
+    private bool showVectorStoreDetails;
 
     private List<IAvailablePlugin> configPlugins = PluginFactory.AvailablePlugins
         .Where(x => x.Type is PluginType.CONFIGURATION)
@@ -95,14 +95,13 @@ public partial class Information : MSGComponentBase
     private List<EnterpriseEnvironment> enterpriseEnvironments = EnterpriseEnvironmentService.CURRENT_ENVIRONMENTS.ToList();
 
     private List<MandatoryInfoPanelData> mandatoryInfoPanels = [];
-    
-    private sealed record EmbeddingStoreDisplayInfo(string Label, string Value);
 
     private sealed record MandatoryInfoPanelData(string HeaderText, string PluginName, DataMandatoryInfo Info, DataMandatoryInfoAcceptance? Acceptance);
-
-    private readonly List<EmbeddingStoreDisplayInfo> embeddingStoreDisplayInfo = new();
-    private DatabaseClient? embeddingStore;
-    private CancellationTokenSource? databaseRefreshCancellationTokenSource;
+    
+    private sealed record VectorStoreDisplayInfo(string Label, string Value);
+    private readonly List<VectorStoreDisplayInfo> vectorStoreDisplayInfo = new();
+    private DatabaseClient? vectorStore;
+    private CancellationTokenSource? vectorStoreRefreshCancellationTokenSource;
 
     private bool HasAnyActiveEnvironment => this.enterpriseEnvironments.Any(e => e.IsActive);
     
@@ -148,9 +147,9 @@ public partial class Information : MSGComponentBase
         this.osUserName = await this.RustService.ReadUserName();
         this.logPaths = await this.RustService.GetLogPaths();
         
-        await this.RefreshDatabaseInfo(CancellationToken.None);
-        if (this.databaseClient?.Status is DatabaseClientStatus.STARTING)
-            this.StartShortDatabaseRefreshLoop();
+        await this.RefreshVectorStoreInfo(CancellationToken.None);
+        if (this.vectorStore?.Status is DatabaseClientStatus.STARTING)
+            this.StartShortVectorStoreRefreshLoop();
         
         // Determine the Pandoc version may take some time, so we start it here
         // without waiting for the result:
@@ -249,22 +248,22 @@ public partial class Information : MSGComponentBase
         this.showEnterpriseConfigDetails = !this.showEnterpriseConfigDetails;
     }
     
-    private void ToggleDatabaseDetails()
+    private void ToggleVectorStoreDetails()
     {
-        this.showEmbeddingStoreDetails = !this.showEmbeddingStoreDetails;
+        this.showVectorStoreDetails = !this.showVectorStoreDetails;
     }
 
-    private async Task RefreshDatabaseInfo(CancellationToken cancellationToken)
+    private async Task RefreshVectorStoreInfo(CancellationToken cancellationToken)
     {
         var refreshedClient = await this.DatabaseClientProvider.RefreshClientAsync(DatabaseRole.VECTOR_STORE, cancellationToken);
-        this.databaseClient = refreshedClient;
-        this.embeddingStoreDisplayInfo.Clear();
+        this.vectorStore = refreshedClient;
+        this.vectorStoreDisplayInfo.Clear();
 
         try
         {
             await foreach (var (label, value) in refreshedClient.GetDisplayInfo().WithCancellation(cancellationToken))
             {
-                this.embeddingStoreDisplayInfo.Add(new EmbeddingStoreDisplayInfo(label, value));
+                this.vectorStoreDisplayInfo.Add(new VectorStoreDisplayInfo(label, value));
             }
         }
         catch (OperationCanceledException)
@@ -273,20 +272,20 @@ public partial class Information : MSGComponentBase
         }
         catch (Exception e)
         {
-            this.databaseClient = new NoDatabaseClient(refreshedClient.Name, e.Message, DatabaseClientStatus.STARTING);
-            await foreach (var (label, value) in this.databaseClient.GetDisplayInfo().WithCancellation(cancellationToken))
+            this.vectorStore = new NoDatabaseClient(refreshedClient.Name, e.Message, DatabaseClientStatus.STARTING);
+            await foreach (var (label, value) in this.vectorStore.GetDisplayInfo().WithCancellation(cancellationToken))
             {
-                this.embeddingStoreDisplayInfo.Add(new EmbeddingStoreDisplayInfo(label, value));
+                this.vectorStoreDisplayInfo.Add(new VectorStoreDisplayInfo(label, value));
             }
         }
     }
 
-    private void StartShortDatabaseRefreshLoop()
+    private void StartShortVectorStoreRefreshLoop()
     {
-        this.databaseRefreshCancellationTokenSource?.Cancel();
-        this.databaseRefreshCancellationTokenSource?.Dispose();
-        this.databaseRefreshCancellationTokenSource = new CancellationTokenSource();
-        var cancellationToken = this.databaseRefreshCancellationTokenSource.Token;
+        this.vectorStoreRefreshCancellationTokenSource?.Cancel();
+        this.vectorStoreRefreshCancellationTokenSource?.Dispose();
+        this.vectorStoreRefreshCancellationTokenSource = new CancellationTokenSource();
+        var cancellationToken = this.vectorStoreRefreshCancellationTokenSource.Token;
 
         _ = Task.Run(async () =>
         {
@@ -298,11 +297,11 @@ public partial class Information : MSGComponentBase
                     await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken);
                     await this.InvokeAsync(async () =>
                     {
-                        await this.RefreshDatabaseInfo(cancellationToken);
+                        await this.RefreshVectorStoreInfo(cancellationToken);
                         this.StateHasChanged();
                     });
 
-                    if (this.databaseClient?.Status is not DatabaseClientStatus.STARTING)
+                    if (this.vectorStore?.Status is not DatabaseClientStatus.STARTING)
                         return;
                 }
                 catch (OperationCanceledException)
@@ -331,8 +330,8 @@ public partial class Information : MSGComponentBase
 
     protected override void DisposeResources()
     {
-        this.databaseRefreshCancellationTokenSource?.Cancel();
-        this.databaseRefreshCancellationTokenSource?.Dispose();
+        this.vectorStoreRefreshCancellationTokenSource?.Cancel();
+        this.vectorStoreRefreshCancellationTokenSource?.Dispose();
         base.DisposeResources();
     }