Merge pull request #350 from ionite34/merge-main-to-dev-ad3b436

CHANGELOG.md

@@ -20,6 +20,10 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ## v2.6.2
 ### Changed
 - Backend changes for auto-update schema v3, supporting customizable release channels and faster downloads with zip compression
+### Fixed
+- Better error reporting including outputs for git subprocess errors during package install / update
+- Fixed `'accelerate' is not recognized as an internal or external command` error when starting training in kohya_ss
+- Fixed some instances of `ModuleNotFoundError: No module named 'bitsandbytes.cuda_setup.paths'` error when using 8-bit optimizers in kohya_ss
 
 ## v2.6.1
 ### Changed

StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs

@@ -126,16 +126,23 @@ public class UnixPrerequisiteHelper : IPrerequisiteHelper
         }
     }
 
-    public async Task RunGit(
-        string? workingDirectory = null,
+    /// <inheritdoc />
+    public Task RunGit(
+        ProcessArgs args,
         Action<ProcessOutput>? onProcessOutput = null,
-        params string[] args
+        string? workingDirectory = null
     )
     {
-        var command =
-            args.Length == 0 ? "git" : "git " + string.Join(" ", args.Select(ProcessRunner.Quote));
+        // Async progress not supported on Unix
+        return RunGit(args, workingDirectory);
+    }
+
+    /// <inheritdoc />
+    public async Task RunGit(ProcessArgs args, string? workingDirectory = null)
+    {
+        var command = args.Prepend("git");
 
-        var result = await ProcessRunner.RunBashCommand(command, workingDirectory ?? "");
+        var result = await ProcessRunner.RunBashCommand(command.ToArray(), workingDirectory ?? "");
         if (result.ExitCode != 0)
         {
             Logger.Error(

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.Win32;
 using NLog;
 using Octokit;
+using StabilityMatrix.Core.Exceptions;
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Core.Processes;
@@ -64,23 +65,35 @@ public class WindowsPrerequisiteHelper : IPrerequisiteHelper
     }
 
     public async Task RunGit(
-        string? workingDirectory = null,
-        Action<ProcessOutput>? onProcessOutput = null,
-        params string[] args
+        ProcessArgs args,
+        Action<ProcessOutput>? onProcessOutput,
+        string? workingDirectory = null
     )
     {
         var process = ProcessRunner.StartAnsiProcess(
             GitExePath,
-            args,
-            workingDirectory: workingDirectory,
+            args.ToArray(),
+            workingDirectory,
+            onProcessOutput,
             environmentVariables: new Dictionary<string, string>
             {
                 { "PATH", Compat.GetEnvPathWithExtensions(GitBinPath) }
-            },
-            outputDataReceived: onProcessOutput
+            }
         );
+        await process.WaitForExitAsync().ConfigureAwait(false);
+        if (process.ExitCode != 0)
+        {
+            throw new ProcessException($"Git exited with code {process.ExitCode}");
+        }
+    }
+
+    public async Task RunGit(ProcessArgs args, string? workingDirectory = null)
+    {
+        var result = await ProcessRunner
+            .GetProcessResultAsync(GitExePath, args, workingDirectory)
+            .ConfigureAwait(false);
 
-        await ProcessRunner.WaitForExitConditionAsync(process);
+        result.EnsureSuccessExitCode();
     }
 
     public async Task<string> GetGitOutput(string? workingDirectory = null, params string[] args)

StabilityMatrix.Avalonia/Views/MainWindow.axaml

@@ -21,6 +21,15 @@
                         DockProperties.IsDropEnabled="True"
                         x:Class="StabilityMatrix.Avalonia.Views.MainWindow">
     
+    <controls:AppWindowBase.Resources>
+        <SolidColorBrush x:Key="BrushB0" Color="#FFFFFFFF" />
+        <DrawingImage x:Key="BrandsPatreonSymbolWhite">
+            <DrawingGroup>
+                <GeometryDrawing Brush="{DynamicResource BrushB0}" Geometry="F1 M1033.05 324.45C1032.86 186.55 925.46 73.53 799.45 32.75C642.97 -17.89 436.59 -10.55 287.17 59.95C106.07 145.41 49.18 332.61 47.06 519.31C45.32 672.81 60.64 1077.1 288.68 1079.98C458.12 1082.13 483.35 863.8 561.75 758.65C617.53 683.84 689.35 662.71 777.76 640.83C929.71 603.22 1033.27 483.3 1033.05 324.45Z" />
+            </DrawingGroup>
+        </DrawingImage>
+    </controls:AppWindowBase.Resources>
+    
     <Grid RowDefinitions="Auto,Auto,*">
         <Grid Name="TitleBarHost"
               ColumnDefinitions="Auto,Auto,*,Auto"
@@ -101,7 +110,7 @@
                                            Content="{x:Static lang:Resources.Label_BecomeAPatron}"
                                            Tapped="PatreonPatreonItem_OnTapped">
                         <ui:NavigationViewItem.IconSource>
-                            <controls:FASymbolIconSource Symbol="fa-brands fa-patreon"/>
+                            <ui:ImageIconSource Source="{StaticResource BrandsPatreonSymbolWhite}" />
                         </ui:NavigationViewItem.IconSource> 
                     </ui:NavigationViewItem>
                     

StabilityMatrix.Core/Exceptions/ProcessException.cs

@@ -1,11 +1,22 @@
-namespace StabilityMatrix.Core.Exceptions;
+using StabilityMatrix.Core.Processes;
+
+namespace StabilityMatrix.Core.Exceptions;
 
 /// <summary>
 /// Exception that is thrown when a process fails.
 /// </summary>
 public class ProcessException : Exception
 {
-    public ProcessException(string message) : base(message)
+    public ProcessResult? ProcessResult { get; }
+
+    public ProcessException(string message)
+        : base(message) { }
+
+    public ProcessException(ProcessResult processResult)
+        : base(
+            $"Process {processResult.ProcessName} exited with code {processResult.ExitCode}. {{StdOut = {processResult.StandardOutput}, StdErr = {processResult.StandardError}}}"
+        )
     {
+        ProcessResult = processResult;
     }
-}
+}

StabilityMatrix.Core/Helper/ArchiveHelper.cs

@@ -15,7 +15,6 @@ namespace StabilityMatrix.Core.Helper;
 public record struct ArchiveInfo(ulong Size, ulong CompressedSize);
 
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-
 public static partial class ArchiveHelper
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
@@ -42,24 +41,24 @@ public static partial class ArchiveHelper
             throw new PlatformNotSupportedException("7z is not supported on this platform.");
         }
     }
-    
+
     // HomeDir is set by ISettingsManager.TryFindLibrary()
     public static string HomeDir { get; set; } = string.Empty;
 
     public static string SevenZipPath => Path.Combine(HomeDir, "Assets", SevenZipFileName);
-    
+
     [GeneratedRegex(@"(?<=Size:\s*)\d+|(?<=Compressed:\s*)\d+")]
     private static partial Regex Regex7ZOutput();
-    
+
     [GeneratedRegex(@"(?<=\s*)\d+(?=%)")]
     private static partial Regex Regex7ZProgressDigits();
-    
+
     [GeneratedRegex(@"(\d+)%.*- (.*)")]
     private static partial Regex Regex7ZProgressFull();
-    
+
     public static async Task<ArchiveInfo> TestArchive(string archivePath)
     {
-        var process = ProcessRunner.StartAnsiProcess(SevenZipPath, new[] {"t", archivePath});
+        var process = ProcessRunner.StartAnsiProcess(SevenZipPath, new[] { "t", archivePath });
         await process.WaitForExitAsync();
         var output = await process.StandardOutput.ReadToEndAsync();
         var matches = Regex7ZOutput().Matches(output);
@@ -67,25 +66,29 @@ public static partial class ArchiveHelper
         var compressed = ulong.Parse(matches[1].Value);
         return new ArchiveInfo(size, compressed);
     }
-    
+
     public static async Task AddToArchive7Z(string archivePath, string sourceDirectory)
     {
         // Start 7z in the parent directory of the source directory
         var sourceParent = Directory.GetParent(sourceDirectory)?.FullName ?? "";
         // We must pass in as `directory\` for archive path to be correct
         var sourceDirName = new DirectoryInfo(sourceDirectory).Name;
-        var process = ProcessRunner.StartAnsiProcess(SevenZipPath, new[]
-        {
-            "a", archivePath, sourceDirName + @"\", "-y"
-        }, workingDirectory: sourceParent);
-        await ProcessRunner.WaitForExitConditionAsync(process);
+
+        var result = await ProcessRunner
+            .GetProcessResultAsync(
+                SevenZipPath,
+                new[] { "a", archivePath, sourceDirName + @"\", "-y" },
+                workingDirectory: sourceParent
+            )
+            .ConfigureAwait(false);
+        result.EnsureSuccessExitCode();
     }
-    
+
     public static async Task<ArchiveInfo> Extract7Z(string archivePath, string extractDirectory)
     {
         var args =
             $"x {ProcessRunner.Quote(archivePath)} -o{ProcessRunner.Quote(extractDirectory)} -y";
-        
+
         Logger.Debug($"Starting process '{SevenZipPath}' with arguments '{args}'");
 
         using var process = new Process();
@@ -99,7 +102,7 @@ public static partial class ArchiveHelper
         process.Start();
         await ProcessRunner.WaitForExitConditionAsync(process);
         var output = await process.StandardOutput.ReadToEndAsync();
-        
+
         try
         {
             var matches = Regex7ZOutput().Matches(output);
@@ -112,14 +115,19 @@ public static partial class ArchiveHelper
             throw new Exception($"Could not parse 7z output [{e.Message}]: {output.ToRepr()}");
         }
     }
-    
-    public static async Task<ArchiveInfo> Extract7Z(string archivePath, string extractDirectory, IProgress<ProgressReport> progress)
+
+    public static async Task<ArchiveInfo> Extract7Z(
+        string archivePath,
+        string extractDirectory,
+        IProgress<ProgressReport> progress
+    )
     {
         var outputStore = new StringBuilder();
         var onOutput = new Action<string?>(s =>
         {
-            if (s == null) return;
-            
+            if (s == null)
+                return;
+
             // Parse progress
             Logger.Trace($"7z: {s}");
             outputStore.AppendLine(s);
@@ -128,23 +136,30 @@ public static partial class ArchiveHelper
             {
                 var percent = int.Parse(match.Groups[1].Value);
                 var currentFile = match.Groups[2].Value;
-                progress.Report(new ProgressReport(percent / (float) 100, "Extracting", currentFile, type: ProgressType.Extract));
+                progress.Report(
+                    new ProgressReport(
+                        percent / (float)100,
+                        "Extracting",
+                        currentFile,
+                        type: ProgressType.Extract
+                    )
+                );
             }
         });
         progress.Report(new ProgressReport(-1, isIndeterminate: true, type: ProgressType.Extract));
-        
+
         // Need -bsp1 for progress reports
         var args =
             $"x {ProcessRunner.Quote(archivePath)} -o{ProcessRunner.Quote(extractDirectory)} -y -bsp1";
         Logger.Debug($"Starting process '{SevenZipPath}' with arguments '{args}'");
-        
+
         var process = ProcessRunner.StartProcess(SevenZipPath, args, outputDataReceived: onOutput);
         await ProcessRunner.WaitForExitConditionAsync(process);
-        
+
         progress.Report(new ProgressReport(1f, "Finished extracting", type: ProgressType.Extract));
-        
+
         var output = outputStore.ToString();
-        
+
         try
         {
             var matches = Regex7ZOutput().Matches(output);
@@ -157,7 +172,7 @@ public static partial class ArchiveHelper
             throw new Exception($"Could not parse 7z output [{e.Message}]: {output.ToRepr()}");
         }
     }
-    
+
     /// <summary>
     /// Extracts a zipped tar (i.e. '.tar.gz') archive.
     /// First extracts the zipped tar, then extracts the tar and removes the tar.
@@ -173,7 +188,7 @@ public static partial class ArchiveHelper
         }
         // Extract the tar.gz to tar
         await Extract7Z(archivePath, extractDirectory);
-        
+
         // Extract the tar
         var tarPath = Path.Combine(extractDirectory, Path.GetFileNameWithoutExtension(archivePath));
         if (!File.Exists(tarPath))
@@ -216,7 +231,11 @@ public static partial class ArchiveHelper
     /// <param name="progress"></param>
     /// <param name="archivePath"></param>
     /// <param name="outputDirectory">Output directory, created if does not exist.</param>
-    public static async Task Extract(string archivePath, string outputDirectory, IProgress<ProgressReport>? progress = default)
+    public static async Task Extract(
+        string archivePath,
+        string outputDirectory,
+        IProgress<ProgressReport>? progress = default
+    )
     {
         Directory.CreateDirectory(outputDirectory);
         progress?.Report(new ProgressReport(-1, isIndeterminate: true));
@@ -229,48 +248,53 @@ public static partial class ArchiveHelper
         // If not available, use the size of the archive file
         if (total == 0)
         {
-            total = (ulong) new FileInfo(archivePath).Length;
+            total = (ulong)new FileInfo(archivePath).Length;
         }
 
         // Create an DispatchTimer that monitors the progress of the extraction
-        var progressMonitor = progress switch {
+        var progressMonitor = progress switch
+        {
             null => null,
             _ => new Timer(TimeSpan.FromMilliseconds(36))
         };
-        
+
         if (progressMonitor != null)
         {
             progressMonitor.Elapsed += (_, _) =>
             {
-                if (count == 0) return;
+                if (count == 0)
+                    return;
                 progress!.Report(new ProgressReport(count, total, message: "Extracting"));
             };
         }
 
-        await Task.Factory.StartNew(() =>
-        {
-            var extractOptions = new ExtractionOptions
+        await Task.Factory.StartNew(
+            () =>
             {
-                Overwrite = true,
-                ExtractFullPath = true,
-            };
-            using var stream = File.OpenRead(archivePath);
-            using var archive = ReaderFactory.Open(stream);
+                var extractOptions = new ExtractionOptions
+                {
+                    Overwrite = true,
+                    ExtractFullPath = true,
+                };
+                using var stream = File.OpenRead(archivePath);
+                using var archive = ReaderFactory.Open(stream);
 
-            // Start the progress reporting timer
-            progressMonitor?.Start();
-            
-            while (archive.MoveToNextEntry())
-            {
-                var entry = archive.Entry;
-                if (!entry.IsDirectory)
+                // Start the progress reporting timer
+                progressMonitor?.Start();
+
+                while (archive.MoveToNextEntry())
                 {
-                    count += (ulong) entry.CompressedSize;
+                    var entry = archive.Entry;
+                    if (!entry.IsDirectory)
+                    {
+                        count += (ulong)entry.CompressedSize;
+                    }
+                    archive.WriteEntryToDirectory(outputDirectory, extractOptions);
                 }
-                archive.WriteEntryToDirectory(outputDirectory, extractOptions);
-            }
-        }, TaskCreationOptions.LongRunning);
-        
+            },
+            TaskCreationOptions.LongRunning
+        );
+
         progress?.Report(new ProgressReport(progress: 1, message: "Done extracting"));
         progressMonitor?.Stop();
         Logger.Info("Finished extracting archive {}", archivePath);
@@ -285,7 +309,7 @@ public static partial class ArchiveHelper
         await using var stream = File.OpenRead(archivePath);
         await ExtractManaged(stream, outputDirectory);
     }
-    
+
     /// <summary>
     /// Extract an archive to the output directory, using SharpCompress managed code.
     /// does not require 7z to be installed, but no progress reporting.
@@ -298,7 +322,7 @@ public static partial class ArchiveHelper
         {
             var entry = reader.Entry;
             var outputPath = Path.Combine(outputDirectory, entry.Key);
-            
+
             if (entry.IsDirectory)
             {
                 if (!Directory.Exists(outputPath))
@@ -310,7 +334,7 @@ public static partial class ArchiveHelper
             {
                 var folder = Path.GetDirectoryName(entry.Key)!;
                 var destDir = Path.GetFullPath(Path.Combine(fullOutputDir, folder));
-                
+
                 if (!Directory.Exists(destDir))
                 {
                     if (!destDir.StartsWith(fullOutputDir, StringComparison.Ordinal))
@@ -322,20 +346,24 @@ public static partial class ArchiveHelper
 
                     Directory.CreateDirectory(destDir);
                 }
-                
+
                 // Check if symbolic link
                 if (entry.LinkTarget != null)
                 {
                     // Not sure why but symlink entries have a key that ends with a space
                     // and some broken path suffix, so we'll remove everything after the last space
-                    Logger.Debug($"Checking if output path {outputPath} contains space char: {outputPath.Contains(' ')}");
+                    Logger.Debug(
+                        $"Checking if output path {outputPath} contains space char: {outputPath.Contains(' ')}"
+                    );
                     if (outputPath.Contains(' '))
                     {
                         outputPath = outputPath[..outputPath.LastIndexOf(' ')];
                     }
-                    
-                    Logger.Debug($"Extracting symbolic link [{entry.Key.ToRepr()}] " +
-                                 $"({outputPath.ToRepr()} to {entry.LinkTarget.ToRepr()})");
+
+                    Logger.Debug(
+                        $"Extracting symbolic link [{entry.Key.ToRepr()}] "
+                            + $"({outputPath.ToRepr()} to {entry.LinkTarget.ToRepr()})"
+                    );
                     // Try to write link, if fail, continue copy file
                     try
                     {
@@ -346,10 +374,12 @@ public static partial class ArchiveHelper
                     }
                     catch (IOException e)
                     {
-                        Logger.Warn($"Could not extract symbolic link, copying file instead: {e.Message}");
+                        Logger.Warn(
+                            $"Could not extract symbolic link, copying file instead: {e.Message}"
+                        );
                     }
                 }
-                
+
                 // Write file
                 await using var entryStream = reader.OpenEntryStream();
                 await using var fileStream = File.Create(outputPath);

StabilityMatrix.Core/Helper/IPrerequisiteHelper.cs

@@ -22,10 +22,16 @@ public interface IPrerequisiteHelper
     /// Run embedded git with the given arguments.
     /// </summary>
     Task RunGit(
-        string? workingDirectory = null,
-        Action<ProcessOutput>? onProcessOutput = null,
-        params string[] args
+        ProcessArgs args,
+        Action<ProcessOutput>? onProcessOutput,
+        string? workingDirectory = null
     );
+
+    /// <summary>
+    /// Run embedded git with the given arguments.
+    /// </summary>
+    Task RunGit(ProcessArgs args, string? workingDirectory = null);
+
     Task<string> GetGitOutput(string? workingDirectory = null, params string[] args);
     Task InstallTkinterIfNecessary(IProgress<ProgressReport>? progress = null);
 }

StabilityMatrix.Core/Helper/PrerequisiteHelper.cs

@@ -1,8 +1,10 @@
-using System.Reflection;
+using System.Diagnostics;
+using System.Reflection;
 using System.Runtime.Versioning;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using Octokit;
+using StabilityMatrix.Core.Exceptions;
 using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Core.Processes;
 using StabilityMatrix.Core.Services;
@@ -61,18 +63,31 @@ public class PrerequisiteHelper : IPrerequisiteHelper
     }
 
     public async Task RunGit(
-        string? workingDirectory = null,
-        Action<ProcessOutput>? onProcessOutput = null,
-        params string[] args
+        ProcessArgs args,
+        Action<ProcessOutput>? onProcessOutput,
+        string? workingDirectory = null
     )
     {
         var process = ProcessRunner.StartAnsiProcess(
             GitExePath,
-            args,
+            args.ToArray(),
             workingDirectory,
             onProcessOutput
         );
-        await ProcessRunner.WaitForExitConditionAsync(process).ConfigureAwait(false);
+        await process.WaitForExitAsync().ConfigureAwait(false);
+        if (process.ExitCode != 0)
+        {
+            throw new ProcessException($"Git exited with code {process.ExitCode}");
+        }
+    }
+
+    public async Task RunGit(ProcessArgs args, string? workingDirectory = null)
+    {
+        var result = await ProcessRunner
+            .GetProcessResultAsync(GitExePath, args, workingDirectory)
+            .ConfigureAwait(false);
+
+        result.EnsureSuccessExitCode();
     }
 
     public async Task<string> GetGitOutput(string? workingDirectory = null, params string[] args)

StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs

@@ -185,13 +185,14 @@ public abstract class BaseGitPackage : BasePackage
         {
             await PrerequisiteHelper
                 .RunGit(
-                    null,
-                    null,
-                    "clone",
-                    "--branch",
-                    versionOptions.VersionTag,
-                    GithubUrl,
-                    $"\"{installLocation}\""
+                    new[]
+                    {
+                        "clone",
+                        "--branch",
+                        versionOptions.VersionTag,
+                        GithubUrl,
+                        installLocation
+                    }
                 )
                 .ConfigureAwait(false);
         }
@@ -199,13 +200,14 @@ public abstract class BaseGitPackage : BasePackage
         {
             await PrerequisiteHelper
                 .RunGit(
-                    null,
-                    null,
-                    "clone",
-                    "--branch",
-                    versionOptions.BranchName,
-                    GithubUrl,
-                    $"\"{installLocation}\""
+                    new[]
+                    {
+                        "clone",
+                        "--branch",
+                        versionOptions.BranchName,
+                        GithubUrl,
+                        installLocation
+                    }
                 )
                 .ConfigureAwait(false);
         }
@@ -213,7 +215,7 @@ public abstract class BaseGitPackage : BasePackage
         if (!versionOptions.IsLatest && !string.IsNullOrWhiteSpace(versionOptions.CommitHash))
         {
             await PrerequisiteHelper
-                .RunGit(installLocation, null, "checkout", versionOptions.CommitHash)
+                .RunGit(new[] { "checkout", versionOptions.CommitHash }, installLocation)
                 .ConfigureAwait(false);
         }
 
@@ -327,12 +329,9 @@ public abstract class BaseGitPackage : BasePackage
                 .ConfigureAwait(false);
             await PrerequisiteHelper
                 .RunGit(
-                    installedPackage.FullPath!,
+                    new[] { "remote", "add", "origin", GithubUrl },
                     onConsoleOutput,
-                    "remote",
-                    "add",
-                    "origin",
-                    GithubUrl
+                    installedPackage.FullPath
                 )
                 .ConfigureAwait(false);
         }
@@ -341,7 +340,7 @@ public abstract class BaseGitPackage : BasePackage
         {
             progress?.Report(new ProgressReport(-1f, "Fetching tags...", isIndeterminate: true));
             await PrerequisiteHelper
-                .RunGit(installedPackage.FullPath!, onConsoleOutput, "fetch", "--tags")
+                .RunGit(new[] { "fetch", "--tags" }, onConsoleOutput, installedPackage.FullPath)
                 .ConfigureAwait(false);
 
             progress?.Report(
@@ -353,11 +352,9 @@ public abstract class BaseGitPackage : BasePackage
             );
             await PrerequisiteHelper
                 .RunGit(
-                    installedPackage.FullPath!,
+                    new[] { "checkout", versionOptions.VersionTag, "--force" },
                     onConsoleOutput,
-                    "checkout",
-                    versionOptions.VersionTag,
-                    "--force"
+                    installedPackage.FullPath
                 )
                 .ConfigureAwait(false);
 
@@ -381,7 +378,7 @@ public abstract class BaseGitPackage : BasePackage
         // fetch
         progress?.Report(new ProgressReport(-1f, "Fetching data...", isIndeterminate: true));
         await PrerequisiteHelper
-            .RunGit(installedPackage.FullPath!, onConsoleOutput, "fetch")
+            .RunGit("fetch", onConsoleOutput, installedPackage.FullPath)
             .ConfigureAwait(false);
 
         if (versionOptions.IsLatest)
@@ -396,11 +393,9 @@ public abstract class BaseGitPackage : BasePackage
             );
             await PrerequisiteHelper
                 .RunGit(
-                    installedPackage.FullPath!,
+                    new[] { "checkout", versionOptions.BranchName!, "--force" },
                     onConsoleOutput,
-                    "checkout",
-                    versionOptions.BranchName,
-                    "--force"
+                    installedPackage.FullPath
                 )
                 .ConfigureAwait(false);
 
@@ -408,12 +403,15 @@ public abstract class BaseGitPackage : BasePackage
             progress?.Report(new ProgressReport(-1f, "Pulling changes...", isIndeterminate: true));
             await PrerequisiteHelper
                 .RunGit(
-                    installedPackage.FullPath!,
+                    new[]
+                    {
+                        "pull",
+                        "--autostash",
+                        "origin",
+                        installedPackage.Version.InstalledBranch!
+                    },
                     onConsoleOutput,
-                    "pull",
-                    "--autostash",
-                    "origin",
-                    installedPackage.Version.InstalledBranch
+                    installedPackage.FullPath!
                 )
                 .ConfigureAwait(false);
         }
@@ -429,11 +427,9 @@ public abstract class BaseGitPackage : BasePackage
             );
             await PrerequisiteHelper
                 .RunGit(
-                    installedPackage.FullPath!,
+                    new[] { "checkout", versionOptions.CommitHash!, "--force" },
                     onConsoleOutput,
-                    "checkout",
-                    versionOptions.CommitHash,
-                    "--force"
+                    installedPackage.FullPath
                 )
                 .ConfigureAwait(false);
         }

StabilityMatrix.Core/Models/Packages/KohyaSs.cs

@@ -1,4 +1,5 @@
 using System.Text.RegularExpressions;
+using Python.Runtime;
 using StabilityMatrix.Core.Attributes;
 using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Helper;
@@ -14,13 +15,19 @@ namespace StabilityMatrix.Core.Models.Packages;
 [Singleton(typeof(BasePackage))]
 public class KohyaSs : BaseGitPackage
 {
+    private readonly IPyRunner pyRunner;
+
     public KohyaSs(
         IGithubApiCache githubApi,
         ISettingsManager settingsManager,
         IDownloadService downloadService,
-        IPrerequisiteHelper prerequisiteHelper
+        IPrerequisiteHelper prerequisiteHelper,
+        IPyRunner pyRunner
     )
-        : base(githubApi, settingsManager, downloadService, prerequisiteHelper) { }
+        : base(githubApi, settingsManager, downloadService, prerequisiteHelper)
+    {
+        this.pyRunner = pyRunner;
+    }
 
     public override string Name => "kohya_ss";
     public override string DisplayName { get; set; } = "kohya_ss";
@@ -147,6 +154,8 @@ public class KohyaSs : BaseGitPackage
             // Install
             venvRunner.RunDetached("setup/setup_sm.py", onConsoleOutput);
             await venvRunner.Process.WaitForExitAsync().ConfigureAwait(false);
+
+            await venvRunner.PipInstall("bitsandbytes-windows").ConfigureAwait(false);
         }
         else if (Compat.IsLinux)
         {
@@ -168,28 +177,64 @@ public class KohyaSs : BaseGitPackage
         await SetupVenv(installedPackagePath).ConfigureAwait(false);
 
         // update gui files to point to venv accelerate
-        var filesToUpdate = new[]
+        await pyRunner.RunInThreadWithLock(() =>
         {
-            "lora_gui.py",
-            "dreambooth_gui.py",
-            "textual_inversion_gui.py",
-            Path.Combine("library", "wd14_caption_gui.py"),
-            "finetune_gui.py"
-        };
+            var scope = Py.CreateScope();
+            scope.Exec(
+                """
+                import ast
+
+                class StringReplacer(ast.NodeTransformer):
+                    def __init__(self, old: str, new: str, replace_count: int = -1):
+                        self.old = old
+                        self.new = new
+                        self.replace_count = replace_count
+                    
+                    def visit_Constant(self, node: ast.Constant) -> ast.Constant:
+                        if isinstance(node.value, str) and self.old in node.value:
+                            new_value = node.value.replace(self.old, self.new, self.replace_count)
+                            node.value = new_value
+                        return node
+                
+                    def rewrite_module(self, module_text: str) -> str:
+                        tree = ast.parse(module_text)
+                        tree = self.visit(tree)
+                        return ast.unparse(tree)
+                """
+            );
 
-        foreach (var file in filesToUpdate)
-        {
-            var path = Path.Combine(installedPackagePath, file);
-            var text = await File.ReadAllTextAsync(path).ConfigureAwait(false);
             var replacementAcceleratePath = Compat.IsWindows
-                ? @".\\venv\\scripts\\accelerate"
+                ? @".\venv\scripts\accelerate"
                 : "./venv/bin/accelerate";
-            text = text.Replace(
-                "run_cmd = f'accelerate launch",
-                $"run_cmd = f'{replacementAcceleratePath} launch"
+
+            var replacer = scope.InvokeMethod(
+                "StringReplacer",
+                "accelerate".ToPython(),
+                $"{replacementAcceleratePath}".ToPython(),
+                1.ToPython()
             );
-            await File.WriteAllTextAsync(path, text).ConfigureAwait(false);
-        }
+
+            var filesToUpdate = new[]
+            {
+                "lora_gui.py",
+                "dreambooth_gui.py",
+                "textual_inversion_gui.py",
+                Path.Combine("library", "wd14_caption_gui.py"),
+                "finetune_gui.py"
+            };
+
+            foreach (var file in filesToUpdate)
+            {
+                var path = Path.Combine(installedPackagePath, file);
+                var text = File.ReadAllText(path);
+                if (text.Contains(replacementAcceleratePath.Replace(@"\", @"\\")))
+                    continue;
+
+                var result = replacer.InvokeMethod("rewrite_module", text.ToPython());
+                var resultStr = result.ToString();
+                File.WriteAllText(path, resultStr);
+            }
+        });
 
         void HandleConsoleOutput(ProcessOutput s)
         {

StabilityMatrix.Core/Models/Packages/VladAutomatic.cs

@@ -242,29 +242,28 @@ public class VladAutomatic : BaseGitPackage
         {
             await PrerequisiteHelper
                 .RunGit(
-                    installDir.Parent ?? "",
-                    null,
-                    "clone",
-                    "https://github.com/vladmandic/automatic",
-                    installDir.Name
+                    new[] { "clone", "https://github.com/vladmandic/automatic", installDir.Name },
+                    installDir.Parent?.FullPath ?? ""
                 )
                 .ConfigureAwait(false);
 
             await PrerequisiteHelper
-                .RunGit(installLocation, null, "checkout", downloadOptions.CommitHash)
+                .RunGit(new[] { "checkout", downloadOptions.CommitHash }, installLocation)
                 .ConfigureAwait(false);
         }
         else if (!string.IsNullOrWhiteSpace(downloadOptions.BranchName))
         {
             await PrerequisiteHelper
                 .RunGit(
-                    installDir.Parent ?? "",
-                    null,
-                    "clone",
-                    "-b",
-                    downloadOptions.BranchName,
-                    "https://github.com/vladmandic/automatic",
-                    installDir.Name
+                    new[]
+                    {
+                        "clone",
+                        "-b",
+                        downloadOptions.BranchName,
+                        "https://github.com/vladmandic/automatic",
+                        installDir.Name
+                    },
+                    installDir.Parent?.FullPath ?? ""
                 )
                 .ConfigureAwait(false);
         }
@@ -325,10 +324,9 @@ public class VladAutomatic : BaseGitPackage
 
         await PrerequisiteHelper
             .RunGit(
-                installedPackage.FullPath,
+                new[] { "checkout", versionOptions.BranchName! },
                 onConsoleOutput,
-                "checkout",
-                versionOptions.BranchName
+                installedPackage.FullPath
             )
             .ConfigureAwait(false);
 

StabilityMatrix.Core/Models/Packages/VoltaML.cs

@@ -62,7 +62,7 @@ public class VoltaML : BaseGitPackage
     public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Symlink;
 
     public override IEnumerable<TorchVersion> AvailableTorchVersions =>
-        new[] { TorchVersion.Cpu, TorchVersion.Cuda, TorchVersion.DirectMl, TorchVersion.Mps };
+        new[] { TorchVersion.Cpu, TorchVersion.Cuda, TorchVersion.DirectMl };
 
     public override IEnumerable<SharedFolderMethod> AvailableSharedFolderMethods =>
         new[] { SharedFolderMethod.Symlink, SharedFolderMethod.None };

StabilityMatrix.Core/Processes/ProcessResult.cs

@@ -1,8 +1,24 @@
-namespace StabilityMatrix.Core.Processes;
+using StabilityMatrix.Core.Exceptions;
+
+namespace StabilityMatrix.Core.Processes;
 
 public readonly record struct ProcessResult
 {
     public required int ExitCode { get; init; }
     public string? StandardOutput { get; init; }
     public string? StandardError { get; init; }
+
+    public string? ProcessName { get; init; }
+
+    public TimeSpan Elapsed { get; init; }
+
+    public bool IsSuccessExitCode => ExitCode == 0;
+
+    public void EnsureSuccessExitCode()
+    {
+        if (!IsSuccessExitCode)
+        {
+            throw new ProcessException(this);
+        }
+    }
 }

StabilityMatrix.Core/Processes/ProcessRunner.cs

@@ -208,7 +208,9 @@ public static class ProcessRunner
         {
             ExitCode = process.ExitCode,
             StandardOutput = stdout,
-            StandardError = stderr
+            StandardError = stderr,
+            ProcessName = process.MachineName,
+            Elapsed = process.ExitTime - process.StartTime
         };
     }
 
@@ -425,6 +427,14 @@ public static class ProcessRunner
         CancellationToken cancelToken = default
     )
     {
+        if (process is AnsiProcess)
+        {
+            throw new ArgumentException(
+                $"{nameof(WaitForExitConditionAsync)} does not support AnsiProcess, which uses custom async data reading",
+                nameof(process)
+            );
+        }
+
         var stdout = new StringBuilder();
         var stderr = new StringBuilder();
         process.OutputDataReceived += (_, args) => stdout.Append(args.Data);

StabilityMatrix.Core/Python/PyRunner.cs

@@ -124,8 +124,11 @@ public class PyRunner : IPyRunner
         {
             throw new FileNotFoundException("get-pip not found", GetPipPath);
         }
-        var p = ProcessRunner.StartAnsiProcess(PythonExePath, "-m get-pip");
-        await ProcessRunner.WaitForExitConditionAsync(p);
+
+        var result = await ProcessRunner
+            .GetProcessResultAsync(PythonExePath, "-m get-pip")
+            .ConfigureAwait(false);
+        result.EnsureSuccessExitCode();
     }
 
     /// <summary>
@@ -137,8 +140,10 @@ public class PyRunner : IPyRunner
         {
             throw new FileNotFoundException("pip not found", PipExePath);
         }
-        var p = ProcessRunner.StartAnsiProcess(PipExePath, $"install {package}");
-        await ProcessRunner.WaitForExitConditionAsync(p);
+        var result = await ProcessRunner
+            .GetProcessResultAsync(PipExePath, $"install {package}")
+            .ConfigureAwait(false);
+        result.EnsureSuccessExitCode();
     }
 
     /// <summary>
@@ -159,15 +164,16 @@ public class PyRunner : IPyRunner
         try
         {
             return await Task.Run(
-                () =>
-                {
-                    using (Py.GIL())
+                    () =>
                     {
-                        return func();
-                    }
-                },
-                cancelToken
-            );
+                        using (Py.GIL())
+                        {
+                            return func();
+                        }
+                    },
+                    cancelToken
+                )
+                .ConfigureAwait(false);
         }
         finally
         {
@@ -193,15 +199,16 @@ public class PyRunner : IPyRunner
         try
         {
             await Task.Run(
-                () =>
-                {
-                    using (Py.GIL())
+                    () =>
                     {
-                        action();
-                    }
-                },
-                cancelToken
-            );
+                        using (Py.GIL())
+                        {
+                            action();
+                        }
+                    },
+                    cancelToken
+                )
+                .ConfigureAwait(false);
         }
         finally
         {