From a0b6979f07a030c944c6496d2e7885eb2cf17118 Mon Sep 17 00:00:00 2001 From: Sasbom Date: Mon, 17 Nov 2025 06:06:23 +0100 Subject: [PATCH] revert import reordering --- app/custom_node_manager.py | 17 ++++------------- comfy/cli_args.py | 1 - folder_paths.py | 10 ++++------ main.py | 18 ++++++++---------- 4 files changed, 16 insertions(+), 30 deletions(-) diff --git a/app/custom_node_manager.py b/app/custom_node_manager.py index accae616b..281febca9 100644 --- a/app/custom_node_manager.py +++ b/app/custom_node_manager.py @@ -1,16 +1,16 @@ from __future__ import annotations +import os +import folder_paths import glob +from aiohttp import web import json import logging -import os from functools import lru_cache -from aiohttp import web - -import folder_paths from utils.json_util import merge_json_recursive + # Extra locale files to load into main.json EXTRA_LOCALE_FILES = [ "nodeDefs.json", @@ -32,15 +32,6 @@ def safe_load_json_file(file_path: str) -> dict: class CustomNodeManager: - """Manages and resolves folders for custom nodes. - - The custom_nodes folder location can be overridden - by passing in a folder argument --custom-nodes-directory. - - The argument can take appropriately delimited path entries, e.g. - `... --custom-nodes-directory /path/to/custom1:/path/to/custom2` for linux / osx (:) - `... --custom-nodes-directory "X:\\path\\to\\custom1;X:\\path\\to\\custom2"` for windows (;) - """ @lru_cache(maxsize=1) def build_translations(self): """Load all custom nodes translations during initialization. Translations are diff --git a/comfy/cli_args.py b/comfy/cli_args.py index a159cfda8..d86d74267 100644 --- a/comfy/cli_args.py +++ b/comfy/cli_args.py @@ -1,7 +1,6 @@ import argparse import enum import os - import comfy.options diff --git a/folder_paths.py b/folder_paths.py index 2373e0ad0..98b7d340c 100644 --- a/folder_paths.py +++ b/folder_paths.py @@ -1,12 +1,12 @@ from __future__ import annotations -import logging -import mimetypes import os -import sys import time +import mimetypes +import logging +import sys +from typing import Literal, List from collections.abc import Collection -from typing import List, Literal from comfy.cli_args import args @@ -117,8 +117,6 @@ def set_input_directory(input_dir: str) -> None: input_directory = input_dir def set_custom_nodes_directory(custom_nodes_dir: str) -> None: - #NOTE: this function doesn't need a "get_custom_nodes_directory", we have "get_folder_paths". - # PATH style ';' / ':' (platform dependant) delimiters allow for more folders. global folder_names_and_paths delimiter = ":" diff --git a/main.py b/main.py index 16813e154..1b8b1f638 100644 --- a/main.py +++ b/main.py @@ -1,21 +1,19 @@ import comfy.options - comfy.options.enable_args_parsing() -import importlib.util -import itertools -import logging import os -import sys -import time - +import importlib.util import folder_paths -import utils.extra_config -from app.logger import setup_logger +import time from comfy.cli_args import args -from comfy_api import feature_flags +from app.logger import setup_logger +import itertools +import utils.extra_config +import logging +import sys from comfy_execution.progress import get_progress_state from comfy_execution.utils import get_executing_context +from comfy_api import feature_flags if __name__ == "__main__": #NOTE: These do not do anything on core ComfyUI, they are for custom nodes.