Refactor chat helper and AnhropicService

Centralize message, image and tool handling into ChatHelper and update services to use it. Added ServiceConstants properties for ToolCalls/ToolCallId/ToolName and replaced hardcoded property keys in LLMService/OpenAiCompatibleService with ServiceConstants.Properties. Moved image extraction, message merging and message-array building logic out of Anthropic/OpenAi services into ChatHelper, made BuildAnthropicRequestBody asynchronous and now use ChatHelper.BuildMessagesArray. Removed duplicated helper methods and consolidated image MIME detection and message content construction.

Author: Madzionator

src/MaIN.Services/Constants/ServiceConstants.cs

@@ -63,6 +63,9 @@ public static class Properties
         public const string DisableCacheProperty = "DisableCache";
         public const string AgentIdProperty = "AgentId";
         public const string MmProjNameProperty = "MmProjName";
+        public const string ToolCallsProperty = "ToolCalls";
+        public const string ToolCallIdProperty = "ToolCallId";
+        public const string ToolNameProperty = "ToolName";
     }
 
     public static class Defaults

src/MaIN.Services/Services/LLMService/AnthropicService.cs

@@ -27,7 +27,6 @@ public sealed class AnthropicService(
 {
     private readonly MaINSettings _settings = settings ?? throw new ArgumentNullException(nameof(settings));
 
-    private static readonly HashSet<string> AnthropicImageExtensions = [".jpg", ".jpeg", ".png", ".gif", ".webp"];
     private static readonly ConcurrentDictionary<string, List<ChatMessage>> SessionCache = new();
 
     private const string CompletionsUrl = ServiceConstants.ApiUrls.AnthropicChatMessages;
@@ -70,16 +69,14 @@ private void ValidateApiKey()
         if (!chat.Messages.Any())
             return null;
 
-        var apiKey = GetApiKey();
-
         var lastMessage = chat.Messages.Last();
-        await ExtractImageFromFiles(lastMessage);
+        await ChatHelper.ExtractImageFromFiles(lastMessage);
 
         var conversation = GetOrCreateConversation(chat, options.CreateSession);
         var resultBuilder = new StringBuilder();
         var tokens = new List<LLMTokenValue>();
 
-        if (HasFiles(lastMessage))
+        if (ChatHelper.HasFiles(lastMessage))
         {
             var result = ChatHelper.ExtractMemoryOptions(lastMessage);
             var memoryResult = await AskMemory(chat, result, options, cancellationToken);
@@ -103,7 +100,6 @@ await options.TokenCallback(new LLMTokenValue()
             return await ProcessWithToolsAsync(
                 chat,
                 conversation,
-                apiKey,
                 tokens,
                 options,
                 cancellationToken);
@@ -114,7 +110,6 @@ await options.TokenCallback(new LLMTokenValue()
             await ProcessStreamingChatAsync(
                 chat,
                 conversation,
-                apiKey,
                 tokens,
                 resultBuilder,
                 options.TokenCallback,
@@ -126,7 +121,6 @@ await ProcessStreamingChatAsync(
             await ProcessNonStreamingChatAsync(
                 chat,
                 conversation,
-                apiKey,
                 resultBuilder,
                 cancellationToken);
         }
@@ -150,7 +144,6 @@ await notificationService.DispatchNotification(
     private async Task<ChatResult> ProcessWithToolsAsync(
         Chat chat,
         List<ChatMessage> conversation,
-        string apiKey,
         List<LLMTokenValue> tokens,
         ChatRequestOptions options,
         CancellationToken cancellationToken)
@@ -183,7 +176,6 @@ await notificationService.DispatchNotification(
                 currentToolUses = await ProcessStreamingChatWithToolsAsync(
                     chat,
                     conversation,
-                    apiKey,
                     tokens,
                     resultBuilder,
                     options,
@@ -194,7 +186,6 @@ await notificationService.DispatchNotification(
                 currentToolUses = await ProcessNonStreamingChatWithToolsAsync(
                     chat,
                     conversation,
-                    apiKey,
                     resultBuilder,
                     cancellationToken);
             }
@@ -319,15 +310,14 @@ await notificationService.DispatchNotification(
     private async Task<List<AnthropicToolUse>?> ProcessStreamingChatWithToolsAsync(
         Chat chat,
         List<ChatMessage> conversation,
-        string apiKey,
         List<LLMTokenValue> tokens,
         StringBuilder resultBuilder,
         ChatRequestOptions options,
         CancellationToken cancellationToken)
     {
         var httpClient = CreateAnthropicHttpClient();
 
-        var requestBody = BuildAnthropicRequestBody(chat, conversation, true);
+        var requestBody = await BuildAnthropicRequestBody(chat, conversation, true);
         var requestJson = JsonSerializer.Serialize(requestBody);
         var content = new StringContent(requestJson, Encoding.UTF8, "application/json");
 
@@ -464,18 +454,17 @@ private async Task HandleApiError(HttpResponseMessage response, CancellationToke
     private async Task<List<AnthropicToolUse>?> ProcessNonStreamingChatWithToolsAsync(
         Chat chat,
         List<ChatMessage> conversation,
-        string apiKey,
         StringBuilder resultBuilder,
         CancellationToken cancellationToken)
     {
         var httpClient = CreateAnthropicHttpClient();
 
-        var requestBody = BuildAnthropicRequestBody(chat, conversation, false);
+        var requestBody = await BuildAnthropicRequestBody(chat, conversation, false);
         var requestJson = JsonSerializer.Serialize(requestBody);
         var content = new StringContent(requestJson, Encoding.UTF8, "application/json");
 
         using var response = await httpClient.PostAsync(CompletionsUrl, content, cancellationToken);
-        
+
         if (!response.IsSuccessStatusCode)
         {
             await HandleApiError(response, cancellationToken);
@@ -510,7 +499,7 @@ private async Task HandleApiError(HttpResponseMessage response, CancellationToke
         return toolUses.Any() ? toolUses : null;
     }
 
-    private object BuildAnthropicRequestBody(Chat chat, List<ChatMessage> conversation, bool stream)
+    private async Task<Dictionary<string, object>> BuildAnthropicRequestBody(Chat chat, List<ChatMessage> conversation, bool stream)
     {
         var anthParams = chat.BackendParams as AnthropicInferenceParams;
 
@@ -519,7 +508,7 @@ private object BuildAnthropicRequestBody(Chat chat, List<ChatMessage> conversati
             ["model"] = chat.ModelId,
             ["max_tokens"] = anthParams?.MaxTokens ?? 4096,
             ["stream"] = stream,
-            ["messages"] = BuildAnthropicMessages(conversation)
+            ["messages"] = await ChatHelper.BuildMessagesArray(conversation, chat, ImageType.AsBase64)
         };
 
         if (anthParams != null)
@@ -562,40 +551,6 @@ private object BuildAnthropicRequestBody(Chat chat, List<ChatMessage> conversati
         return requestBody;
     }
 
-    private List<object> BuildAnthropicMessages(List<ChatMessage> conversation)
-    {
-        var messages = new List<object>();
-
-        foreach (var msg in conversation)
-        {
-            if (msg.Role.Equals("system", StringComparison.OrdinalIgnoreCase))
-                continue;
-
-            object content;
-
-            if (msg.Content is string textContent)
-            {
-                content = textContent;
-            }
-            else if (msg.Content is List<object> contentBlocks)
-            {
-                content = contentBlocks;
-            }
-            else
-            {
-                content = msg.Content;
-            }
-
-            messages.Add(new
-            {
-                role = msg.Role,
-                content = content
-            });
-        }
-
-        return messages;
-    }
-
     public async Task<ChatResult?> AskMemory(Chat chat, ChatMemoryOptions memoryOptions, ChatRequestOptions requestOptions,
         CancellationToken cancellationToken = default)
     {
@@ -639,7 +594,7 @@ private List<ChatMessage> GetOrCreateConversation(Chat chat, bool createSession)
             conversation = new List<ChatMessage>();
         }
 
-        OpenAiCompatibleService.MergeMessages(conversation, chat.Messages);
+        ChatHelper.MergeMessages(conversation, chat.Messages);
         return conversation;
     }
 
@@ -651,51 +606,9 @@ private void UpdateSessionCache(string chatId, string assistantResponse, bool cr
         }
     }
 
-    private static bool HasFiles(Message message)
-    {
-        return message.Files != null && message.Files.Count > 0;
-    }
-
-    private static async Task ExtractImageFromFiles(Message message)
-    {
-        if (message.Files == null || message.Files.Count == 0)
-            return;
-
-        var imageFiles = message.Files
-            .Where(f => AnthropicImageExtensions.Contains(f.Extension.ToLowerInvariant()))
-            .ToList();
-
-        if (imageFiles.Count == 0)
-            return;
-
-        var imageBytesList = new List<byte[]>();
-        foreach (var imageFile in imageFiles)
-        {
-            if (imageFile.StreamContent != null)
-            {
-                using var ms = new MemoryStream();
-                imageFile.StreamContent.Position = 0;
-                await imageFile.StreamContent.CopyToAsync(ms);
-                imageBytesList.Add(ms.ToArray());
-            }
-            else if (imageFile.Path != null)
-            {
-                imageBytesList.Add(await File.ReadAllBytesAsync(imageFile.Path));
-            }
-
-            message.Files.Remove(imageFile);
-        }
-
-        message.Images = imageBytesList;
-
-        if (message.Files.Count == 0)
-            message.Files = null;
-    }
-
     private async Task ProcessStreamingChatAsync(
         Chat chat,
         List<ChatMessage> conversation,
-        string apiKey,
         List<LLMTokenValue> tokens,
         StringBuilder resultBuilder,
         Func<LLMTokenValue, Task>? tokenCallback,
@@ -704,29 +617,7 @@ private async Task ProcessStreamingChatAsync(
     {
         var httpClient = CreateAnthropicHttpClient();
 
-        var anthParams2 = chat.BackendParams as AnthropicInferenceParams;
-        var requestBody = new Dictionary<string, object>
-        {
-            ["model"] = chat.ModelId,
-            ["max_tokens"] = anthParams2?.MaxTokens ?? 4096,
-            ["stream"] = true,
-            ["system"] = chat.InferenceGrammar is not null
-                ? $"Respond only using the following grammar format: \n{chat.InferenceGrammar.Value}\n. Do not add explanations, code tags, or any extra content."
-                : "",
-            ["messages"] = await OpenAiCompatibleService.BuildMessagesArray(conversation, chat, ImageType.AsBase64)
-        };
-        if (anthParams2 != null)
-        {
-            if (anthParams2.Temperature.HasValue) requestBody["temperature"] = anthParams2.Temperature.Value;
-            if (anthParams2.TopP.HasValue) requestBody["top_p"] = anthParams2.TopP.Value;
-            if (anthParams2.TopK.HasValue) requestBody["top_k"] = anthParams2.TopK.Value;
-        }
-        if (chat.BackendParams?.AdditionalParams != null)
-        {
-            foreach (var (key, value) in chat.BackendParams.AdditionalParams)
-                requestBody[key] = value;
-        }
-
+        var requestBody = await BuildAnthropicRequestBody(chat, conversation, true);
         var requestJson = JsonSerializer.Serialize(requestBody);
         var content = new StringContent(requestJson, Encoding.UTF8, "application/json");
 
@@ -798,35 +689,12 @@ await notificationService.DispatchNotification(
     private async Task ProcessNonStreamingChatAsync(
         Chat chat,
         List<ChatMessage> conversation,
-        string apiKey,
         StringBuilder resultBuilder,
         CancellationToken cancellationToken)
     {
         var httpClient = CreateAnthropicHttpClient();
 
-        var anthParams3 = chat.BackendParams as AnthropicInferenceParams;
-        var requestBody = new Dictionary<string, object>
-        {
-            ["model"] = chat.ModelId,
-            ["max_tokens"] = anthParams3?.MaxTokens ?? 4096,
-            ["stream"] = false,
-            ["system"] = chat.InferenceGrammar is not null
-                ? $"Respond only using the following grammar format: \n{chat.InferenceGrammar.Value}\n. Do not add explanations, code tags, or any extra content."
-                : "",
-            ["messages"] = await OpenAiCompatibleService.BuildMessagesArray(conversation, chat, ImageType.AsBase64)
-        };
-        if (anthParams3 != null)
-        {
-            if (anthParams3.Temperature.HasValue) requestBody["temperature"] = anthParams3.Temperature.Value;
-            if (anthParams3.TopP.HasValue) requestBody["top_p"] = anthParams3.TopP.Value;
-            if (anthParams3.TopK.HasValue) requestBody["top_k"] = anthParams3.TopK.Value;
-        }
-        if (chat.BackendParams?.AdditionalParams != null)
-        {
-            foreach (var (key, value) in chat.BackendParams.AdditionalParams)
-                requestBody[key] = value;
-        }
-
+        var requestBody = await BuildAnthropicRequestBody(chat, conversation, false);
         var requestJson = JsonSerializer.Serialize(requestBody);
         var content = new StringContent(requestJson, Encoding.UTF8, "application/json");
 

src/MaIN.Services/Services/LLMService/LLMService.cs

@@ -391,7 +391,7 @@ private static void ProcessTextMessage(Conversation conversation,
         bool isNewConversation)
     {
         var template = new LLamaTemplate(llmModel);
-        var finalPrompt = ChatHelper.GetFinalPrompt(lastMsg, model, isNewConversation);
+        var finalPrompt = GetFinalPrompt(lastMsg, model, isNewConversation);
 
         var hasTools = chat.ToolsConfiguration?.Tools != null && chat.ToolsConfiguration.Tools.Count != 0;
 
@@ -470,7 +470,19 @@ private static string FormatToolsForPrompt(ToolsConfiguration toolsConfig)
         using var sampler = LLMService.CreateSampler(chat.LocalParams!);
         var decoder = new StreamingTokenDecoder(executor.Context);
 
-        var inferenceParams = ChatHelper.CreateInferenceParams(chat, llmModel);
+        var inferenceParams = new InferenceParams
+        {
+            SamplingPipeline = new DefaultSamplingPipeline
+            {
+                Temperature = chat.LocalParams!.Temperature,
+                TopK = chat.LocalParams!.TopK,
+                TopP = chat.LocalParams!.TopP
+            },
+            AntiPrompts = [llmModel.Vocab.EOT?.ToString() ?? "User:"],
+            TokensKeep = chat.LocalParams!.TokensKeep,
+            MaxTokens = chat.LocalParams!.MaxTokens
+        };
+
         var maxTokens = inferenceParams.MaxTokens == -1 ? int.MaxValue : inferenceParams.MaxTokens;
         var reasoningModel = model as IReasoningModel;
 
@@ -704,7 +716,7 @@ private async Task<ChatResult> ProcessWithToolsAsync(
             }
 
             var toolCalls = parseResult.ToolCalls!;
-            responseMessage.Properties[ToolCallsProperty] = JsonSerializer.Serialize(toolCalls);
+            responseMessage.Properties[ServiceConstants.Properties.ToolCallsProperty] = JsonSerializer.Serialize(toolCalls);
 
             foreach (var toolCall in toolCalls)
             {                
@@ -758,8 +770,8 @@ await requestOptions.ToolCallback.Invoke(new ToolInvocation
                         Type = MessageType.LocalLLM,
                         Tool = true
                     };
-                    toolMessage.Properties[ToolCallIdProperty] = toolCall.Id;
-                    toolMessage.Properties[ToolNameProperty] = toolCall.Function.Name;
+                    toolMessage.Properties[ServiceConstants.Properties.ToolCallIdProperty] = toolCall.Id;
+                    toolMessage.Properties[ServiceConstants.Properties.ToolNameProperty] = toolCall.Function.Name;
                     chat.Messages.Add(toolMessage.MarkProcessed());
                 }
                 catch (Exception ex)
@@ -772,8 +784,8 @@ await requestOptions.ToolCallback.Invoke(new ToolInvocation
                         Type = MessageType.LocalLLM,
                         Tool = true
                     };
-                    toolMessage.Properties[ToolCallIdProperty] = toolCall.Id;
-                    toolMessage.Properties[ToolNameProperty] = toolCall.Function.Name;
+                    toolMessage.Properties[ServiceConstants.Properties.ToolCallIdProperty] = toolCall.Id;
+                    toolMessage.Properties[ServiceConstants.Properties.ToolNameProperty] = toolCall.Function.Name;
                     chat.Messages.Add(toolMessage.MarkProcessed());
                 }
             }
@@ -808,7 +820,12 @@ await requestOptions.ToolCallback.Invoke(new ToolInvocation
         };
     }
 
-    private const string ToolCallsProperty = "ToolCalls";
-    private const string ToolCallIdProperty = "ToolCallId";
-    private const string ToolNameProperty = "ToolName";
+    private static string GetFinalPrompt(Message message, AIModel model, bool startSession)
+    {
+        var additionalPrompt = (model as IReasoningModel)?.AdditionalPrompt;
+        return startSession && additionalPrompt != null
+            ? $"{message.Content}{additionalPrompt}"
+            : message.Content;
+    }
+
 }