From c1e0bae9a7db6c51a301e803ccdf8bf9522676d5 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Sun, 5 Jan 2025 21:39:09 +0100 Subject: [PATCH] Ensure that we can use ERI servers of different versions --- .../{DataSourceERI.cs => DataSourceERI_V1.cs} | 12 ++++++++++-- .../Settings/DataModel/DataSourceType.cs | 2 +- .../Settings/DataModel/DataSourceTypeExtension.cs | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) rename app/MindWork AI Studio/Settings/DataModel/{DataSourceERI.cs => DataSourceERI_V1.cs} (71%) diff --git a/app/MindWork AI Studio/Settings/DataModel/DataSourceERI.cs b/app/MindWork AI Studio/Settings/DataModel/DataSourceERI_V1.cs similarity index 71% rename from app/MindWork AI Studio/Settings/DataModel/DataSourceERI.cs rename to app/MindWork AI Studio/Settings/DataModel/DataSourceERI_V1.cs index 6bc76641..f06fbc7c 100644 --- a/app/MindWork AI Studio/Settings/DataModel/DataSourceERI.cs +++ b/app/MindWork AI Studio/Settings/DataModel/DataSourceERI_V1.cs @@ -1,11 +1,14 @@ +using ERI_Client.V1; + +// ReSharper disable InconsistentNaming namespace AIStudio.Settings.DataModel; /// /// An external data source, accessed via an ERI server, cf. https://github.com/MindWorkAI/ERI. /// -public readonly record struct DataSourceERI : IDataSource +public readonly record struct DataSourceERI_V1 : IDataSource { - public DataSourceERI() + public DataSourceERI_V1() { } @@ -30,4 +33,9 @@ public readonly record struct DataSourceERI : IDataSource /// The port of the ERI server. /// public int Port { get; init; } + + /// + /// The authentication method to use. + /// + public AuthMethod AuthMethod { get; init; } = AuthMethod.NONE; } \ No newline at end of file diff --git a/app/MindWork AI Studio/Settings/DataModel/DataSourceType.cs b/app/MindWork AI Studio/Settings/DataModel/DataSourceType.cs index 5749fd3f..9c8b031f 100644 --- a/app/MindWork AI Studio/Settings/DataModel/DataSourceType.cs +++ b/app/MindWork AI Studio/Settings/DataModel/DataSourceType.cs @@ -23,5 +23,5 @@ public enum DataSourceType /// /// External data source accessed via an ERI server, cf. https://github.com/MindWorkAI/ERI. /// - ERI, + ERI_V1, } \ No newline at end of file diff --git a/app/MindWork AI Studio/Settings/DataModel/DataSourceTypeExtension.cs b/app/MindWork AI Studio/Settings/DataModel/DataSourceTypeExtension.cs index 39d67de9..a630a922 100644 --- a/app/MindWork AI Studio/Settings/DataModel/DataSourceTypeExtension.cs +++ b/app/MindWork AI Studio/Settings/DataModel/DataSourceTypeExtension.cs @@ -16,7 +16,7 @@ public static class DataSourceTypeExtension { DataSourceType.LOCAL_FILE => "Local File", DataSourceType.LOCAL_DIRECTORY => "Local Directory", - DataSourceType.ERI => "External ERI Server", + DataSourceType.ERI_V1 => "External ERI Server (v1)", _ => "None", };