delete useless nodes and change to use primitive node

README.md

@@ -2,22 +2,6 @@
 
 ![](./nodes.png)
 
-## Basic nodes
-
-|category|node name|input type|output type|desc.|
-| --- | --- | --- | --- | --- |
-|value|Text|`STRING`|`TEXT`| - |
-|value|Integer|`INT`|`Integer`| - |
-|value|Float|`FLOAT`|`Float`| - |
-|value|SamplerName|(dropdown)|`SamplerName`| - |
-|value|SchedulerName|(dropdown)|`SchedulerName`| - |
-
-## CLIP nodes
-
-|category|node name|input type|output type|desc.|
-| --- | --- | --- | --- | --- |
-|conditioning|CLIPTextEncode2|`CLIP`, `TEXT`|`CONDITIONING`|external prompt input|
-
 ## Latent nodes
 
 |category|node name|input type|output type|desc.|

__init__.py

@@ -1,7 +1,3 @@
-from .text import Text
-from .number import Integer, Float
-from .sampler import SamplerName, SchedulerName
-from .cliptextencode2 import CLIPTextEncode2
 from .randomlatent import RandomLatentImage
 from .vae import VAEDecodeBatched, VAEEncodeBatched
 from .sample import KSamplerSetting, KSamplerOverrided, KSamplerXYZ
@@ -9,28 +5,6 @@ from .model import StateDictLoader, Dict2Model, StateDictMerger, StateDictMerger
 from .image import GridImage
 
 NODE_CLASS_MAPPINGS = {
-    # basic nodes
-    
-    ## text output
-    'Text': Text,
-    
-    ## integer output
-    'Integer': Integer,
-    
-    ## float output
-    'Float': Float,
-    
-    ## sampler selection
-    'SamplerName': SamplerName,
-    
-    ## scheduler selection
-    'SchedulerName': SchedulerName,
-    
-    # conditioning
-    
-    ## same as CLIPTextEncode, but the prompt and CLIP are external inputs
-    'CLIPTextEncode2': CLIPTextEncode2,
-    
     # latent
     
     'RandomLatentImage': RandomLatentImage,

cliptextencode2.py

@@ -1,11 +0,0 @@
-class CLIPTextEncode2:
-    @classmethod
-    def INPUT_TYPES(cls):
-        return {"required": {"clip": ("CLIP", ), "text": ("TEXT",)}}
-    RETURN_TYPES = ("CONDITIONING",)
-    FUNCTION = "encode"
-
-    CATEGORY = "conditioning"
-
-    def encode(self, clip, text):
-        return ([[clip.encode(text), {}]], )

model.py

@@ -279,7 +279,7 @@ class StateDictMergerBlockWeighted(StateDictMerger):
         d['required']['base_alpha'] = d['required']['alpha']
         del d['required']['alpha']
         del d['optional']['model_C']
-        d['required']['alphas'] = ('TEXT',)
+        d['required']['alphas'] = ('STRING', { 'multiline': True, 'default': '' })
         return d
 
     def execute(

number.py

@@ -1,43 +0,0 @@
-import re
-
-re_range = re.compile(r"\s*([+-]?\s*\d+)\s*-\s*([+-]?\s*\d+)(?:\s*\(([+-]\d+)\s*\))?\s*")
-re_range_float = re.compile(r"\s*([+-]?\s*\d+(?:.\d*)?)\s*-\s*([+-]?\s*\d+(?:.\d*)?)(?:\s*\(([+-]\d+(?:.\d*)?)\s*\))?\s*")
-
-class Integer:
-    
-    @classmethod
-    def INPUT_TYPES(cls):
-        return {
-            'required': {
-                'value': ('INT', {})
-            }
-        }
-    
-    RETURN_TYPES = ('Integer',)
-    
-    FUNCTION = 'execute'
-    
-    CATEGORY = 'value'
-    
-    def execute(self, value: int):
-        return (value,)
-
-
-class Float:
-
-    @classmethod
-    def INPUT_TYPES(cls):
-        return {
-            'required': {
-                'value': ('FLOAT', {})
-            }
-        }
-    
-    RETURN_TYPES = ('Float',)
-    
-    FUNCTION = 'execute'
-    
-    CATEGORY = 'value'
-    
-    def execute(self, value: float):
-        return (value,)

sample.py

@@ -234,11 +234,11 @@ class KSamplerXYZ:
             },
             'optional': {
                 'model': ('MODEL',),
-                'seed': ('TEXT',),
-                'steps': ('TEXT',),
-                'cfg': ('TEXT',),
-                'sampler_name': ('TEXT',),
-                'scheduler': ('TEXT', ),
+                'seed': ('STRING', { 'multiline': True, 'default': '' }),
+                'steps': ('STRING', { 'multiline': True, 'default': '' }),
+                'cfg': ('STRING', { 'multiline': True, 'default': '' }),
+                'sampler_name': ('STRING', { 'multiline': True, 'default': '' }),
+                'scheduler': ('STRING', { 'multiline': True, 'default': '' }),
             }
         }
 

sampler.py

@@ -1,39 +0,0 @@
-import comfy.samplers
-
-class SamplerName:
-
-    @classmethod
-    def INPUT_TYPES(cls):
-        return {
-            'required': {
-                'value': (comfy.samplers.KSampler.SAMPLERS,)
-            }
-        }
-    
-    RETURN_TYPES = ('SamplerName',)
-    
-    FUNCTION = 'execute'
-    
-    CATEGORY = 'value'
-    
-    def execute(self, value: str):
-        return (value,)
-
-class SchedulerName:
-
-    @classmethod
-    def INPUT_TYPES(cls):
-        return {
-            'required': {
-                'value': (comfy.samplers.KSampler.SCHEDULERS,)
-            }
-        }
-    
-    RETURN_TYPES = ('SchedulerName',)
-    
-    FUNCTION = 'execute'
-    
-    CATEGORY = 'value'
-    
-    def execute(self, value: str):
-        return (value,)

text.py

@@ -1,20 +0,0 @@
-class Text:
-    
-    @classmethod
-    def INPUT_TYPES(cls):
-        return {
-            'required': {
-                'text': ('STRING', {
-                    'multiline': True,
-                })
-            }
-        }
-    
-    RETURN_TYPES = ('TEXT',) # currently no widgets can receive 'STRING' inputs...
-    
-    FUNCTION = 'execute'
-    
-    CATEGORY = 'value'
-    
-    def execute(self, text: str):
-        return (text,)