Merge pull request LykosAI#955 from ionite34/inference-improvements-to-main

inference improvements to main

Author: mohnjiles

CHANGELOG.md

@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
 - Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
 - Fixed Inference image selector card buttons taking up the whole height of the card
+- Fixed Inference mask editor failing to paint to the right-most edge on large images
+- Fixed Inference mask editor not showing the entire image in certain circumstances
 
 ## v2.13.0
 ### Added

StabilityMatrix.Avalonia/Controls/Painting/PaintCanvas.axaml.cs

@@ -260,7 +260,7 @@ private void HandlePointerMoved(PointerEventArgs e)
         // penPath.Path.LineTo(cursorPosition.ToSKPoint());
 
         // Get bounds for discarding invalid points
-        var canvasBounds = MainCanvas?.Bounds ?? new Rect();
+        var canvasBounds = new Rect(0, 0, MainCanvas?.Bounds.Width ?? 0, MainCanvas?.Bounds.Height ?? 0);
 
         // Add points
         foreach (var point in points)

StabilityMatrix.Avalonia/ViewModels/Controls/PaintCanvasViewModel.cs

@@ -215,7 +215,22 @@ public void RenderToSurface(
                 }
                 else
                 {
-                    layer.Surface.Canvas.Clear(SKColors.Transparent);
+                    var currentInfo = layer.Surface.Canvas.DeviceClipBounds;
+                    if (currentInfo.Width != CanvasSize.Width || currentInfo.Height != CanvasSize.Height)
+                    {
+                        // Dispose the old surface
+                        layer.Surface.Dispose();
+
+                        // Create a brand-new SKSurface with the new size
+                        layer.Surface = SKSurface.Create(
+                            new SKImageInfo(CanvasSize.Width, CanvasSize.Height)
+                        );
+                    }
+                    else
+                    {
+                        // No resize needed, just clear
+                        layer.Surface.Canvas.Clear(SKColors.Transparent);
+                    }
                 }
             }
         }

StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs

@@ -115,7 +115,7 @@ public override async Task OnLoadedAsync()
                 )
             );
         }
-        catch (ApiException e)
+        catch (Exception e)
         {
             // hide dialog and show error msg
             logger.LogError(e, "Failed to get recommended models");

StabilityMatrix.Avalonia/ViewModels/Inference/SelectImageCardViewModel.cs

@@ -7,6 +7,7 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
+using Avalonia.Controls.Notifications;
 using Avalonia.Input;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
@@ -206,6 +207,11 @@ private async Task OpenEditMaskDialogAsync()
         if (await ImageSource.GetBitmapAsync() is not { } currentBitmap)
         {
             Logger.Warn("GetBitmapAsync returned null for image {Path}", ImageSource.LocalFile?.FullPath);
+            notificationService.ShowPersistent(
+                "Error Loading Image",
+                "Could not load mask editor for the provided image.",
+                NotificationType.Error
+            );
             return;
         }
         MaskEditorViewModel.PaintCanvasViewModel.BackgroundImage = currentBitmap.ToSKBitmap();