Merge pull request LykosAI#1228 from ionite34/downmerg-again

Downmerg again

Author: mohnjiles

StabilityMatrix.Avalonia/ViewModels/Base/PausableProgressItemViewModelBase.cs

@@ -14,7 +14,9 @@ public abstract partial class PausableProgressItemViewModelBase : ProgressItemVi
         nameof(IsPaused),
         nameof(IsCompleted),
         nameof(CanPauseResume),
-        nameof(CanCancel)
+        nameof(CanCancel),
+        nameof(CanRetry),
+        nameof(CanDismiss)
     )]
     private ProgressState state = ProgressState.Inactive;
 
@@ -33,9 +35,31 @@ public abstract partial class PausableProgressItemViewModelBase : ProgressItemVi
     public virtual bool SupportsPauseResume => true;
     public virtual bool SupportsCancel => true;
 
+    /// <summary>
+    /// Override to true in subclasses that support manual retry after failure.
+    /// Defaults to false so unrelated progress item types are never affected.
+    /// </summary>
+    public virtual bool SupportsRetry => false;
+
+    /// <summary>
+    /// Override to true in subclasses that support dismissing a failed item,
+    /// which runs full sidecar cleanup before removing the entry.
+    /// </summary>
+    public virtual bool SupportsDismiss => false;
+
     public bool CanPauseResume => SupportsPauseResume && !IsCompleted && !IsPending;
     public bool CanCancel => SupportsCancel && !IsCompleted;
 
+    /// <summary>
+    /// True only when this item supports retry AND is in the Failed state.
+    /// </summary>
+    public bool CanRetry => SupportsRetry && State == ProgressState.Failed;
+
+    /// <summary>
+    /// True only when this item supports dismiss AND is in the Failed state.
+    /// </summary>
+    public bool CanDismiss => SupportsDismiss && State == ProgressState.Failed;
+
     private AsyncRelayCommand? pauseCommand;
     public IAsyncRelayCommand PauseCommand => pauseCommand ??= new AsyncRelayCommand(Pause);
 
@@ -51,6 +75,16 @@ public abstract partial class PausableProgressItemViewModelBase : ProgressItemVi
 
     public virtual Task Cancel() => Task.CompletedTask;
 
+    private AsyncRelayCommand? retryCommand;
+    public IAsyncRelayCommand RetryCommand => retryCommand ??= new AsyncRelayCommand(Retry);
+
+    public virtual Task Retry() => Task.CompletedTask;
+
+    private AsyncRelayCommand? dismissCommand;
+    public IAsyncRelayCommand DismissCommand => dismissCommand ??= new AsyncRelayCommand(Dismiss);
+
+    public virtual Task Dismiss() => Task.CompletedTask;
+
     [RelayCommand]
     private Task TogglePauseResume()
     {

StabilityMatrix.Avalonia/ViewModels/Progress/DownloadProgressItemViewModel.cs

@@ -71,6 +71,17 @@ private void OnProgressStateChanged(ProgressState state)
         }
     }
 
+    /// <summary>
+    /// Downloads support manual retry when they reach the Failed state.
+    /// </summary>
+    public override bool SupportsRetry => true;
+
+    /// <summary>
+    /// Downloads support dismiss, which cleans up all sidecar files when
+    /// the user discards a failed download without retrying.
+    /// </summary>
+    public override bool SupportsDismiss => true;
+
     /// <inheritdoc />
     public override Task Cancel()
     {
@@ -91,4 +102,23 @@ public override Task Resume()
     {
         return downloadService.TryResumeDownload(download);
     }
+
+    /// <inheritdoc />
+    /// Resets the internal retry counter so the user gets a fresh 3-attempt budget,
+    /// then re-registers the download in the service dictionary (it was removed on
+    /// failure) and resumes it through the normal concurrency queue.
+    public override Task Retry()
+    {
+        download.ResetAttempts();
+        return downloadService.TryRestartDownload(download);
+    }
+
+    /// <inheritdoc />
+    /// Runs full cleanup (temp file + sidecar files) for a failed download the user
+    /// chooses not to retry, then transitions to Cancelled so the service removes it.
+    public override Task Dismiss()
+    {
+        download.Dismiss();
+        return Task.CompletedTask;
+    }
 }

StabilityMatrix.Avalonia/Views/ProgressManagerPage.axaml

@@ -113,6 +113,24 @@
                                         IsVisible="{Binding CanCancel}">
                                         <ui:SymbolIcon Symbol="Cancel" />
                                     </Button>
+
+                                    <!--  Retry button: only visible when download is in Failed state  -->
+                                    <Button
+                                        Classes="transparent-full"
+                                        Command="{Binding RetryCommand}"
+                                        IsVisible="{Binding CanRetry}"
+                                        ToolTip.Tip="Retry download">
+                                        <ui:SymbolIcon Symbol="Refresh" />
+                                    </Button>
+
+                                    <!--  Dismiss button: cleans up sidecar files for failed downloads that won't be retried  -->
+                                    <Button
+                                        Classes="transparent-full"
+                                        Command="{Binding DismissCommand}"
+                                        IsVisible="{Binding CanDismiss}"
+                                        ToolTip.Tip="Dismiss and clean up">
+                                        <ui:SymbolIcon Symbol="Delete" />
+                                    </Button>
                                 </StackPanel>
 
                                 <ProgressBar

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -219,19 +219,19 @@ public override async Task InstallPackage(
             .ConfigureAwait(false);
 
         var torchIndex = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
-        var isBlackwell =
+        var isLegacyNvidia =
             torchIndex is TorchIndex.Cuda
-            && (SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu());
+            && (SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu());
 
         // 1. Configure the entire install process declaratively.
         var config = new PipInstallConfig
         {
             RequirementsFilePaths = ["requirements_versions.txt"],
-            TorchVersion = torchIndex == TorchIndex.Mps ? "==2.3.1" : (isBlackwell ? "" : "==2.1.2"),
-            TorchvisionVersion = torchIndex == TorchIndex.Mps ? "==0.18.1" : (isBlackwell ? "" : "==0.16.2"),
-            XformersVersion = isBlackwell ? " " : "==0.0.23.post1",
-            CudaIndex = isBlackwell ? "cu128" : "cu121",
-            RocmIndex = "rocm5.6",
+            TorchVersion = " ",
+            TorchvisionVersion = " ",
+            XformersVersion = isLegacyNvidia ? "==0.0.30" : " ",
+            CudaIndex = isLegacyNvidia ? "cu126" : "cu128",
+            RocmIndex = "rocm7.2",
             ExtraPipArgs =
             [
                 "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -431,7 +431,7 @@ _ when gfxArch.StartsWith("gfx120") => "https://rocm.nightlies.amd.com/v2/gfx120
                 ExtraPipArgs = ["numpy<2"],
                 TorchaudioVersion = " ", // Request torchaudio without a specific version
                 CudaIndex = isLegacyNvidia ? "cu126" : "cu130",
-                RocmIndex = "rocm7.1",
+                RocmIndex = "rocm7.2",
                 UpgradePackages = true,
                 PostInstallPipArgs = ["typing-extensions>=4.15.0"],
             };

StabilityMatrix.Core/Models/Packages/InvokeAI.cs

@@ -229,7 +229,7 @@ public override async Task InstallPackage(
             TorchIndex.Cpu when Compat.IsLinux => "https://download.pytorch.org/whl/cpu",
             TorchIndex.Cuda when isLegacyNvidiaGpu => "https://download.pytorch.org/whl/cu126",
             TorchIndex.Cuda => "https://download.pytorch.org/whl/cu128",
-            TorchIndex.Rocm => "https://download.pytorch.org/whl/rocm6.3",
+            TorchIndex.Rocm => "https://download.pytorch.org/whl/rocm7.2",
             _ => string.Empty,
         };
 

StabilityMatrix.Core/Models/Packages/PipInstallConfig.cs

@@ -15,7 +15,7 @@ public record PipInstallConfig
     public string TorchaudioVersion { get; init; } = "";
     public string XformersVersion { get; init; } = "";
     public string CudaIndex { get; init; } = "cu130";
-    public string RocmIndex { get; init; } = "rocm6.4";
+    public string RocmIndex { get; init; } = "rocm7.2";
     public bool ForceReinstallTorch { get; init; } = true;
     public bool UpgradePackages { get; init; } = false;
     public bool SkipTorchInstall { get; init; } = false;

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@@ -181,18 +181,18 @@ public override async Task InstallPackage(
         }
 
         var torchIndex = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
-        var isBlackwell =
+        var isLegacyNvidia =
             torchIndex is TorchIndex.Cuda
-            && (SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu());
+            && (SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu());
 
         var config = new PipInstallConfig
         {
             PrePipInstallArgs = ["joblib"],
             RequirementsFilePaths = requirementsPaths,
-            TorchVersion = "",
-            TorchvisionVersion = "",
-            CudaIndex = isBlackwell ? "cu128" : "cu126",
-            RocmIndex = "rocm7.1",
+            TorchVersion = " ",
+            TorchvisionVersion = " ",
+            CudaIndex = isLegacyNvidia ? "cu126" : "cu128",
+            RocmIndex = "rocm7.2",
             ExtraPipArgs =
             [
                 "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",