Merge pull request #533 from ionite34/maybe-fix-a1111-update

Use venvRunner.Setup instead of SetupVenv during install/update

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Hopefully actually fixed [#464](https://github.com/LykosAI/StabilityMatrix/issues/464) - error when installing InvokeAI on macOS
 - Fixed default command line args for SDWebUI Forge on macOS
 - Fixed output paths and output sharing for SDWebUI Forge
+- Maybe fixed update hanging for Auto1111 and SDWebUI Forge
 
 ## v2.9.0-dev.2
 ### Added

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -195,7 +195,9 @@ public class A3WebUI(
         var venvPath = Path.Combine(installLocation, "venv");
         var exists = Directory.Exists(venvPath);
 
-        var venvRunner = await SetupVenv(installLocation, forceRecreate: true).ConfigureAwait(false);
+        await using var venvRunner = new PyVenvRunner(venvPath);
+        venvRunner.WorkingDirectory = installLocation;
+        await venvRunner.Setup(true, onConsoleOutput).ConfigureAwait(false);
         await venvRunner.PipInstall("--upgrade pip wheel", onConsoleOutput).ConfigureAwait(false);
 
         progress?.Report(new ProgressReport(-1f, "Installing requirements...", isIndeterminate: true));

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@@ -115,7 +115,11 @@ public class SDWebForge(
     {
         progress?.Report(new ProgressReport(-1f, "Setting up venv", isIndeterminate: true));
 
-        var venvRunner = await SetupVenv(installLocation, forceRecreate: true).ConfigureAwait(false);
+        var venvPath = Path.Combine(installLocation, "venv");
+
+        await using var venvRunner = new PyVenvRunner(venvPath);
+        venvRunner.WorkingDirectory = installLocation;
+        await venvRunner.Setup(true, onConsoleOutput).ConfigureAwait(false);
         await venvRunner.PipInstall("--upgrade pip wheel", onConsoleOutput).ConfigureAwait(false);
 
         progress?.Report(new ProgressReport(-1f, "Installing requirements...", isIndeterminate: true));