Merge pull request #605 from ionite34/moar-bug-fixes

fixed a few more github issues

CHANGELOG.md

@@ -6,15 +6,22 @@ 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.
+- 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 "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 [#574](https://github.com/LykosAI/StabilityMatrix/issues/574) - local images not showing on macOS or Linux
 - 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

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs

@@ -177,6 +177,8 @@ public partial class CivitAiBrowserViewModel : TabViewModelBase, IInfinitelyScro
             model => model.ShowNsfw,
             settings => settings.ModelBrowserNsfwEnabled
         );
+
+        SearchModelsCommand.ExecuteAsync(false);
     }
 
     /// <summary>

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFile.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 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;
@@ -10,7 +11,6 @@ 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 partial class CheckpointFile : ViewModelBase
             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 partial class CheckpointFolder : ViewModelBase
             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/OpenArtBrowserViewModel.cs

@@ -12,7 +12,6 @@ using DynamicData.Binding;
 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 @@ public partial class OpenArtBrowserViewModel(
     {
         searchResultsCache.Connect().DeferUntilLoaded().Bind(SearchResults).Subscribe();
         SelectedSortMode = AllSortModes.First();
+        DoSearch().SafeFireAndForget();
     }
 
     [RelayCommand]

StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageCardViewModel.cs

@@ -95,6 +95,9 @@ public partial class PackageCardViewModel(
     [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 @@ public partial class PackageCardViewModel(
             }
 
             IsUpdateAvailable = await HasUpdate();
+            if (IsUpdateAvailable)
+            {
+                UpdateVersion = await basePackage.GetUpdate(currentPackage);
+            }
 
             if (
                 Package != null
@@ -426,21 +433,6 @@ public partial class PackageCardViewModel(
                 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 @@ public partial class PackageCardViewModel(
         try
         {
             var hasUpdate = await basePackage.CheckForUpdates(Package);
+            UpdateVersion = await basePackage.GetUpdate(Package);
 
             await using (settingsManager.BeginTransaction())
             {

StabilityMatrix.Avalonia/Views/PackageManagerPage.axaml

@@ -255,9 +255,14 @@
                                                 Margin="4,4,0,0"
                                                 Padding="4"
                                                 IsEnabled="{Binding !IsRunning}"
-                                                ToolTip.Tip="{x:Static lang:Resources.Label_UpdateAvailable}"
                                                 markupExtensions:ShowDisabledTooltipExtension.ShowOnDisabled="True"
                                                 Command="{Binding Update}">
+                                            <ToolTip.Tip>
+                                                <TextBlock>
+                                                    <Run Text="{x:Static lang:Resources.Label_UpdateAvailable}"/>
+                                                    <Run Text="(" /><Run Text="{Binding UpdateVersion.ReadableVersionString, FallbackValue=Unknown}"/><Run Text=")"/>
+                                                </TextBlock>
+                                            </ToolTip.Tip>
                                             <Button.IsVisible>
                                                 <MultiBinding Converter="{x:Static BoolConverters.And}">
                                                     <Binding Path="!IsUnknownPackage" />

StabilityMatrix.Avalonia/Views/Settings/MainSettingsPage.axaml

@@ -82,19 +82,6 @@
                             Symbol="Alert" />
                     </ui:SettingsExpander.IconSource>
                 </ui:SettingsExpander>
-                <ui:SettingsExpander Grid.Row="3"
-                                     Header="{x:Static lang:Resources.Label_HolidayMode}">
-                    <ui:SettingsExpander.IconSource>
-                        <fluentIcons:SymbolIconSource
-                            FontSize="10"
-                            IsFilled="True"
-                            Symbol="WeatherSnowflake" />
-                    </ui:SettingsExpander.IconSource>
-                    <ui:SettingsExpander.Footer>
-                        <ui:FAComboBox SelectedItem="{Binding HolidayModeSetting}"
-                                       ItemsSource="{Binding HolidayModes}"/>
-                    </ui:SettingsExpander.Footer>
-                </ui:SettingsExpander>
             </sg:SpacedGrid>
             
             <!--  Integrations  -->
@@ -215,7 +202,7 @@
             </sg:SpacedGrid>
             
             <!--  Theme  -->
-            <Grid RowDefinitions="Auto,*,*,*">
+            <Grid RowDefinitions="Auto,*,*,*,*">
                 <TextBlock
                     Margin="0,0,0,8"
                     FontWeight="Medium"
@@ -245,8 +232,24 @@
                             SelectedItem="{Binding SelectedLanguage}" />
                     </ui:SettingsExpander.Footer>
                 </ui:SettingsExpander>
+                
+                <ui:SettingsExpander Grid.Row="3"
+                                     Margin="8,0,8,4"
+                                     Header="{x:Static lang:Resources.Label_HolidayMode}">
+                    <ui:SettingsExpander.IconSource>
+                        <fluentIcons:SymbolIconSource
+                            FontSize="10"
+                            IsFilled="True"
+                            Symbol="WeatherSnowflake" />
+                    </ui:SettingsExpander.IconSource>
+                    <ui:SettingsExpander.Footer>
+                        <ui:FAComboBox SelectedItem="{Binding HolidayModeSetting}"
+                                       ItemsSource="{Binding HolidayModes}"/>
+                    </ui:SettingsExpander.Footer>
+                </ui:SettingsExpander>
+                
                 <ui:SettingsExpander
-                    Grid.Row="3"
+                    Grid.Row="4"
                     Margin="8,0,8,4"
                     ActionIconSource="ChevronRight"
                     Command="{Binding NavigateToSubPageCommand}"

StabilityMatrix.Core/Models/DownloadPackageVersionOptions.cs

@@ -10,4 +10,6 @@ public class DownloadPackageVersionOptions
 
     public string GetReadableVersionString() =>
         !string.IsNullOrWhiteSpace(VersionTag) ? VersionTag : $"{BranchName}@{CommitHash?[..7]}";
+
+    public string ReadableVersionString => GetReadableVersionString();
 }

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -66,7 +66,8 @@ public class A3WebUI(
             [SharedFolderType.T2IAdapter] = new[] { "models/controlnet/T2IAdapter" },
             [SharedFolderType.IpAdapter] = new[] { "models/controlnet/IpAdapter" },
             [SharedFolderType.InvokeIpAdapters15] = new[] { "models/controlnet/DiffusersIpAdapters" },
-            [SharedFolderType.InvokeIpAdaptersXl] = new[] { "models/controlnet/DiffusersIpAdaptersXL" }
+            [SharedFolderType.InvokeIpAdaptersXl] = new[] { "models/controlnet/DiffusersIpAdaptersXL" },
+            [SharedFolderType.SVD] = new[] { "models/svd" }
         };
 
     public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>
@@ -77,7 +78,8 @@ public class A3WebUI(
             [SharedOutputType.Img2Img] = new[] { "output/img2img-images" },
             [SharedOutputType.Text2Img] = new[] { "output/txt2img-images" },
             [SharedOutputType.Img2ImgGrids] = new[] { "output/img2img-grids" },
-            [SharedOutputType.Text2ImgGrids] = new[] { "output/txt2img-grids" }
+            [SharedOutputType.Text2ImgGrids] = new[] { "output/txt2img-grids" },
+            [SharedOutputType.SVD] = new[] { "output/svd" }
         };
 
     [SuppressMessage("ReSharper", "ArrangeObjectCreationWhenTypeNotEvident")]

StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs

@@ -345,6 +345,54 @@ public abstract class BaseGitPackage : BasePackage
         }
     }
 
+    public override async Task<DownloadPackageVersionOptions?> GetUpdate(InstalledPackage installedPackage)
+    {
+        var currentVersion = installedPackage.Version;
+        if (currentVersion is null or { InstalledReleaseVersion: null, InstalledBranch: null })
+        {
+            Logger.Warn(
+                "Could not check updates for package {Name}, version is invalid: {@currentVersion}",
+                Name,
+                currentVersion
+            );
+            return null;
+        }
+
+        var versionOptions = new DownloadPackageVersionOptions { IsLatest = true };
+
+        try
+        {
+            if (currentVersion.IsReleaseMode)
+            {
+                var latestVersion = await GetLatestVersion(currentVersion.IsPrerelease).ConfigureAwait(false);
+                versionOptions.IsPrerelease = latestVersion.IsPrerelease;
+                versionOptions.VersionTag = latestVersion.VersionTag;
+                return versionOptions;
+            }
+
+            var allCommits = (
+                await GetAllCommits(currentVersion.InstalledBranch!).ConfigureAwait(false)
+            )?.ToList();
+
+            if (allCommits == null || !allCommits.Any())
+            {
+                Logger.Warn("No commits found for {Package}", installedPackage.PackageName);
+                return null;
+            }
+            var latestCommitHash = allCommits.First().Sha;
+
+            versionOptions.CommitHash = latestCommitHash;
+            versionOptions.BranchName = currentVersion.InstalledBranch;
+
+            return versionOptions;
+        }
+        catch (ApiException e)
+        {
+            Logger.Warn(e, "Failed to check for package updates");
+            return null;
+        }
+    }
+
     public override async Task<InstalledPackageVersion> Update(
         InstalledPackage installedPackage,
         TorchVersion torchVersion,

StabilityMatrix.Core/Models/Packages/BasePackage.cs

@@ -237,4 +237,6 @@ public abstract class BasePackage
             onConsoleOutput
         );
     }
+
+    public abstract Task<DownloadPackageVersionOptions?> GetUpdate(InstalledPackage installedPackage);
 }

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@@ -41,17 +41,6 @@ public class SDWebForge(
     public override string OutputFolderName => "output";
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.ReallyRecommended;
 
-    public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>
-        new()
-        {
-            [SharedOutputType.Extras] = new[] { "output/extras-images" },
-            [SharedOutputType.Saved] = new[] { "log/images" },
-            [SharedOutputType.Img2Img] = new[] { "output/img2img-images" },
-            [SharedOutputType.Text2Img] = new[] { "output/txt2img-images" },
-            [SharedOutputType.Img2ImgGrids] = new[] { "output/img2img-grids" },
-            [SharedOutputType.Text2ImgGrids] = new[] { "output/txt2img-grids" }
-        };
-
     public override List<LaunchOptionDefinition> LaunchOptions =>
         [
             new LaunchOptionDefinition

StabilityMatrix.Core/Models/Packages/UnknownPackage.cs

@@ -15,8 +15,7 @@ public class UnknownPackage : BasePackage
 
     public override string GithubUrl => "";
     public override string LicenseType => "AGPL-3.0";
-    public override string LicenseUrl =>
-        "https://github.com/LykosAI/StabilityMatrix/blob/main/LICENSE";
+    public override string LicenseUrl => "https://github.com/LykosAI/StabilityMatrix/blob/main/LICENSE";
     public override string Blurb => "A dank interface for diffusion";
     public override string LaunchCommand => "test";
 
@@ -140,20 +139,20 @@ public class UnknownPackage : BasePackage
     public override List<LaunchOptionDefinition> LaunchOptions => new();
 
     public override Dictionary<SharedFolderType, IReadOnlyList<string>>? SharedFolders { get; }
-    public override Dictionary<
-        SharedOutputType,
-        IReadOnlyList<string>
-    >? SharedOutputFolders { get; }
+    public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders { get; }
 
-    public override Task<DownloadPackageVersionOptions> GetLatestVersion(
-        bool includePrerelease = false
-    )
+    public override Task<DownloadPackageVersionOptions> GetLatestVersion(bool includePrerelease = false)
     {
         throw new NotImplementedException();
     }
 
     public override string MainBranch { get; }
 
+    public override Task<DownloadPackageVersionOptions?> GetUpdate(InstalledPackage installedPackage)
+    {
+        return Task.FromResult(new DownloadPackageVersionOptions { IsLatest = true, VersionTag = "1.8.0" });
+    }
+
     public override Task<PackageVersionOptions> GetAllVersionOptions() =>
         Task.FromResult(new PackageVersionOptions());
 

StabilityMatrix.Core/Models/SharedFolderType.cs

@@ -39,6 +39,7 @@ public enum SharedFolderType
     InvokeIpAdapters15 = 1 << 24,
     InvokeIpAdaptersXl = 1 << 25,
     InvokeClipVision = 1 << 26,
+    SVD = 1 << 27,
 
     PromptExpansion = 1 << 30
 }

StabilityMatrix.Core/Models/SharedOutputType.cs

@@ -8,6 +8,7 @@ public enum SharedOutputType
     Extras,
     Text2ImgGrids,
     Img2ImgGrids,
+    SVD,
     Saved,
     Consolidated
 }