Merge branch 'dev' into stable-swarm

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed failing InvokeAI install on macOS due to missing nodejs
 - Increased timeout on Recommended Models call to prevent potential timeout errors on slow connections
 - Fixed SynchronizationLockException when saving settings
+- Fixed missing tkinter dependency for OneTrainer on Windows
 
 ## v2.8.0
 ### Added

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

@@ -21,7 +21,6 @@ namespace StabilityMatrix.Avalonia.Helpers;
 
 [SupportedOSPlatform("windows")]
 public class WindowsPrerequisiteHelper(
-    IGitHubClient gitHubClient,
     IDownloadService downloadService,
     ISettingsManager settingsManager,
     IPyRunner pyRunner
@@ -168,6 +167,11 @@ public class WindowsPrerequisiteHelper(
         {
             await InstallDotnetIfNecessary(progress);
         }
+        
+        if (prerequisites.Contains(PackagePrerequisite.Tkinter))
+        {
+            await InstallTkinterIfNecessary(progress);
+        }
     }
 
     public async Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = null)

StabilityMatrix.Core/Models/PackagePrerequisite.cs

@@ -7,4 +7,5 @@ public enum PackagePrerequisite
     Git,
     Node,
     Dotnet,
+    Tkinter
 }

StabilityMatrix.Core/Models/Packages/KohyaSs.cs

@@ -50,6 +50,8 @@ public class KohyaSs(
     public override IEnumerable<TorchVersion> AvailableTorchVersions => [TorchVersion.Cuda];
     public override IEnumerable<SharedFolderMethod> AvailableSharedFolderMethods =>
         new[] { SharedFolderMethod.None };
+    public override IEnumerable<PackagePrerequisite> Prerequisites =>
+        base.Prerequisites.Concat([PackagePrerequisite.Tkinter]);
 
     public override List<LaunchOptionDefinition> LaunchOptions =>
         [
@@ -114,12 +116,6 @@ public class KohyaSs(
         Action<ProcessOutput>? onConsoleOutput = null
     )
     {
-        if (Compat.IsWindows)
-        {
-            progress?.Report(new ProgressReport(-1f, "Installing prerequisites...", isIndeterminate: true));
-            await PrerequisiteHelper.InstallTkinterIfNecessary(progress).ConfigureAwait(false);
-        }
-
         progress?.Report(new ProgressReport(-1f, "Setting up venv", isIndeterminate: true));
         // Setup venv
         await using var venvRunner = new PyVenvRunner(Path.Combine(installLocation, "venv"));

StabilityMatrix.Core/Models/Packages/OneTrainer.cs

@@ -41,6 +41,8 @@ public class OneTrainer(
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Nightmare;
     public override bool OfferInOneClickInstaller => false;
     public override bool ShouldIgnoreReleases => true;
+    public override IEnumerable<PackagePrerequisite> Prerequisites =>
+        base.Prerequisites.Concat([PackagePrerequisite.Tkinter]);
 
     public override async Task InstallPackage(
         string installLocation,