Merge branch 'master' into dev

Author: kuschanow

__init__.py

@@ -4,7 +4,7 @@
     "LatentMirror": LatentMirror,
     "LatentShift": LatentShift,
     "LatentNormalize": LatentNormalize,
-    "KSamplerWithTransform": TSamplerWithTransform,
+    "TSamplerWithTransform": TSamplerWithTransform,
     "TransformSampler": TransformSampler,
     "MirrorTransform": MirrorTransform,
     "ShiftTransform": ShiftTransform,
@@ -25,7 +25,7 @@
     "LatentMirror": "Latent mirror",
     "LatentShift": "Latent shift",
     "LatentNormalize": "Latent normalize",
-    "KSamplerWithTransform": "TSampler with transforms (Latent Control)",
+    "TSamplerWithTransform": "TSampler with transforms (Latent Control)",
     "TransformSampler": "TSampler (Latent Control)",
     "MirrorTransform": "Mirror transform",
     "ShiftTransform": "Shift transform",

nodes/KSamplerNodes/TransformSampler.py

@@ -7,7 +7,7 @@ def prepare_callback(model, steps, transforms, x0_output_dict=None):
     def transform_callback(step, x0, x, total_steps):
         for transform in transforms:
             for i in range(x0.size()[0]):
-                x0[i] = transform["function"](step, x0[i], total_steps, transform["params"])
+                x0[i] = transform["function"](step, x0[i].unsqueeze(0), total_steps, transform["params"])
 
     preview = preview_callback(model, steps, x0_output_dict)
 

nodes/KSamplerNodes/Transforms/LatentAddTransform.py

@@ -1,4 +1,6 @@
 from .utils import latent_add_transform, get_offset_list
+import comfy
+import torch
 
 
 class LatentAddTransform:
@@ -22,14 +24,14 @@ def INPUT_TYPES(s):
     CATEGORY = "sampling/transforms"
 
     def process(self,
-                offset_optional,
                 latent,
                 start_at=0,
                 stop_at=0,
-                multiplier=1):
+                multiplier=1,
+                offset_optional=None):
         return ([{
             "params": {
-                "latent": latent["samples"][0],
+                "latent": latent["samples"][0].unsqueeze(0),
                 "start_at": start_at,
                 "stop_at": stop_at,
                 "multiplier": multiplier,

nodes/KSamplerNodes/Transforms/LatentIntrpolateTransform.py

@@ -1,4 +1,6 @@
 from .utils import latent_interpolate_transform, get_offset_list
+import comfy
+import torch
 
 
 class LatentInterpolateTransform:
@@ -23,15 +25,15 @@ def INPUT_TYPES(s):
     CATEGORY = "sampling/transforms"
 
     def process(self,
-                offset_optional,
                 latent,
                 start_at=0,
                 stop_at=0,
                 factor=0.5,
-                multiplier=1):
+                multiplier=1,
+                offset_optional=None):
         return ([{
             "params": {
-                "latent": latent["samples"][0],
+                "latent": latent["samples"][0].unsqueeze(0),
                 "start_at": start_at,
                 "stop_at": stop_at,
                 "factor": factor,

nodes/KSamplerNodes/Transforms/MirrorTransform.py

@@ -24,11 +24,11 @@ def INPUT_TYPES(s):
     CATEGORY = "sampling/transforms"
 
     def process(self,
-                offset_optional,
                 start_at=0,
                 stop_at=0,
                 mode="replace",
-                direction="horizontally",):
+                direction="horizontally",
+                offset_optional=None):
         return ([{
             "params": {
                 "start_at": start_at,

nodes/KSamplerNodes/Transforms/MultiplyTransform.py

@@ -22,11 +22,11 @@ def INPUT_TYPES(s):
     CATEGORY = "sampling/transforms"
 
     def process(self,
-                offset_optional,
                 start_at=0,
                 stop_at=0,
                 mode="combine",
-                multiplier=1):
+                multiplier=1,
+                offset_optional=None):
         return ([{
             "params": {
                 "start_at": start_at,

nodes/KSamplerNodes/Transforms/ShiftTransform.py

@@ -23,12 +23,12 @@ def INPUT_TYPES(s):
     CATEGORY = "sampling/transforms"
 
     def process(self,
-                offset_optional,
                 start_at=0,
                 stop_at=0,
                 mode="replace",
                 x_shift=0,
-                y_shift=0):
+                y_shift=0,
+                offset_optional=None):
         return ([{
             "params": {
                 "start_at": start_at,

nodes/KSamplerNodes/Transforms/utils.py

@@ -59,11 +59,11 @@ def mirror_transform(x0, params):
 
 
 def latent_interpolate_transform(x0, params):
-    latent = params["latent"]
+    latent = params["latent"].to(x0.device)
 
     if x0.shape != latent.shape:
         latent.permute(0, 3, 1, 2)
-        latent = comfy.utils.common_upscale(latent, x0.shape[3], x0.shape[2], 'bicubic')
+        latent = comfy.utils.common_upscale(latent, x0.shape[3], x0.shape[2], 'bicubic', crop='center')
         latent.permute(0, 2, 3, 1)
 
     x = x0 * params["factor"] + latent * (1 - params["factor"])
@@ -73,11 +73,11 @@ def latent_interpolate_transform(x0, params):
 
 
 def latent_add_transform(x0, params):
-    latent = params["latent"]
+    latent = params["latent"].to(x0.device)
 
     if x0.shape != latent.shape:
         latent.permute(0, 3, 1, 2)
-        latent = comfy.utils.common_upscale(latent, x0.shape[3], x0.shape[2], 'bicubic')
+        latent = comfy.utils.common_upscale(latent, x0.shape[3], x0.shape[2], 'bicubic',  crop='center')
         latent.permute(0, 2, 3, 1)
 
     x = x0 + latent