Merge branch '43-include-grammar-in-chat-agent-contexts' of https://github.com/wisedev-code/MaIN.NET into 43-include-grammar-in-chat-agent-contexts

Author: Piotr Stachaczynski

src/MaIN.InferPage/Program.cs

@@ -81,7 +81,7 @@
         settings.BackendType = BackendType.OpenAi;
     });
 }
-if (Utils.Gemini)
+else if (Utils.Gemini)
 {
     builder.Services.AddMaIN(builder.Configuration, settings =>
     {

src/MaIN.InferPage/Utils.cs

@@ -6,7 +6,7 @@ public static class Utils
 {
     public static string? Model = "gemma2:2b";
     public static bool Visual => VisualModels.Contains(Model);
-    private static readonly string[] VisualModels = ["FLUX.1_Shnell", "dall-e-3"];
+    private static readonly string[] VisualModels = ["FLUX.1_Shnell", "FLUX.1", "dall-e-3", "dall-e", "imagen", "imagen-3"]; //user might type different names
     public static bool OpenAi { get; set; }
     public static bool Gemini { get; set; }
     public static string? Path { get; set; }

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

@@ -25,10 +25,16 @@ public abstract class OpenAiCompatibleService(
     ILogger<OpenAiCompatibleService>? logger = null)
     : ILLMService
 {
-    private readonly INotificationService _notificationService = notificationService ?? throw new ArgumentNullException(nameof(notificationService));
-    private readonly IHttpClientFactory _httpClientFactory = httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));
+    private readonly INotificationService _notificationService =
+        notificationService ?? throw new ArgumentNullException(nameof(notificationService));
+
+    private readonly IHttpClientFactory _httpClientFactory =
+        httpClientFactory ?? throw new ArgumentNullException(nameof(httpClientFactory));
+
     private static readonly ConcurrentDictionary<string, List<ChatMessage>> SessionCache = new();
-    private static readonly JsonSerializerOptions DefaultJsonSerializerOptions  = new() { PropertyNameCaseInsensitive = true };
+
+    private static readonly JsonSerializerOptions DefaultJsonSerializerOptions =
+        new() { PropertyNameCaseInsensitive = true };
 
     protected abstract string GetApiKey();
     protected abstract void ValidateApiKey();
@@ -190,7 +196,14 @@ private async Task ProcessStreamingChatAsync(
         var requestBody = new
         {
             model = chat.Model,
-            messages = conversation.Select(m => new { role = m.Role, content = m.Content }).ToArray(),
+            messages = conversation.Select(m => new
+            {
+                role = m.Role,
+                content = chat.InterferenceParams.Grammar != null
+                //I know that this is a bit ugly, but hey, it works
+                    ? $"{m.Content} | Respond only using the following grammar format: \n{chat.InterferenceParams.Grammar}\n. Do not add explanations, code tags, or any extra content."
+                    : m.Content
+            }).ToArray(),
             stream = true
         };
 
@@ -277,7 +290,8 @@ private async Task ProcessNonStreamingChatAsync(
         response.EnsureSuccessStatusCode();
 
         var responseJson = await response.Content.ReadAsStringAsync(cancellationToken);
-        var chatResponse = JsonSerializer.Deserialize<ChatCompletionResponse>(responseJson, DefaultJsonSerializerOptions);
+        var chatResponse =
+            JsonSerializer.Deserialize<ChatCompletionResponse>(responseJson, DefaultJsonSerializerOptions);
         var responseContent = chatResponse?.Choices?.FirstOrDefault()?.Message?.Content;
 
         if (responseContent != null)
@@ -323,7 +337,6 @@ private static async Task InvokeTokenCallbackAsync(Func<LLMTokenValue, Task>? ca
             await callback.Invoke(token);
         }
     }
-
 }
 
 public class ChatRequestOptions
@@ -377,4 +390,4 @@ file class OpenAiModelsResponse
 file abstract class OpenAiModel
 {
     public string? Id { get; set; }
-}
+}