Decouple Services and Infrastructure

Frontend/MainFE/Components/Models/AgentContextDto.cs → Frontend/MainFE/Components/Models/AgentConfigDto.cs

@@ -2,7 +2,7 @@
 
 namespace MaIN.Models.Rag;
 
-public class AgentContextDto
+public class AgentConfigDto
 {
     [JsonPropertyName("instruction")]
     public string Instruction { get; set; }
@@ -13,4 +13,4 @@ public class AgentContextDto
     [JsonPropertyName("relations")]
     public List<string>? Relations { get; set; }
 
-}
+}

Frontend/MainFE/Components/Models/AgentDto.cs

@@ -21,8 +21,8 @@ public class AgentDto
     public bool Started { get; set; }
     [JsonPropertyName("flow")]
     public bool Flow { get; set; }
-    [JsonPropertyName("context")]
-    public AgentContextDto Context { get; set; }
+    [JsonPropertyName("config")]
+    public AgentConfigDto Config { get; set; }
     public AgentProcessingState State { get; set; }
     public bool IsProcessing { get; set; }
     public List<string>? AgentDependencies { get; set; } = [];
@@ -36,4 +36,4 @@ public string ProgressMessage
         set => _progressMessage = value;
     }
     private string? _progressMessage;
-}
+}

src/MaIN.Core.UnitTests/AgentContextTests.cs

@@ -34,7 +34,7 @@ public void Constructor_ShouldInitializeNewAgent()
         Assert.NotNull(agentId);
         Assert.NotEmpty(agentId);
         Assert.NotNull(agent);
-        Assert.NotNull(agent.Context);
+        Assert.NotNull(agent.Config);
         Assert.NotNull(agent.Behaviours);
         Assert.Equal("Agent created by MaIN", agent.Description);
     }
@@ -88,7 +88,7 @@ public void WithInitialPrompt_ShouldSetInstruction()
         var result = _agentContext.WithInitialPrompt(expectedPrompt);
 
         // Assert
-        Assert.Equal(expectedPrompt, _agentContext.GetAgent().Context.Instruction);
+        Assert.Equal(expectedPrompt, _agentContext.GetAgent().Config.Instruction);
         Assert.Equal(result, _agentContext);
     }
 
@@ -102,7 +102,7 @@ public void WithSteps_ShouldSetAgentSteps()
         var result = _agentContext.WithSteps(expectedSteps);
 
         // Assert
-        Assert.Equal(expectedSteps, _agentContext.GetAgent().Context.Steps);
+        Assert.Equal(expectedSteps, _agentContext.GetAgent().Config.Steps);
         Assert.Equal(result, _agentContext);
     }
 
@@ -132,7 +132,7 @@ public async Task CreateAsync_ShouldCallAgentServiceCreateAgent()
         {
             Id = Guid.NewGuid().ToString(),
             CurrentBehaviour = "Default",
-            Context = new AgentData()
+            Config = new AgentConfig()
         };
         _mockAgentService
             .Setup(s => s.CreateAgent(
@@ -224,7 +224,7 @@ public async Task FromExisting_ShouldCreateContextFromExistingAgent()
             Id = existingAgentId,
             Name = "Existing Agent",
             CurrentBehaviour = "Default",
-            Context = new AgentData()
+            Config = new AgentConfig()
         };
 
         _mockAgentService

src/MaIN.Core.UnitTests/FlowContextTests.cs

@@ -25,7 +25,7 @@ public FlowContextTests()
         var testModel = new GenericLocalModel(_testModelId);
         ModelRegistry.RegisterOrReplace(testModel);
     }
-    
+
     [Fact]
     public async Task WithId_ShouldSetFlowId()
     {
@@ -34,7 +34,7 @@ public async Task WithId_ShouldSetFlowId()
 
         // Act
         var result = _flowContext.WithId(expectedId);
-        
+
         // Setup mock to return flow with the set ID
         _mockFlowService
             .Setup(s => s.GetFlowById(expectedId))
@@ -55,13 +55,14 @@ public async Task WithName_ShouldSetFlowName()
 
         // Act
         var result = _flowContext.WithName(expectedName);
-        
+
         // Setup mock to return flow with the set name
         _mockFlowService
             .Setup(s => s.GetFlowById(It.IsAny<string>()))
-            .ReturnsAsync(new AgentFlow { 
-                Id = It.IsAny<string>(), 
-                Name = expectedName 
+            .ReturnsAsync(new AgentFlow
+            {
+                Id = It.IsAny<string>(),
+                Name = expectedName
             });
 
         var flow = await _flowContext.GetCurrentFlow();
@@ -92,24 +93,32 @@ public async Task CreateAsync_ShouldCallFlowService()
     public async Task ProcessAsync_WithStringMessage_ShouldReturnChatResult()
     {
         // Arrange
-        var firstAgent = new Agent { Id = "first-agent", Order = 0, CurrentBehaviour = It.IsAny<string>(), Context = new AgentData()};
+        var firstAgent = new Agent
+        {
+            Id = "first-agent",
+            Order = 0,
+            CurrentBehaviour = It.IsAny<string>(),
+            Config = new AgentConfig()
+        };
         _flowContext.AddAgent(firstAgent);
 
         var message = "Hello, flow!";
-        var chat = new Chat { Id = firstAgent.Id, Messages = new List<Message>(), ModelId = _testModelId, Name = "test"};
+        var chat = new Chat { Id = firstAgent.Id, Messages = [], ModelId = _testModelId, Name = "test" };
 
         _mockAgentService
             .Setup(s => s.GetChatByAgent(firstAgent.Id))
             .ReturnsAsync(chat);
 
         _mockAgentService
             .Setup(s => s.Process(It.IsAny<Chat>(), firstAgent.Id, It.IsAny<Knowledge>(), It.IsAny<bool>(), null, null))
-            .ReturnsAsync(new Chat { 
-                ModelId = _testModelId, 
+            .ReturnsAsync(new Chat
+            {
+                ModelId = _testModelId,
                 Name = "test",
-                Messages = new List<Message> { 
-                    new() { Content = "Response", Role = "Assistant", Type = MessageType.LocalLLM} 
-                } 
+                Messages =
+                [
+                    new() { Content = "Response", Role = "Assistant", Type = MessageType.LocalLLM}
+                ]
             });
 
         // Act
@@ -165,17 +174,17 @@ public async Task FromExisting_ShouldCreateFlowContextFromExistingFlow()
     {
         // Arrange
         var existingFlowId = "existing-flow-id";
-        var existingFlow = new AgentFlow 
-        { 
-            Id = existingFlowId, 
+        var existingFlow = new AgentFlow
+        {
+            Id = existingFlowId,
             Name = "Existing Flow",
             Agents =
             [
                 new Agent
                 {
                     Id = "agent1",
                     CurrentBehaviour = It.IsAny<string>(),
-                    Context = new AgentData()
+                    Config = new AgentConfig()
                 }
             ]
         };
@@ -203,4 +212,4 @@ public async Task FromExisting_ShouldThrowArgumentExceptionWhenFlowNotFound()
         // Act & Assert
         await Assert.ThrowsAsync<FlowNotFoundException>(() => _flowContext.FromExisting(nonExistentFlowId));
     }
-}
+}

src/MaIN.Core/Bootstrapper.cs

@@ -2,6 +2,7 @@
 using MaIN.Core.Interfaces;
 using MaIN.Core.Services;
 using MaIN.Domain.Configuration;
+using MaIN.Infrastructure;
 using MaIN.Services;
 using MaIN.Services.Services;
 using MaIN.Services.Services.Abstract;
@@ -18,6 +19,7 @@ public static IServiceCollection AddMaIN(
         Action<MaINSettings>? configureSettings = null)
     {
         services.ConfigureMaIN(configuration, configureSettings);
+        services.ConfigureInfrastructure(configuration);
         services.AddAIHub();
         return services;
     }

src/MaIN.Core/Hub/Contexts/AgentContext.cs

@@ -35,7 +35,7 @@ internal AgentContext(IAgentService agentService)
             Description = "Agent created by MaIN",
             CurrentBehaviour = "Default",
             Flow = false,
-            Context = new AgentData()
+            Config = new AgentConfig()
             {
                 Instruction = "Hello, I'm your personal assistant. How can I assist you today?",
                 Relations = [],
@@ -84,7 +84,7 @@ public async Task<IAgentContextExecutor> FromExisting(string agentId)
 
     public IAgentConfigurationBuilder WithInitialPrompt(string prompt)
     {
-        _agent.Context.Instruction = prompt;
+        _agent.Config.Instruction = prompt;
         return this;
     }
 
@@ -114,7 +114,7 @@ public IAgentConfigurationBuilder EnsureModelDownloaded()
 
     public IAgentConfigurationBuilder WithSource(IAgentSource source, AgentSourceType type)
     {
-        _agent.Context.Source = new AgentSource()
+        _agent.Config.Source = new AgentSource()
         {
             Details = source,
             Type = type
@@ -134,8 +134,7 @@ public IAgentConfigurationBuilder WithMcpConfig(Mcp mcpConfig)
         {
             mcpConfig.Backend = ModelRegistry.GetById(_agent.Model).Backend;
         }
-
-        _agent.Context.McpConfig = mcpConfig;
+        _agent.Config.McpConfig = mcpConfig;
         return this;
     }
 
@@ -153,7 +152,7 @@ public IAgentConfigurationBuilder WithMemoryParams(MemoryParams memoryParams)
 
     public IAgentConfigurationBuilder WithSteps(List<string>? steps)
     {
-        _agent.Context.Steps = steps;
+        _agent.Config.Steps = steps;
         return this;
     }
 

src/MaIN.Domain/Entities/Agents/Agent.cs

@@ -11,7 +11,7 @@ public class Agent
     public string? Description { get; init; }
     public bool Started { get; set; }
     public bool Flow { get; set; }
-    public required AgentData Context { get; init; }
+    public required AgentConfig Config { get; init; }
     public string ChatId { get; set; } = string.Empty;
     public int Order { get; set; }
     public BackendType? Backend { get; set; }

src/MaIN.Domain/Entities/Agents/AgentData.cs → src/MaIN.Domain/Entities/Agents/AgentConfig.cs

@@ -1,11 +1,10 @@
 namespace MaIN.Domain.Entities.Agents;
 
-public class AgentData
+public class AgentConfig
 {
     public string? Instruction { get; set; }
     public AgentSource.AgentSource? Source { get; set; }
     public Mcp? McpConfig { get; set; }
     public List<string>? Steps { get; set; }
     public List<string>? Relations { get; set; }
-
-}
+}

src/MaIN.Domain/Exceptions/Agents/AgentContextNotFoundException.cs → src/MaIN.Domain/Exceptions/Agents/AgentConfigNotFoundException.cs

@@ -1,8 +1,8 @@
-using System.Net;
+using System.Net;
 
 namespace MaIN.Domain.Exceptions.Agents;
 
-public class AgentContextNotFoundException(string agentId) : MaINCustomException($"Context of agent with id: '{agentId}' not found.")
+public class AgentConfigNotFoundException(string agentId) : MaINCustomException($"Context of agent with id: '{agentId}' not found.")
 {
     public override string PublicErrorMessage => "Agent context not found.";
     public override HttpStatusCode HttpStatusCode => HttpStatusCode.NotFound;

src/MaIN.Domain/Repositories/IAgentFlowRepository.cs

@@ -0,0 +1,12 @@
+using MaIN.Domain.Entities.Agents.AgentSource;
+
+namespace MaIN.Domain.Repositories;
+
+public interface IAgentFlowRepository
+{
+    Task<IEnumerable<AgentFlow>> GetAllFlows();
+    Task<AgentFlow?> GetFlowById(string id);
+    Task AddFlow(AgentFlow flow);
+    Task UpdateFlow(string id, AgentFlow flow);
+    Task DeleteFlow(string id);
+}

src/MaIN.Domain/Repositories/IAgentRepository.cs

@@ -0,0 +1,13 @@
+using MaIN.Domain.Entities.Agents;
+
+namespace MaIN.Domain.Repositories;
+
+public interface IAgentRepository
+{
+    Task<IEnumerable<Agent>> GetAllAgents();
+    Task<Agent?> GetAgentById(string id);
+    Task AddAgent(Agent agent);
+    Task UpdateAgent(string id, Agent agent);
+    Task DeleteAgent(string id);
+    Task<bool> Exists(string id);
+}

src/MaIN.Domain/Repositories/IChatRepository.cs

@@ -0,0 +1,12 @@
+using MaIN.Domain.Entities;
+
+namespace MaIN.Domain.Repositories;
+
+public interface IChatRepository
+{
+    Task<IEnumerable<Chat>> GetAllChats();
+    Task<Chat?> GetChatById(string id);
+    Task AddChat(Chat chat);
+    Task UpdateChat(string id, Chat chat);
+    Task DeleteChat(string id);
+}

src/MaIN.Infrastructure/Bootstrapper.cs

@@ -1,7 +1,7 @@
 using MaIN.Domain.Configuration;
 using MaIN.Infrastructure.Configuration;
 using MaIN.Infrastructure.Repositories;
-using MaIN.Infrastructure.Repositories.Abstract;
+using MaIN.Domain.Repositories;
 using MaIN.Infrastructure.Repositories.FileSystem;
 using MaIN.Infrastructure.Repositories.Mongo;
 using Microsoft.Extensions.Configuration;

src/MaIN.Infrastructure/Configuration/SqlExtensions.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using MaIN.Infrastructure.Repositories.Abstract;
+using MaIN.Domain.Repositories;
 using MaIN.Infrastructure.Repositories.Sql;
 using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.DependencyInjection;

src/MaIN.Infrastructure/Configuration/SqliteExtensions.cs

@@ -1,5 +1,5 @@
 using Dapper;
-using MaIN.Infrastructure.Repositories.Abstract;
+using MaIN.Domain.Repositories;
 using MaIN.Infrastructure.Repositories.Sqlite;
 using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.DependencyInjection;