Skip to content

Commit

Permalink
Revert "Add union link connection type support (#5806)" (#5889)
Browse files Browse the repository at this point in the history
This reverts commit 8d4e063.
  • Loading branch information
huchenlei authored Dec 3, 2024
1 parent c1b92b7 commit bf9a90a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 110 deletions.
32 changes: 0 additions & 32 deletions comfy_execution/validation.py

This file was deleted.

6 changes: 3 additions & 3 deletions execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from comfy_execution.graph import get_input_info, ExecutionList, DynamicPrompt, ExecutionBlocker
from comfy_execution.graph_utils import is_link, GraphBuilder
from comfy_execution.caching import HierarchicalCache, LRUCache, CacheKeySetInputSignature, CacheKeySetID
from comfy_execution.validation import validate_node_input
from comfy.cli_args import args

class ExecutionResult(Enum):
Expand Down Expand Up @@ -528,6 +527,7 @@ def execute(self, prompt, prompt_id, extra_data={}, execute_outputs=[]):
comfy.model_management.unload_all_models()



def validate_inputs(prompt, item, validated):
unique_id = item
if unique_id in validated:
Expand Down Expand Up @@ -589,8 +589,8 @@ def validate_inputs(prompt, item, validated):
r = nodes.NODE_CLASS_MAPPINGS[o_class_type].RETURN_TYPES
received_type = r[val[1]]
received_types[x] = received_type
if 'input_types' not in validate_function_inputs and not validate_node_input(received_type, type_input):
details = f"{x}, received_type({received_type}) mismatch input_type({type_input})"
if 'input_types' not in validate_function_inputs and received_type != type_input:
details = f"{x}, {received_type} != {type_input}"
error = {
"type": "return_type_mismatch",
"message": "Return type mismatch between linked nodes",
Expand Down
75 changes: 0 additions & 75 deletions tests-unit/execution_test/validate_node_input_test.py

This file was deleted.

0 comments on commit bf9a90a

Please sign in to comment.