Merge branch 'main' of https://github.com/ionite34/StabilityMatrix

Author: ionite34

.config/.csharpierrc.json

@@ -1,4 +1,4 @@
 {
-    "printWidth": 120,
+    "printWidth": 110,
     "preprocessorSymbolSets": ["", "DEBUG", "DEBUG,CODE_STYLE"]
 }

.config/dotnet-tools.json

@@ -15,10 +15,10 @@
       ]
     },
     "csharpier": {
-      "version": "0.26.4",
+      "version": "0.26.7",
       "commands": [
         "dotnet-csharpier"
       ]
     }
   }
-}
+}

.csharpierrc.yaml

@@ -0,0 +1 @@
+printWidth: 110

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+## v2.7.4
+### Changed
+- Improved low disk space handling
+### Fixed
+- Fixed denoise strength in Inference Text to Image
+- Fixed PathTooLongException for IPAdapter folders when using ComfyUI in Symlink mode
+- Fixed configs and symlinks not being cleaned up when switched to the opposite mode
+- Fixed model indexing stopping when encountering paths longer than 1021 bytes in length
+- Fixed repeated nested folders being created in `Models/ControlNet` when using ComfyUI in Symlink mode. Existing folders will be repaired to their original structure on launch.
+
 ## v2.7.3
 ### Added
 - Added missing IPAdapter and CLIP Vision folder links for ComfyUI

StabilityMatrix.Avalonia/ViewModels/Dialogs/SelectModelVersionViewModel.cs

@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
@@ -8,6 +10,8 @@
 using StabilityMatrix.Avalonia.Models;
 using StabilityMatrix.Avalonia.ViewModels.Base;
 using StabilityMatrix.Core.Attributes;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models.FileInterfaces;
 using StabilityMatrix.Core.Services;
 
 namespace StabilityMatrix.Avalonia.ViewModels.Dialogs;
@@ -49,12 +53,12 @@ public partial class SelectModelVersionViewModel : ContentDialogViewModelBase
     [NotifyPropertyChangedFor(nameof(DisplayedPageNumber))]
     private int selectedImageIndex;
 
+    [ObservableProperty]
+    private string importTooltip = string.Empty;
+
     public int DisplayedPageNumber => SelectedImageIndex + 1;
 
-    public SelectModelVersionViewModel(
-        ISettingsManager settingsManager,
-        IDownloadService downloadService
-    )
+    public SelectModelVersionViewModel(ISettingsManager settingsManager, IDownloadService downloadService)
     {
         this.settingsManager = settingsManager;
         this.downloadService = downloadService;
@@ -70,7 +74,9 @@ partial void OnSelectedVersionViewModelChanged(ModelVersionViewModel? value)
     {
         var nsfwEnabled = settingsManager.Settings.ModelBrowserNsfwEnabled;
         var allImages = value
-            ?.ModelVersion?.Images?.Where(img => nsfwEnabled || img.Nsfw == "None")
+            ?.ModelVersion
+            ?.Images
+            ?.Where(img => nsfwEnabled || img.Nsfw == "None")
             ?.Select(x => new ImageSource(x.Url))
             .ToList();
 
@@ -84,18 +90,35 @@ partial void OnSelectedVersionViewModelChanged(ModelVersionViewModel? value)
             CanGoToNextImage = allImages.Count > 1;
         }
 
-        Dispatcher.UIThread.Post(() =>
-        {
-            CanGoToPreviousImage = false;
-            SelectedFile = SelectedVersionViewModel?.CivitFileViewModels.FirstOrDefault();
-            ImageUrls = new ObservableCollection<ImageSource>(allImages);
-            SelectedImageIndex = 0;
-        });
+        Dispatcher
+            .UIThread
+            .Post(() =>
+            {
+                CanGoToPreviousImage = false;
+                SelectedFile = SelectedVersionViewModel?.CivitFileViewModels.FirstOrDefault();
+                ImageUrls = new ObservableCollection<ImageSource>(allImages);
+                SelectedImageIndex = 0;
+            });
     }
 
     partial void OnSelectedFileChanged(CivitFileViewModel? value)
     {
-        IsImportEnabled = value?.CivitFile != null;
+        var canImport = true;
+        if (settingsManager.IsLibraryDirSet)
+        {
+            var fileSizeBytes = value?.CivitFile.SizeKb * 1024;
+            var freeSizeBytes = SystemInfo.GetDiskFreeSpaceBytes(settingsManager.ModelsDirectory);
+            canImport = fileSizeBytes < freeSizeBytes;
+            ImportTooltip = canImport
+                ? $"Free space after download: {Size.FormatBytes(Convert.ToUInt64(freeSizeBytes - fileSizeBytes))}"
+                : $"Not enough space on disk. Need {Size.FormatBytes(Convert.ToUInt64(fileSizeBytes))} but only have {Size.FormatBytes(Convert.ToUInt64(freeSizeBytes))}";
+        }
+        else
+        {
+            ImportTooltip = "Please set the library directory in settings";
+        }
+
+        IsImportEnabled = value?.CivitFile != null && canImport;
     }
 
     public void Cancel()

StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs

@@ -26,9 +26,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 [View(typeof(InferenceTextToImageView), IsPersistent = true)]
 [ManagedService]
 [Transient]
-public class InferenceTextToImageViewModel
-    : InferenceGenerationViewModelBase,
-        IParametersLoadableState
+public class InferenceTextToImageViewModel : InferenceGenerationViewModelBase, IParametersLoadableState
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -81,6 +79,7 @@ IModelIndexService modelIndexService
             samplerCard.IsCfgScaleEnabled = true;
             samplerCard.IsSamplerSelectionEnabled = true;
             samplerCard.IsSchedulerSelectionEnabled = true;
+            samplerCard.DenoiseStrength = 1.0d;
         });
 
         PromptCardViewModel = vmFactory.Get<PromptCardViewModel>();
@@ -162,22 +161,19 @@ protected override void BuildPrompt(BuildPromptEventArgs args)
     /// <inheritdoc />
     protected override IEnumerable<ImageSource> GetInputImages()
     {
-        var samplerImages = SamplerCardViewModel.ModulesCardViewModel.Cards
+        var samplerImages = SamplerCardViewModel
+            .ModulesCardViewModel
+            .Cards
             .OfType<IInputImageProvider>()
             .SelectMany(m => m.GetInputImages());
 
-        var moduleImages = ModulesCardViewModel.Cards
-            .OfType<IInputImageProvider>()
-            .SelectMany(m => m.GetInputImages());
+        var moduleImages = ModulesCardViewModel.Cards.OfType<IInputImageProvider>().SelectMany(m => m.GetInputImages());
 
         return samplerImages.Concat(moduleImages);
     }
 
     /// <inheritdoc />
-    protected override async Task GenerateImageImpl(
-        GenerateOverrides overrides,
-        CancellationToken cancellationToken
-    )
+    protected override async Task GenerateImageImpl(GenerateOverrides overrides, CancellationToken cancellationToken)
     {
         // Validate the prompts
         if (!await PromptCardViewModel.ValidatePrompts())
@@ -205,11 +201,7 @@ CancellationToken cancellationToken
         {
             var seed = seedCard.Seed + i;
 
-            var buildPromptArgs = new BuildPromptEventArgs
-            {
-                Overrides = overrides,
-                SeedOverride = seed
-            };
+            var buildPromptArgs = new BuildPromptEventArgs { Overrides = overrides, SeedOverride = seed };
             BuildPrompt(buildPromptArgs);
 
             var generationArgs = new ImageGenerationEventArgs
@@ -241,6 +233,11 @@ public void LoadStateFromParameters(GenerationParameters parameters)
         ModelCardViewModel.LoadStateFromParameters(parameters);
 
         SeedCardViewModel.Seed = Convert.ToInt64(parameters.Seed);
+
+        if (Math.Abs(SamplerCardViewModel.DenoiseStrength - 1.0d) > 0.01d)
+        {
+            SamplerCardViewModel.DenoiseStrength = 1.0d;
+        }
     }
 
     /// <inheritdoc />
@@ -270,16 +267,12 @@ public override void LoadStateFromJsonObject(JsonObject state, int version)
 
                 if (state.TryGetPropertyValue("HiresSampler", out var hiresSamplerState))
                 {
-                    module
-                        .GetCard<SamplerCardViewModel>()
-                        .LoadStateFromJsonObject(hiresSamplerState!.AsObject());
+                    module.GetCard<SamplerCardViewModel>().LoadStateFromJsonObject(hiresSamplerState!.AsObject());
                 }
 
                 if (state.TryGetPropertyValue("HiresUpscaler", out var hiresUpscalerState))
                 {
-                    module
-                        .GetCard<UpscalerCardViewModel>()
-                        .LoadStateFromJsonObject(hiresUpscalerState!.AsObject());
+                    module.GetCard<UpscalerCardViewModel>().LoadStateFromJsonObject(hiresUpscalerState!.AsObject());
                 }
             });
 
@@ -289,17 +282,17 @@ public override void LoadStateFromJsonObject(JsonObject state, int version)
 
                 if (state.TryGetPropertyValue("Upscaler", out var upscalerState))
                 {
-                    module
-                        .GetCard<UpscalerCardViewModel>()
-                        .LoadStateFromJsonObject(upscalerState!.AsObject());
+                    module.GetCard<UpscalerCardViewModel>().LoadStateFromJsonObject(upscalerState!.AsObject());
                 }
             });
 
             // Add FreeU to sampler
-            SamplerCardViewModel.ModulesCardViewModel.AddModule<FreeUModule>(module =>
-            {
-                module.IsEnabled = state.GetPropertyValueOrDefault<bool>("IsFreeUEnabled");
-            });
+            SamplerCardViewModel
+                .ModulesCardViewModel
+                .AddModule<FreeUModule>(module =>
+                {
+                    module.IsEnabled = state.GetPropertyValueOrDefault<bool>("IsFreeUEnabled");
+                });
         }
 
         base.LoadStateFromJsonObject(state);