From 74757c8fa4b2c4a3c145b7b820473e661c9460b5 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Tue, 18 Feb 2025 11:33:43 +0100 Subject: [PATCH] Refactored EMPTY_BLOCK into the agent base class --- app/MindWork AI Studio/Agents/AgentBase.cs | 8 ++++++++ app/MindWork AI Studio/Agents/AgentDataSourceSelection.cs | 8 -------- app/MindWork AI Studio/Agents/AgentTextContentCleaner.cs | 8 -------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/app/MindWork AI Studio/Agents/AgentBase.cs b/app/MindWork AI Studio/Agents/AgentBase.cs index 5ea5bd9b..ef4756f7 100644 --- a/app/MindWork AI Studio/Agents/AgentBase.cs +++ b/app/MindWork AI Studio/Agents/AgentBase.cs @@ -11,6 +11,14 @@ namespace AIStudio.Agents; public abstract class AgentBase(ILogger logger, SettingsManager settingsManager, DataSourceService dataSourceService, ThreadSafeRandom rng) : IAgent { + protected static readonly ContentBlock EMPTY_BLOCK = new() + { + Content = null, + ContentType = ContentType.NONE, + Role = ChatRole.AGENT, + Time = DateTimeOffset.UtcNow, + }; + protected static readonly JsonSerializerOptions JSON_SERIALIZER_OPTIONS = new() { PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower, diff --git a/app/MindWork AI Studio/Agents/AgentDataSourceSelection.cs b/app/MindWork AI Studio/Agents/AgentDataSourceSelection.cs index f42a4764..3eb5de99 100644 --- a/app/MindWork AI Studio/Agents/AgentDataSourceSelection.cs +++ b/app/MindWork AI Studio/Agents/AgentDataSourceSelection.cs @@ -12,14 +12,6 @@ namespace AIStudio.Agents; public sealed class AgentDataSourceSelection (ILogger logger, ILogger baseLogger, SettingsManager settingsManager, DataSourceService dataSourceService, ThreadSafeRandom rng) : AgentBase(baseLogger, settingsManager, dataSourceService, rng) { - private static readonly ContentBlock EMPTY_BLOCK = new() - { - Content = null, - ContentType = ContentType.NONE, - Role = ChatRole.AGENT, - Time = DateTimeOffset.UtcNow, - }; - private readonly List answers = new(); #region Overrides of AgentBase diff --git a/app/MindWork AI Studio/Agents/AgentTextContentCleaner.cs b/app/MindWork AI Studio/Agents/AgentTextContentCleaner.cs index d8e83817..2ffff27b 100644 --- a/app/MindWork AI Studio/Agents/AgentTextContentCleaner.cs +++ b/app/MindWork AI Studio/Agents/AgentTextContentCleaner.cs @@ -6,14 +6,6 @@ namespace AIStudio.Agents; public sealed class AgentTextContentCleaner(ILogger logger, SettingsManager settingsManager, DataSourceService dataSourceService, ThreadSafeRandom rng) : AgentBase(logger, settingsManager, dataSourceService, rng) { - private static readonly ContentBlock EMPTY_BLOCK = new() - { - Content = null, - ContentType = ContentType.NONE, - Role = ChatRole.AGENT, - Time = DateTimeOffset.UtcNow, - }; - private readonly List context = new(); private readonly List answers = new();