rename of types.py to dreamtypes.py

Allows to output name of frame file

__init__.py

@@ -35,7 +35,7 @@ _SIGNATURE_SUFFIX = " [Dream]"
 
 MANIFEST = {
     "name": "Dream Project Animation",
-    "version": (4, 3, 0),
+    "version": (4, 3, 1),
     "author": "Dream Project",
     "project": "https://github.com/alt-key-project/comfyui-dream-project",
     "description": "Various utility nodes for creating animations with ComfyUI",

base.py

@@ -3,7 +3,7 @@ import glob
 
 from .categories import NodeCategories
 from .shared import *
-from .types import *
+from .dreamtypes import *
 
 
 class DreamFrameCounterInfo:

colors.py

@@ -2,7 +2,7 @@
 
 from .categories import NodeCategories
 from .shared import *
-from .types import *
+from .dreamtypes import *
 
 
 class DreamImageAreaSampler:

curves.py

@@ -8,7 +8,7 @@ from scipy.io.wavfile import read as wav_read
 
 from .categories import NodeCategories
 from .shared import hashed_as_strings
-from .types import SharedTypes, FrameCounter
+from .dreamtypes import SharedTypes, FrameCounter
 
 
 def _linear_value_calc(x, x_start, x_end, y_start, y_end):
@@ -141,7 +141,6 @@ class WavData:
 
         for i in range(self._num_buckets):
             self._buckets[i] = float(self._buckets[i]) / self._max_bucket_value
-            print("Bucket {} = {}".format(i, self._buckets[i]))
 
     def value_at_time(self, second: float) -> float:
         if second < 0.0 or second > self._length_in_seconds:

image_processing.py

@@ -9,7 +9,7 @@ from PIL.Image import Resampling
 from .categories import *
 from .shared import ALWAYS_CHANGED_FLAG, convertTensorImageToPIL, DreamImageProcessor, \
     DreamImage, DreamMask
-from .types import SharedTypes, FrameCounter
+from .dreamtypes import SharedTypes, FrameCounter
 
 
 class DreamImageMotion:

laboratory.py

@@ -6,7 +6,7 @@ import json
 
 from .categories import *
 from .shared import ALWAYS_CHANGED_FLAG, DreamStateFile
-from .types import *
+from .dreamtypes import *
 
 _laboratory_state = DreamStateFile("laboratory")
 

loaders.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from .categories import NodeCategories
 from .shared import ALWAYS_CHANGED_FLAG, list_images_in_directory, DreamImage
-from .types import SharedTypes, FrameCounter
+from .dreamtypes import SharedTypes, FrameCounter
+import os
 
 
 class DreamImageSequenceInputWithDefaultFallback:
@@ -22,8 +23,8 @@ class DreamImageSequenceInputWithDefaultFallback:
         }
 
     CATEGORY = NodeCategories.IMAGE_ANIMATION
-    RETURN_TYPES = ("IMAGE",)
-    RETURN_NAMES = ("image",)
+    RETURN_TYPES = ("IMAGE","STRING")
+    RETURN_NAMES = ("image","frame_name")
     FUNCTION = "result"
 
     @classmethod
@@ -37,5 +38,6 @@ class DreamImageSequenceInputWithDefaultFallback:
         if not entry:
             return (default_image, "")
         else:
+            image_names = [os.path.basename(file_path) for file_path in entry]
             images = map(lambda f: DreamImage(file_path=f), entry)
-            return (DreamImage.join_to_tensor_data(images),)
+            return (DreamImage.join_to_tensor_data(images), image_names[0]) 

noise.py

@@ -3,7 +3,7 @@ import math
 
 from .categories import NodeCategories
 from .shared import *
-from .types import *
+from .dreamtypes import *
 
 
 def _generate_noise(image: DreamImage, color_function, rng: random.Random, block_size, blur_amount,

output.py

@@ -8,7 +8,7 @@ from PIL.PngImagePlugin import PngInfo
 from .categories import NodeCategories
 from .shared import hashed_as_strings, DreamImageProcessor, DreamImage, \
     list_images_in_directory, DreamConfig
-from .types import SharedTypes, FrameCounter, AnimationSequence, LogEntry
+from .dreamtypes import SharedTypes, FrameCounter, AnimationSequence, LogEntry
 
 CONFIG = DreamConfig()
 

prompting.py

@@ -1,6 +1,6 @@
 from .categories import NodeCategories
 from .shared import hashed_as_strings
-from .types import PartialPrompt
+from .dreamtypes import PartialPrompt
 
 
 class DreamWeightedPromptBuilder:

seq_processing.py

@@ -10,7 +10,7 @@ from PIL import Image as PilImage
 from .categories import NodeCategories
 from .err import on_error
 from .shared import DreamConfig, MpegEncoderUtility
-from .types import *
+from .dreamtypes import *
 
 CONFIG = DreamConfig()
 

switches.py

@@ -1,7 +1,7 @@
 from .categories import NodeCategories
 from .err import *
 from .shared import ALWAYS_CHANGED_FLAG, hashed_as_strings
-from .types import RGBPalette
+from .dreamtypes import RGBPalette
 
 
 def _generate_switch_input(type: str):

utility.py

@@ -7,7 +7,7 @@ import folder_paths as comfy_paths
 
 from .categories import NodeCategories
 from .shared import hashed_as_strings, DreamStateFile
-from .types import LogEntry, SharedTypes, FrameCounter
+from .dreamtypes import LogEntry, SharedTypes, FrameCounter
 
 _logfile_state = DreamStateFile("logging")