Merge pull request #1054 from ionite34/dev

2.14.0

Author: mohnjiles

.aiexclude

@@ -0,0 +1,30 @@
+# Docs
+LICENSE
+CHANGELOG.md
+
+# Legacy
+StabilityMatrix/
+
+# Tests
+*.verified.*
+
+# Misc projects
+StabilityMatrix.Native/
+StabilityMatrix.Native.*/
+StabilityMatrix.Avalonia.Diagnostics/
+StabilityMatrix.Avalonia.Diagnostics/
+StabilityMatrix.UITests/
+
+# Vendored
+Avalonia.Gif/
+
+# Configs
+*.editorconfig
+*.DotSettings
+
+# Assets
+*.svg
+StabilityMatrix.Avalonia/Assets/Fonts/
+StabilityMatrix.Avalonia/Assets/linux-x64/
+StabilityMatrix.Avalonia/Assets/macos-arm64/
+StabilityMatrix.Avalonia/Assets/win-x64/

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "husky": {
-      "version": "0.6.0",
+      "version": "0.7.2",
       "commands": [
         "husky"
       ],

.husky/task-runner.json

@@ -19,6 +19,12 @@
          "group": "generate-openapi",
          "command": "dotnet",
          "args": ["refitter", "--settings-file", "./StabilityMatrix.Core/Api/LykosAuthApi/.refitter"]
+      },
+      {
+         "name": "Run refitter for PromptGenApi",
+         "group": "generate-promptgen-openapi",
+         "command": "dotnet",
+         "args": ["refitter", "--settings-file", "./StabilityMatrix.Core/Api/PromptGen/.refitter"]
       }
    ]
 }

Avalonia.Gif/GifImage.cs

@@ -18,30 +18,28 @@ public class GifImage : Control
             string
         >("SourceUriRaw");
 
-        public static readonly StyledProperty<Uri> SourceUriProperty = AvaloniaProperty.Register<GifImage, Uri>(
-            "SourceUri"
-        );
+        public static readonly StyledProperty<Uri> SourceUriProperty = AvaloniaProperty.Register<
+            GifImage,
+            Uri
+        >("SourceUri");
 
         public static readonly StyledProperty<Stream> SourceStreamProperty = AvaloniaProperty.Register<
             GifImage,
             Stream
         >("SourceStream");
 
-        public static readonly StyledProperty<IterationCount> IterationCountProperty = AvaloniaProperty.Register<
-            GifImage,
-            IterationCount
-        >("IterationCount", IterationCount.Infinite);
+        public static readonly StyledProperty<IterationCount> IterationCountProperty =
+            AvaloniaProperty.Register<GifImage, IterationCount>("IterationCount", IterationCount.Infinite);
 
         private IGifInstance? _gifInstance;
 
-        public static readonly StyledProperty<StretchDirection> StretchDirectionProperty = AvaloniaProperty.Register<
-            GifImage,
-            StretchDirection
-        >("StretchDirection");
+        public static readonly StyledProperty<StretchDirection> StretchDirectionProperty =
+            AvaloniaProperty.Register<GifImage, StretchDirection>("StretchDirection");
 
-        public static readonly StyledProperty<Stretch> StretchProperty = AvaloniaProperty.Register<GifImage, Stretch>(
-            "Stretch"
-        );
+        public static readonly StyledProperty<Stretch> StretchProperty = AvaloniaProperty.Register<
+            GifImage,
+            Stretch
+        >("Stretch");
 
         private CompositionCustomVisual? _customVisual;
 
@@ -288,10 +286,19 @@ e.NewValue is null
         private void UpdateGifInstance(object source)
         {
             _gifInstance?.Dispose();
-            _gifInstance = new WebpInstance(source);
-            // _gifInstance = new GifInstance(source);
-            _gifInstance.IterationCount = IterationCount;
-            _customVisual?.SendHandlerMessage(_gifInstance);
+
+            try
+            {
+                _gifInstance = new WebpInstance(source);
+                // _gifInstance = new GifInstance(source);
+
+                _gifInstance.IterationCount = IterationCount;
+                _customVisual?.SendHandlerMessage(_gifInstance);
+            }
+            catch (Exception e)
+            {
+                Logger.Sink?.Log(LogEventLevel.Warning, "GifImage Update Source ", this, e.ToString());
+            }
         }
     }
 }

Avalonia.Gif/GifInstance.cs

@@ -8,6 +8,7 @@
 using Avalonia.Gif.Decoding;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
+using SkiaSharp;
 
 namespace Avalonia.Gif
 {
@@ -60,12 +61,20 @@ public GifInstance(Stream currentStream)
                 _gifDecoder.Header.Dimensions.Height
             );
 
-            _targetBitmap = new WriteableBitmap(
-                pixSize,
-                new Vector(96, 96),
-                PixelFormat.Bgra8888,
-                AlphaFormat.Opaque
-            );
+            // Different on os: https://github.com/mono/SkiaSharp/issues/1492#issuecomment-689015409
+            // ReSharper disable once SwitchExpressionHandlesSomeKnownEnumValuesWithExceptionInDefault
+            var format = SKImageInfo.PlatformColorType switch
+            {
+                SKColorType.Bgra8888 => PixelFormat.Bgra8888,
+                SKColorType.Rgba8888 => PixelFormat.Rgba8888,
+                _
+                    => throw new NotSupportedException(
+                        $"Unsupported color type: {SKImageInfo.PlatformColorType}"
+                    )
+            };
+
+            _targetBitmap = new WriteableBitmap(pixSize, new Vector(96, 96), format, AlphaFormat.Opaque);
+
             GifPixelSize = pixSize;
 
             _totalTime = TimeSpan.Zero;

Avalonia.Gif/WebpInstance.cs

@@ -54,12 +54,17 @@ public WebpInstance(Stream currentStream)
 
         var pixSize = new PixelSize(_codec.Info.Width, _codec.Info.Height);
 
-        _targetBitmap = new WriteableBitmap(
-            pixSize,
-            new Vector(96, 96),
-            PixelFormat.Bgra8888,
-            AlphaFormat.Opaque
-        );
+        // Different on os: https://github.com/mono/SkiaSharp/issues/1492#issuecomment-689015409
+        // ReSharper disable once SwitchExpressionHandlesSomeKnownEnumValuesWithExceptionInDefault
+        var format = SKImageInfo.PlatformColorType switch
+        {
+            SKColorType.Bgra8888 => PixelFormat.Bgra8888,
+            SKColorType.Rgba8888 => PixelFormat.Rgba8888,
+            _ => throw new NotSupportedException($"Unsupported color type: {SKImageInfo.PlatformColorType}")
+        };
+
+        _targetBitmap = new WriteableBitmap(pixSize, new Vector(96, 96), format, AlphaFormat.Opaque);
+
         GifPixelSize = pixSize;
 
         _totalTime = TimeSpan.Zero;
@@ -121,9 +126,18 @@ private static Stream GetStreamFromUri(Uri uri)
 
         if (!uriString.StartsWith("resm") && !uriString.StartsWith("avares"))
         {
-            return new FileStream(uriString, FileMode.Open, FileAccess.Read);
+            // Local file
+            using var fs = new FileStream(uriString, FileMode.Open, FileAccess.Read);
+
+            // Copy to memory stream then return
+            var memoryStream = new MemoryStream();
+            fs.CopyTo(memoryStream);
+            memoryStream.Seek(0, SeekOrigin.Begin);
+
+            return memoryStream;
         }
 
+        // Internal Avalonia resources
         return AssetLoader.Open(uri);
     }