Browse Source

Fix interrupt handler disposed too early

pull/165/head
Ionite 1 year ago
parent
commit
48b81afc68
No known key found for this signature in database
  1. 18
      StabilityMatrix.Avalonia/ViewModels/Base/InferenceGenerationViewModelBase.cs
  2. 11
      StabilityMatrix.Avalonia/ViewModels/Base/ProgressViewModel.cs

18
StabilityMatrix.Avalonia/ViewModels/Base/InferenceGenerationViewModelBase.cs

@ -132,7 +132,19 @@ public abstract partial class InferenceGenerationViewModelBase
// Register progress handler // Register progress handler
promptTask.ProgressUpdate += OnProgressUpdateReceived; promptTask.ProgressUpdate += OnProgressUpdateReceived;
promptTask.RunningNodeChanged += OnRunningNodeChanged;
// Delay attaching running node change handler to not show indeterminate progress
// if progress updates are received before the prompt starts
Task.Run(
async () =>
{
await Task.Delay(200, cancellationToken);
// ReSharper disable once AccessToDisposedClosure
promptTask.RunningNodeChanged += OnRunningNodeChanged;
},
cancellationToken
)
.SafeFireAndForget();
// Wait for prompt to finish // Wait for prompt to finish
await promptTask.Task.WaitAsync(cancellationToken); await promptTask.Task.WaitAsync(cancellationToken);
@ -166,15 +178,13 @@ public abstract partial class InferenceGenerationViewModelBase
client.PreviewImageReceived -= OnPreviewImageReceived; client.PreviewImageReceived -= OnPreviewImageReceived;
// Clear progress // Clear progress
OutputProgress.Value = 0; OutputProgress.ClearProgress();
OutputProgress.Text = "";
ImageGalleryCardViewModel.PreviewImage?.Dispose(); ImageGalleryCardViewModel.PreviewImage?.Dispose();
ImageGalleryCardViewModel.PreviewImage = null; ImageGalleryCardViewModel.PreviewImage = null;
ImageGalleryCardViewModel.IsPreviewOverlayEnabled = false; ImageGalleryCardViewModel.IsPreviewOverlayEnabled = false;
// Cleanup tasks // Cleanup tasks
promptTask?.Dispose(); promptTask?.Dispose();
await promptInterrupt.DisposeAsync();
} }
} }

11
StabilityMatrix.Avalonia/ViewModels/Base/ProgressViewModel.cs

@ -12,16 +12,23 @@ public partial class ProgressViewModel : ViewModelBase
[ObservableProperty] [ObservableProperty]
private string? description; private string? description;
[ObservableProperty, NotifyPropertyChangedFor(nameof(IsProgressVisible))] [ObservableProperty, NotifyPropertyChangedFor(nameof(IsProgressVisible))]
private double value; private double value;
[ObservableProperty] [ObservableProperty]
private double maximum = 100; private double maximum = 100;
[ObservableProperty, NotifyPropertyChangedFor(nameof(IsProgressVisible))] [ObservableProperty, NotifyPropertyChangedFor(nameof(IsProgressVisible))]
private bool isIndeterminate; private bool isIndeterminate;
public virtual bool IsProgressVisible => Value > 0 || IsIndeterminate; public virtual bool IsProgressVisible => Value > 0 || IsIndeterminate;
public virtual bool IsTextVisible => !string.IsNullOrWhiteSpace(Text); public virtual bool IsTextVisible => !string.IsNullOrWhiteSpace(Text);
public void ClearProgress()
{
Value = 0;
Text = null;
IsIndeterminate = false;
}
} }

Loading…
Cancel
Save