Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
6897a1d
support pip comfyui-manager
ltdrdata Mar 19, 2025
1855efe
Merge branch 'comfyanonymous:master' into dr-support-pip-cm
ltdrdata Apr 5, 2025
545d96c
Merge branch 'master' into dr-support-pip-cm
ltdrdata Apr 9, 2025
fb1b9c7
added: --disable-manager option
ltdrdata Apr 9, 2025
8b9f31a
fixed: ruff check
ltdrdata Apr 10, 2025
311f64a
Merge branch 'master' into dr-support-pip-cm
ltdrdata Apr 12, 2025
cc975e5
add comfyui_manager to requirements.txt
ltdrdata Apr 12, 2025
418eaed
fixed: Ensure that `comfyui_manager`'s prestartup always runs, even w…
ltdrdata Apr 12, 2025
94f61c6
add --enable-manager-legacy-ui
ltdrdata Apr 14, 2025
d2ed1dc
Merge branch 'master' into dr-support-pip-cm
ltdrdata Apr 15, 2025
4fafc0c
Merge branch 'master' into dr-support-pip-cm
ltdrdata Apr 20, 2025
ec82eea
Merge branch 'master' into dr-support-pip-cm
ltdrdata Apr 21, 2025
9c2eb2c
Merge branch 'master' into dr-support-pip-cm
ltdrdata Apr 21, 2025
ea3d3cc
Merge branch 'master' into dr-support-pip-cm
ltdrdata Apr 23, 2025
57dae14
modified: --disable-manager will prevent importing comfyui-manager
ltdrdata Apr 28, 2025
14598c1
Merge branch 'master' into dr-support-pip-cm
ltdrdata Apr 28, 2025
f51047a
Merge branch 'master' into dr-support-pip-cm
ltdrdata Apr 30, 2025
28d23a7
Merge branch 'master' into dr-support-pip-cm
ltdrdata May 3, 2025
31aecbe
Merge branch 'master' into dr-support-pip-cm
ltdrdata May 8, 2025
b69ef5f
Merge branch 'master' into dr-support-pip-cm
ltdrdata May 10, 2025
9ac1854
Merge branch 'master' into dr-support-pip-cm
ltdrdata May 18, 2025
ef641f3
Merge branch 'master' into dr-support-pip-cm
ltdrdata May 25, 2025
baeeeb0
Merge branch 'master' into dr-support-pip-cm
ltdrdata May 31, 2025
35a2944
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 9, 2025
d1ab6ad
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 15, 2025
4e95c0c
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 20, 2025
39f39c3
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 21, 2025
5a0ec18
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 22, 2025
364e07d
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 24, 2025
d5167d2
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 25, 2025
8744ebb
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 26, 2025
f398256
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 28, 2025
9eba154
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jun 29, 2025
ad633b2
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 1, 2025
17cfabe
added: Apply manager middleware
ltdrdata Jul 1, 2025
d6fa7a7
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 2, 2025
2ce64b1
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 3, 2025
552fe9d
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 8, 2025
16a0b24
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 12, 2025
98b5183
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 14, 2025
0adeb9b
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 15, 2025
3c9a0fc
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 17, 2025
b603e03
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 20, 2025
51bf04c
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 21, 2025
74087e2
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 21, 2025
726aa75
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 23, 2025
4e90430
Merge branch 'dr-support-pip-cm'
ltdrdata Jul 24, 2025
6b19857
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 25, 2025
d0625d7
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 26, 2025
6909638
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 27, 2025
ac7bde1
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 29, 2025
62c08e4
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 29, 2025
3c8196a
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 30, 2025
5582e2a
Merge branch 'master' into dr-support-pip-cm
ltdrdata Jul 31, 2025
56cff96
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 1, 2025
ac7e834
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 3, 2025
02317a1
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 4, 2025
4620959
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 5, 2025
2fe5857
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 6, 2025
ab1a79a
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 7, 2025
bf01579
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 8, 2025
1065101
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 8, 2025
37277e4
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 10, 2025
d750aa0
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 11, 2025
264116d
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 12, 2025
1c66507
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 13, 2025
d7777dc
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 13, 2025
91555ac
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 14, 2025
37aa552
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 15, 2025
8b44e58
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 17, 2025
ca04f8f
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 18, 2025
3dfecd5
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 18, 2025
be456cb
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 19, 2025
4b1aac7
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 20, 2025
d7b4f45
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 20, 2025
7c36368
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 21, 2025
20953cb
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 22, 2025
844e5e7
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 22, 2025
117d8ae
update requirments.txt
ltdrdata Aug 22, 2025
47350d3
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 22, 2025
26cac3c
restore custom_nodes dir
ltdrdata Aug 22, 2025
881db45
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 23, 2025
6728792
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 24, 2025
6087e02
modified: Changed behavior so that if comfyui-manager is not installe…
ltdrdata Aug 24, 2025
b7faa5f
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 24, 2025
eda556d
Merge branch 'dr-support-pip-cm'
ltdrdata Aug 26, 2025
5c8f724
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 27, 2025
523b54b
update requirements.txt
ltdrdata Aug 27, 2025
2cc7baf
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 28, 2025
1224d58
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 29, 2025
7fd8742
Merge branch 'master' into dr-support-pip-cm
ltdrdata Aug 31, 2025
69bbe1d
modified: SERVER_FEATURE_FLAGS - manager extension is added
ltdrdata Sep 1, 2025
cc21e84
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 2, 2025
74a027f
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 3, 2025
e0f111c
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 3, 2025
31469f9
fixed: issue of not properly detecting the removal of the `comfyui_ma…
ltdrdata Sep 4, 2025
561eaf6
fixed: Robust detection of missing comfyui_manager
ltdrdata Sep 4, 2025
f8aab7c
fixed: more robust detection of missing comfyui_manager
ltdrdata Sep 4, 2025
08e9c3d
fixed: more robust detection of missing comfyui_manager
ltdrdata Sep 4, 2025
2ade597
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 4, 2025
6a1f95c
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 4, 2025
fc88b4f
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 5, 2025
3b65618
update requirements
ltdrdata Sep 5, 2025
ba3c8e3
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 5, 2025
c97f6aa
Fix OS reporting in /system_stats API to use sys.platform
viva-jinyi Sep 7, 2025
8a2f805
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 7, 2025
d4cb177
Merge pull request #2 from viva-jinyi/fix/system-os
ltdrdata Sep 7, 2025
1c8c9f7
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 8, 2025
0e31eca
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 8, 2025
c7f0423
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 9, 2025
2a30a19
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 10, 2025
b5745ae
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 10, 2025
f9cfea0
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 10, 2025
cc8a026
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 11, 2025
033e725
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 11, 2025
ff5e92a
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 12, 2025
9d70d75
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 12, 2025
0f8d572
Update comfyui_manager dependency in requirements
ltdrdata Sep 12, 2025
ce1df28
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 13, 2025
f4d7a32
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 15, 2025
07212a2
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 16, 2025
7fa5990
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 16, 2025
2c30881
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 17, 2025
77e1075
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 17, 2025
e7ff647
--disable-manager -> --enable-manager
comfyanonymous Sep 18, 2025
036aa3e
fixed: Even if --enable-manager is applied, it should switch to a dis…
ltdrdata Sep 18, 2025
0a084a8
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 18, 2025
fa51f0c
Merge branch 'master' into dr-support-pip-cm
ltdrdata Sep 19, 2025
267c54e
Updated `comfyui_manager` to version 4.0.2 in `requirements.txt`
ltdrdata Sep 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions comfy/cli_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ class LatentPreviewMethod(enum.Enum):
upcast.add_argument("--dont-upcast-attention", action="store_true", help="Disable all upcasting of attention. Should be unnecessary except for debugging.")


parser.add_argument("--enable-manager", action="store_true", help="Enable the ComfyUI-Manager feature.")
manager_group = parser.add_mutually_exclusive_group()
manager_group.add_argument("--disable-manager-ui", action="store_true", help="Disables only the ComfyUI-Manager UI and endpoints. Scheduled installations and similar background tasks will still operate.")
manager_group.add_argument("--enable-manager-legacy-ui", action="store_true", help="Enables the legacy UI of ComfyUI-Manager")


vram_group = parser.add_mutually_exclusive_group()
vram_group.add_argument("--gpu-only", action="store_true", help="Store and run everything (text encoders/CLIP models, etc... on the GPU).")
vram_group.add_argument("--highvram", action="store_true", help="By default models will be unloaded to CPU memory after being used. This option keeps them in GPU memory.")
Expand Down Expand Up @@ -164,6 +170,7 @@ class PerformanceFeature(enum.Enum):
parser.add_argument("--verbose", default='INFO', const='DEBUG', nargs="?", choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], help='Set the logging level')
parser.add_argument("--log-stdout", action="store_true", help="Send normal process output to stdout instead of stderr (default).")


# The default built-in provider hosted under web/
DEFAULT_VERSION_STRING = "comfyanonymous/ComfyUI@latest"

Expand Down
1 change: 1 addition & 0 deletions comfy_api/feature_flags.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
SERVER_FEATURE_FLAGS: Dict[str, Any] = {
"supports_preview_metadata": True,
"max_upload_size": args.max_upload_size * 1024 * 1024, # Convert MB to bytes
"extension": {"manager": {"supports_v4": True}},
}


Expand Down
29 changes: 29 additions & 0 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,30 @@
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.
os.environ['HF_HUB_DISABLE_TELEMETRY'] = '1'
os.environ['DO_NOT_TRACK'] = '1'

setup_logger(log_level=args.verbose, use_stdout=args.log_stdout)


def handle_comfyui_manager_unavailable():
logging.warning(f"\n\nYou appear to be running comfyui-manager from source, this is not recommended. Please install comfyui-manager using the following command:\ncommand:\n\t{sys.executable} -m pip install --pre comfyui_manager\n")
args.enable_manager = False


if args.enable_manager:
if importlib.util.find_spec("comfyui_manager"):
import comfyui_manager

if not comfyui_manager.__file__ or not comfyui_manager.__file__.endswith('__init__.py'):
handle_comfyui_manager_unavailable()
else:
handle_comfyui_manager_unavailable()


def apply_custom_paths():
# extra model paths
extra_model_paths_config_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "extra_model_paths.yaml")
Expand Down Expand Up @@ -79,6 +96,11 @@ def execute_script(script_path):

for possible_module in possible_modules:
module_path = os.path.join(custom_node_path, possible_module)

if args.enable_manager:
if comfyui_manager.should_be_disabled(module_path):
continue

if os.path.isfile(module_path) or module_path.endswith(".disabled") or module_path == "__pycache__":
continue

Expand All @@ -101,6 +123,10 @@ def execute_script(script_path):
logging.info("")

apply_custom_paths()

if args.enable_manager:
comfyui_manager.prestartup()

execute_prestartup_script()


Expand Down Expand Up @@ -312,6 +338,9 @@ def start_comfyui(asyncio_loop=None):
asyncio.set_event_loop(asyncio_loop)
prompt_server = server.PromptServer(asyncio_loop)

if args.enable_manager and not args.disable_manager_ui:
comfyui_manager.start()

hook_breaker_ac10a0.save_functions()
asyncio_loop.run_until_complete(nodes.init_extra_nodes(
init_custom_nodes=(not args.disable_all_custom_nodes) or len(args.whitelist_custom_nodes) > 0,
Expand Down
9 changes: 9 additions & 0 deletions nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
import latent_preview
import node_helpers

if args.enable_manager:
import comfyui_manager

def before_node_execution():
comfy.model_management.throw_exception_if_processing_interrupted()

Expand Down Expand Up @@ -2230,6 +2233,12 @@ async def init_external_custom_nodes():
if args.disable_all_custom_nodes and possible_module not in args.whitelist_custom_nodes:
logging.info(f"Skipping {possible_module} due to disable_all_custom_nodes and whitelist_custom_nodes")
continue

if args.enable_manager:
if comfyui_manager.should_be_disabled(module_path):
logging.info(f"Blocked by policy: {module_path}")
continue

time_before = time.perf_counter()
success = await load_custom_node(module_path, base_node_names, module_parent="custom_nodes")
node_import_times.append((time.perf_counter() - time_before, module_path, success))
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
comfyui-frontend-package==1.26.11
comfyui-workflow-templates==0.1.81
comfyui-embedded-docs==0.2.6
comfyui_manager==4.0.2
torch
torchsde
torchvision
Expand Down
8 changes: 7 additions & 1 deletion server.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
# Import cache control middleware
from middleware.cache_middleware import cache_control

if args.enable_manager:
import comfyui_manager

async def send_socket_catch_exception(function, message):
try:
await function(message)
Expand Down Expand Up @@ -168,6 +171,9 @@ def __init__(self, loop):
else:
middlewares.append(create_origin_only_middleware())

if args.enable_manager:
middlewares.append(comfyui_manager.create_middleware())

max_upload_size = round(args.max_upload_size * 1024 * 1024)
self.app = web.Application(client_max_size=max_upload_size, middlewares=middlewares)
self.sockets = dict()
Expand Down Expand Up @@ -553,7 +559,7 @@ async def system_stats(request):

system_stats = {
"system": {
"os": os.name,
"os": sys.platform,
"ram_total": ram_total,
"ram_free": ram_free,
"comfyui_version": __version__,
Expand Down
Loading