Merge branch 'refs/heads/dev' into fixes

# Conflicts:
#	CHANGELOG.md

Author: ionite34

CHANGELOG.md

@@ -11,17 +11,21 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added Accelerated Model Discovery (Beta) (⚡ icon in Civitai Browser) for Insider+ supporters. Utilizes an optimized connection for dramatically faster, more responsive browsing of online model repositories.
 - Added Undo/Redo commands to text editor context menus
 - Added Prompt Amplifier to Inference - click the magic wand 🪄 in the prompt editor to expand and enrich your ideas. Tailor the vibe with the ‘Feel’ selector and watch as your generations come to life with extra detail, coherence, and flair!
+- (pre.2 re-release) Added support for HiDream in Inference - see [ComfyUI Examples](https://comfyanonymous.github.io/ComfyUI_examples/hidream/) for more details
+- (pre.2 re-release) Added toggle for filtering Inference Extra Networks by base model
 ### Changed
 - Updated install for kohya_ss to support RTX 5000-series GPUs
 - (pre.2 re-release) Merged Inference GGUF workflows into the UNet model loader option (no longer need to choose GGUF separately)
-- Performance optimizations for Checkpoint Manager (progress indicators now fully uses Compiled Bindings)
+- (pre.2 re-release) Updated some date strings to take into account the user's locale
+- (pre.2 re-release) Fixed some crashes when using Accelerated Model Discovery
+- (pre.2 re-release) Performance optimizations for Checkpoint Manager (progress indicators now fully uses Compiled Bindings)
 ### Fixed
 - Fixed Inference ControlNet Preprocessors using incorrect resolution and increased maximum of smallest dimension to 16384
 - Fixed Triton/Sage install option showing for incompatible GPUs
 - Fixed errors from invalid pip specifiers in requirements files
 - Fixed package images sometimes showing as blank due to concurrent image caching. Requests to same image resources are now de-duplicated
 - (pre.2 re-release) Fixed Inference Extra Networks card not allowing for more than one model at a time
-- Reduced memory usage from `ShowDisabledTooltipExtension`
+- (pre.2 re-release) Reduced memory usage from `ShowDisabledTooltipExtension`
 ### Supporters
 #### Visionaries
 - Big shout-out to our Visionary-tier patrons: Waterclouds, Corey T, bluepopsicle, and Bob S! Your steadfast support keeps Stability Matrix moving forward, and we couldn’t do it without you. 🚀 Thank you!

StabilityMatrix.Avalonia/Assets/hf-packages.json

@@ -986,6 +986,33 @@
     ],
     "LicenseType": "Apache 2.0"
   },
+  {
+    "ModelCategory": "Clip",
+    "ModelName": "CLIP G (HiDream)",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/text_encoders/clip_g_hidream.safetensors"
+    ],
+    "LicenseType": "MIT"
+  },
+  {
+    "ModelCategory": "Clip",
+    "ModelName": "CLIP L (HiDream)",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/text_encoders/clip_l_hidream.safetensors"
+    ],
+    "LicenseType": "MIT"
+  },
+  {
+    "ModelCategory": "Clip",
+    "ModelName": "Llama 3.1 8b Instruct fp8",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/text_encoders/split_files/text_encoders/llama_3.1_8b_instruct_fp8_scaled.safetensors"
+    ],
+    "LicenseType": "Llama3.1"
+  },
   {
     "ModelCategory": "Unet",
     "ModelName": "Wan 2.1 I2V 480p bf16",
@@ -1058,6 +1085,60 @@
     ],
     "LicenseType": "Apache 2.0"
   },
+  {
+    "ModelCategory": "Unet",
+    "ModelName": "HiDream I1 Dev bf16",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/diffusion_models/hidream_i1_dev_bf16.safetensors"
+    ],
+    "LicenseType": "MIT"
+  },
+  {
+    "ModelCategory": "Unet",
+    "ModelName": "HiDream I1 Dev fp8",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/diffusion_models/hidream_i1_dev_fp8.safetensors"
+    ],
+    "LicenseType": "MIT"
+  },
+  {
+    "ModelCategory": "Unet",
+    "ModelName": "HiDream I1 Fast bf16",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/diffusion_models/hidream_i1_fast_bf16.safetensors"
+    ],
+    "LicenseType": "MIT"
+  },
+  {
+    "ModelCategory": "Unet",
+    "ModelName": "HiDream I1 Fast fp8",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/diffusion_models/hidream_i1_fast_fp8.safetensors"
+    ],
+    "LicenseType": "MIT"
+  },
+  {
+    "ModelCategory": "Unet",
+    "ModelName": "HiDream I1 Full fp16",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/diffusion_models/hidream_i1_full_fp16.safetensors"
+    ],
+    "LicenseType": "MIT"
+  },
+  {
+    "ModelCategory": "Unet",
+    "ModelName": "HiDream I1 Full fp8",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/diffusion_models/hidream_i1_full_fp8.safetensors"
+    ],
+    "LicenseType": "MIT"
+  },
   {
     "ModelCategory": "Vae",
     "ModelName": "Flux.1 VAE",
@@ -1075,5 +1156,14 @@
       "split_files/vae/wan_2.1_vae.safetensors"
     ],
     "LicenseType": "Apache 2.0"
+  },
+  {
+    "ModelCategory": "Vae",
+    "ModelName": "HiDream I1 VAE",
+    "RepositoryPath": "Comfy-Org/HiDream-I1_ComfyUI",
+    "Files": [
+      "split_files/vae/ae.safetensors"
+    ],
+    "LicenseType": "MIT"
   }
 ]

StabilityMatrix.Avalonia/Controls/Inference/ModelCard.axaml

@@ -47,7 +47,7 @@
                     <sg:SpacedGrid
                         ColumnDefinitions="Auto,*,Auto"
                         ColumnSpacing="8"
-                        RowDefinitions="*,*,*,*,*,*,*,*,*,*,*"
+                        RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*,*"
                         RowSpacing="0">
                         <!--  Model  -->
                         <TextBlock
@@ -317,9 +317,15 @@
                             Grid.Column="0"
                             Margin="0,8,0,0"
                             VerticalAlignment="Center"
-                            IsVisible="{Binding IsSd3Clip}"
                             Text="Encoder 3"
-                            TextAlignment="Left" />
+                            TextAlignment="Left">
+                            <TextBlock.IsVisible>
+                                <MultiBinding Converter="{x:Static BoolConverters.Or}">
+                                    <Binding Path="IsSd3Clip" />
+                                    <Binding Path="IsHiDreamClip" />
+                                </MultiBinding>
+                            </TextBlock.IsVisible>
+                        </TextBlock>
 
                         <controls:BetterDownloadableComboBox
                             Grid.Row="9"
@@ -328,14 +334,62 @@
                             Margin="0,8,0,0"
                             Padding="8,6,4,6"
                             HorizontalAlignment="Stretch"
-                            IsVisible="{Binding IsSd3Clip}"
                             ItemsSource="{Binding ClientManager.ClipModels}"
                             SelectedItem="{Binding SelectedClip3}"
+                            Theme="{StaticResource BetterComboBoxHybridModelTheme}">
+                            <controls:BetterDownloadableComboBox.IsVisible>
+                                <MultiBinding Converter="{x:Static BoolConverters.Or}">
+                                    <Binding Path="IsSd3Clip" />
+                                    <Binding Path="IsHiDreamClip" />
+                                </MultiBinding>
+                            </controls:BetterDownloadableComboBox.IsVisible>
+                        </controls:BetterDownloadableComboBox>
+
+                        <!--  CLIP 4  -->
+                        <TextBlock
+                            Grid.Row="10"
+                            Grid.Column="0"
+                            Margin="0,8,0,0"
+                            VerticalAlignment="Center"
+                            IsVisible="{Binding IsHiDreamClip}"
+                            Text="Encoder 4"
+                            TextAlignment="Left" />
+
+                        <controls:BetterDownloadableComboBox
+                            Grid.Row="10"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="2"
+                            Margin="0,8,0,0"
+                            Padding="8,6,4,6"
+                            HorizontalAlignment="Stretch"
+                            IsVisible="{Binding IsHiDreamClip}"
+                            ItemsSource="{Binding ClientManager.ClipModels}"
+                            SelectedItem="{Binding SelectedClip4}"
                             Theme="{StaticResource BetterComboBoxHybridModelTheme}" />
 
+                        <TextBlock
+                            Grid.Row="11"
+                            Grid.Column="0"
+                            Margin="0,8,0,0"
+                            VerticalAlignment="Center"
+                            IsVisible="{Binding IsHiDreamClip}"
+                            Text="Shift" />
+                        <ui:NumberBox
+                            Grid.Row="11"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="2"
+                            Margin="0,8,0,0"
+                            HorizontalAlignment="Stretch"
+                            IsVisible="{Binding IsHiDreamClip}"
+                            SelectionHighlightColor="Transparent"
+                            SimpleNumberFormat="F2"
+                            SmallChange="0.25"
+                            SpinButtonPlacementMode="Inline"
+                            Value="{Binding Shift}" />
+
                         <!--  Extra Networks  -->
                         <Panel
-                            Grid.Row="10"
+                            Grid.Row="12"
                             Grid.Column="0"
                             Grid.ColumnSpan="3"
                             IsVisible="{Binding IsExtraNetworksEnabled}">

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CheckpointBrowserCardViewModel.cs

@@ -27,7 +27,6 @@
 using StabilityMatrix.Core.Models.Api;
 using StabilityMatrix.Core.Models.Database;
 using StabilityMatrix.Core.Models.FileInterfaces;
-using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Core.Processes;
 using StabilityMatrix.Core.Services;
 
@@ -267,7 +266,7 @@ private async Task ShowVersionDialog(CivitModel model)
             .Where(v => !settingsManager.Settings.HideEarlyAccessModels || !v.IsEarlyAccess)
             .Select(version => new ModelVersionViewModel(modelIndexService, version))
             .ToImmutableArray();
-        viewModel.SelectedVersionViewModel = viewModel.Versions[0];
+        viewModel.SelectedVersionViewModel = viewModel.Versions.Any() ? viewModel.Versions[0] : null;
 
         // Update with latest version (including files) if we have no files
         if (model.ModelVersions?.FirstOrDefault()?.Files is not { Count: > 0 })
@@ -312,7 +311,9 @@ private async Task ShowVersionDialog(CivitModel model)
                             .Where(v => !settingsManager.Settings.HideEarlyAccessModels || !v.IsEarlyAccess)
                             .Select(version => new ModelVersionViewModel(modelIndexService, version))
                             .ToImmutableArray();
-                        viewModel.SelectedVersionViewModel = viewModel.Versions[0];
+                        viewModel.SelectedVersionViewModel = viewModel.Versions.Any()
+                            ? viewModel.Versions[0]
+                            : null;
                     });
 
                     // Save to db

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/HuggingFacePageViewModel.cs

@@ -156,6 +156,15 @@ private async Task ImportSelected()
                     $"https://huggingface.co/{viewModel.Item.RepositoryPath}/resolve/main/{file}?download=true";
                 var sharedFolderType = viewModel.Item.ModelCategory.ConvertTo<SharedFolderType>();
                 var fileName = Path.GetFileName(file);
+
+                if (
+                    fileName.Equals("ae.safetensors", StringComparison.OrdinalIgnoreCase)
+                    && viewModel.Item.ModelName == "HiDream I1 VAE"
+                )
+                {
+                    fileName = "hidream_vae.safetensors";
+                }
+
                 var downloadPath = new FilePath(
                     Path.Combine(
                         Design.IsDesignMode ? string.Empty : settingsManager.ModelsDirectory,
@@ -164,6 +173,7 @@ private async Task ImportSelected()
                         fileName
                     )
                 );
+
                 downloadPath.Directory?.Create();
                 var download = trackedDownloadService.NewDownload(url, downloadPath);
                 download.ProgressUpdate += DownloadOnProgressUpdate;

StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs

@@ -673,7 +673,7 @@ private async Task ShowCivitVersionDialog(CheckpointFileViewModel item)
         viewModel.Versions = versions
             .Select(version => new ModelVersionViewModel(modelIndexService, version))
             .ToImmutableArray();
-        viewModel.SelectedVersionViewModel = viewModel.Versions[0];
+        viewModel.SelectedVersionViewModel = viewModel.Versions.Any() ? viewModel.Versions[0] : null;
 
         dialog.Content = new SelectModelVersionDialog { DataContext = viewModel };
 
@@ -1107,7 +1107,7 @@ private void RefreshCategories()
             previouslySelectedCategory
             ?? Categories.FirstOrDefault(x => x.Path == previouslySelectedCategory?.Path)
             ?? Categories.FirstOrDefault()
-            ?? categoriesCache.Items[0];
+            ?? (categoriesCache.Items.Any() ? categoriesCache.Items[0] : null);
 
         var dirPath = new DirectoryPath(SelectedCategory.Path);
 
@@ -1128,7 +1128,7 @@ private void RefreshCategories()
                 previouslySelectedCategory
                 ?? Categories.FirstOrDefault(x => x.Path == previouslySelectedCategory?.Path)
                 ?? Categories.FirstOrDefault()
-                ?? categoriesCache.Items[0];
+                ?? (categoriesCache.Items.Any() ? categoriesCache.Items[0] : null);
         });
     }
 

StabilityMatrix.Avalonia/ViewModels/HuggingFacePage/HuggingfaceItemViewModel.cs

@@ -29,7 +29,10 @@ public partial class HuggingfaceItemViewModel : ViewModelBase
                 ModelsDir,
                 Item.ModelCategory.ConvertTo<SharedFolderType>().ToString(),
                 Item.Subfolder ?? string.Empty,
-                Path.GetFileName(Item.Files[0])
+                Path.GetFileName(Item.Files[0]).Equals("ae.safetensors")
+                && Item.ModelName.Equals("HiDream I1 VAE")
+                    ? "hidream_vae.safetensors"
+                    : Path.GetFileName(Item.Files[0])
             )
         );
 

StabilityMatrix.Avalonia/ViewModels/Inference/ExtraNetworkCardViewModel.cs

@@ -13,6 +13,8 @@
 using StabilityMatrix.Core.Attributes;
 using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Models;
+using StabilityMatrix.Core.Services;
+
 #pragma warning disable CS0657 // Not a valid attribute location for this declaration
 
 namespace StabilityMatrix.Avalonia.ViewModels.Inference;
@@ -22,6 +24,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 [RegisterTransient<ExtraNetworkCardViewModel>]
 public partial class ExtraNetworkCardViewModel : DisposableLoadableViewModelBase
 {
+    private readonly ISettingsManager settingsManager;
     public const string ModuleKey = "ExtraNetwork";
 
     /// <summary>
@@ -60,8 +63,9 @@ public partial class ExtraNetworkCardViewModel : DisposableLoadableViewModelBase
     public readonly SourceCache<HybridModelFile, string> LoraModelsSource = new(p => p.GetId());
 
     /// <inheritdoc/>
-    public ExtraNetworkCardViewModel(IInferenceClientManager clientManager)
+    public ExtraNetworkCardViewModel(IInferenceClientManager clientManager, ISettingsManager settingsManager)
     {
+        this.settingsManager = settingsManager;
         ClientManager = clientManager;
 
         var filterPredicate = this.WhenPropertyChanged(vm => vm.SelectedBaseModel)
@@ -85,6 +89,13 @@ public ExtraNetworkCardViewModel(IInferenceClientManager clientManager)
                 .Subscribe()
         );
 
+        AddDisposable(
+            settingsManager.RegisterPropertyChangedHandler(
+                s => s.FilterExtraNetworksByBaseModel,
+                _ => LoraModelsSource.Refresh()
+            )
+        );
+
         LoraModelsSource.EditDiff(clientManager.LoraModels);
     }
 
@@ -138,6 +149,9 @@ private void CopyTriggerWords()
 
     private bool FilterCompatibleLoras(HybridModelFile? lora)
     {
+        if (!settingsManager.Settings.FilterExtraNetworksByBaseModel)
+            return true;
+
         return SelectedBaseModel is null
             || lora?.Local?.ConnectedModelInfo == null
             || SelectedBaseModel.Local?.ConnectedModelInfo == null