Merge branch 'dev' into codex/unet-workflow-support

Author: mohnjiles

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 
 ## v2.16.0-pre.1
 ### Added
+- Added CivArchive model browser with details page, image viewer, version selector, trigger words, and in-app downloads with tracked progress
 - Added support for the civitai.red (mature-content) domain — NSFW CivitAI links now open and copy as civitai.red URLs, and pasting a civitai.red URL into the CivitAI model browser search works the same as a civitai.com URL
 - Added official Inference support for Z-Image/Z-Image-Turbo, Anima, and Flux.2 UNet-only workflows, including their text encoder, latent, scheduler, and sampling requirements
 - Added an Inference workflow profile selector with recommended defaults for default checkpoints, Flux, Flux.2, Z-Image Base/Turbo, and Anima

StabilityMatrix.Avalonia/DesignData/DesignData.cs

@@ -138,7 +138,7 @@ public static void Initialize()
             .AddSingleton(Substitute.For<INotificationService>())
             .AddSingleton(Substitute.For<ISharedFolders>())
             .AddSingleton(Substitute.For<IDownloadService>())
-            .AddSingleton(Substitute.For<IHttpClientFactory>())
+            .AddSingleton(CreateHttpClientFactory())
             .AddSingleton(Substitute.For<IApiFactory>())
             .AddSingleton(Substitute.For<IDiscordRichPresenceService>())
             .AddSingleton(Substitute.For<ITrackedDownloadService>())
@@ -459,6 +459,13 @@ public static void Initialize()
     [NotNull]
     public static PackageInstallBrowserViewModel? NewInstallerDialogViewModel { get; private set; }
 
+    private static IHttpClientFactory CreateHttpClientFactory()
+    {
+        var httpClientFactory = Substitute.For<IHttpClientFactory>();
+        httpClientFactory.CreateClient(Arg.Any<string>()).Returns(_ => new HttpClient());
+        return httpClientFactory;
+    }
+
     [NotNull]
     public static PackageInstallDetailViewModel? PackageInstallDetailViewModel { get; private set; }
 

StabilityMatrix.Avalonia/DesignData/MockModelIndexService.cs

@@ -83,6 +83,23 @@ public class MockModelIndexService : IModelIndexService
     public IReadOnlySet<string> ModelIndexBlake3Hashes =>
         ModelIndex.Values.SelectMany(x => x).Select(x => x.HashBlake3).WhereNotNull().ToHashSet();
 
+    /// <inheritdoc />
+    public IReadOnlySet<string> ModelIndexSha256Hashes =>
+        ModelIndex
+            .Values.SelectMany(x => x)
+            .Select(x => x.HashSha256)
+            .WhereNotNull()
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+    /// <inheritdoc />
+    public IReadOnlySet<string> ModelIndexCivArchiveUrls =>
+        ModelIndex
+            .Values.SelectMany(x => x)
+            .Where(x => x.HasCivArchiveMetadata)
+            .Select(x => x.ConnectedModelInfo!.SourceUrl)
+            .WhereNotNull()
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
     /// <inheritdoc />
     public Task RefreshIndex()
     {

StabilityMatrix.Avalonia/Models/NamedOption.cs

@@ -0,0 +1,9 @@
+namespace StabilityMatrix.Avalonia.Models;
+
+public class NamedOption<T>(string label, T value)
+{
+    public string Label { get; } = label;
+    public T Value { get; } = value;
+
+    public override string ToString() => Label;
+}

StabilityMatrix.Avalonia/Services/ModelImportService.cs

@@ -274,6 +274,20 @@ public async Task DoCustomImport(
         Action<TrackedDownload>? configureDownload = null
     )
     {
+        // Subfolder support: if the file name contains a path separator (e.g. from a
+        // user-defined FileNameFormat pattern like "{base_model}/{file_name}"), split off
+        // the directory portion and join it onto the download folder. Matches DoImport.
+        if (modelFileName.Contains('/') || modelFileName.Contains('\\'))
+        {
+            var lastIndex = modelFileName.LastIndexOfAny(['/', '\\']);
+            if (lastIndex >= 0)
+            {
+                var folderPath = modelFileName.Substring(0, lastIndex);
+                modelFileName = modelFileName.Substring(lastIndex + 1);
+                downloadFolder = downloadFolder.JoinDir(folderPath);
+            }
+        }
+
         // Folders might be missing if user didn't install any packages yet
         downloadFolder.Create();
 
@@ -285,7 +299,9 @@ public async Task DoCustomImport(
 
         var downloadPath = downloadFolder.JoinFile(modelBaseFileName + modelFileExtension);
 
-        // Save model info and preview image first if available
+        // Save model info first if available. Preview image downloads can be slow
+        // or hosted on flaky third-party mirrors, so start the model download before
+        // fetching the preview in the background.
         var cleanupFilePaths = new List<string>();
         if (connectedModelInfo is not null)
         {
@@ -294,6 +310,8 @@ public async Task DoCustomImport(
                 downloadFolder.JoinFile(modelBaseFileName + ConnectedModelInfo.FileExtension)
             );
         }
+
+        FilePath? previewImageDownloadPath = null;
         if (previewImageUri is not null)
         {
             if (previewImageFileExtension is null)
@@ -307,15 +325,10 @@ public async Task DoCustomImport(
                 }
             }
 
-            var previewImageDownloadPath = downloadFolder.JoinFile(
+            previewImageDownloadPath = downloadFolder.JoinFile(
                 modelBaseFileName + ".preview" + previewImageFileExtension
             );
 
-            await notificationService.TryAsync(
-                downloadService.DownloadToFileAsync(previewImageUri.ToString(), previewImageDownloadPath),
-                "Could not download preview image"
-            );
-
             cleanupFilePaths.Add(previewImageDownloadPath);
         }
 
@@ -337,6 +350,19 @@ await notificationService.TryAsync(
         // download.ContextAction = CivitPostDownloadContextAction.FromCivitFile(modelFile);
 
         await trackedDownloadService.TryStartDownload(download);
+
+        if (previewImageUri is not null && previewImageDownloadPath is not null)
+        {
+            DownloadPreviewImageAsync(previewImageUri, previewImageDownloadPath).SafeFireAndForget();
+        }
+    }
+
+    private async Task DownloadPreviewImageAsync(Uri previewImageUri, FilePath previewImageDownloadPath)
+    {
+        await notificationService.TryAsync(
+            downloadService.DownloadToFileAsync(previewImageUri.ToString(), previewImageDownloadPath),
+            "Could not download preview image"
+        );
     }
 
     private string GenerateUniqueFileName(string folder, string fileName)