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

Author: mohnjiles

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.10.1
+### Added
+- Added SVD Shared Model & Output Folders for Forge (fixes [#580](https://github.com/LykosAI/StabilityMatrix/issues/580))
+### Changed
+- Improved error message when logging in with a Lykos account fails due to incorrect email or password
+- Model Browser & Workflow Browser now auto-load when first navigating to those pages
+- Removed update confirmation dialog, instead showing the new version in the update button tooltip
+### Fixed
+- Fixed package launch not working when environment variable `SETUPTOOLS_USE_DISTUTILS` is set due to conflict with a default environment variable. User environment variables will now correctly override any default environment variables.
+- Fixed "No refresh token found" error when failing to login with Lykos account in some cases
+- Fixed blank entries appearing in the Categories dropdown on the Checkpoints page
+- Fixed crash when loading invalid connected model info files
+- Fixed [#585](https://github.com/LykosAI/StabilityMatrix/issues/585) - Crash when drag & drop source and destination are the same
+- Fixed [#584](https://github.com/LykosAI/StabilityMatrix/issues/584) - `--launch-package` argument not working
+- Fixed [#581](https://github.com/LykosAI/StabilityMatrix/issues/581) - Inference teaching tip showing more often than it should
+- Fixed [#578](https://github.com/LykosAI/StabilityMatrix/issues/578) - "python setup.py egg_info did not run successfully" failure when installing Auto1111 or SDWebUI Forge
+- Fixed [#574](https://github.com/LykosAI/StabilityMatrix/issues/574) - local images not showing on macOS or Linux
+
 ## v2.10.0
 ### Added
 - Added Reference-Only mode for Inference ControlNet, used for guiding the sampler with an image without a pretrained model. Part of the latent and attention layers will be connected to the reference image, similar to Image to Image or Inpainting.

StabilityMatrix.Avalonia/Controls/Inference/ImageFolderCard.axaml

@@ -11,6 +11,7 @@
     xmlns:scroll="clr-namespace:StabilityMatrix.Avalonia.Controls.Scroll"
     xmlns:labs="clr-namespace:Avalonia.Labs.Controls;assembly=Avalonia.Labs.Controls"
     xmlns:vendorLabs="clr-namespace:StabilityMatrix.Avalonia.Controls.VendorLabs"
+    xmlns:converters="clr-namespace:StabilityMatrix.Avalonia.Converters"
     x:DataType="vmInference:ImageFolderCardViewModel">
 
     <Design.PreviewWith>
@@ -20,6 +21,8 @@
             </Grid>
         </Panel>
     </Design.PreviewWith>
+    
+    <converters:FileUriConverter x:Key="FileUriConverter" />
 
     <ControlTheme x:Key="{x:Type controls:ImageFolderCard}" TargetType="controls:ImageFolderCard">
         <Setter Property="Background" Value="Transparent" />
@@ -200,7 +203,7 @@
                                                     <vendorLabs:BetterAsyncImage
                                                         Width="{Binding $parent[ItemsRepeater].((vmInference:ImageFolderCardViewModel)DataContext).ImageSize.Width}"
                                                         Height="{Binding $parent[ItemsRepeater].((vmInference:ImageFolderCardViewModel)DataContext).ImageSize.Height}"
-                                                        Source="{Binding AbsolutePath}"
+                                                        Source="{Binding AbsolutePath, Converter={StaticResource FileUriConverter}}"
                                                         Stretch="UniformToFill" />
 
                                                     <Border

StabilityMatrix.Avalonia/Controls/Inference/PromptCard.axaml

@@ -72,7 +72,7 @@
                                     <ui:TeachingTip 
                                         Target="{Binding #PART_HelpButton}"
                                         Title="{x:Static lang:Resources.TeachingTip_InferencePromptHelpButton}"
-                                        IsOpen="{Binding IsHelpButtonTeachingTipOpen}"/>
+                                        IsOpen="{Binding IsHelpButtonTeachingTipOpen, Mode=TwoWay}"/>
                                 </Panel>
 
                                 <Button

StabilityMatrix.Avalonia/Converters/FileUriConverter.cs

@@ -17,6 +17,7 @@ public class FileUriConverter : IValueConverter
 
         return value switch
         {
+            string str when str.StartsWith("avares://") => new Uri(str),
             string str => new Uri("file://" + str),
             IFormattable formattable => new Uri("file://" + formattable.ToString(null, culture)),
             _ => null

StabilityMatrix.Avalonia/Services/INavigationService.cs

@@ -39,4 +39,5 @@ void NavigateTo(
     bool GoBack();
 
     bool CanGoBack { get; }
+    object? CurrentPageDataContext { get; }
 }

StabilityMatrix.Avalonia/Services/NavigationService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Media.Animation;
 using FluentAvalonia.UI.Navigation;
@@ -190,4 +191,6 @@ public bool GoBack()
     }
 
     public bool CanGoBack => _frame?.CanGoBack ?? false;
+
+    public object? CurrentPageDataContext => (_frame?.Content as Control)?.DataContext;
 }

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs

@@ -177,6 +177,8 @@ public override void OnLoaded()
             model => model.ShowNsfw,
             settings => settings.ModelBrowserNsfwEnabled
         );
+
+        SearchModelsCommand.ExecuteAsync(false);
     }
 
     /// <summary>

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFile.cs

@@ -3,14 +3,14 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Avalonia.Data;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FluentAvalonia.UI.Controls;
 using Microsoft.Extensions.DependencyInjection;
 using NLog;
-using StabilityMatrix.Avalonia.Languages;
 using StabilityMatrix.Avalonia.ViewModels.Base;
 using StabilityMatrix.Core.Attributes;
 using StabilityMatrix.Core.Extensions;
@@ -333,8 +333,15 @@ public static IEnumerable<CheckpointFile> FromDirectoryIndex(
             if (File.Exists(jsonPath))
             {
                 var json = File.ReadAllText(jsonPath);
-                var connectedModelInfo = ConnectedModelInfo.FromJson(json);
-                checkpointFile.ConnectedModel = connectedModelInfo;
+                try
+                {
+                    var connectedModelInfo = ConnectedModelInfo.FromJson(json);
+                    checkpointFile.ConnectedModel = connectedModelInfo;
+                }
+                catch (JsonException)
+                {
+                    checkpointFile.ConnectedModel = null;
+                }
             }
 
             checkpointFile.PreviewImagePath = SupportedImageExtensions

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFolder.cs

@@ -92,7 +92,8 @@ public partial class CheckpointFolder : ViewModelBase
 
     public string TitleWithFilesCount =>
         CheckpointFiles.Any() || SubFolders.Any(f => f.CheckpointFiles.Any())
-            ? $"{FolderType.GetDescription() ?? FolderType.GetStringValue()} ({CheckpointFiles.Count + SubFolders.Sum(folder => folder.CheckpointFiles.Count)})"
+            ? $"{FolderType.GetDescription() ?? (string.IsNullOrWhiteSpace(FolderType.GetStringValue()) ? Path.GetFileName(DirectoryPath) : FolderType.GetStringValue())} "
+                + $"({CheckpointFiles.Count + SubFolders.Sum(folder => folder.CheckpointFiles.Count)})"
             : FolderType.GetDescription() ?? FolderType.GetStringValue();
 
     public ProgressViewModel Progress { get; } = new();
@@ -447,6 +448,22 @@ public async Task ImportFilesAsync(IEnumerable<string> files, bool convertToConn
             Progress.Value = 0;
             var copyPaths = files.ToDictionary(k => k, v => Path.Combine(DirectoryPath, Path.GetFileName(v)));
 
+            // remove files that are already in the folder
+            foreach (var (source, destination) in copyPaths)
+            {
+                if (source == destination)
+                {
+                    copyPaths.Remove(source);
+                }
+            }
+
+            if (copyPaths.Count == 0)
+            {
+                Progress.Text = "Import complete";
+                Progress.Value = 100;
+                return;
+            }
+
             var progress = new Progress<ProgressReport>(report =>
             {
                 Progress.IsIndeterminate = false;

StabilityMatrix.Avalonia/ViewModels/Dialogs/LykosLoginViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Net;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -90,7 +91,15 @@ private async Task LoginAsync()
         }
         catch (ApiException e)
         {
-            LoginError = new AppException("Failed to login", $"{e.StatusCode} - {e.Message}");
+            LoginError = e.StatusCode switch
+            {
+                HttpStatusCode.Unauthorized
+                    => new AppException(
+                        "Incorrect email or password",
+                        "Please try again or reset your password"
+                    ),
+                _ => new AppException("Failed to login", $"{e.StatusCode} - {e.Message}")
+            };
         }
     }
 

StabilityMatrix.Avalonia/ViewModels/OpenArtBrowserViewModel.cs

@@ -12,7 +12,6 @@
 using FluentAvalonia.UI.Controls;
 using Refit;
 using StabilityMatrix.Avalonia.Controls;
-using StabilityMatrix.Avalonia.Languages;
 using StabilityMatrix.Avalonia.Models;
 using StabilityMatrix.Avalonia.Services;
 using StabilityMatrix.Avalonia.ViewModels.Base;
@@ -36,8 +35,7 @@ public partial class OpenArtBrowserViewModel(
     IOpenArtApi openArtApi,
     INotificationService notificationService,
     ISettingsManager settingsManager,
-    IPackageFactory packageFactory,
-    ServiceManager<ViewModelBase> vmFactory
+    IPackageFactory packageFactory
 ) : TabViewModelBase, IInfinitelyScroll
 {
     private const int PageSize = 20;
@@ -90,6 +88,7 @@ protected override void OnInitialLoaded()
     {
         searchResultsCache.Connect().DeferUntilLoaded().Bind(SearchResults).Subscribe();
         SelectedSortMode = AllSortModes.First();
+        DoSearch().SafeFireAndForget();
     }
 
     [RelayCommand]

StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageCardViewModel.cs

@@ -95,6 +95,9 @@ RunningPackageService runningPackageService
     [ObservableProperty]
     private bool showWebUiButton;
 
+    [ObservableProperty]
+    private DownloadPackageVersionOptions? updateVersion;
+
     private void RunningPackagesOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
     {
         if (runningPackageService.RunningPackages.Select(x => x.Value) is not { } runningPackages)
@@ -196,6 +199,10 @@ and not UnknownPackage
             }
 
             IsUpdateAvailable = await HasUpdate();
+            if (IsUpdateAvailable)
+            {
+                UpdateVersion = await basePackage.GetUpdate(currentPackage);
+            }
 
             if (
                 Package != null
@@ -426,21 +433,6 @@ public async Task Update()
                 versionOptions.CommitHash = latest.Sha;
             }
 
-            var confirmationDialog = new BetterContentDialog
-            {
-                Title = Resources.Label_AreYouSure,
-                Content =
-                    $"{Package.DisplayName} will be updated to the latest version ({versionOptions.GetReadableVersionString()})",
-                PrimaryButtonText = Resources.Action_Continue,
-                SecondaryButtonText = Resources.Action_Cancel,
-                DefaultButton = ContentDialogButton.Primary,
-                IsSecondaryButtonEnabled = true,
-            };
-
-            var dialogResult = await confirmationDialog.ShowAsync();
-            if (dialogResult != ContentDialogResult.Primary)
-                return;
-
             var updatePackageStep = new UpdatePackageStep(
                 settingsManager,
                 Package,
@@ -672,6 +664,7 @@ private async Task<bool> HasUpdate()
         try
         {
             var hasUpdate = await basePackage.CheckForUpdates(Package);
+            UpdateVersion = await basePackage.GetUpdate(Package);
 
             await using (settingsManager.BeginTransaction())
             {

StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageInstallDetailViewModel.cs

@@ -283,6 +283,13 @@ private async Task Install()
 
         if (!runner.Failed)
         {
+            if (ReferenceEquals(this, packageNavigationService.CurrentPageDataContext))
+            {
+                packageNavigationService.GoBack();
+                packageNavigationService.GoBack();
+                await Task.Delay(100);
+            }
+
             EventManager.Instance.OnInstalledPackagesChanged();
         }
     }

StabilityMatrix.Avalonia/ViewModels/PackageManagerViewModel.cs

@@ -42,6 +42,7 @@ public partial class PackageManagerViewModel : PageViewModelBase
     private readonly INotificationService notificationService;
     private readonly INavigationService<NewPackageManagerViewModel> packageNavigationService;
     private readonly ILogger<PackageManagerViewModel> logger;
+    private readonly RunningPackageService runningPackageService;
 
     public override string Title => Resources.Label_Packages;
     public override IconSource IconSource => new SymbolIconSource { Symbol = Symbol.Box, IsFilled = true };
@@ -69,14 +70,16 @@ public PackageManagerViewModel(
         ServiceManager<ViewModelBase> dialogFactory,
         INotificationService notificationService,
         INavigationService<NewPackageManagerViewModel> packageNavigationService,
-        ILogger<PackageManagerViewModel> logger
+        ILogger<PackageManagerViewModel> logger,
+        RunningPackageService runningPackageService
     )
     {
         this.settingsManager = settingsManager;
         this.dialogFactory = dialogFactory;
         this.notificationService = notificationService;
         this.packageNavigationService = packageNavigationService;
         this.logger = logger;
+        this.runningPackageService = runningPackageService;
 
         EventManager.Instance.InstalledPackagesChanged += OnInstalledPackagesChanged;
         EventManager.Instance.OneClickInstallFinished += OnOneClickInstallFinished;
@@ -118,15 +121,39 @@ public void SetUnknownPackages(IEnumerable<InstalledPackage> packages)
         unknownInstalledPackages.Edit(s => s.Load(packages));
     }
 
+    protected override async Task OnInitialLoadedAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Program.Args.LaunchPackageName))
+        {
+            await base.OnInitialLoadedAsync();
+            return;
+        }
+
+        await LoadPackages();
+
+        var package = Packages.FirstOrDefault(x => x.DisplayName == Program.Args.LaunchPackageName);
+        if (package is not null)
+        {
+            await runningPackageService.StartPackage(package);
+            return;
+        }
+
+        package = Packages.FirstOrDefault(x => x.Id.ToString() == Program.Args.LaunchPackageName);
+        if (package is null)
+        {
+            await base.OnInitialLoadedAsync();
+            return;
+        }
+
+        await runningPackageService.StartPackage(package);
+    }
+
     public override async Task OnLoadedAsync()
     {
         if (Design.IsDesignMode || !settingsManager.IsLibraryDirSet)
             return;
 
-        installedPackages.EditDiff(settingsManager.Settings.InstalledPackages, InstalledPackage.Comparer);
-
-        var currentUnknown = await Task.Run(IndexUnknownPackages);
-        unknownInstalledPackages.Edit(s => s.Load(currentUnknown));
+        await LoadPackages();
 
         timer.Start();
     }
@@ -142,6 +169,14 @@ public void ShowInstallDialog(BasePackage? selectedPackage = null)
         NavigateToSubPage(typeof(PackageInstallBrowserViewModel));
     }
 
+    private async Task LoadPackages()
+    {
+        installedPackages.EditDiff(settingsManager.Settings.InstalledPackages, InstalledPackage.Comparer);
+
+        var currentUnknown = await Task.Run(IndexUnknownPackages);
+        unknownInstalledPackages.Edit(s => s.Load(currentUnknown));
+    }
+
     private async Task CheckPackagesForUpdates()
     {
         foreach (var package in PackageCards)

StabilityMatrix.Avalonia/Views/CheckpointsPage.axaml

@@ -31,6 +31,7 @@
             x:Key="TextDropShadowEffect" />
 
         <converters:EnumStringConverter x:Key="EnumStringConverter" />
+        <converters:FileUriConverter x:Key="FileUriConverter"/>
 
         <!--  Template for a single badge  -->
         <DataTemplate DataType="{x:Type system:String}" x:Key="BadgeTemplate">
@@ -143,7 +144,7 @@
                                     <vendorLabs:BetterAsyncImage
                                         Margin="0,0,0,4"
                                         CornerRadius="4"
-                                        Source="{Binding PreviewImagePath}"
+                                        Source="{Binding PreviewImagePath, Converter={StaticResource FileUriConverter}}"
                                         Stretch="Uniform"
                                         IsVisible="{Binding IsConnectedModel}" />
                                     <TextBlock
@@ -182,7 +183,7 @@
                                          Grid.ColumnSpan="2"
                                          Margin="0, 4,0,4"
                                          CornerRadius="8"
-                                         Source="{Binding PreviewImagePath}"
+                                         Source="{Binding PreviewImagePath, Converter={StaticResource FileUriConverter}}"
                                          ClipToBounds="True"
                                          Stretch="UniformToFill"
                                          Height="300"

StabilityMatrix.Avalonia/Views/Dialogs/LykosLoginDialog.axaml

@@ -14,6 +14,7 @@
     xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
     xmlns:ctxt="clr-namespace:ColorTextBlock.Avalonia;assembly=ColorTextBlock.Avalonia"
     Focusable="True"
+    MaxWidth="400"
     d:DataContext="{x:Static mocks:DesignData.LykosLoginViewModel}"
     d:DesignHeight="350"
     d:DesignWidth="400"