mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-01-03 02:30:52 +08:00
0be8a76c93
* Support Combo outputs in a more sane way * Remove test validate_inputs function on test node * Make curr_prefix be a list of strings instead of string for easier parsing as keys get added to dynamic types * Start to account for id prefixes from frontend, need to fix bug with nested dynamics * Ensure inputs/outputs/hidden are lists in schema finalize function, remove no longer needed 'is not None' checks * Add raw_link and extra_dict to all relevant Inputs * Make nested DynamicCombos work properly with prefixed keys on latest frontend; breaks old Autogrow, but is pretty much ready for upcoming Autogrow keys * Replace ... usage with a MISSING sentinel for clarity in nodes_logic.py * Added CustomCombo node in backend to reflect frontend node * Prepare Autogrow's expand_schema_for_dynamic to work with upcoming frontend changes * Prepare for look up table for dynamic input stuff * More progress towards dynamic input lookup function stuff * Finished converting _expand_schema_for_dynamic to be done via lookup instead of OOP to guarantee working with process isolation, did refactoring to remove old implementation + cleaning INPUT_TYPES definition including v3 hidden definition * Change order of functions * Removed some unneeded functions after dynamic refactor * Make MatchType's output default displayname "MATCHTYPE" * Fix DynamicSlot get_all * Removed redundant code - dynamic stuff no longer happens in OOP way * Natively support AnyType (*) without __ne__ hacks * Remove stray code that made it in * Remove expand_schema_for_dynamic left over on DynamicInput class * get_dynamic() on DynamicInput/Output was not doing anything anymore, so removed it * Make validate_inputs validate combo input correctly * Temporarily comment out conversion to 'new' (9 month old) COMBO format in get_input_info * Remove refrences to resources feature scrapped from V3 * Expose DynamicCombo in public API * satisfy ruff after some code got commented out * Make missing input error prettier for dynamic types * Created a Switch2 node as a side-by-side test, will likely go with Switch2 as the initial switch node * Figured out Switch situation * Pass in v3_data in IsChangedCache.get function's fingerprint_inputs, add a from_v3_data helper method to HiddenHolder * Switch order of Switch and Soft Switch nodes in file * Temp test node for MatchType * Fix missing v3_data for v1 nodes in validation * For now, remove chacking duplicate id's for dynamic types * Add Resize Image/Mask node that thanks to MatchType+DynamicCombo is 16-nodes-in-1 * Made DynamicCombo references in DCTestNode use public interface * Add an AnyTypeTestNode * Make lazy status for specific inputs on DynamicInputs work by having the values of the dictionary for check_lazy_status be a tuple, where the second element is the key of the input that can be returned * Comment out test logic nodes * Make primitive float's step make more sense * Add (and leave commented out) some potential logic nodes * Change default crop option to "center" on Resize Image/Mask node * Changed copy.copy(d) to d.copy() * Autogrow is available in stable frontend, so exposing it in public API * Use outputs id as display_name if no display_name present, remove v3 outputs id restriction that made them have to have unique IDs from the inputs * Enable Custom Combo node as stable frontend now supports it * Make id properly act like display_name on outputs * Add Batch Images/Masks/Latents node * Comment out Batch Images/Masks/Latents node for now, as Autogrow has a bug with MatchType where top connection is disconnected upon refresh * Removed code for a couple test nodes in nodes_logic.py * Add Batch Images, Batch Masks, and Batch Latents nodes with Autogrow, deprecate old Batch Images + LatentBatch nodes
60 lines
2.5 KiB
Python
60 lines
2.5 KiB
Python
from __future__ import annotations
|
|
from comfy_api.latest import IO
|
|
|
|
|
|
def validate_node_input(
|
|
received_type: str, input_type: str, strict: bool = False
|
|
) -> bool:
|
|
"""
|
|
received_type and input_type are both strings of the form "T1,T2,...".
|
|
|
|
If strict is True, the input_type must contain the received_type.
|
|
For example, if received_type is "STRING" and input_type is "STRING,INT",
|
|
this will return True. But if received_type is "STRING,INT" and input_type is
|
|
"INT", this will return False.
|
|
|
|
If strict is False, the input_type must have overlap with the received_type.
|
|
For example, if received_type is "STRING,BOOLEAN" and input_type is "STRING,INT",
|
|
this will return True.
|
|
|
|
Supports pre-union type extension behaviour of ``__ne__`` overrides.
|
|
"""
|
|
# If the types are exactly the same, we can return immediately
|
|
# Use pre-union behaviour: inverse of `__ne__`
|
|
# NOTE: this lets legacy '*' Any types work that override the __ne__ method of the str class.
|
|
if not received_type != input_type:
|
|
return True
|
|
|
|
# If one of the types is '*', we can return True immediately; this is the 'Any' type.
|
|
if received_type == IO.AnyType.io_type or input_type == IO.AnyType.io_type:
|
|
return True
|
|
|
|
# If the received type or input_type is a MatchType, we can return True immediately;
|
|
# validation for this is handled by the frontend
|
|
if received_type == IO.MatchType.io_type or input_type == IO.MatchType.io_type:
|
|
return True
|
|
|
|
# This accounts for some custom nodes that output lists of options as the type;
|
|
# if we ever want to break them on purpose, this can be removed
|
|
if isinstance(received_type, list) and input_type == IO.Combo.io_type:
|
|
return True
|
|
|
|
# Not equal, and not strings
|
|
if not isinstance(received_type, str) or not isinstance(input_type, str):
|
|
return False
|
|
|
|
# Split the type strings into sets for comparison
|
|
received_types = set(t.strip() for t in received_type.split(","))
|
|
input_types = set(t.strip() for t in input_type.split(","))
|
|
|
|
# If any of the types is '*', we can return True immediately; this is the 'Any' type.
|
|
if IO.AnyType.io_type in received_types or IO.AnyType.io_type in input_types:
|
|
return True
|
|
|
|
if strict:
|
|
# In strict mode, all received types must be in the input types
|
|
return received_types.issubset(input_types)
|
|
else:
|
|
# In non-strict mode, there must be at least one type in common
|
|
return len(received_types.intersection(input_types)) > 0
|