Refactor OnRunningNodeChanged to fix UI bug in video gen UI improve progress update handling in InferenceGenerationViewModelBase

Author: NeuralFault

StabilityMatrix.Avalonia/ViewModels/Base/InferenceGenerationViewModelBase.cs

@@ -143,7 +143,7 @@ protected async Task<FilePath> WriteOutputImageAsync(
         {
             GenerationParameters = args.Parameters,
             ProjectType = args.Project?.ProjectType,
-            ProjectName = ProjectFile?.NameWithoutExtension
+            ProjectName = ProjectFile?.NameWithoutExtension,
         };
 
         // Parse to format
@@ -260,7 +260,7 @@ public async Task RunCustomGeneration(
             Project = InferenceProjectDocument.FromLoadable(this),
             FilesToTransfer = args.FilesToTransfer,
             Parameters = new GenerationParameters(),
-            ClearOutputImages = true
+            ClearOutputImages = true,
         };
 
         await RunGeneration(generationArgs, cancellationToken);
@@ -410,7 +410,7 @@ await notificationService.ShowAsync(
                 {
                     Title = "Prompt Completed",
                     Body = $"Prompt [{promptTask.Id[..7].ToLower()}] completed successfully",
-                    BodyImagePath = notificationImage?.FullPath
+                    BodyImagePath = notificationImage?.FullPath,
                 }
             );
         }
@@ -521,14 +521,14 @@ private async Task<List<ImageSource>> ProcessOutputImages(
                 var opts = new JsonSerializerOptions
                 {
                     DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-                    Converters = { new JsonStringEnumConverter() }
+                    Converters = { new JsonStringEnumConverter() },
                 };
                 var paramsJson = JsonSerializer.Serialize(parameters, opts);
                 var smProject = JsonSerializer.Serialize(project, opts);
                 var metadata = new Dictionary<ExifTag, string>
                 {
                     { ExifTag.ImageDescription, paramsJson },
-                    { ExifTag.Software, smProject }
+                    { ExifTag.Software, smProject },
                 };
 
                 var bytesWithMetadata = ImageMetadata.AddMetadataToWebp(imageArray, metadata);
@@ -779,7 +779,7 @@ out var localSemVersion
             {
                 ShowDialogOnStart = true,
                 ModificationCompleteTitle = "Extensions Installed",
-                ModificationCompleteMessage = "Finished installing required extensions"
+                ModificationCompleteMessage = "Finished installing required extensions",
             };
             EventManager.Instance.OnPackageInstallProgressAdded(runner);
 
@@ -859,8 +859,14 @@ private void AttachRunningNodeChangedHandler(ComfyTask comfyTask)
     /// </summary>
     protected virtual void OnRunningNodeChanged(object? sender, string? nodeName)
     {
-        // Ignore if regular progress updates started
-        if (sender is not ComfyTask { HasProgressUpdateStarted: false })
+        var task = sender as ComfyTask;
+        if (task == null)
+        {
+            return;
+        }
+
+        // Ignore if regular progress updates started, unless the running node is different from the one reporting progress
+        if (task.HasProgressUpdateStarted && task.LastProgressUpdate?.RunningNode == nodeName)
         {
             return;
         }
@@ -906,7 +912,7 @@ public ModuleApplyStepEventArgs ToModuleApplyStepEventArgs()
             {
                 Builder = Builder,
                 IsEnabledOverrides = overrides,
-                FilesToTransfer = FilesToTransfer
+                FilesToTransfer = FilesToTransfer,
             };
         }