feat: process pr comments

Author: Piotr Stachaczynski

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

@@ -2,6 +2,7 @@
 using MaIN.Domain.Configuration;
 using MaIN.Domain.Entities;
 using MaIN.Services.Services;
+using MaIN.Services.Services.Abstract;
 using MaIN.Services.Services.Models;
 
 namespace MaIN.Core.Hub.Contexts;

src/MaIN.Services/Services/Abstract/IMcpService.cs

@@ -0,0 +1,9 @@
+using MaIN.Domain.Entities;
+using MaIN.Services.Services.Models;
+
+namespace MaIN.Services.Services.Abstract;
+
+public interface IMcpService
+{
+    Task<McpResult> Prompt(Mcp config, string prompt);
+}

src/MaIN.Services/Services/McpService.cs

@@ -1,6 +1,7 @@
 using LLama.Common;
 using MaIN.Domain.Configuration;
 using MaIN.Domain.Entities;
+using MaIN.Services.Services.Abstract;
 using MaIN.Services.Services.Models;
 using Microsoft.SemanticKernel;
 using Microsoft.SemanticKernel.Connectors.Google;
@@ -11,11 +12,6 @@
 
 namespace MaIN.Services.Services;
 
-public interface IMcpService
-{
-    Task<McpResult> Prompt(Mcp config, string prompt);
-}
-
 public class McpService(MaINSettings settings) : IMcpService
 {
     public async Task<McpResult> Prompt(Mcp config, string prompt)
@@ -52,11 +48,6 @@ public async Task<McpResult> Prompt(Mcp config, string prompt)
 
     private PromptExecutionSettings InitializeChatCompletions(IKernelBuilder kernelBuilder, BackendType backendType, string model)
     {
-        if (backendType == BackendType.Self)
-        {
-            throw new NotSupportedException("Self backend (local models) does not support MCP integration.");
-        }
-
         switch (backendType)
         {
             case BackendType.OpenAi:
@@ -73,6 +64,8 @@ private PromptExecutionSettings InitializeChatCompletions(IKernelBuilder kernelB
                     ModelId = model,
                     FunctionChoiceBehavior = FunctionChoiceBehavior.Auto(options: new() { RetainArgumentTypes = true })
                 };
+            case BackendType.Self:
+                throw new NotSupportedException("Self backend (local models) does not support MCP integration.");
             default:
                 throw new ArgumentOutOfRangeException(nameof(backendType));
         }

src/MaIN.Services/Services/Steps/AnswerStepHandler.cs

@@ -19,7 +19,7 @@ public async Task<StepResult> Handle(StepContext context)
 
         var answerCommand = new AnswerCommand
         {
-            Chat = EnsureUserMessageReadiness(context.Chat), 
+            Chat = StepHandlerExtensions.EnsureUserMessageReadiness(context.Chat), 
             UseMemory = useMemory
         };
 
@@ -45,27 +45,4 @@ public async Task<StepResult> Handle(StepContext context)
         var match = Regex.Match(content!, pattern);
         return match.Success ? match.Groups[1].Value : null;
     }
-    
-    //This is useful for cases that we want to perform retry
-    private Chat EnsureUserMessageReadiness(Chat chat)
-    {
-        if (chat.Messages.Count == 0)
-            return chat;
-        
-        var lastMessage = chat.Messages.LastOrDefault();
-        if (lastMessage == null || lastMessage.Role== "User")
-            return chat;
-    
-        var lastUserMessage = chat.Messages.LastOrDefault(m => m.Role == "User");
-        if (lastUserMessage == null)
-            return chat; // No user messages
-    
-        var newMessages = chat.Messages
-            .Where(m => m != lastUserMessage)
-            .ToList();
-        newMessages.Add(lastUserMessage);
-
-        chat.Messages = newMessages;
-        return chat;
-    }
 }

src/MaIN.Services/Services/Steps/McpStepHandler.cs

@@ -22,18 +22,21 @@ public async Task<StepResult> Handle(StepContext context)
         await context.NotifyProgress("true", context.Agent.Id, null, context.Agent.CurrentBehaviour);
         var mcpCommand = new McpCommand()
         {
-            Chat = EnsureUserMessageReadiness(context.Chat), 
+            Chat = StepHandlerExtensions.EnsureUserMessageReadiness(context.Chat), 
             McpConfig = context.McpConfig
         };
 
         var mcpResponse = await commandDispatcher.DispatchAsync(mcpCommand);
-        if (mcpResponse == null) 
+        if (mcpResponse == null)
+        {
             throw new Exception("MCP command failed"); //TODO proper candidate for custom exception
-        
+        }
+
         var filterVal = GetFilter(mcpResponse.Content);
         if (!string.IsNullOrEmpty(filterVal))
+        {
             context.Chat.Properties.TryAdd("data_filter", filterVal);
-        
+        }
 
         mcpResponse.Time = DateTime.Now;
         context.Chat.Messages.Add(mcpResponse);
@@ -47,27 +50,4 @@ public async Task<StepResult> Handle(StepContext context)
         var match = Regex.Match(content!, pattern);
         return match.Success ? match.Groups[1].Value : null;
     }
-    
-    //This is useful for cases that we want to perform retry
-    private Chat EnsureUserMessageReadiness(Chat chat)
-    {
-        if (chat.Messages.Count == 0)
-            return chat;
-        
-        var lastMessage = chat.Messages.LastOrDefault();
-        if (lastMessage == null || lastMessage.Role== "User")
-            return chat;
-    
-        var lastUserMessage = chat.Messages.LastOrDefault(m => m.Role == "User");
-        if (lastUserMessage == null)
-            return chat; // No user messages
-    
-        var newMessages = chat.Messages
-            .Where(m => m != lastUserMessage)
-            .ToList();
-        newMessages.Add(lastUserMessage);
-
-        chat.Messages = newMessages;
-        return chat;
-    }
 }

src/MaIN.Services/Services/Steps/StepHandlerExtensions.cs

@@ -0,0 +1,28 @@
+using MaIN.Domain.Entities;
+
+namespace MaIN.Services.Services.Steps;
+
+public class StepHandlerExtensions
+{
+    public static Chat EnsureUserMessageReadiness(Chat chat)
+    {
+        if (chat.Messages.Count == 0)
+            return chat;
+        
+        var lastMessage = chat.Messages.LastOrDefault();
+        if (lastMessage == null || lastMessage.Role== "User")
+            return chat;
+    
+        var lastUserMessage = chat.Messages.LastOrDefault(m => m.Role == "User");
+        if (lastUserMessage == null)
+            return chat; // No user messages
+    
+        var newMessages = chat.Messages
+            .Where(m => m != lastUserMessage)
+            .ToList();
+        newMessages.Add(lastUserMessage);
+
+        chat.Messages = newMessages;
+        return chat;
+    }
+}