Use ModelCompatChecker for ExtraNetworkCard

Author: ionite34

StabilityMatrix.Avalonia/ViewModels/Inference/ExtraNetworkCardViewModel.cs

@@ -12,7 +12,7 @@
 using StabilityMatrix.Avalonia.Services;
 using StabilityMatrix.Avalonia.ViewModels.Base;
 using StabilityMatrix.Core.Attributes;
-using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Services;
 
@@ -26,6 +26,8 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 public partial class ExtraNetworkCardViewModel : DisposableLoadableViewModelBase
 {
     private readonly ISettingsManager settingsManager;
+    private readonly ModelCompatChecker modelCompatChecker = new();
+
     public const string ModuleKey = "ExtraNetwork";
 
     /// <summary>
@@ -161,11 +163,7 @@ private bool FilterCompatibleLoras(HybridModelFile? lora)
         if (!settingsManager.Settings.FilterExtraNetworksByBaseModel)
             return true;
 
-        return SelectedBaseModel is null
-            || lora?.Local?.ConnectedModelInfo == null
-            || SelectedBaseModel.Local?.ConnectedModelInfo == null
-            || lora.Local?.ConnectedModelInfo?.BaseModel
-                == SelectedBaseModel.Local?.ConnectedModelInfo?.BaseModel;
+        return modelCompatChecker.IsLoraCompatibleWithBaseModel(lora, SelectedBaseModel) ?? true;
     }
 
     internal class ExtraNetworkCardModel

StabilityMatrix.Core/Helper/ModelCompatChecker.cs

@@ -0,0 +1,64 @@
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Models;
+using StabilityMatrix.Core.Models.Api;
+
+namespace StabilityMatrix.Core.Helper;
+
+public class ModelCompatChecker
+{
+    private readonly Dictionary<string, CivitBaseModelType> baseModelNamesToTypes =
+        Enum.GetValues<CivitBaseModelType>().ToDictionary(x => x.GetStringValue());
+
+    public bool? IsLoraCompatibleWithBaseModel(HybridModelFile? lora, HybridModelFile? baseModel)
+    {
+        // Require connected info for both
+        if (
+            lora?.Local?.ConnectedModelInfo is not { } loraInfo
+            || baseModel?.Local?.ConnectedModelInfo is not { } baseModelInfo
+        )
+            return null;
+
+        if (
+            loraInfo.BaseModel is null
+            || !baseModelNamesToTypes.TryGetValue(loraInfo.BaseModel, out var loraBaseModelType)
+        )
+            return null;
+
+        if (
+            baseModelInfo.BaseModel is null
+            || !baseModelNamesToTypes.TryGetValue(baseModelInfo.BaseModel, out var baseModelType)
+        )
+            return null;
+
+        // Normalize both
+        var normalizedLoraBaseModelType = NormalizeBaseModelType(loraBaseModelType);
+        var normalizedBaseModelType = NormalizeBaseModelType(baseModelType);
+
+        // Ignore if either is "Other"
+        if (
+            normalizedLoraBaseModelType == CivitBaseModelType.Other
+            || normalizedBaseModelType == CivitBaseModelType.Other
+        )
+            return null;
+
+        return normalizedLoraBaseModelType == normalizedBaseModelType;
+    }
+
+    // Normalize base model type
+    private static CivitBaseModelType NormalizeBaseModelType(CivitBaseModelType baseModel)
+    {
+        return baseModel switch
+        {
+            CivitBaseModelType.Sdxl09 => CivitBaseModelType.Sdxl10,
+            CivitBaseModelType.Sdxl10Lcm => CivitBaseModelType.Sdxl10,
+            CivitBaseModelType.SdxlDistilled => CivitBaseModelType.Sdxl10,
+            CivitBaseModelType.SdxlHyper => CivitBaseModelType.Sdxl10,
+            CivitBaseModelType.SdxlLightning => CivitBaseModelType.Sdxl10,
+            CivitBaseModelType.SdxlTurbo => CivitBaseModelType.Sdxl10,
+            CivitBaseModelType.Pony => CivitBaseModelType.Sdxl10,
+            CivitBaseModelType.NoobAi => CivitBaseModelType.Sdxl10,
+            CivitBaseModelType.Illustrious => CivitBaseModelType.Sdxl10,
+            _ => baseModel,
+        };
+    }
+}