Merge pull request LykosAI#981 from ionite34/backport/main/pr-980

[dev to main] backport: Fix models with same name overwriting each other on download & update… (980)

Author: mohnjiles

CHANGELOG.md

@@ -5,9 +5,14 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+## v2.13.4
+### Changed
+- Upgraded ComfyUI CUDA torch to 12.6
+### Fixed
+- Fixed [#1128](https://github.com/LykosAI/StabilityMatrix/issues/1128) - overwriting models when downloading multiple with the same name
+- Fixed ROCm torch indexes for ComfyUI & Forge
+
 ## v2.13.3
-### Added
-- Added Safetensor Metadata viewer to the Checkpoint Manager context menu - thanks to @genteure!
 ### Changed
 - "Remove symbolic links on shutdown" option now also removes links from Output Sharing
 ### Fixed

StabilityMatrix.Avalonia/Services/ModelImportService.cs

@@ -5,11 +5,14 @@
 using AsyncAwaitBestPractices;
 using Avalonia.Controls.Notifications;
 using Injectio.Attributes;
+using Python.Runtime;
+using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Api;
 using StabilityMatrix.Core.Models.FileInterfaces;
 using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Core.Services;
+using Dispatcher = Avalonia.Threading.Dispatcher;
 
 namespace StabilityMatrix.Avalonia.Services;
 
@@ -117,6 +120,23 @@ public async Task DoImport(
         modelFile.Name = Path.GetInvalidFileNameChars()
             .Aggregate(modelFile.Name, (current, c) => current.Replace(c, '_'));
 
+        // New code: Ensure unique file name
+        var originalFileName = modelFile.Name;
+        var uniqueFileName = GenerateUniqueFileName(downloadFolder.ToString(), originalFileName);
+        if (!uniqueFileName.Equals(originalFileName, StringComparison.Ordinal))
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+                notificationService.Show(
+                    new Notification(
+                        "File renamed",
+                        $"A file with the name \"{originalFileName}\" already exists. The model will be saved as \"{uniqueFileName}\"."
+                    )
+                );
+            });
+            modelFile.Name = uniqueFileName;
+        }
+
         var downloadPath = downloadFolder.JoinFile(modelFile.Name);
 
         // Download model info and preview first
@@ -163,4 +183,25 @@ public async Task DoImport(
 
         await trackedDownloadService.TryStartDownload(download);
     }
+
+    private string GenerateUniqueFileName(string folder, string fileName)
+    {
+        var fullPath = Path.Combine(folder, fileName);
+        if (!File.Exists(fullPath))
+            return fileName;
+
+        var name = Path.GetFileNameWithoutExtension(fileName);
+        var extension = Path.GetExtension(fileName);
+        var count = 1;
+        string newFileName;
+
+        do
+        {
+            newFileName = $"{name} ({count}){extension}";
+            fullPath = Path.Combine(folder, newFileName);
+            count++;
+        } while (File.Exists(fullPath));
+
+        return newFileName;
+    }
 }

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -219,8 +219,8 @@ public override async Task InstallPackage(
                         torchVersion switch
                         {
                             TorchIndex.Cpu => "cpu",
-                            TorchIndex.Cuda => "cu124",
-                            TorchIndex.Rocm => "rocm6.2",
+                            TorchIndex.Cuda => "cu126",
+                            TorchIndex.Rocm => "rocm6.2.4",
                             TorchIndex.Mps => "cpu",
                             _
                                 => throw new ArgumentOutOfRangeException(

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@@ -161,7 +161,7 @@ public override async Task InstallPackage(
                     {
                         TorchIndex.Cpu => "cpu",
                         TorchIndex.Cuda => "cu121",
-                        TorchIndex.Rocm => "rocm5.6",
+                        TorchIndex.Rocm => "rocm5.7",
                         TorchIndex.Mps => "cpu",
                         _ => throw new ArgumentOutOfRangeException(nameof(torchVersion), torchVersion, null)
                     }