Models sorting improvements

LM-Kit · Dec 25, 2024 · 52cb92d · 52cb92d
1 parent 7356722
commit 52cb92d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/LM-Kit-Maestro/Services/LLMFileManager.cs b/LM-Kit-Maestro/Services/LLMFileManager.cs
@@ -371,6 +371,7 @@ private void CollectModels()
             foreach (var filePath in files)
             {
                 bool processed = false;
+
                 foreach (var predefinedModel in _predefinedModelCards)
                 {
                     if (predefinedModel.LocalPath == filePath)

diff --git a/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml b/LM-Kit-Maestro/UI/Pages/ModelsPage.xaml
@@ -219,7 +219,7 @@
 
                         <Label VerticalOptions="Center" 
                                Grid.Column="2" 
-                               Text="{Binding ModelInfo.ModelName}"
+                               Text="{Binding ModelInfo.ShortModelName}"
                                ToolTipProperties.Text="{Binding ModelInfo.Description}"/>
 
 

diff --git a/LM-Kit-Maestro/ViewModels/ModelInfoViewModel.cs b/LM-Kit-Maestro/ViewModels/ModelInfoViewModel.cs
@@ -32,6 +32,9 @@ public bool IsLocallyAvailable
         [ObservableProperty]
         string _name;
 
+        [ObservableProperty]
+        string _shortName;
+
         [ObservableProperty]
         string _modelPath;
 
@@ -73,6 +76,7 @@ public ModelInfoViewModel(ModelCard modelCard)
         {
             _modelCard = modelCard;
             Name = modelCard.ModelName;
+            ShortName = modelCard.ShortModelName;
             FileSize = modelCard.FileSize;
             Precision = modelCard.QuantizationPrecision.ToString() + (modelCard.QuantizationPrecision > 1 ? "-bits" : "-bit");
             ModelSize = Math.Round((double)modelCard.ParameterCount / 1000000000, 1).ToString().Replace(",", ".") + "B";

diff --git a/LM-Kit-Maestro/ViewModels/ModelListViewModel.cs b/LM-Kit-Maestro/ViewModels/ModelListViewModel.cs
@@ -170,7 +170,16 @@ private void AddModel(ModelInfoViewModel modelCardViewModel, bool sort = true)
             {
                 int insertIndex = 0;
 
-                while (insertIndex < Models.Count && string.Compare(Models[insertIndex].Name, modelCardViewModel.Name) < 0)
+                //First sorting pass: Sort by short name in ascending order.
+                while (insertIndex < Models.Count && string.Compare(Models[insertIndex].ShortName, modelCardViewModel.ShortName) < 0)
+                {
+                    insertIndex++;
+                }
+
+                //Second sorting pass: by model size
+                while (insertIndex < Models.Count &&
+                       string.Compare(Models[insertIndex].ShortName, modelCardViewModel.ShortName) == 0 &&
+                       Models[insertIndex].FileSize < modelCardViewModel.FileSize)
                 {
                     insertIndex++;
                 }