i

README.md

@@ -167,7 +167,10 @@ class FreeUForForge(scripts.Script):
 
         return freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2
 
-    def process_batch(self, p, *script_args, **kwargs):
+    def process_before_every_sampling(self, p, *script_args, **kwargs):
+        # This will be called before every sampling.
+        # If you use highres fix, this will be called twice.
+        
         freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2 = script_args
 
         if not freeu_enabled:

extensions-builtin/sd_forge_freeu/scripts/forge_freeu.py

@@ -60,7 +60,10 @@ class FreeUForForge(scripts.Script):
 
         return freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2
 
-    def process_batch(self, p, *script_args, **kwargs):
+    def process_before_every_sampling(self, p, *script_args, **kwargs):
+        # This will be called before every sampling.
+        # If you use highres fix, this will be called twice.
+
         freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2 = script_args
 
         if not freeu_enabled:

extensions-builtin/sd_forge_hypertile/scripts/forge_hypertile.py

@@ -24,7 +24,7 @@ class HyperTileForForge(scripts.Script):
 
         return enabled, tile_size, swap_size, max_depth, scale_depth
 
-    def process_batch(self, p, *script_args, **kwargs):
+    def process_before_every_sampling(self, p, *script_args, **kwargs):
         enabled, tile_size, swap_size, max_depth, scale_depth = script_args
         tile_size, swap_size, max_depth = int(tile_size), int(swap_size), int(max_depth)
 

extensions-builtin/sd_forge_kohya_hrfix/scripts/kohya_hrfix.py

@@ -28,7 +28,7 @@ class KohyaHRFixForForge(scripts.Script):
 
         return enabled, block_number, downscale_factor, start_percent, end_percent, downscale_after_skip, downscale_method, upscale_method
 
-    def process_batch(self, p, *script_args, **kwargs):
+    def process_before_every_sampling(self, p, *script_args, **kwargs):
         enabled, block_number, downscale_factor, start_percent, end_percent, downscale_after_skip, downscale_method, upscale_method = script_args
         block_number = int(block_number)
 

extensions-builtin/sd_forge_sag/scripts/forge_sag.py

@@ -22,7 +22,7 @@ class SAGForForge(scripts.Script):
 
         return enabled, scale, blur_sigma
 
-    def process_batch(self, p, *script_args, **kwargs):
+    def process_before_every_sampling(self, p, *script_args, **kwargs):
         enabled, scale, blur_sigma = script_args
 
         if not enabled:

modules/processing.py

@@ -1248,6 +1248,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
 
             x = self.rng.next()
 
+            self.sd_model.forge_objects = self.sd_model.forge_objects_after_applying_lora.shallow_copy()
             if self.scripts is not None:
                 self.scripts.process_before_every_sampling(self,
                                                            x=x,
@@ -1356,6 +1357,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
         if self.scripts is not None:
             self.scripts.before_hr(self)
 
+        self.sd_model.forge_objects = self.sd_model.forge_objects_after_applying_lora.shallow_copy()
         if self.scripts is not None:
             self.scripts.process_before_every_sampling(self,
                                                        x=samples,
@@ -1666,6 +1668,7 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing):
             self.extra_generation_params["Noise multiplier"] = self.initial_noise_multiplier
             x *= self.initial_noise_multiplier
 
+        self.sd_model.forge_objects = self.sd_model.forge_objects_after_applying_lora.shallow_copy()
         if self.scripts is not None:
             self.scripts.process_before_every_sampling(self,
                                                        x=self.init_latent,

modules/sd_hijack.py

@@ -148,13 +148,7 @@ class StableDiffusionModelHijack:
         pass
 
     def apply_circular(self, enable):
-        if self.circular_enabled == enable:
-            return
-
-        self.circular_enabled = enable
-
-        for layer in [layer for layer in self.layers if type(layer) == torch.nn.Conv2d]:
-            layer.padding_mode = 'circular' if enable else 'zeros'
+        pass
 
     def clear_comments(self):
         self.comments = []