Merge cb820f02492a8ecb866bb41eecacafc5c9ca7611 into 62a862db37d77a9a2e7611f638f9ff151a24fdec

Add None checks to prevent warnings in path resolution

nodes/image_nodes.py

@@ -2156,8 +2156,8 @@ class ReplaceImagesInBatch:
     FUNCTION = "replace"
     CATEGORY = "KJNodes/image"
     DESCRIPTION = """
-Replaces the images in a batch, starting from the specified start index,  
-with the replacement images.
+Replaces the images in a batch, starting from the specified start index with step stride,  
+using the replacement images.
 """
 
     @classmethod
@@ -2165,6 +2165,7 @@ with the replacement images.
         return {
             "required": {
                  "start_index": ("INT", {"default": 1,"min": 0, "max": 4096, "step": 1}),
+                 "step": ("INT", {"default": 1,"min": 1, "max": 4096, "step": 1}),
         },
         "optional": {
             "original_images": ("IMAGE",),
@@ -2174,14 +2175,14 @@ with the replacement images.
         }
     } 
     
-    def replace(self, original_images=None, replacement_images=None, start_index=1, original_masks=None, replacement_masks=None):
+    def replace(self, original_images=None, replacement_images=None, start_index=1, step=1, original_masks=None, replacement_masks=None):
         images = None
         masks = None
         
         if original_images is not None and replacement_images is not None:
             if start_index >= len(original_images):
                 raise ValueError("ReplaceImagesInBatch: Start index is out of range")
-            end_index = start_index + len(replacement_images)
+            end_index = start_index + len(replacement_images) * step
             if end_index > len(original_images):
                 raise ValueError("ReplaceImagesInBatch: End index is out of range")
             
@@ -2189,7 +2190,7 @@ with the replacement images.
             if original_images_copy.shape[2] != replacement_images.shape[2] or original_images_copy.shape[3] != replacement_images.shape[3]:
                 replacement_images = common_upscale(replacement_images.movedim(-1, 1), original_images_copy.shape[1], original_images_copy.shape[2], "lanczos", "center").movedim(1, -1)
             
-            original_images_copy[start_index:end_index] = replacement_images
+            original_images_copy[start_index:end_index:step] = replacement_images
             images = original_images_copy
         else:
             images = torch.zeros((1, 64, 64, 3))
@@ -2197,7 +2198,7 @@ with the replacement images.
         if original_masks is not None and replacement_masks is not None:
             if start_index >= len(original_masks):
                 raise ValueError("ReplaceImagesInBatch: Start index is out of range")
-            end_index = start_index + len(replacement_masks)
+            end_index = start_index + len(replacement_masks) * step
             if end_index > len(original_masks):
                 raise ValueError("ReplaceImagesInBatch: End index is out of range")
 
@@ -2205,7 +2206,7 @@ with the replacement images.
             if original_masks_copy.shape[1] != replacement_masks.shape[1] or original_masks_copy.shape[2] != replacement_masks.shape[2]:
                 replacement_masks = common_upscale(replacement_masks.unsqueeze(1), original_masks_copy.shape[1], original_masks_copy.shape[2], "nearest-exact", "center").squeeze(0)
                 
-            original_masks_copy[start_index:end_index] = replacement_masks
+            original_masks_copy[start_index:end_index:step] = replacement_masks
             masks = original_masks_copy
         else:
             masks = torch.zeros((1, 64, 64))
@@ -2963,9 +2964,9 @@ class LoadImagesFromFolderKJ:
 
     @classmethod
     def IS_CHANGED(cls, folder, **kwargs):
-        if not os.path.isabs(folder) and args.base_directory:
+        if folder and not os.path.isabs(folder) and args.base_directory:
             folder = os.path.join(args.base_directory, folder)
-        if not os.path.isdir(folder):
+        if not folder or not os.path.isdir(folder):
             return float("NaN")
         
         valid_extensions = ['.jpg', '.jpeg', '.png', '.webp', '.tga']
@@ -3033,11 +3034,11 @@ class LoadImagesFromFolderKJ:
     CATEGORY = "KJNodes/image"
     DESCRIPTION = """Loads images from a folder into a batch, images are resized and loaded into a batch."""
 
-    def load_images(self, folder, width, height, image_load_cap, start_index, keep_aspect_ratio, include_subfolders=False):
-        if not os.path.isabs(folder) and args.base_directory:
-            folder = os.path.join(args.base_directory, folder)      
-        if not os.path.isdir(folder):
-            raise FileNotFoundError(f"Folder '{folder} cannot be found.'")
+    def load_images(self, folder, width, height, image_load_cap, start_index, keep_aspect_ratio, include_subfolders=False):    
+        if folder and not os.path.isabs(folder) and args.base_directory:
+            folder = os.path.join(args.base_directory, folder)
+        if not folder or not os.path.isdir(folder):
+            raise FileNotFoundError(f"Folder '{folder}' cannot be found.")
         
         valid_extensions = ['.jpg', '.jpeg', '.png', '.webp', '.tga']
         image_paths = []
@@ -3339,7 +3340,7 @@ class SaveStringKJ:
         filename_prefix += self.prefix_append
         
         full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, self.output_dir)
-        if not os.path.isabs(output_folder) and args.base_directory:
+        if output_folder and not os.path.isabs(output_folder) and args.base_directory:
             output_folder = os.path.join(args.base_directory, output_folder)
         if output_folder != "output":
             if not os.path.exists(output_folder):
@@ -3966,7 +3967,7 @@ class LoadVideosFromFolder:
     FUNCTION = "load_video"
 
     def load_video(self, output_type, grid_max_columns, add_label=False, **kwargs):
-        if not os.path.isabs(kwargs['video']) and args.base_directory:
+        if kwargs.get('video') and not os.path.isabs(kwargs['video']) and args.base_directory:
             kwargs['video'] = os.path.join(args.base_directory, kwargs['video'])
             
         if self.vhs_nodes is None: