Revert "Merge"

This reverts commit abb1e3f52d.

app/MindWork AI Studio/Chat/ChatRole.cs

@@ -12,6 +12,7 @@ public enum ChatRole
     USER,
     AI,
     AGENT,
+    RAG,
 }
 
 /// <summary>

app/MindWork AI Studio/Chat/ChatThread.cs

@@ -40,16 +40,6 @@ public sealed record ChatThread
     /// </summary>
     public IReadOnlyList<DataSourceAgentSelected> AISelectedDataSources { get; set; } = [];
 
-    /// <summary>
-    /// The augmented data for this chat thread. Will be inserted into the system prompt.
-    /// </summary>
-    public string AugmentedData { get; set; } = string.Empty;
-
-    /// <summary>
-    /// The data security to use, derived from the data sources used so far.
-    /// </summary>
-    public DataSourceSecurity DataSecurity { get; set; } = DataSourceSecurity.NOT_SPECIFIED;
-
     /// <summary>
     /// The name of the chat thread. Usually generated by an AI model or manually edited by the user.
     /// </summary>
@@ -84,48 +74,31 @@ public sealed record ChatThread
     /// <returns>The prepared system prompt.</returns>
     public string PrepareSystemPrompt(SettingsManager settingsManager, ChatThread chatThread, ILogger logger)
     {
-        var isAugmentedDataAvailable = !string.IsNullOrWhiteSpace(chatThread.AugmentedData);
-        var systemPromptWithAugmentedData = isAugmentedDataAvailable switch
-        {
-            true => $"""
-                     {chatThread.SystemPrompt}
-                     
-                     {chatThread.AugmentedData}
-                     """,
-
-            false => chatThread.SystemPrompt,
-        };
-        
-        if(isAugmentedDataAvailable)
-            logger.LogInformation("Augmented data is available for the chat thread.");
-        else
-            logger.LogInformation("No augmented data is available for the chat thread.");
-        
         //
         // Prepare the system prompt:
         //
         string systemPromptText;
         var logMessage = $"Using no profile for chat thread '{chatThread.Name}'.";
         if (string.IsNullOrWhiteSpace(chatThread.SelectedProfile))
-            systemPromptText = systemPromptWithAugmentedData;
+            systemPromptText = chatThread.SystemPrompt;
         else
         {
             if(!Guid.TryParse(chatThread.SelectedProfile, out var profileId))
-                systemPromptText = systemPromptWithAugmentedData;
+                systemPromptText = chatThread.SystemPrompt;
             else
             {
                 if(chatThread.SelectedProfile == Profile.NO_PROFILE.Id || profileId == Guid.Empty)
-                    systemPromptText = systemPromptWithAugmentedData;
+                    systemPromptText = chatThread.SystemPrompt;
                 else
                 {
                     var profile = settingsManager.ConfigurationData.Profiles.FirstOrDefault(x => x.Id == chatThread.SelectedProfile);
                     if(profile == default)
-                        systemPromptText = systemPromptWithAugmentedData;
+                        systemPromptText = chatThread.SystemPrompt;
                     else
                     {
                         logMessage = $"Using profile '{profile.Name}' for chat thread '{chatThread.Name}'.";
                         systemPromptText = $"""
-                                            {systemPromptWithAugmentedData}
+                                            {chatThread.SystemPrompt}
 
                                             {profile.ToSystemPrompt()}
                                             """;

app/MindWork AI Studio/Chat/ChatThreadExtensions.cs

@@ -1,58 +0,0 @@
-using AIStudio.Provider.SelfHosted;
-using AIStudio.Settings.DataModel;
-
-namespace AIStudio.Chat;
-
-public static class ChatThreadExtensions
-{
-    /// <summary>
-    /// Checks if the specified provider is allowed for the chat thread.
-    /// </summary>
-    /// <remarks>
-    /// We don't check if the provider is allowed to use the data sources of the chat thread.
-    /// That kind of check is done in the RAG process itself.<br/><br/>
-    /// 
-    /// One thing which is not so obvious: after RAG was used on this thread, the entire chat
-    /// thread is kind of a data source by itself. Why? Because the augmentation data collected
-    /// from the data sources is stored in the chat thread. This means we must check if the
-    /// selected provider is allowed to use this thread's data.
-    /// </remarks>
-    /// <param name="chatThread">The chat thread to check.</param>
-    /// <param name="provider">The provider to check.</param>
-    /// <returns>True, when the provider is allowed for the chat thread. False, otherwise.</returns>
-    public static bool IsLLMProviderAllowed<T>(this ChatThread? chatThread, T provider)
-    {
-        // No chat thread available means we have a new chat. That's fine:
-        if (chatThread is null)
-            return true;
-        
-        // The chat thread is available, but the data security is not specified.
-        // Means, we never used RAG or RAG was enabled, but no data sources were selected.
-        // That's fine as well:
-        if (chatThread.DataSecurity is DataSourceSecurity.NOT_SPECIFIED)
-            return true;
-
-        //
-        // Is the provider self-hosted?
-        //
-        var isSelfHostedProvider = provider switch
-        {
-            ProviderSelfHosted => true,
-            AIStudio.Settings.Provider p => p.IsSelfHosted,
-            
-            _ => false,
-        };
-        
-        //
-        // Check the chat data security against the selected provider:
-        //
-        return isSelfHostedProvider switch
-        {
-            // The provider is self-hosted -- we can use any data source:
-            true => true,
-            
-            // The provider is not self-hosted -- it depends on the data security of the chat thread:
-            false => chatThread.DataSecurity is not DataSourceSecurity.SELF_HOSTED,
-        };
-    }
-}

app/MindWork AI Studio/Chat/ContentBlockComponent.razor

@@ -27,7 +27,7 @@
             @if (this.IsLastContentBlock && this.Role is ChatRole.AI && this.RegenerateFunc is not null)
             {
                 <MudTooltip Text="Regenerate" Placement="Placement.Bottom">
-                    <MudIconButton Icon="@Icons.Material.Filled.Recycling" Color="Color.Default" Disabled="@(!this.RegenerateEnabled())" OnClick="@this.RegenerateBlock"/>
+                    <MudIconButton Icon="@Icons.Material.Filled.Recycling" Color="Color.Default" OnClick="@this.RegenerateBlock"/>
                 </MudTooltip>
             }
             @if (this.RemoveBlockFunc is not null)

app/MindWork AI Studio/Chat/ContentImage.cs

@@ -28,7 +28,7 @@ public sealed class ContentImage : IContent, IImageSource
     public Func<Task> StreamingEvent { get; set; } = () => Task.CompletedTask;
 
     /// <inheritdoc />
-    public Task<ChatThread> CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastPrompt, ChatThread? chatChatThread, CancellationToken token = default)
+    public Task CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastPrompt, ChatThread? chatChatThread, CancellationToken token = default)
     {
         throw new NotImplementedException();
     }

app/MindWork AI Studio/Chat/ContentText.cs

@@ -36,31 +36,16 @@ public sealed class ContentText : IContent
     public Func<Task> StreamingEvent { get; set; } = () => Task.CompletedTask;
 
     /// <inheritdoc />
-    public async Task<ChatThread> CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastPrompt, ChatThread? chatThread, CancellationToken token = default)
+    public async Task CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastPrompt, ChatThread? chatThread, CancellationToken token = default)
     {
         if(chatThread is null)
-            return new();
+            return;
         
-        if(!chatThread.IsLLMProviderAllowed(provider))
-        {
-            var logger = Program.SERVICE_PROVIDER.GetService<ILogger<ContentText>>()!;
-            logger.LogError("The provider is not allowed for this chat thread due to data security reasons. Skipping the AI process.");
-            return chatThread;
-        }
-
         // Call the RAG process. Right now, we only have one RAG process:
         if (lastPrompt is not null)
         {
-            try
-            {
-                var rag = new AISrcSelWithRetCtxVal();
-                chatThread = await rag.ProcessAsync(provider, lastPrompt, chatThread, token);
-            }
-            catch (Exception e)
-            {
-                var logger = Program.SERVICE_PROVIDER.GetService<ILogger<ContentText>>()!;
-                logger.LogError(e, "Skipping the RAG process due to an error.");
-            }
+            var rag = new AISrcSelWithRetCtxVal();
+            chatThread = await rag.ProcessAsync(provider, lastPrompt, chatThread, token);
         }
 
         // Store the last time we got a response. We use this later
@@ -122,7 +107,6 @@ public sealed class ContentText : IContent
         
         // Inform the UI that the streaming is done:
         await this.StreamingDone();
-        return chatThread;
     }
 
     #endregion

app/MindWork AI Studio/Chat/IContent.cs

@@ -41,7 +41,7 @@ public interface IContent
     /// <summary>
     /// Uses the provider to create the content.
     /// </summary>
-    public Task<ChatThread> CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastPrompt, ChatThread? chatChatThread, CancellationToken token = default);
+    public Task CreateFromProviderAsync(IProvider provider, Model chatModel, IContent? lastPrompt, ChatThread? chatChatThread, CancellationToken token = default);
 
     /// <summary>
     /// Returns the corresponding ERI content type.