Browse Source

Fixed extension modification dialog not showing any progress messages & added GFPGAN link to a1111

pull/447/head
JT 9 months ago
parent
commit
59af8bc07d
  1. 3
      CHANGELOG.md
  2. 21
      StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs
  3. 5
      StabilityMatrix.Core/Models/PackageModification/PackageModificationRunner.cs
  4. 1
      StabilityMatrix.Core/Models/Packages/A3WebUI.cs
  5. 16
      StabilityMatrix.Core/Models/Packages/Extensions/GitPackageExtensionManager.cs

3
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

21
StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageExtensionBrowserViewModel.cs

@ -179,7 +179,12 @@ public partial class PackageExtensionBrowserViewModel : ViewModelBase, IDisposab
.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 partial class PackageExtensionBrowserViewModel : ViewModelBase, IDisposab
.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 partial class PackageExtensionBrowserViewModel : ViewModelBase, IDisposab
.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);

5
StabilityMatrix.Core/Models/PackageModification/PackageModificationRunner.cs

@ -15,6 +15,11 @@ public class PackageModificationRunner : IPackageModificationRunner
ConsoleOutput.Add(report.Message);
}
if (!string.IsNullOrWhiteSpace(report.Title))
{
ConsoleOutput.Add(report.Title);
}
OnProgressChanged(report);
});

1
StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@ -48,6 +48,7 @@ public class A3WebUI(
{
[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" },

16
StabilityMatrix.Core/Models/Packages/Extensions/GitPackageExtensionManager.cs

@ -155,13 +155,15 @@ public abstract class GitPackageExtensionManager(IPrerequisiteHelper prerequisit
{
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 abstract class GitPackageExtensionManager(IPrerequisiteHelper prerequisit
.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 @@ public abstract class GitPackageExtensionManager(IPrerequisiteHelper prerequisit
.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 @@ public abstract class GitPackageExtensionManager(IPrerequisiteHelper prerequisit
await path.DeleteAsync().ConfigureAwait(false);
}
}
progress?.Report(new ProgressReport(1f, message: "Uninstalled extension"));
}
}

Loading…
Cancel
Save