Skip to content

Commit

Permalink
Move a few files from comfy -> comfy_execution.
Browse files Browse the repository at this point in the history
Python code in the comfy folder should not import things from outside it.
  • Loading branch information
comfyanonymous committed Aug 15, 2024
1 parent 5cfe38f commit 5960f94
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 12 deletions.
4 changes: 2 additions & 2 deletions comfy/caching.py → comfy_execution/caching.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import itertools
from typing import Sequence, Mapping
from comfy.graph import DynamicPrompt
from comfy_execution.graph import DynamicPrompt

import nodes

from comfy.graph_utils import is_link
from comfy_execution.graph_utils import is_link

class CacheKeySet:
def __init__(self, dynprompt, node_ids, is_changed_cache):
Expand Down
2 changes: 1 addition & 1 deletion comfy/graph.py → comfy_execution/graph.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import nodes

from comfy.graph_utils import is_link
from comfy_execution.graph_utils import is_link

class DependencyCycleError(Exception):
pass
Expand Down
File renamed without changes.
7 changes: 3 additions & 4 deletions execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
import nodes

import comfy.model_management
import comfy.graph_utils
from comfy.graph import get_input_info, ExecutionList, DynamicPrompt, ExecutionBlocker
from comfy.graph_utils import is_link, GraphBuilder
from comfy.caching import HierarchicalCache, LRUCache, CacheKeySetInputSignature, CacheKeySetID
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.cli_args import args

class ExecutionResult(Enum):
Expand Down
2 changes: 1 addition & 1 deletion tests/inference/test_execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import urllib.request
import urllib.parse
import urllib.error
from comfy.graph_utils import GraphBuilder, Node
from comfy_execution.graph_utils import GraphBuilder, Node

class RunResult:
def __init__(self, prompt_id: str):
Expand Down
4 changes: 2 additions & 2 deletions tests/inference/testing_nodes/testing-pack/flow_control.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from comfy.graph_utils import GraphBuilder, is_link
from comfy.graph import ExecutionBlocker
from comfy_execution.graph_utils import GraphBuilder, is_link
from comfy_execution.graph import ExecutionBlocker
from .tools import VariantSupport

NUM_FLOW_SOCKETS = 5
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import torch
from .tools import VariantSupport
from comfy.graph_utils import GraphBuilder
from comfy_execution.graph_utils import GraphBuilder

class TestLazyMixImages:
@classmethod
Expand Down
2 changes: 1 addition & 1 deletion tests/inference/testing_nodes/testing-pack/util.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from comfy.graph_utils import GraphBuilder
from comfy_execution.graph_utils import GraphBuilder
from .tools import VariantSupport

@VariantSupport()
Expand Down

0 comments on commit 5960f94

Please sign in to comment.