--disable-manager -> --enable-manager

This commit is contained in:
comfyanonymous 2025-09-17 20:58:42 -04:00
parent 77e10752fe
commit e7ff647d02
4 changed files with 17 additions and 17 deletions

View File

@ -120,8 +120,8 @@ upcast.add_argument("--force-upcast-attention", action="store_true", help="Force
upcast.add_argument("--dont-upcast-attention", action="store_true", help="Disable all upcasting of attention. Should be unnecessary except for debugging.") 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 = parser.add_mutually_exclusive_group()
manager_group.add_argument("--disable-manager", action="store_true", help="Completely disable the ComfyUI-Manager feature.")
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("--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") manager_group.add_argument("--enable-manager-legacy-ui", action="store_true", help="Enables the legacy UI of ComfyUI-Manager")

24
main.py
View File

@ -16,12 +16,19 @@ from comfy_execution.utils import get_executing_context
from comfy_api import feature_flags 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(): 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") 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.disable_manager = True
if not args.disable_manager: if args.enable_manager:
if importlib.util.find_spec("comfyui_manager"): if importlib.util.find_spec("comfyui_manager"):
import comfyui_manager import comfyui_manager
@ -31,13 +38,6 @@ if not args.disable_manager:
handle_comfyui_manager_unavailable() handle_comfyui_manager_unavailable()
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 apply_custom_paths(): def apply_custom_paths():
# extra model paths # extra model paths
extra_model_paths_config_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "extra_model_paths.yaml") extra_model_paths_config_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "extra_model_paths.yaml")
@ -96,7 +96,7 @@ def execute_prestartup_script():
for possible_module in possible_modules: for possible_module in possible_modules:
module_path = os.path.join(custom_node_path, possible_module) module_path = os.path.join(custom_node_path, possible_module)
if not args.disable_manager: if args.enable_manager:
if comfyui_manager.should_be_disabled(module_path): if comfyui_manager.should_be_disabled(module_path):
continue continue
@ -123,7 +123,7 @@ def execute_prestartup_script():
apply_custom_paths() apply_custom_paths()
if not args.disable_manager: if args.enable_manager:
comfyui_manager.prestartup() comfyui_manager.prestartup()
execute_prestartup_script() execute_prestartup_script()
@ -337,7 +337,7 @@ def start_comfyui(asyncio_loop=None):
asyncio.set_event_loop(asyncio_loop) asyncio.set_event_loop(asyncio_loop)
prompt_server = server.PromptServer(asyncio_loop) prompt_server = server.PromptServer(asyncio_loop)
if not args.disable_manager and not args.disable_manager_ui: if args.enable_manager and not args.disable_manager_ui:
comfyui_manager.start() comfyui_manager.start()
hook_breaker_ac10a0.save_functions() hook_breaker_ac10a0.save_functions()

View File

@ -43,7 +43,7 @@ import folder_paths
import latent_preview import latent_preview
import node_helpers import node_helpers
if not args.disable_manager: if args.enable_manager:
import comfyui_manager import comfyui_manager
def before_node_execution(): def before_node_execution():
@ -2234,7 +2234,7 @@ async def init_external_custom_nodes():
logging.info(f"Skipping {possible_module} due to disable_all_custom_nodes and whitelist_custom_nodes") logging.info(f"Skipping {possible_module} due to disable_all_custom_nodes and whitelist_custom_nodes")
continue continue
if not args.disable_manager: if args.enable_manager:
if comfyui_manager.should_be_disabled(module_path): if comfyui_manager.should_be_disabled(module_path):
logging.info(f"Blocked by policy: {module_path}") logging.info(f"Blocked by policy: {module_path}")
continue continue

View File

@ -42,7 +42,7 @@ from protocol import BinaryEventTypes
# Import cache control middleware # Import cache control middleware
from middleware.cache_middleware import cache_control from middleware.cache_middleware import cache_control
if not args.disable_manager: if args.enable_manager:
import comfyui_manager import comfyui_manager
async def send_socket_catch_exception(function, message): async def send_socket_catch_exception(function, message):
@ -171,7 +171,7 @@ class PromptServer():
else: else:
middlewares.append(create_origin_only_middleware()) middlewares.append(create_origin_only_middleware())
if not args.disable_manager: if args.enable_manager:
middlewares.append(comfyui_manager.create_middleware()) middlewares.append(comfyui_manager.create_middleware())
max_upload_size = round(args.max_upload_size * 1024 * 1024) max_upload_size = round(args.max_upload_size * 1024 * 1024)