Merge pull request #514 from ionite34/fix-extension-dialog

Fixed extension modification dialog not showing any progress messages…
LykosAI · Feb 9, 2024 · 269a912 · 269a912
2 parents dfc27fc + 59af8bc
commit 269a912
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,13 @@ 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.8.2
+### Added
+- Added missing GFPGAN link to Automatic1111 packages
 ### Fixed
 - Fixed Inference Image to Image Denoise setting becoming hidden after changing schedulers
 - Fixed Inference ControlNet models showing as downloadable even when they are already installed
 - Fixed Inference Sampler Addon conditioning not applying (i.e. ControlNet)
+- Fixed extension modification dialog not showing any progress messages
 
 ## v2.8.1
 ### Fixed

diff --git a/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
@@ -179,7 +179,12 @@ public async Task InstallSelectedExtensions()
             .Cast<IPackageStep>()
             .ToArray();
 
-        var runner = new PackageModificationRunner { ShowDialogOnStart = true };
+        var runner = new PackageModificationRunner
+        {
+            ShowDialogOnStart = true,
+            ModificationCompleteTitle = "Installed Extensions",
+            ModificationCompleteMessage = "Finished installing extensions"
+        };
         EventManager.Instance.OnPackageInstallProgressAdded(runner);
 
         await runner.ExecuteSteps(steps);
@@ -209,7 +214,12 @@ public async Task UpdateSelectedExtensions()
             .Cast<IPackageStep>()
             .ToArray();
 
-        var runner = new PackageModificationRunner { ShowDialogOnStart = true };
+        var runner = new PackageModificationRunner
+        {
+            ShowDialogOnStart = true,
+            ModificationCompleteTitle = "Updated Extensions",
+            ModificationCompleteMessage = "Finished updating extensions"
+        };
         EventManager.Instance.OnPackageInstallProgressAdded(runner);
 
         await runner.ExecuteSteps(steps);
@@ -239,7 +249,12 @@ public async Task UninstallSelectedExtensions()
             .Cast<IPackageStep>()
             .ToArray();
 
-        var runner = new PackageModificationRunner { ShowDialogOnStart = true };
+        var runner = new PackageModificationRunner
+        {
+            ShowDialogOnStart = true,
+            ModificationCompleteTitle = "Uninstalled Extensions",
+            ModificationCompleteMessage = "Finished uninstalling extensions"
+        };
         EventManager.Instance.OnPackageInstallProgressAdded(runner);
 
         await runner.ExecuteSteps(steps);

diff --git a/StabilityMatrix.Core/Models/PackageModification/PackageModificationRunner.cs b/StabilityMatrix.Core/Models/PackageModification/PackageModificationRunner.cs
@@ -15,6 +15,11 @@ public async Task ExecuteSteps(IReadOnlyList<IPackageStep> steps)
                 ConsoleOutput.Add(report.Message);
             }
 
+            if (!string.IsNullOrWhiteSpace(report.Title))
+            {
+                ConsoleOutput.Add(report.Title);
+            }
+
             OnProgressChanged(report);
         });
 

diff --git a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs
@@ -48,6 +48,7 @@ IPrerequisiteHelper prerequisiteHelper
         {
             [SharedFolderType.StableDiffusion] = new[] { "models/Stable-diffusion" },
             [SharedFolderType.ESRGAN] = new[] { "models/ESRGAN" },
+            [SharedFolderType.GFPGAN] = new[] { "models/GFPGAN" },
             [SharedFolderType.RealESRGAN] = new[] { "models/RealESRGAN" },
             [SharedFolderType.SwinIR] = new[] { "models/SwinIR" },
             [SharedFolderType.Lora] = new[] { "models/Lora" },

diff --git a/StabilityMatrix.Core/Models/Packages/Extensions/GitPackageExtensionManager.cs b/StabilityMatrix.Core/Models/Packages/Extensions/GitPackageExtensionManager.cs
@@ -155,13 +155,15 @@ public virtual async Task InstallExtensionAsync(
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            progress?.Report(new ProgressReport(0f, $"Cloning {repositoryUri}", isIndeterminate: true));
+            progress?.Report(
+                new ProgressReport(0f, message: $"Cloning {repositoryUri}", isIndeterminate: true)
+            );
 
             await prerequisiteHelper
                 .CloneGitRepository(cloneRoot, repositoryUri.ToString(), version)
                 .ConfigureAwait(false);
 
-            progress?.Report(new ProgressReport(1f, $"Cloned {repositoryUri}"));
+            progress?.Report(new ProgressReport(1f, message: $"Cloned {repositoryUri}"));
         }
     }
 
@@ -191,7 +193,11 @@ public virtual async Task UpdateExtensionAsync(
                 .ConfigureAwait(false);
 
             progress?.Report(
-                new ProgressReport(0f, $"Updating git repository {repoPath.Name}", isIndeterminate: true)
+                new ProgressReport(
+                    0f,
+                    message: $"Updating git repository {repoPath.Name}",
+                    isIndeterminate: true
+                )
             );
 
             // If version not provided, use current branch
@@ -206,7 +212,7 @@ await prerequisiteHelper
                 .UpdateGitRepository(repoPath, remoteUrlResult.StandardOutput!.Trim(), version)
                 .ConfigureAwait(false);
 
-            progress?.Report(new ProgressReport(1f, $"Updated git repository {repoPath.Name}"));
+            progress?.Report(new ProgressReport(1f, message: $"Updated git repository {repoPath.Name}"));
         }
     }
 
@@ -233,5 +239,7 @@ await directoryPath
                 await path.DeleteAsync().ConfigureAwait(false);
             }
         }
+
+        progress?.Report(new ProgressReport(1f, message: "Uninstalled extension"));
     }
 }