mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2025-07-28 08:46:35 +00:00
Added ComfyNodeInternal to comfy_api.internal that will contain classes intended to be used by all V3 schema iterations going forward
This commit is contained in:
parent
4294dfc496
commit
d99f778982
6
comfy_api/internal/__init__.py
Normal file
6
comfy_api/internal/__init__.py
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
class ComfyNodeInternal:
|
||||||
|
'''Class that all V3-based APIs inhertif from for ComfyNode.
|
||||||
|
|
||||||
|
This is intended to only be referenced within execution.py, as it has to handle all V3 APIs going forward.'''
|
||||||
|
...
|
||||||
|
|
@ -6,6 +6,7 @@ from abc import ABC, abstractmethod
|
|||||||
from dataclasses import dataclass, asdict
|
from dataclasses import dataclass, asdict
|
||||||
from collections import Counter
|
from collections import Counter
|
||||||
from comfy_execution.graph import ExecutionBlocker
|
from comfy_execution.graph import ExecutionBlocker
|
||||||
|
from comfy_api.internal import ComfyNodeInternal
|
||||||
from comfy_api.v3.resources import Resources, ResourcesLocal
|
from comfy_api.v3.resources import Resources, ResourcesLocal
|
||||||
import copy
|
import copy
|
||||||
# used for type hinting
|
# used for type hinting
|
||||||
@ -227,6 +228,13 @@ class OutputV3(IO_V3):
|
|||||||
self.tooltip = tooltip
|
self.tooltip = tooltip
|
||||||
self.is_output_list = is_output_list
|
self.is_output_list = is_output_list
|
||||||
|
|
||||||
|
def as_dict_V3(self):
|
||||||
|
return prune_dict({
|
||||||
|
"display_name": self.display_name,
|
||||||
|
"tooltip": self.tooltip,
|
||||||
|
"is_output_list": self.is_output_list,
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
class ComfyTypeI(ComfyType):
|
class ComfyTypeI(ComfyType):
|
||||||
'''ComfyType subclass that only has a default Input class - intended for types that only have Inputs.'''
|
'''ComfyType subclass that only has a default Input class - intended for types that only have Inputs.'''
|
||||||
@ -733,6 +741,10 @@ class BBOX(ComfyTypeIO):
|
|||||||
class SEGS(ComfyTypeIO):
|
class SEGS(ComfyTypeIO):
|
||||||
Type = Any # NOTE: I couldn't find any references in core code to POINT io_type. Does this exist?
|
Type = Any # NOTE: I couldn't find any references in core code to POINT io_type. Does this exist?
|
||||||
|
|
||||||
|
@comfytype(io_type="*")
|
||||||
|
class AnyType(ComfyTypeIO):
|
||||||
|
Type = Any
|
||||||
|
|
||||||
@comfytype(io_type="COMFY_MULTITYPED_V3")
|
@comfytype(io_type="COMFY_MULTITYPED_V3")
|
||||||
class MultiType:
|
class MultiType:
|
||||||
Type = Any
|
Type = Any
|
||||||
@ -794,7 +806,7 @@ class DynamicOutput(OutputV3, ABC):
|
|||||||
'''
|
'''
|
||||||
Abstract class for dynamic output registration.
|
Abstract class for dynamic output registration.
|
||||||
'''
|
'''
|
||||||
def __init__(self, id: str, display_name: str=None, tooltip: str=None,
|
def __init__(self, id: str=None, display_name: str=None, tooltip: str=None,
|
||||||
is_output_list=False):
|
is_output_list=False):
|
||||||
super().__init__(id, display_name, tooltip, is_output_list)
|
super().__init__(id, display_name, tooltip, is_output_list)
|
||||||
|
|
||||||
@ -804,7 +816,7 @@ class DynamicOutput(OutputV3, ABC):
|
|||||||
|
|
||||||
|
|
||||||
@comfytype(io_type="COMFY_AUTOGROW_V3")
|
@comfytype(io_type="COMFY_AUTOGROW_V3")
|
||||||
class AutogrowDynamic:
|
class AutogrowDynamic(ComfyTypeI):
|
||||||
Type = list[Any]
|
Type = list[Any]
|
||||||
class Input(DynamicInput):
|
class Input(DynamicInput):
|
||||||
def __init__(self, id: str, template_input: InputV3, min: int=1, max: int=None,
|
def __init__(self, id: str, template_input: InputV3, min: int=1, max: int=None,
|
||||||
@ -850,6 +862,48 @@ class ComboDynamicInput(DynamicInput):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@comfytype(io_type="COMFY_MATCHTYPE_V3")
|
||||||
|
class MatchType(ComfyTypeIO):
|
||||||
|
class Template:
|
||||||
|
def __init__(self, template_id: str, allowed_types: ComfyType | list[ComfyType]):
|
||||||
|
self.template_id = template_id
|
||||||
|
self.allowed_types = [allowed_types] if isinstance(allowed_types, ComfyType) else allowed_types
|
||||||
|
|
||||||
|
def as_dict(self):
|
||||||
|
return {
|
||||||
|
"template_id": self.template_id,
|
||||||
|
"allowed_types": "".join(t.io_type for t in self.allowed_types),
|
||||||
|
}
|
||||||
|
|
||||||
|
class Input(DynamicInput):
|
||||||
|
def __init__(self, id: str, template: MatchType.Template,
|
||||||
|
display_name: str=None, optional=False, tooltip: str=None, lazy: bool=None, extra_dict=None):
|
||||||
|
super().__init__(id, display_name, optional, tooltip, lazy, extra_dict)
|
||||||
|
self.template = template
|
||||||
|
|
||||||
|
def get_dynamic(self) -> list[InputV3]:
|
||||||
|
return [self]
|
||||||
|
|
||||||
|
def as_dict_V1(self):
|
||||||
|
return super().as_dict_V1() | prune_dict({
|
||||||
|
"template": self.template.as_dict(),
|
||||||
|
})
|
||||||
|
|
||||||
|
class Output(DynamicOutput):
|
||||||
|
def __init__(self, id: str, template: MatchType.Template, display_name: str=None, tooltip: str=None,
|
||||||
|
is_output_list=False):
|
||||||
|
super().__init__(id, display_name, tooltip, is_output_list)
|
||||||
|
self.template = template
|
||||||
|
|
||||||
|
def get_dynamic(self) -> list[OutputV3]:
|
||||||
|
return [self]
|
||||||
|
|
||||||
|
def as_dict_V3(self):
|
||||||
|
return super().as_dict_V3() | prune_dict({
|
||||||
|
"template": self.template.as_dict(),
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
class HiddenHolder:
|
class HiddenHolder:
|
||||||
def __init__(self, unique_id: str, prompt: Any,
|
def __init__(self, unique_id: str, prompt: Any,
|
||||||
extra_pnginfo: Any, dynprompt: Any,
|
extra_pnginfo: Any, dynprompt: Any,
|
||||||
@ -1083,7 +1137,7 @@ def add_to_dict_v1(i: InputV3, input: dict):
|
|||||||
input.setdefault(key, {})[i.id] = (i.get_io_type_V1(), i.as_dict_V1())
|
input.setdefault(key, {})[i.id] = (i.get_io_type_V1(), i.as_dict_V1())
|
||||||
|
|
||||||
|
|
||||||
class ComfyNodeV3:
|
class ComfyNodeV3(ComfyNodeInternal):
|
||||||
"""Common base class for all V3 nodes."""
|
"""Common base class for all V3 nodes."""
|
||||||
|
|
||||||
RELATIVE_PYTHON_MODULE = None
|
RELATIVE_PYTHON_MODULE = None
|
||||||
|
Loading…
x
Reference in New Issue
Block a user