Merge pull request #117 from LykosAI/main

.github/workflows/release.yml

@@ -197,4 +197,4 @@ jobs:
           tag_name: v${{ github.event.inputs.version }}
           body: ${{ steps.release_notes.outputs.release_notes }}
           draft: ${{ github.event.inputs.github-release-draft == 'true' }}
-          prerelease: ${{ github.event.inputs.github-release-prerelease == 'true' }}
+          prerelease: ${{ github.event.inputs.github-release-prerelease == 'true' }} 

.husky/task-runner.json

@@ -11,7 +11,7 @@
          "name": "Run xamlstyler",
          "group": "pre-commit",
          "command": "dotnet",
-         "args": [ "xstyler", "${staged}" ],
+         "args": [ "xstyler", "-f", "${staged}" ],
          "include": [ "**/*.axaml" ]
       }
    ]

CHANGELOG.md

@@ -5,6 +5,24 @@ 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.4.0
+### Added
+- New installable Package - [Fooocus-MRE](https://github.com/MoonRide303/Fooocus-MRE)
+- Added toggle to show connected model images in the Checkpoints tab
+- Added "Find Connected Metadata" option to the context menu of Checkpoint Folders in the Checkpoints tab to connect models that don't have any metadata
+### Changed
+- Revamped package installer
+  - Added "advanced options" section for commit, shared folder method, and pytorch options
+  - Can be run in the background
+  - Shows progress in the Downloads tab
+- Even more performance improvements for loading and searching the Checkpoints page
+### Fixed
+- Fixed [#97](https://github.com/LykosAI/StabilityMatrix/issues/97) - Codeformer folder should now get linked correctly
+- Fixed [#106](https://github.com/LykosAI/StabilityMatrix/issues/106) - ComfyUI should now install correctly on Windows machines with an AMD GPU using DirectML
+- Fixed [#107](https://github.com/LykosAI/StabilityMatrix/issues/107) - Added `--autolaunch` option to SD.Next
+- Fixed [#110](https://github.com/LykosAI/StabilityMatrix/issues/110) - Model Browser should properly navigate to the next page of Installed models
+- Installed tag on model browser should now show for connected models imported via drag & drop
+
 ## v2.3.4
 ### Fixed
 - Fixed [#108](https://github.com/LykosAI/StabilityMatrix/issues/108) - (Linux) Fixed permission error on updates [#103](https://github.com/LykosAI/StabilityMatrix/pull/103)

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Controls/LogViewerControl.axaml.cs

@@ -8,16 +8,15 @@ namespace StabilityMatrix.Avalonia.Diagnostics.LogViewer.Controls;
 
 public partial class LogViewerControl : UserControl
 {
-    public LogViewerControl()
-        => InitializeComponent();
+    public LogViewerControl() => InitializeComponent();
 
     private ILogDataStoreImpl? vm;
     private LogModel? item;
 
     protected override void OnDataContextChanged(EventArgs e)
     {
         base.OnDataContextChanged(e);
-        
+
         if (DataContext is null)
             return;
 
@@ -45,8 +44,9 @@ protected void OnLayoutUpdated(object? sender, EventArgs e)
     protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
     {
         base.OnDetachedFromLogicalTree(e);
-
-        if (vm is null) return;
+
+        if (vm is null)
+            return;
         vm.DataStore.Entries.CollectionChanged -= OnCollectionChanged;
     }
 }

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Converters/ChangeColorTypeConverter.cs

@@ -13,13 +13,15 @@ public object Convert(object? value, Type targetType, object? parameter, Culture
             return new SolidColorBrush((Color)(parameter ?? Colors.Black));
 
         var sysDrawColor = (SysDrawColor)value!;
-        return new SolidColorBrush(Color.FromArgb(
-            sysDrawColor.A,
-            sysDrawColor.R,
-            sysDrawColor.G,
-            sysDrawColor.B));
+        return new SolidColorBrush(
+            Color.FromArgb(sysDrawColor.A, sysDrawColor.R, sysDrawColor.G, sysDrawColor.B)
+        );
     }
 
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-        => throw new NotImplementedException();
+    public object ConvertBack(
+        object? value,
+        Type targetType,
+        object? parameter,
+        CultureInfo culture
+    ) => throw new NotImplementedException();
 }

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Converters/EventIdConverter.cs

@@ -17,6 +17,10 @@ public object Convert(object? value, Type targetType, object? parameter, Culture
     }
 
     // If not implemented, an error is thrown
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-        => new EventId(0, value?.ToString() ?? string.Empty);
+    public object ConvertBack(
+        object? value,
+        Type targetType,
+        object? parameter,
+        CultureInfo culture
+    ) => new EventId(0, value?.ToString() ?? string.Empty);
 }

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Core/Extensions/LoggerExtensions.cs

@@ -4,8 +4,14 @@ namespace StabilityMatrix.Avalonia.Diagnostics.LogViewer.Core.Extensions;
 
 public static class LoggerExtensions
 {
-    public static void Emit(this ILogger logger, EventId eventId,
-        LogLevel logLevel, string message, Exception? exception = null, params object?[] args)
+    public static void Emit(
+        this ILogger logger,
+        EventId eventId,
+        LogLevel logLevel,
+        string message,
+        Exception? exception = null,
+        params object?[] args
+    )
     {
         if (logger is null)
             return;

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Core/Logging/DataStoreLoggerConfiguration.cs

@@ -6,42 +6,28 @@ namespace StabilityMatrix.Avalonia.Diagnostics.LogViewer.Core.Logging;
 public class DataStoreLoggerConfiguration
 {
     #region Properties
-    
+
     public EventId EventId { get; set; }
 
-    public Dictionary<LogLevel, LogEntryColor> Colors { get; } = new()
-    {
-        [LogLevel.Trace] = new LogEntryColor
-        {
-            Foreground = Color.DarkGray
-        },
-        [LogLevel.Debug] = new LogEntryColor
-        {
-            Foreground = Color.Gray
-        },
-        [LogLevel.Information] = new LogEntryColor
-        {
-            Foreground = Color.WhiteSmoke,
-        },
-        [LogLevel.Warning] = new LogEntryColor
-        {
-            Foreground = Color.Orange
-        },
-        [LogLevel.Error] = new LogEntryColor
-        {
-            Foreground = Color.White, 
-            Background = Color.OrangeRed
-        },
-        [LogLevel.Critical] = new LogEntryColor
-        {
-            Foreground = Color.White, 
-            Background = Color.Red
-        },
-        [LogLevel.None] = new LogEntryColor
+    public Dictionary<LogLevel, LogEntryColor> Colors { get; } =
+        new()
         {
-            Foreground = Color.Magenta
-        }
-    };
+            [LogLevel.Trace] = new LogEntryColor { Foreground = Color.DarkGray },
+            [LogLevel.Debug] = new LogEntryColor { Foreground = Color.Gray },
+            [LogLevel.Information] = new LogEntryColor { Foreground = Color.WhiteSmoke, },
+            [LogLevel.Warning] = new LogEntryColor { Foreground = Color.Orange },
+            [LogLevel.Error] = new LogEntryColor
+            {
+                Foreground = Color.White,
+                Background = Color.OrangeRed
+            },
+            [LogLevel.Critical] = new LogEntryColor
+            {
+                Foreground = Color.White,
+                Background = Color.Red
+            },
+            [LogLevel.None] = new LogEntryColor { Foreground = Color.Magenta }
+        };
 
     #endregion
 }

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Core/Logging/ILogDataStoreImpl.cs

@@ -3,4 +3,4 @@
 public interface ILogDataStoreImpl
 {
     public ILogDataStore DataStore { get; }
-}
+}

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Core/Logging/LogDataStore.cs

@@ -6,7 +6,7 @@ namespace StabilityMatrix.Avalonia.Diagnostics.LogViewer.Core.Logging;
 public class LogDataStore : ILogDataStore
 {
     public static LogDataStore Instance { get; } = new();
-    
+
     #region Fields
 
     private static readonly SemaphoreSlim _semaphore = new(initialCount: 1);

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Core/Logging/LogEntryColor.cs

@@ -4,9 +4,7 @@ namespace StabilityMatrix.Avalonia.Diagnostics.LogViewer.Core.Logging;
 
 public class LogEntryColor
 {
-    public LogEntryColor()
-    {
-    }
+    public LogEntryColor() { }
 
     public LogEntryColor(Color foreground, Color background)
     {
@@ -16,5 +14,4 @@ public LogEntryColor(Color foreground, Color background)
 
     public Color Foreground { get; set; } = Color.Black;
     public Color Background { get; set; } = Color.Transparent;
-
-}
+}

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Core/Logging/LogModel.cs

@@ -13,11 +13,11 @@ public class LogModel
     public EventId EventId { get; set; }
 
     public object? State { get; set; }
-    
+
     public string? LoggerName { get; set; }
-    
+
     public string? CallerClassName { get; set; }
-    
+
     public string? CallerMemberName { get; set; }
 
     public string? Exception { get; set; }
@@ -26,8 +26,6 @@ public class LogModel
 
     #endregion
 
-    public string LoggerDisplayName => 
-        LoggerName?
-            .Split('.', StringSplitOptions.RemoveEmptyEntries)
-            .LastOrDefault() ?? "";
+    public string LoggerDisplayName =>
+        LoggerName?.Split('.', StringSplitOptions.RemoveEmptyEntries).LastOrDefault() ?? "";
 }

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Core/ViewModels/LogViewerControlViewModel.cs

@@ -18,4 +18,4 @@ public LogViewerControlViewModel(ILogDataStore dataStore)
     public ILogDataStore DataStore { get; set; }
 
     #endregion
-}
+}

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Core/ViewModels/ObservableObject.cs

@@ -5,9 +5,14 @@ namespace StabilityMatrix.Avalonia.Diagnostics.LogViewer.Core.ViewModels;
 
 public class ObservableObject : INotifyPropertyChanged
 {
-    protected bool Set<TValue>(ref TValue field, TValue newValue, [CallerMemberName] string? propertyName = null)
+    protected bool Set<TValue>(
+        ref TValue field,
+        TValue newValue,
+        [CallerMemberName] string? propertyName = null
+    )
     {
-        if (EqualityComparer<TValue>.Default.Equals(field, newValue)) return false;
+        if (EqualityComparer<TValue>.Default.Equals(field, newValue))
+            return false;
         field = newValue;
         OnPropertyChanged(propertyName);
 
@@ -16,6 +21,6 @@ protected bool Set<TValue>(ref TValue field, TValue newValue, [CallerMemberName]
 
     public event PropertyChangedEventHandler? PropertyChanged;
 
-    protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
-        => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null) =>
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 }

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Core/ViewModels/ViewModel.cs

@@ -1,3 +1,5 @@
 namespace StabilityMatrix.Avalonia.Diagnostics.LogViewer.Core.ViewModels;
 
-public class ViewModel : ObservableObject { /* skip */ }
+public class ViewModel
+    : ObservableObject { /* skip */
+}

StabilityMatrix.Avalonia.Diagnostics/LogViewer/DataStoreLoggerTarget.cs

@@ -54,21 +54,27 @@ protected override void Write(LogEventInfo logEvent)
         }
 
         // add log entry
-        _dataStore?.AddEntry(new LogModel
-        {
-            Timestamp = DateTime.UtcNow,
-            LogLevel = logLevel,
-            // do we override the default EventId if it exists?
-            EventId = eventId.Id == 0 && (_config?.EventId.Id ?? 0) != 0 ? _config!.EventId : eventId,
-            State = message,
-            LoggerName = logEvent.LoggerName,
-            CallerClassName = logEvent.CallerClassName,
-            CallerMemberName = logEvent.CallerMemberName,
-            Exception = logEvent.Exception?.Message ?? (logLevel == MsLogLevel.Error ? message : ""),
-            Color = _config!.Colors[logLevel],
-        });
-
-        Debug.WriteLine($"--- [{logLevel.ToString()[..3]}] {message} - {logEvent.Exception?.Message ?? "no error"}");
+        _dataStore?.AddEntry(
+            new LogModel
+            {
+                Timestamp = DateTime.UtcNow,
+                LogLevel = logLevel,
+                // do we override the default EventId if it exists?
+                EventId =
+                    eventId.Id == 0 && (_config?.EventId.Id ?? 0) != 0 ? _config!.EventId : eventId,
+                State = message,
+                LoggerName = logEvent.LoggerName,
+                CallerClassName = logEvent.CallerClassName,
+                CallerMemberName = logEvent.CallerMemberName,
+                Exception =
+                    logEvent.Exception?.Message ?? (logLevel == MsLogLevel.Error ? message : ""),
+                Color = _config!.Colors[logLevel],
+            }
+        );
+
+        Debug.WriteLine(
+            $"--- [{logLevel.ToString()[..3]}] {message} - {logEvent.Exception?.Message ?? "no error"}"
+        );
     }
 
     #endregion

StabilityMatrix.Avalonia.Diagnostics/LogViewer/Extensions/ServicesExtension.cs

@@ -15,30 +15,36 @@ public static class ServicesExtension
 {
     public static IServiceCollection AddLogViewer(this IServiceCollection services)
     {
-        services.AddSingleton<ILogDataStore, LogDataStore>();
+        services.AddSingleton<ILogDataStore>(Core.Logging.LogDataStore.Instance);
         services.AddSingleton<LogViewerControlViewModel>();
 
         return services;
     }
-    
+
     public static IServiceCollection AddLogViewer(
-        this IServiceCollection services, 
-        Action<DataStoreLoggerConfiguration> configure)
+        this IServiceCollection services,
+        Action<DataStoreLoggerConfiguration> configure
+    )
     {
         services.AddSingleton<ILogDataStore>(Core.Logging.LogDataStore.Instance);
         services.AddSingleton<LogViewerControlViewModel>();
         services.Configure(configure);
-        
+
         return services;
     }
-
-    public static ILoggingBuilder AddNLogTargets(this ILoggingBuilder builder, IConfiguration config)
+
+    public static ILoggingBuilder AddNLogTargets(
+        this ILoggingBuilder builder,
+        IConfiguration config
+    )
     {
         LogManager
             .Setup()
             // Register custom Target
-            .SetupExtensions(extensionBuilder =>
-                extensionBuilder.RegisterTarget<DataStoreLoggerTarget>("DataStoreLogger"));
+            .SetupExtensions(
+                extensionBuilder =>
+                    extensionBuilder.RegisterTarget<DataStoreLoggerTarget>("DataStoreLogger")
+            );
 
         /*builder
             .ClearProviders()
@@ -56,7 +62,11 @@ public static ILoggingBuilder AddNLogTargets(this ILoggingBuilder builder, IConf
         return builder;
     }
 
-    public static ILoggingBuilder AddNLogTargets(this ILoggingBuilder builder, IConfiguration config, Action<DataStoreLoggerConfiguration> configure)
+    public static ILoggingBuilder AddNLogTargets(
+        this ILoggingBuilder builder,
+        IConfiguration config,
+        Action<DataStoreLoggerConfiguration> configure
+    )
     {
         builder.AddNLogTargets(config);
         builder.Services.Configure(configure);