merge dev making 2.2.1

Author: papuSpartan

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 Formatting: [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
+## [2.2.1] - 2024-5-16
+
+### Fixed
+- Grid generation regression
+- Model propagation error handling
+
 ## [2.2.0] - 2024-5-11
 
 ### Added

scripts/distributed.py

@@ -17,7 +17,7 @@
 from PIL import Image
 from modules import processing
 from modules import scripts
-from modules.images import save_image
+from modules.images import save_image, image_grid
 from modules.processing import fix_seed
 from modules.shared import opts, cmd_opts
 from modules.shared import state as webui_state
@@ -198,7 +198,7 @@ def processed_inject_image(image, info_index, save_path_override=None, grid=Fals
 
         # generate and inject grid
         if opts.return_grid:
-            grid = images.image_grid(processed.images, len(processed.images))
+            grid = image_grid(processed.images, len(processed.images))
             processed_inject_image(
                 image=grid,
                 info_index=0,

scripts/spartan/worker.py

@@ -688,7 +688,7 @@ def load_options(self, model, vae=None):
             if vae is not None:
                 self.loaded_vae = vae
 
-            self.response = response
+        self.response = response
 
         return self