Merge branch 'dev' into forge-classic

Author: mohnjiles

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - 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
 
 ## v2.14.0-pre.1
 ### Added

StabilityMatrix.Avalonia/Controls/VendorLabs/AsyncImage/BetterAsyncImageCacheProvider.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Reflection;
 using System.Threading;
+using Fusillade;
 using StabilityMatrix.Avalonia.Controls.VendorLabs.Cache;
 
 namespace StabilityMatrix.Avalonia.Controls.VendorLabs;
@@ -20,7 +21,8 @@ public static class BetterAsyncImageCacheProvider
                             && !string.IsNullOrEmpty(assemblyName)
                                 ? Path.Combine(Path.GetTempPath(), assemblyName, "Cache")
                                 : Path.Combine(Path.GetTempPath(), "Cache"),
-                        CacheDuration = TimeSpan.FromDays(1)
+                        CacheDuration = TimeSpan.FromDays(1),
+                        HttpMessageHandler = NetCache.UserInitiated
                     }
                 ),
             LazyThreadSafetyMode.ExecutionAndPublication

StabilityMatrix.Avalonia/Views/Dialogs/SafetensorMetadataDialog.axaml

@@ -66,7 +66,7 @@
                         Orientation="Horizontal" />
                 </ui:ItemsRepeater.Layout>
                 <ui:ItemsRepeater.ItemTemplate>
-                    <DataTemplate>
+                    <DataTemplate x:DataType="models:SafetensorMetadata+Tag">
                         <Button
                             Command="{Binding $parent[ui:ItemsRepeater].((dialogs:SafetensorMetadataViewModel)DataContext).CopyTagToClipboardCommand}"
                             CommandParameter="{Binding Name}"
@@ -100,7 +100,7 @@
                 IsVisible="{Binding !!Metadata.OtherMetadata.Count}"
                 ItemsSource="{Binding Metadata.OtherMetadata}">
                 <ui:ItemsRepeater.ItemTemplate>
-                    <DataTemplate>
+                    <DataTemplate x:DataType="models:SafetensorMetadata+Metadata">
                         <StackPanel Margin="5" Orientation="Vertical">
                             <TextBlock FontWeight="SemiBold" Text="{Binding Name}" />
                             <TextBlock Text="{Binding Value}" />