Replaced ModelInfo by LMKit.ModelCard

LM-Kit-Maestro/Helpers/FileHelpers.cs

@@ -1,4 +1,5 @@
 using LMKit.Maestro.Services;
+using LMKit.Model;
 using System.Web;
 
 namespace LMKit.Maestro.Helpers;
@@ -108,14 +109,14 @@ public static string SanitizeUriSegment(string uriSegment)
         return Uri.UnescapeDataString(uriSegment);
     }
 
-    public static Uri GetModelFileUri(ModelInfo modelInfo, string modelsFolderPath)
+    public static Uri GetModelFileUri(ModelCard modelCard, string modelsFolderPath)
     {
-        return new Uri(GetModelFilePath(modelInfo, modelsFolderPath));
+        return new Uri(GetModelFilePath(modelCard, modelsFolderPath));
     }
 
-    public static string GetModelFilePath(ModelInfo modelInfo, string modelsFolderPath)
+    public static string GetModelFilePath(ModelCard modelCard, string modelsFolderPath)
     {
-        return Path.Combine(modelsFolderPath, modelInfo.Publisher, modelInfo.Repository, modelInfo.FileName);
+        return Path.Combine(modelsFolderPath, modelCard.Publisher, modelCard.Repository, modelCard.FileName);
     }
 
     public static string? GetModelFilePathFromUrl(Uri modelUrl, string modelsFolderPath)
@@ -176,9 +177,9 @@ public static long GetFileSize(string path)
         return new FileInfo(path).Length;
     }
 
-    public static string GetModelFileRelativeName(ModelInfo modelInfo)
+    public static string GetModelFileRelativeName(ModelCard modelCard)
     {
-        return Path.Combine(modelInfo.Publisher, modelInfo.Repository, modelInfo.FileName);
+        return Path.Combine(modelCard.Publisher, modelCard.Repository, modelCard.FileName);
     }
 
     public static string GetModelFileRelativePath(string filePath, string modelsFolderPath)

LM-Kit-Maestro/Helpers/MaestroHelpers.cs

@@ -1,54 +1,60 @@
 using LMKit.Maestro.Services;
 using LMKit.Maestro.ViewModels;
+using LMKit.Model;
 
 namespace LMKit.Maestro.Helpers
 {
     internal static class MaestroHelpers
     {
-        public static ModelInfoViewModel? TryGetExistingModelInfoViewModel(ICollection<ModelInfoViewModel> modelInfoViewModels, ModelInfo modelInfo)
+        public static ModelInfoViewModel? TryGetExistingModelInfoViewModel(ICollection<ModelInfoViewModel> modelCardViewModels, ModelCard modelCard)
         {
-            foreach (var modelInfoViewModel in modelInfoViewModels)
-            {
-                if (string.CompareOrdinal(modelInfoViewModel.ModelInfo.FileName, modelInfo.FileName) == 0 &&
-                    string.CompareOrdinal(modelInfoViewModel.ModelInfo.Repository, modelInfo.Repository) == 0 &&
-                    string.CompareOrdinal(modelInfoViewModel.ModelInfo.Publisher, modelInfo.Publisher) == 0)
+            foreach (var modelCardViewModel in modelCardViewModels)
+            {//todo: use sha instead
+                if (string.CompareOrdinal(modelCardViewModel.ModelInfo.FileName, modelCard.FileName) == 0 &&
+                    string.CompareOrdinal(modelCardViewModel.ModelInfo.Repository, modelCard.Repository) == 0 &&
+                    string.CompareOrdinal(modelCardViewModel.ModelInfo.Publisher, modelCard.Publisher) == 0)
                 {
-                    return modelInfoViewModel;
+                    return modelCardViewModel;
                 }
             }
 
             return null;
         }
 
-        public static ModelInfoViewModel? TryGetExistingModelInfoViewModel(string modelsFolderPath, ICollection<ModelInfoViewModel> modelInfoViewModels, Uri modelFileUri)
+        public static ModelInfoViewModel? TryGetExistingModelInfoViewModel(string modelsFolderPath, ICollection<ModelInfoViewModel> modelCardViewModels, Uri modelFileUri)
         {
             if (FileHelpers.GetModelInfoFromPath(modelFileUri.LocalPath, modelsFolderPath, out string publisher, out string repository, out string fileName))
             {
-                foreach (var modelInfoViewModel in modelInfoViewModels)
+                foreach (var modelCardViewModel in modelCardViewModels)
                 {
-                    if (string.CompareOrdinal(modelInfoViewModel.ModelInfo.FileName, fileName) == 0 &&
-                        string.CompareOrdinal(modelInfoViewModel.ModelInfo.Repository, repository) == 0 &&
-                        string.CompareOrdinal(modelInfoViewModel.ModelInfo.Publisher, publisher) == 0)
+                    if (string.CompareOrdinal(modelCardViewModel.ModelInfo.FileName, fileName) == 0 &&
+                        string.CompareOrdinal(modelCardViewModel.ModelInfo.Repository, repository) == 0 &&
+                        string.CompareOrdinal(modelCardViewModel.ModelInfo.Publisher, publisher) == 0)
                     {
-                        return modelInfoViewModel;
+                        return modelCardViewModel;
                     }
                 }
             }
             else
             {
                 //handling unsorted models.
-                foreach (var modelInfoViewModel in modelInfoViewModels)
+                foreach (var modelCardViewModel in modelCardViewModels)
                 {
-                    if (modelInfoViewModel.ModelInfo.FileUri == modelFileUri)
+                    if (modelCardViewModel.ModelInfo.ModelUri == modelFileUri)
                     {
-                        return modelInfoViewModel;
+                        return modelCardViewModel;
                     }
                 }
             }
 
-            //Loïc: we have an architecture defect. We can reach this stage, especially at startup, while modelInfoViewModels is not completely loaded.
+            //Loïc: we have an architecture defect. We can reach this stage, especially at startup, while modelCardViewModels is not completely loaded.
             //todo Evan: fix.
-            return new ModelInfoViewModel(new ModelInfo(publisher, repository, fileName, modelFileUri));
+            return new ModelInfoViewModel(new ModelCard()
+            {
+                Publisher = publisher,
+                Repository = repository,
+                ModelUri = modelFileUri
+            });
         }
     }
 }

LM-Kit-Maestro/Services/Interfaces/ILLMFileManager.cs

@@ -1,14 +1,15 @@
-using System.Collections.ObjectModel;
+using LMKit.Model;
+using System.Collections.ObjectModel;
 
 namespace LMKit.Maestro.Services;
 
 public interface ILLMFileManager
 {
-    ObservableCollection<ModelInfo> UserModels { get; }
+    ObservableCollection<ModelCard> UserModels { get; }
     ObservableCollection<Uri> UnsortedModels { get; }
     bool FileCollectingInProgress { get; }
     string ModelStorageDirectory { get; set; }
     event EventHandler? FileCollectingCompleted;
     void Initialize();
-    void DeleteModel(ModelInfo modelInfo);
+    void DeleteModel(ModelCard modelCard);
 }