Merge pull request #329 from ionite34/invoke-fixes

Invoke fixes & other misc changes

StabilityMatrix.Avalonia/ViewModels/Dialogs/InstallerViewModel.cs

@@ -249,8 +249,10 @@ public partial class InstallerViewModel : ContentDialogViewModelBase
                 ?? throw new NullReferenceException("Selected version is null");
             downloadOptions.IsLatest =
                 AvailableVersions?.First().TagName == downloadOptions.VersionTag;
+            downloadOptions.IsPrerelease = SelectedVersion.IsPrerelease;
 
             installedVersion.InstalledReleaseVersion = downloadOptions.VersionTag;
+            installedVersion.IsPrerelease = SelectedVersion.IsPrerelease;
         }
         else
         {
@@ -275,6 +277,7 @@ public partial class InstallerViewModel : ContentDialogViewModelBase
         var installStep = new InstallPackageStep(
             SelectedPackage,
             SelectedTorchVersion,
+            SelectedSharedFolderMethod,
             downloadOptions,
             installLocation
         );
@@ -337,14 +340,12 @@ public partial class InstallerViewModel : ContentDialogViewModelBase
         {
             SelectedVersion = null;
         }
-        else if (SelectedPackage is FooocusMre)
-        {
-            SelectedVersion = AvailableVersions.FirstOrDefault(x => x.TagName == "moonride-main");
-        }
         else
         {
-            // First try to find master
+            // First try to find the package-defined main branch
-            var version = AvailableVersions.FirstOrDefault(x => x.TagName == "master");
+            var version = AvailableVersions.FirstOrDefault(
+                x => x.TagName == SelectedPackage.MainBranch
+            );
             // If not found, try main
             version ??= AvailableVersions.FirstOrDefault(x => x.TagName == "main");
 

StabilityMatrix.Avalonia/ViewModels/Dialogs/OneClickInstallViewModel.cs

@@ -140,8 +140,12 @@ public partial class OneClickInstallViewModel : ContentDialogViewModelBase
             SelectedPackage.Name
         );
 
-        var downloadVersion = new DownloadPackageVersionOptions { IsLatest = true };
+        var downloadVersion = new DownloadPackageVersionOptions
-        var installedVersion = new InstalledPackageVersion();
+        {
+            IsLatest = true,
+            IsPrerelease = false
+        };
+        var installedVersion = new InstalledPackageVersion { IsPrerelease = false };
 
         var versionOptions = await SelectedPackage.GetAllVersionOptions();
         if (versionOptions.AvailableVersions != null && versionOptions.AvailableVersions.Any())
@@ -151,7 +155,8 @@ public partial class OneClickInstallViewModel : ContentDialogViewModelBase
         }
         else
         {
-            downloadVersion.BranchName = await SelectedPackage.GetLatestVersion();
+            var latestVersion = await SelectedPackage.GetLatestVersion();
+            downloadVersion.BranchName = latestVersion.BranchName;
             downloadVersion.CommitHash =
                 (await SelectedPackage.GetAllCommits(downloadVersion.BranchName))
                     ?.FirstOrDefault()
@@ -174,6 +179,7 @@ public partial class OneClickInstallViewModel : ContentDialogViewModelBase
         var installStep = new InstallPackageStep(
             SelectedPackage,
             torchVersion,
+            recommendedSharedFolderMethod,
             downloadVersion,
             installLocation
         );

StabilityMatrix.Avalonia/ViewModels/PackageManager/PackageCardViewModel.cs

@@ -265,7 +265,7 @@ public partial class PackageCardViewModel : ProgressViewModel
             var versionOptions = new DownloadPackageVersionOptions { IsLatest = true };
             if (Package.Version.IsReleaseMode)
             {
-                versionOptions.VersionTag = await basePackage.GetLatestVersion();
+                versionOptions = await basePackage.GetLatestVersion(Package.Version.IsPrerelease);
             }
             else
             {

StabilityMatrix.Core/Models/DownloadPackageVersionOptions.cs

@@ -6,4 +6,5 @@ public class DownloadPackageVersionOptions
     public string? CommitHash { get; set; }
     public string? VersionTag { get; set; }
     public bool IsLatest { get; set; }
+    public bool IsPrerelease { get; set; }
 }

StabilityMatrix.Core/Models/InstalledPackage.cs

@@ -239,14 +239,19 @@ public class InstalledPackage : IJsonOnDeserialized
         )
         {
             // release mode
-            Version = new InstalledPackageVersion { InstalledReleaseVersion = PackageVersion };
+            Version = new InstalledPackageVersion
+            {
+                InstalledReleaseVersion = PackageVersion,
+                IsPrerelease = false
+            };
         }
         else if (!string.IsNullOrWhiteSpace(PackageVersion))
         {
             Version = new InstalledPackageVersion
             {
                 InstalledBranch = InstalledBranch,
-                InstalledCommitSha = PackageVersion
+                InstalledCommitSha = PackageVersion,
+                IsPrerelease = false
             };
         }
     }

StabilityMatrix.Core/Models/InstalledPackageVersion.cs

@@ -7,6 +7,7 @@ public class InstalledPackageVersion
     public string? InstalledReleaseVersion { get; set; }
     public string? InstalledBranch { get; set; }
     public string? InstalledCommitSha { get; set; }
+    public bool IsPrerelease { get; set; }
 
     [JsonIgnore]
     public bool IsReleaseMode => string.IsNullOrWhiteSpace(InstalledBranch);

StabilityMatrix.Core/Models/PackageModification/InstallPackageStep.cs

@@ -8,18 +8,21 @@ public class InstallPackageStep : IPackageStep
 {
     private readonly BasePackage package;
     private readonly TorchVersion torchVersion;
+    private readonly SharedFolderMethod selectedSharedFolderMethod;
     private readonly DownloadPackageVersionOptions versionOptions;
     private readonly string installPath;
 
     public InstallPackageStep(
         BasePackage package,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         string installPath
     )
     {
         this.package = package;
         this.torchVersion = torchVersion;
+        this.selectedSharedFolderMethod = selectedSharedFolderMethod;
         this.versionOptions = versionOptions;
         this.installPath = installPath;
     }
@@ -32,7 +35,14 @@ public class InstallPackageStep : IPackageStep
         }
 
         await package
-            .InstallPackage(installPath, torchVersion, versionOptions, progress, OnConsoleOutput)
+            .InstallPackage(
+                installPath,
+                torchVersion,
+                selectedSharedFolderMethod,
+                versionOptions,
+                progress,
+                OnConsoleOutput
+            )
             .ConfigureAwait(false);
     }
 

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -174,17 +174,14 @@ public class A3WebUI : BaseGitPackage
     public override IEnumerable<TorchVersion> AvailableTorchVersions =>
         new[] { TorchVersion.Cpu, TorchVersion.Cuda, TorchVersion.Rocm };
 
-    public override async Task<string> GetLatestVersion()
+    public override string MainBranch => "master";
-    {
-        var release = await GetLatestRelease().ConfigureAwait(false);
-        return release.TagName!;
-    }
 
     public override string OutputFolderName => "outputs";
 
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null

StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs

@@ -72,6 +72,29 @@ public abstract class BaseGitPackage : BasePackage
         PrerequisiteHelper = prerequisiteHelper;
     }
 
+    public override async Task<DownloadPackageVersionOptions> GetLatestVersion(
+        bool includePrerelease = false
+    )
+    {
+        if (ShouldIgnoreReleases)
+        {
+            return new DownloadPackageVersionOptions
+            {
+                IsLatest = true,
+                IsPrerelease = false,
+                BranchName = MainBranch
+            };
+        }
+
+        var release = await GetLatestRelease(includePrerelease).ConfigureAwait(false);
+        return new DownloadPackageVersionOptions
+        {
+            IsLatest = true,
+            IsPrerelease = release.Prerelease,
+            VersionTag = release.TagName!
+        };
+    }
+
     protected async Task<Release> GetLatestRelease(bool includePrerelease = false)
     {
         var releases = await GithubApi.GetAllReleases(Author, Name).ConfigureAwait(false);
@@ -267,14 +290,17 @@ public abstract class BaseGitPackage : BasePackage
         {
             if (currentVersion.IsReleaseMode)
             {
-                var latestVersion = await GetLatestVersion().ConfigureAwait(false);
+                var latestVersion = await GetLatestVersion(currentVersion.IsPrerelease)
-                UpdateAvailable = latestVersion != currentVersion.InstalledReleaseVersion;
+                    .ConfigureAwait(false);
+                UpdateAvailable =
+                    latestVersion.VersionTag != currentVersion.InstalledReleaseVersion;
                 return UpdateAvailable;
             }
 
             var allCommits = (
                 await GetAllCommits(currentVersion.InstalledBranch!).ConfigureAwait(false)
             )?.ToList();
+
             if (allCommits == null || !allCommits.Any())
             {
                 Logger.Warn("No commits found for {Package}", package.PackageName);
@@ -350,11 +376,8 @@ public abstract class BaseGitPackage : BasePackage
             await InstallPackage(
                     installedPackage.FullPath!,
                     torchVersion,
-                    new DownloadPackageVersionOptions
+                    installedPackage.PreferredSharedFolderMethod ?? SharedFolderMethod.Symlink,
-                    {
+                    versionOptions,
-                        VersionTag = versionOptions.VersionTag,
-                        IsLatest = versionOptions.IsLatest
-                    },
                     progress,
                     onConsoleOutput
                 )
@@ -362,7 +385,8 @@ public abstract class BaseGitPackage : BasePackage
 
             return new InstalledPackageVersion
             {
-                InstalledReleaseVersion = versionOptions.VersionTag
+                InstalledReleaseVersion = versionOptions.VersionTag,
+                IsPrerelease = versionOptions.IsPrerelease
             };
         }
 
@@ -428,11 +452,8 @@ public abstract class BaseGitPackage : BasePackage
         await InstallPackage(
                 installedPackage.FullPath,
                 torchVersion,
-                new DownloadPackageVersionOptions
+                installedPackage.PreferredSharedFolderMethod ?? SharedFolderMethod.Symlink,
-                {
+                versionOptions,
-                    CommitHash = versionOptions.CommitHash,
-                    IsLatest = versionOptions.IsLatest
-                },
                 progress,
                 onConsoleOutput
             )
@@ -441,7 +462,8 @@ public abstract class BaseGitPackage : BasePackage
         return new InstalledPackageVersion
         {
             InstalledBranch = versionOptions.BranchName,
-            InstalledCommitSha = versionOptions.CommitHash
+            InstalledCommitSha = versionOptions.CommitHash,
+            IsPrerelease = versionOptions.IsPrerelease
         };
     }
 

StabilityMatrix.Core/Models/Packages/BasePackage.cs

@@ -55,6 +55,7 @@ public abstract class BasePackage
     public abstract Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null
@@ -159,7 +160,6 @@ public abstract class BasePackage
         IReadOnlyList<string>
     >? SharedOutputFolders { get; }
 
-    public abstract Task<string> GetLatestVersion();
     public abstract Task<PackageVersionOptions> GetAllVersionOptions();
     public abstract Task<IEnumerable<GitCommit>?> GetAllCommits(
         string branch,
@@ -168,6 +168,10 @@ public abstract class BasePackage
     );
     public abstract Task<IEnumerable<Branch>> GetAllBranches();
     public abstract Task<IEnumerable<Release>> GetAllReleases();
+    public abstract Task<DownloadPackageVersionOptions> GetLatestVersion(
+        bool includePrerelease = false
+    );
+    public abstract string MainBranch { get; }
     public event EventHandler<int>? Exited;
     public event EventHandler<string>? StartupComplete;
 

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -146,7 +146,7 @@ public class ComfyUI : BaseGitPackage
             LaunchOptionDefinition.Extras
         };
 
-    public override Task<string> GetLatestVersion() => Task.FromResult("master");
+    public override string MainBranch => "master";
 
     public override IEnumerable<TorchVersion> AvailableTorchVersions =>
         new[]
@@ -161,6 +161,7 @@ public class ComfyUI : BaseGitPackage
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null

StabilityMatrix.Core/Models/Packages/DankDiffusion.cs

@@ -37,6 +37,7 @@ public class DankDiffusion : BaseGitPackage
     public override Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null
@@ -89,8 +90,5 @@ public class DankDiffusion : BaseGitPackage
         IReadOnlyList<string>
     >? SharedOutputFolders { get; }
 
-    public override Task<string> GetLatestVersion()
+    public override string MainBranch { get; }
-    {
-        throw new NotImplementedException();
-    }
 }

StabilityMatrix.Core/Models/Packages/FocusControlNet.cs

@@ -33,5 +33,6 @@ public class FocusControlNet : Fooocus
     public override string LaunchCommand => "launch.py";
     public override Uri PreviewImageUri =>
         new("https://github.com/fenneishi/Fooocus-ControlNet-SDXL/raw/main/asset/canny/snip.png");
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Advanced;
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Expert;
+    public override bool OfferInOneClickInstaller => false;
 }

StabilityMatrix.Core/Models/Packages/Fooocus.cs

@@ -141,7 +141,7 @@ public class Fooocus : BaseGitPackage
     public override IEnumerable<TorchVersion> AvailableTorchVersions =>
         new[] { TorchVersion.Cpu, TorchVersion.Cuda, TorchVersion.DirectMl, TorchVersion.Rocm };
 
-    public override Task<string> GetLatestVersion() => Task.FromResult("main");
+    public override string MainBranch => "main";
 
     public override bool ShouldIgnoreReleases => true;
 
@@ -152,6 +152,7 @@ public class Fooocus : BaseGitPackage
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null

StabilityMatrix.Core/Models/Packages/FooocusMre.cs

@@ -99,17 +99,14 @@ public class FooocusMre : BaseGitPackage
     public override IEnumerable<TorchVersion> AvailableTorchVersions =>
         new[] { TorchVersion.Cpu, TorchVersion.Cuda, TorchVersion.Rocm };
 
-    public override async Task<string> GetLatestVersion()
+    public override string MainBranch => "moonride-main";
-    {
-        var release = await GetLatestRelease().ConfigureAwait(false);
-        return release.TagName!;
-    }
 
     public override string OutputFolderName => "outputs";
 
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null

StabilityMatrix.Core/Models/Packages/InvokeAI.cs

@@ -50,6 +50,8 @@ public class InvokeAI : BaseGitPackage
         new[] { SharedFolderMethod.Symlink, SharedFolderMethod.None };
     public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Symlink;
 
+    public override string MainBranch => "main";
+
     public InvokeAI(
         IGithubApiCache githubApi,
         ISettingsManager settingsManager,
@@ -76,6 +78,10 @@ public class InvokeAI : BaseGitPackage
             [SharedFolderType.ControlNet] = new[]
             {
                 Path.Combine(RelativeRootPath, "autoimport", "controlnet")
+            },
+            [SharedFolderType.IpAdapter] = new[]
+            {
+                Path.Combine(RelativeRootPath, "autoimport", "ip_adapter")
             }
         };
 
@@ -144,12 +150,6 @@ public class InvokeAI : BaseGitPackage
             LaunchOptionDefinition.Extras
         };
 
-    public override async Task<string> GetLatestVersion()
-    {
-        var release = await GetLatestRelease().ConfigureAwait(false);
-        return release.TagName!;
-    }
-
     public override IEnumerable<TorchVersion> AvailableTorchVersions =>
         new[] { TorchVersion.Cpu, TorchVersion.Cuda, TorchVersion.Rocm, TorchVersion.Mps };
 
@@ -166,6 +166,7 @@ public class InvokeAI : BaseGitPackage
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null
@@ -228,15 +229,21 @@ public class InvokeAI : BaseGitPackage
 
         progress?.Report(new ProgressReport(-1f, "Configuring InvokeAI", isIndeterminate: true));
 
+        // need to setup model links before running invokeai-configure so it can do its conversion
+        await SetupModelFolders(installLocation, selectedSharedFolderMethod).ConfigureAwait(false);
+
         await RunInvokeCommand(
                 installLocation,
                 "invokeai-configure",
                 "--yes --skip-sd-weights",
-                false,
+                true,
-                onConsoleOutput
+                onConsoleOutput,
+                spam3: true
             )
             .ConfigureAwait(false);
 
+        await VenvRunner.Process.WaitForExitAsync();
+
         progress?.Report(new ProgressReport(1f, "Done!", isIndeterminate: false));
     }
 
@@ -252,9 +259,15 @@ public class InvokeAI : BaseGitPackage
         string command,
         string arguments,
         bool runDetached,
-        Action<ProcessOutput>? onConsoleOutput
+        Action<ProcessOutput>? onConsoleOutput,
+        bool spam3 = false
     )
     {
+        if (spam3 && !runDetached)
+        {
+            throw new InvalidOperationException("Cannot spam 3 if not running detached");
+        }
+
         await SetupVenv(installedPackagePath).ConfigureAwait(false);
 
         arguments = command switch
@@ -308,6 +321,18 @@ public class InvokeAI : BaseGitPackage
             {
                 onConsoleOutput?.Invoke(s);
 
+                if (
+                    spam3
+                    && s.Text.Contains(
+                        "[3] Accept the best guess;",
+                        StringComparison.OrdinalIgnoreCase
+                    )
+                )
+                {
+                    VenvRunner.Process?.StandardInput.WriteLine("3");
+                    return;
+                }
+
                 if (!s.Text.Contains("running on", StringComparison.OrdinalIgnoreCase))
                     return;
 

StabilityMatrix.Core/Models/Packages/KohyaSs.cs

@@ -111,6 +111,7 @@ public class KohyaSs : BaseGitPackage
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null
@@ -218,11 +219,7 @@ public class KohyaSs : BaseGitPackage
         IReadOnlyList<string>
     >? SharedOutputFolders { get; }
 
-    public override async Task<string> GetLatestVersion()
+    public override string MainBranch => "master";
-    {
-        var release = await GetLatestRelease().ConfigureAwait(false);
-        return release.TagName!;
-    }
 
     private Dictionary<string, string> GetEnvVars(string installDirectory)
     {

StabilityMatrix.Core/Models/Packages/PackageVersionOptions.cs

@@ -2,8 +2,8 @@
 
 public class PackageVersionOptions
 {
-    public IEnumerable<PackageVersion> AvailableVersions { get; set; } =
+    public IEnumerable<PackageVersion>? AvailableVersions { get; set; } =
         Enumerable.Empty<PackageVersion>();
-    public IEnumerable<PackageVersion> AvailableBranches { get; set; } =
+    public IEnumerable<PackageVersion>? AvailableBranches { get; set; } =
         Enumerable.Empty<PackageVersion>();
 }

StabilityMatrix.Core/Models/Packages/StableDiffusionDirectMl.cs

@@ -14,7 +14,7 @@ using StabilityMatrix.Core.Services;
 namespace StabilityMatrix.Core.Models.Packages;
 
 [Singleton(typeof(BasePackage))]
-public class StableDiffusionDirectMl : BaseGitPackage
+public class StableDiffusionDirectMl : A3WebUI
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -44,145 +44,15 @@ public class StableDiffusionDirectMl : BaseGitPackage
     )
         : base(githubApi, settingsManager, downloadService, prerequisiteHelper) { }
 
-    public override Dictionary<SharedFolderType, IReadOnlyList<string>> SharedFolders =>
-        new()
-        {
-            [SharedFolderType.StableDiffusion] = new[] { "models/Stable-diffusion" },
-            [SharedFolderType.ESRGAN] = new[] { "models/ESRGAN" },
-            [SharedFolderType.RealESRGAN] = new[] { "models/RealESRGAN" },
-            [SharedFolderType.SwinIR] = new[] { "models/SwinIR" },
-            [SharedFolderType.Lora] = new[] { "models/Lora" },
-            [SharedFolderType.LyCORIS] = new[] { "models/LyCORIS" },
-            [SharedFolderType.ApproxVAE] = new[] { "models/VAE-approx" },
-            [SharedFolderType.VAE] = new[] { "models/VAE" },
-            [SharedFolderType.DeepDanbooru] = new[] { "models/deepbooru" },
-            [SharedFolderType.Karlo] = new[] { "models/karlo" },
-            [SharedFolderType.TextualInversion] = new[] { "embeddings" },
-            [SharedFolderType.Hypernetwork] = new[] { "models/hypernetworks" },
-            [SharedFolderType.ControlNet] = new[] { "models/ControlNet" },
-            [SharedFolderType.Codeformer] = new[] { "models/Codeformer" },
-            [SharedFolderType.LDSR] = new[] { "models/LDSR" },
-            [SharedFolderType.AfterDetailer] = new[] { "models/adetailer" }
-        };
-
-    public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>
-        new()
-        {
-            [SharedOutputType.Extras] = new[] { "outputs/extras-images" },
-            [SharedOutputType.Saved] = new[] { "log/images" },
-            [SharedOutputType.Img2Img] = new[] { "outputs/img2img-images" },
-            [SharedOutputType.Text2Img] = new[] { "outputs/txt2img-images" },
-            [SharedOutputType.Img2ImgGrids] = new[] { "outputs/img2img-grids" },
-            [SharedOutputType.Text2ImgGrids] = new[] { "outputs/txt2img-grids" }
-        };
-
-    [SuppressMessage("ReSharper", "ArrangeObjectCreationWhenTypeNotEvident")]
-    public override List<LaunchOptionDefinition> LaunchOptions =>
-        new()
-        {
-            new()
-            {
-                Name = "Host",
-                Type = LaunchOptionType.String,
-                DefaultValue = "localhost",
-                Options = new() { "--server-name" }
-            },
-            new()
-            {
-                Name = "Port",
-                Type = LaunchOptionType.String,
-                DefaultValue = "7860",
-                Options = new() { "--port" }
-            },
-            new()
-            {
-                Name = "VRAM",
-                Type = LaunchOptionType.Bool,
-                InitialValue = HardwareHelper
-                    .IterGpuInfo()
-                    .Select(gpu => gpu.MemoryLevel)
-                    .Max() switch
-                {
-                    Level.Low => "--lowvram",
-                    Level.Medium => "--medvram",
-                    _ => null
-                },
-                Options = new() { "--lowvram", "--medvram", "--medvram-sdxl" }
-            },
-            new()
-            {
-                Name = "Xformers",
-                Type = LaunchOptionType.Bool,
-                InitialValue = HardwareHelper.HasNvidiaGpu(),
-                Options = new() { "--xformers" }
-            },
-            new()
-            {
-                Name = "API",
-                Type = LaunchOptionType.Bool,
-                InitialValue = true,
-                Options = new() { "--api" }
-            },
-            new()
-            {
-                Name = "Auto Launch Web UI",
-                Type = LaunchOptionType.Bool,
-                InitialValue = false,
-                Options = new() { "--autolaunch" }
-            },
-            new()
-            {
-                Name = "Skip Torch CUDA Check",
-                Type = LaunchOptionType.Bool,
-                InitialValue = !HardwareHelper.HasNvidiaGpu(),
-                Options = new() { "--skip-torch-cuda-test" }
-            },
-            new()
-            {
-                Name = "Skip Python Version Check",
-                Type = LaunchOptionType.Bool,
-                InitialValue = true,
-                Options = new() { "--skip-python-version-check" }
-            },
-            new()
-            {
-                Name = "No Half",
-                Type = LaunchOptionType.Bool,
-                Description = "Do not switch the model to 16-bit floats",
-                InitialValue = HardwareHelper.HasAmdGpu(),
-                Options = new() { "--no-half" }
-            },
-            new()
-            {
-                Name = "Skip SD Model Download",
-                Type = LaunchOptionType.Bool,
-                InitialValue = false,
-                Options = new() { "--no-download-sd-model" }
-            },
-            new()
-            {
-                Name = "Skip Install",
-                Type = LaunchOptionType.Bool,
-                Options = new() { "--skip-install" }
-            },
-            LaunchOptionDefinition.Extras
-        };
-
-    public override IEnumerable<SharedFolderMethod> AvailableSharedFolderMethods =>
-        new[] { SharedFolderMethod.Symlink, SharedFolderMethod.None };
-
     public override IEnumerable<TorchVersion> AvailableTorchVersions =>
         new[] { TorchVersion.Cpu, TorchVersion.DirectMl };
 
-    public override Task<string> GetLatestVersion() => Task.FromResult("master");
-
     public override bool ShouldIgnoreReleases => true;
 
-    public override string OutputFolderName => "outputs";
-
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null
@@ -205,6 +75,8 @@ public class StableDiffusionDirectMl : BaseGitPackage
                 break;
         }
 
+        await venvRunner.PipInstall("httpx==0.24.1").ConfigureAwait(false);
+
         // Install requirements file
         progress?.Report(
             new ProgressReport(-1f, "Installing Package Requirements", isIndeterminate: true)
@@ -218,34 +90,4 @@ public class StableDiffusionDirectMl : BaseGitPackage
 
         progress?.Report(new ProgressReport(1f, "Install complete", isIndeterminate: false));
     }
-
-    public override async Task RunPackage(
-        string installedPackagePath,
-        string command,
-        string arguments,
-        Action<ProcessOutput>? onConsoleOutput
-    )
-    {
-        await SetupVenv(installedPackagePath).ConfigureAwait(false);
-
-        void HandleConsoleOutput(ProcessOutput s)
-        {
-            onConsoleOutput?.Invoke(s);
-
-            if (!s.Text.Contains("Running on", StringComparison.OrdinalIgnoreCase))
-                return;
-
-            var regex = new Regex(@"(https?:\/\/)([^:\s]+):(\d+)");
-            var match = regex.Match(s.Text);
-            if (!match.Success)
-                return;
-
-            WebUrl = match.Value;
-            OnStartupComplete(WebUrl);
-        }
-
-        var args = $"\"{Path.Combine(installedPackagePath, command)}\" {arguments}";
-
-        VenvRunner.RunDetached(args.TrimEnd(), HandleConsoleOutput, OnExit);
-    }
 }

StabilityMatrix.Core/Models/Packages/StableDiffusionUx.cs

@@ -175,7 +175,7 @@ public class StableDiffusionUx : BaseGitPackage
     public override IEnumerable<TorchVersion> AvailableTorchVersions =>
         new[] { TorchVersion.Cpu, TorchVersion.Cuda, TorchVersion.Rocm };
 
-    public override Task<string> GetLatestVersion() => Task.FromResult("master");
+    public override string MainBranch => "master";
 
     public override bool ShouldIgnoreReleases => true;
 
@@ -184,6 +184,7 @@ public class StableDiffusionUx : BaseGitPackage
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null

StabilityMatrix.Core/Models/Packages/UnknownPackage.cs

@@ -43,6 +43,7 @@ public class UnknownPackage : BasePackage
     public override Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null
@@ -144,7 +145,14 @@ public class UnknownPackage : BasePackage
         IReadOnlyList<string>
     >? SharedOutputFolders { get; }
 
-    public override Task<string> GetLatestVersion() => Task.FromResult(string.Empty);
+    public override Task<DownloadPackageVersionOptions> GetLatestVersion(
+        bool includePrerelease = false
+    )
+    {
+        throw new NotImplementedException();
+    }
+
+    public override string MainBranch { get; }
 
     public override Task<PackageVersionOptions> GetAllVersionOptions() =>
         Task.FromResult(new PackageVersionOptions());

StabilityMatrix.Core/Models/Packages/VladAutomatic.cs

@@ -172,11 +172,12 @@ public class VladAutomatic : BaseGitPackage
 
     public override string ExtraLaunchArguments => "";
 
-    public override Task<string> GetLatestVersion() => Task.FromResult("master");
+    public override string MainBranch => "master";
 
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null
@@ -348,7 +349,8 @@ public class VladAutomatic : BaseGitPackage
             return new InstalledPackageVersion
             {
                 InstalledBranch = versionOptions.BranchName,
-                InstalledCommitSha = output.Replace(Environment.NewLine, "").Replace("\n", "")
+                InstalledCommitSha = output.Replace(Environment.NewLine, "").Replace("\n", ""),
+                IsPrerelease = false
             };
         }
         catch (Exception e)
@@ -369,7 +371,8 @@ public class VladAutomatic : BaseGitPackage
 
         return new InstalledPackageVersion
         {
-            InstalledBranch = installedPackage.Version.InstalledBranch
+            InstalledBranch = installedPackage.Version.InstalledBranch,
+            IsPrerelease = false
         };
     }
 

StabilityMatrix.Core/Models/Packages/VoltaML.cs

@@ -26,7 +26,7 @@ public class VoltaML : BaseGitPackage
             "https://github.com/LykosAI/StabilityMatrix/assets/13956642/d9a908ed-5665-41a5-a380-98458f4679a8"
         );
 
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Advanced;
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
 
     // There are releases but the manager just downloads the latest commit anyways,
     // so we'll just limit to commit mode to be more consistent
@@ -146,11 +146,12 @@ public class VoltaML : BaseGitPackage
             LaunchOptionDefinition.Extras
         };
 
-    public override Task<string> GetLatestVersion() => Task.FromResult("main");
+    public override string MainBranch => "main";
 
     public override async Task InstallPackage(
         string installLocation,
         TorchVersion torchVersion,
+        SharedFolderMethod selectedSharedFolderMethod,
         DownloadPackageVersionOptions versionOptions,
         IProgress<ProgressReport>? progress = null,
         Action<ProcessOutput>? onConsoleOutput = null

StabilityMatrix.Core/Models/SharedFolderType.cs

@@ -28,5 +28,6 @@ public enum SharedFolderType
     CLIP = 1 << 18,
     ScuNET = 1 << 19,
     GLIGEN = 1 << 20,
-    AfterDetailer = 1 << 21
+    AfterDetailer = 1 << 21,
+    IpAdapter = 1 << 22
 }