do some .ToSTrings() on DirectoryPaths so they dont enumerate & log every item

also added jsonmerge to a1111 & some other stuff

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ### Fixed
 - Inference file name patterns with directory separator characters will now have the subdirectories created automatically
 - Fixed missing up/downgrade buttons on the Python Packages dialog when the version was not semver compatible
+- Automatic1111 package installs will now install the missing `jsonmerge` package
 
 ## v2.8.0-dev.4
 ### Added

StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageInstallDetailViewModel.cs

@@ -90,6 +90,9 @@ public partial class PackageInstallDetailViewModel(
 
         OnInstallNameChanged(InstallName);
 
+        SelectedTorchVersion = SelectedPackage.GetRecommendedTorchVersion();
+        SelectedSharedFolderMethod = SelectedPackage.RecommendedSharedFolderMethod;
+
         allOptions = await SelectedPackage.GetAllVersionOptions();
         if (ShowReleaseMode)
         {
@@ -100,9 +103,6 @@ public partial class PackageInstallDetailViewModel(
             UpdateVersions();
             await UpdateCommits(SelectedPackage.MainBranch);
         }
-
-        SelectedTorchVersion = SelectedPackage.GetRecommendedTorchVersion();
-        SelectedSharedFolderMethod = SelectedPackage.RecommendedSharedFolderMethod;
     }
 
     [RelayCommand]

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -187,13 +187,11 @@ public class A3WebUI(
         progress?.Report(new ProgressReport(-1f, "Setting up venv", isIndeterminate: true));
 
         var venvRunner = await SetupVenv(installLocation, forceRecreate: true).ConfigureAwait(false);
-
         await venvRunner.PipInstall("--upgrade pip wheel", onConsoleOutput).ConfigureAwait(false);
 
         progress?.Report(new ProgressReport(-1f, "Installing requirements...", isIndeterminate: true));
 
         var requirements = new FilePath(installLocation, "requirements_versions.txt");
-
         var pipArgs = new PipInstallArgs()
             .WithTorch("==2.0.1")
             .WithTorchVision("==0.15.2")
@@ -222,6 +220,9 @@ public class A3WebUI(
             pipArgs = pipArgs.AddArg("httpx==0.24.1");
         }
 
+        // Add jsonmerge to fix https://github.com/AUTOMATIC1111/stable-diffusion-webui/issues/12482
+        pipArgs = pipArgs.AddArg("jsonmerge");
+
         await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
 
         progress?.Report(new ProgressReport(-1f, "Updating configuration", isIndeterminate: true));

StabilityMatrix.Core/Python/PyVenvRunner.cs

@@ -515,7 +515,7 @@ public class PyVenvRunner : IDisposable, IAsyncDisposable
             "Launching venv process [{PythonPath}] "
                 + "in working directory [{WorkingDirectory}] with args {Arguments}",
             PythonPath,
-            WorkingDirectory,
+            WorkingDirectory?.ToString(),
             arguments
         );
 

StabilityMatrix.Core/Services/ImageIndexService.cs

@@ -26,10 +26,7 @@ public class ImageIndexService : IImageIndexService
         this.logger = logger;
         this.settingsManager = settingsManager;
 
-        InferenceImages = new IndexCollection<LocalImageFile, string>(
+        InferenceImages = new IndexCollection<LocalImageFile, string>(this, file => file.AbsolutePath)
-            this,
-            file => file.AbsolutePath
-        )
         {
             RelativePath = "Inference"
         };
@@ -56,7 +53,7 @@ public class ImageIndexService : IImageIndexService
 
         // Start
         var stopwatch = Stopwatch.StartNew();
-        logger.LogInformation("Refreshing images index at {SearchDir}...", searchDir);
+        logger.LogInformation("Refreshing images index at {SearchDir}...", searchDir.ToString());
 
         var toAdd = new ConcurrentBag<LocalImageFile>();
 
@@ -64,9 +61,7 @@ public class ImageIndexService : IImageIndexService
             {
                 var files = searchDir
                     .EnumerateFiles("*.*", SearchOption.AllDirectories)
-                    .Where(
+                    .Where(file => LocalImageFile.SupportedImageExtensions.Contains(file.Extension));
-                        file => LocalImageFile.SupportedImageExtensions.Contains(file.Extension)
-                    );
 
                 Parallel.ForEach(
                     files,