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

LykosAI · Aug 25, 2023 · 7019817 · 7019817
2 parents afecf8f + 8499e00
commit 7019817
Show file tree

Hide file tree

Showing 84 changed files with 5,020 additions and 929 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,37 @@ 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.3.0
+### Added
+- New installable Package - [Fooocus](https://github.com/lllyasviel/Fooocus)
+- Added "Select New Data Directory" button to Settings
+- Added "Skip to First/Last Page" buttons to the Model Browser
+- Added VAE as a checkpoint category in the Model Browser
+- Pause/Resume/Cancel buttons on downloads popup. Paused downloads persists and may be resumed after restarting the app
+- Unknown Package installs in the Package directory will now show up with a button to import them
+### Fixed
+- Fixed issue where model version wouldn't be selected in the "All Versions" section of the Model Browser
+- Improved Checkpoints page indexing performance
+- Fixed issue where Checkpoints page may not show all checkpoints after clearing search filter
+- Fixed issue where Checkpoints page may show incorrect checkpoints for the given filter after changing pages
+- Fixed issue where Open Web UI button would try to load 0.0.0.0 addresses
+- Fixed Dictionary error when launch arguments saved with duplicate arguments
+- Fixed Launch arguments search not working
+### Changed
+- Changed update method for SD.Next to use the built-in upgrade functionality
+- Model Browser navigation buttons are no longer disabled while changing pages
+
+## v2.2.1
+### Fixed
+- Fixed SD.Next shared folders config not working with new config format, reverted to Junctions / Symlinks
+
 ## v2.2.1
+
 ### Fixed
 - Fixed SD.Next shared folders config not working with new config format, reverted to Junctions / Symlinks
 
 ## v2.2.0
+
 ### Added
 - Added option to search by Base Model in the Model Browser
 - Animated page transitions

diff --git a/README.md b/README.md
@@ -13,23 +13,27 @@
 [sdnext]: https://github.com/vladmandic/automatic
 [voltaml]: https://github.com/VoltaML/voltaML-fast-stable-diffusion
 [invokeai]: https://github.com/invoke-ai/InvokeAI
+[fooocus]: https://github.com/lllyasviel/Fooocus
 
 [civitai]: https://civitai.com/
 
 Multi-Platform Package Manager for Stable Diffusion
 
 ### 🖱️ One click install and update for Stable Diffusion Web UI Packages
-- Supports [Automatic 1111][auto1111], [Comfy UI][comfy], [SD.Next (Vladmandic)][sdnext], [VoltaML][voltaml], [InvokeAI][invokeai]
+- Supports [Automatic 1111][auto1111], [Comfy UI][comfy], [SD.Next (Vladmandic)][sdnext], [VoltaML][voltaml], [InvokeAI][invokeai], and [Fooocus][fooocus]
 - Embedded Git and Python dependencies, with no need for either to be globally installed
-- Fully Portable, move Stability Matrix's Data Directory to a new drive or computer at any time
+- Fully portable - move Stability Matrix's Data Directory to a new drive or computer at any time
+
 ### 🚀 Launcher with syntax highlighted terminal emulator, routed GUI input prompts
 - Launch arguments editor with predefined or custom options for each Package install
-- Package environment variables
+- Configurable Environment Variables
+
 ### 🗃️ Checkpoint Manager, configured to be shared by all Package installs
 - Option to find CivitAI metadata and preview thumbnails for new local imports
+
 ### ☁️ Model Browser to import from [CivitAI][civitai]
 - Automatically imports to the associated model folder depending on the model type
-- Also downloads relavent metadata files and preview image
+- Downloads relevant metadata files and preview image
 
 ![header](https://github.com/LykosAI/StabilityMatrix/assets/13956642/a9c5f925-8561-49ba-855b-1b7bf57d7c0d)
 
@@ -48,17 +52,17 @@ Multi-Platform Package Manager for Stable Diffusion
 
 ### Model browser powered by [Civit AI][civitai]
 - Downloads new models, automatically uses the appropriate shared model directory
-- Available immediately to all installed packages
+- Pause and resume downloads, even after closing the app
 
 <p align="center">
   <img style="width: 80%; height: 80%" src="https://github.com/LykosAI/StabilityMatrix/assets/13956642/30b9f610-6033-4307-8d92-7d72b93cd73e" alt=""/>
 </p>
 
 ### Shared model directory for all your packages
-
 - Import local models by simple drag and drop
+- Option to find CivitAI metadata and preview thumbnails for new local imports
 - Toggle visibility of categories like LoRA, VAE, CLIP, etc.
-- For models imported from Civit AI, shows additional information like version, fp precision, and preview thumbnail on hover
+
 <p align="center">
   <img style="width: 80%; height: 80%" src="https://github.com/LykosAI/StabilityMatrix/assets/13956642/d42d1c53-67a4-45a0-b009-21400d44e17e" alt=""/>
 </p>

diff --git a/StabilityMatrix.Avalonia/App.axaml b/StabilityMatrix.Avalonia/App.axaml
@@ -28,5 +28,6 @@
         <StyleInclude Source="Styles/ProgressRing.axaml"/>
         <StyleInclude Source="Styles/ButtonStyles.axaml"/>
         <StyleInclude Source="Styles/SplitButtonStyles.axaml"/>
+        <StyleInclude Source="Styles/ToggleButtonStyles.axaml"/>
     </Application.Styles>
 </Application>
diff --git a/StabilityMatrix.Avalonia/App.axaml.cs b/StabilityMatrix.Avalonia/App.axaml.cs
@@ -34,11 +34,13 @@
 using StabilityMatrix.Avalonia.Controls;
 using StabilityMatrix.Avalonia.DesignData;
 using StabilityMatrix.Avalonia.Helpers;
+using StabilityMatrix.Avalonia.Languages;
 using StabilityMatrix.Avalonia.Models;
 using StabilityMatrix.Avalonia.Services;
 using StabilityMatrix.Avalonia.ViewModels;
 using StabilityMatrix.Avalonia.ViewModels.Base;
 using StabilityMatrix.Avalonia.ViewModels.CheckpointBrowser;
+using StabilityMatrix.Avalonia.ViewModels.CheckpointManager;
 using StabilityMatrix.Avalonia.ViewModels.Dialogs;
 using StabilityMatrix.Avalonia.ViewModels.PackageManager;
 using StabilityMatrix.Avalonia.Views;
@@ -57,8 +59,6 @@
 using StabilityMatrix.Core.Services;
 using StabilityMatrix.Core.Updater;
 using Application = Avalonia.Application;
-using CheckpointFile = StabilityMatrix.Avalonia.ViewModels.CheckpointManager.CheckpointFile;
-using CheckpointFolder = StabilityMatrix.Avalonia.ViewModels.CheckpointManager.CheckpointFolder;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace StabilityMatrix.Avalonia;
@@ -194,7 +194,12 @@ private static void ConfigureServiceProvider()
         Services = services.BuildServiceProvider();
 
         var settingsManager = Services.GetRequiredService<ISettingsManager>();
-        settingsManager.TryFindLibrary();
+
+        if (settingsManager.TryFindLibrary())
+        {
+            Cultures.TrySetSupportedCulture(settingsManager.Settings.Language);
+        }
+
         Services.GetRequiredService<ProgressManagerViewModel>().StartEventListener();
     }
 
@@ -204,13 +209,15 @@ internal static void ConfigurePageViewModels(IServiceCollection services)
             .AddSingleton<SettingsViewModel>()
             .AddSingleton<CheckpointBrowserViewModel>()
             .AddSingleton<CheckpointsPageViewModel>()
+            .AddSingleton<NewCheckpointsPageViewModel>()
             .AddSingleton<LaunchPageViewModel>()
             .AddSingleton<ProgressManagerViewModel>();
 
         services.AddSingleton<MainWindowViewModel>(provider =>
             new MainWindowViewModel(provider.GetRequiredService<ISettingsManager>(),
                 provider.GetRequiredService<IDiscordRichPresenceService>(),
-                provider.GetRequiredService<ServiceManager<ViewModelBase>>())
+                provider.GetRequiredService<ServiceManager<ViewModelBase>>(),
+                provider.GetRequiredService<ITrackedDownloadService>())
             {
                 Pages =
                 {
@@ -240,14 +247,16 @@ internal static void ConfigureDialogViewModels(IServiceCollection services)
         services.AddTransient<LaunchOptionsViewModel>();
         services.AddTransient<ExceptionViewModel>();
         services.AddTransient<EnvVarsViewModel>();
+        services.AddTransient<PackageImportViewModel>();
+
+        // Dialog view models (singleton)
         services.AddSingleton<FirstLaunchSetupViewModel>();
         services.AddSingleton<UpdateViewModel>();
 
         // Other transients (usually sub view models)
-        services.AddTransient<CheckpointFolder>()
-            .AddTransient<CheckpointFile>()
-            .AddTransient<CheckpointBrowserCardViewModel>();
-
+        services.AddTransient<CheckpointFolder>();
+        services.AddTransient<CheckpointFile>();
+        services.AddTransient<CheckpointBrowserCardViewModel>();
         services.AddTransient<PackageCardViewModel>();
 
         // Global progress
@@ -273,7 +282,9 @@ internal static void ConfigureDialogViewModels(IServiceCollection services)
                 .Register(provider.GetRequiredService<ExceptionViewModel>)
                 .Register(provider.GetRequiredService<EnvVarsViewModel>)
                 .Register(provider.GetRequiredService<ProgressManagerViewModel>)
-                .Register(provider.GetRequiredService<FirstLaunchSetupViewModel>));
+                .Register(provider.GetRequiredService<FirstLaunchSetupViewModel>)
+                .Register(provider.GetRequiredService<PackageImportViewModel>)
+            );
     }
 
     internal static void ConfigureViews(IServiceCollection services)
@@ -285,13 +296,15 @@ internal static void ConfigureViews(IServiceCollection services)
         services.AddSingleton<SettingsPage>();
         services.AddSingleton<CheckpointBrowserPage>();
         services.AddSingleton<ProgressManagerPage>();
+        services.AddSingleton<NewCheckpointsPage>();
 
         // Dialogs
         services.AddTransient<SelectDataDirectoryDialog>();
         services.AddTransient<LaunchOptionsDialog>();
         services.AddTransient<UpdateDialog>();
         services.AddTransient<ExceptionDialog>();
         services.AddTransient<EnvVarsDialog>();
+        services.AddTransient<PackageImportDialog>();
 
         // Controls
         services.AddTransient<RefreshBadge>();
@@ -308,6 +321,7 @@ internal static void ConfigurePackages(IServiceCollection services)
         services.AddSingleton<BasePackage, ComfyUI>();
         services.AddSingleton<BasePackage, VoltaML>();
         services.AddSingleton<BasePackage, InvokeAI>();
+        services.AddSingleton<BasePackage, Fooocus>();
     }
 
     private static IServiceCollection ConfigureServices()
@@ -333,6 +347,10 @@ private static IServiceCollection ConfigureServices()
         services.AddSingleton<IUpdateHelper, UpdateHelper>();
         services.AddSingleton<INavigationService, NavigationService>();
 
+        services.AddSingleton<ITrackedDownloadService, TrackedDownloadService>();
+        services.AddSingleton<IDisposable>(provider => 
+            (IDisposable) provider.GetRequiredService<ITrackedDownloadService>());
+
         // Rich presence
         services.AddSingleton<IDiscordRichPresenceService, DiscordRichPresenceService>();
         services.AddSingleton<IDisposable>(provider =>