feat: model names cleanup

Author: Piotr Stachaczynski

src/MaIN.Domain/Models/SupportedModels.cs

@@ -1,90 +1,75 @@
 namespace MaIN.Domain.Models;
 
-public struct Model
+public class Model
 {
-    public string Name { get; set; }
-    public string FileName { get; set; }
-    public string DownloadUrl { get; set; }
-    public string Description { get; set; }
-    public string Path { get; set; }
+    public required string Name { get; init; }
+    public required string FileName { get; init; }
+    public string? DownloadUrl { get; set; }
+    public string? Description { get; set; }
+    public string? Path { get; set; }
 }
 
 public struct KnownModels
 {
-    internal static Dictionary<string, Model> Models => new(StringComparer.OrdinalIgnoreCase)
+    internal static List<Model> Models => new()
     {
-        {
-            KnownModelNames.Gemma2_2b, new Model()
+        
+             new Model()
             {
                 Description = string.Empty,
                 Name = KnownModelNames.Gemma2_2b,
                 FileName = "gemma2-2b.gguf",
                 DownloadUrl = "https://huggingface.co/TheBloke/gemma2-2b-quantized/resolve/main/gemma2-2b-quantized.bin",
-            }
-        },
-        {
-            KnownModelNames.Llama3_2_3b, new Model()
+            },
+            new Model()
             {
                 Description = string.Empty,
                 Name = KnownModelNames.Llama3_2_3b,
                 FileName = "Llama3.2-3b.gguf",
                 DownloadUrl = string.Empty
-            }
-        },
-        {
-            KnownModelNames.Llama3_1_8b, new Model()
+            },
+            new Model()
             {
                 Description = string.Empty,
                 Name = KnownModelNames.Llama3_1_8b,
                 FileName = "Llama3.1-8b.gguf",
                 DownloadUrl = string.Empty
-            }
-        },
-        {
-           KnownModelNames.Llava_7b, new Model()
+            },
+           new Model()
            {
                Description = string.Empty,
                Name = KnownModelNames.Llava_7b,
                FileName = "Llava.gguf",
                DownloadUrl = string.Empty,
-           }
-        },
-        {
-            KnownModelNames.Phi_mini, new Model()
+           },
+           new Model()
             {
                 Description = string.Empty,
                 Name = KnownModelNames.Phi_mini,
                 FileName = "phi3.5.gguf",
                 DownloadUrl = string.Empty
-            }
-        },
-        {
-            KnownModelNames.Qwen2_5_0_5b, new Model()
+            },
+            new Model()
             {
                 Description = string.Empty,
                 Name = KnownModelNames.Qwen2_5_0_5b,
                 FileName = "Qwen2.5.gguf",
                 DownloadUrl = string.Empty
-            }
-        },
-        {
-            KnownModelNames.DeepSeek_R1_8b, new Model()
+            },
+            new Model()
             {
                 Description = string.Empty,
                 Name = KnownModelNames.DeepSeek_R1_8b,
                 FileName = "DeepSeekR1-8b.gguf",
                 DownloadUrl = string.Empty
-            }
-        },
-        {
-            KnownModelNames.Fox_1_6b, new Model()
+            },
+             new Model()
             {
                 Description = string.Empty,
                 Name = KnownModelNames.Fox_1_6b,
                 FileName = "Fox-1.6b.gguf",
                 DownloadUrl = string.Empty
             }
-        },
     };
 
     public static Model GetEmbeddingModel() =>
@@ -96,27 +81,28 @@ public static Model GetEmbeddingModel() =>
             DownloadUrl = string.Empty,
         };
 
-    public static Model GetModel(string? path, string name)
+    public static Model GetModel(string path, string name)
     {
-        var isPresent = Models.TryGetValue(name, out var model);
-        if (!isPresent)
+        var model = Models.FirstOrDefault(x => x.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase)
+                                               || x.Name.Replace(':', '-').Equals(name,
+                                                   StringComparison.InvariantCultureIgnoreCase));
+        if (model is null)
         {
             //todo support domain specific exceptions
             throw new Exception($"Model {name} is not supported");
         }
 
         if (File.Exists(Path.Combine(path, model.FileName)))
         {
-            return Models[name];  
+            return model;  
         }
 
         throw new Exception($"Model {name} is not downloaded");
     } 
 
     public static Model? GetModelByFileName(string path, string fileName)
     {
-        var models = Models.Values.ToList();
-        var isPresent = models.Exists(x => x.FileName == fileName);
+        var isPresent = Models.Exists(x => x.FileName == fileName);
         if (!isPresent)
         {
             //todo support domain specific exceptions
@@ -126,15 +112,15 @@ public static Model GetModel(string? path, string name)
 
         if (File.Exists(Path.Combine(path, fileName)))
         {
-            return models.First(x => x.FileName == fileName);  
+            return Models.First(x => x.FileName == fileName);  
         }
 
         throw new Exception($"Model {fileName} is not downloaded");
     }
 
     public static void AddModel(string model, string path)
     {
-        Models.Add(model, new Model()
+        Models.Add(new Model()
         {
             Description = string.Empty,
             DownloadUrl = string.Empty,
@@ -154,6 +140,6 @@ public struct KnownModelNames
     public const string Phi_mini = "phi3:mini";
     public const string Llava_7b = "llava:7b";
     public const string Qwen2_5_0_5b = "qwen2.5:0.5b";
-    public const string DeepSeek_R1_8b = "deepseek:r1_8b";
+    public const string DeepSeek_R1_8b = "deepseekR1-8b";
     public const string Fox_1_6b = "fox:1.6b";
 }

src/MaIN.InferPage/Components/Pages/Home.razor

@@ -9,7 +9,7 @@
 @using Message = MaIN.Domain.Entities.Message
 <link rel="stylesheet" href="home.css">
 
-<PageTitle>Home</PageTitle>
+<PageTitle>MaIN Infer</PageTitle>
 
 <FluentGrid>
     <FluentGridItem sm="1" xs="1" lg="1"></FluentGridItem>

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

@@ -329,7 +329,7 @@ public Task<List<string>> GetCurrentModels()
             var model = KnownModels.GetModelByFileName(path, Path.GetFileName(file));
             if (model != null)
             {
-                models.Add(model.Value.Name);
+                models.Add(model.Name);
             }
         }
 

src/MaIN/Program.cs

@@ -191,16 +191,16 @@
     Results.Ok((await chatService.GetById(id)).ToDto()));
 
 app.MapGet("/api/chats/models", async (HttpContext context,
-    [FromServices] ILLMService ollamaService, 
+    [FromServices] ILLMService llmService, 
     [FromServices] IHttpClientFactory httpClientFactory,
-    [FromServices] IOptions<MaINSettings> options) =>
+    [FromServices] MaINSettings options) =>
 {
-    var models = await ollamaService.GetCurrentModels();
+    var models = await llmService.GetCurrentModels();
     //add flux support
     var client = httpClientFactory.CreateClient();
     try
     {
-        var response = await client.GetAsync(options.Value.ImageGenUrl + "/health");
+        var response = await client.GetAsync(options.ImageGenUrl + "/health");
         if (response.IsSuccessStatusCode)
         {
             models.Add(ImageGenService.Models.FLUX);