Allowed passing parameters to Comfy, updated Comfy

Author: MoonRide303

launch.py

@@ -2,13 +2,15 @@
 import sys
 import platform
 import fooocus_version
+import argparse
 
 from modules.launch_util import is_installed, run, python, \
     run_pip, repo_dir, git_clone, requirements_met, script_path, dir_repos
 from modules.model_loader import load_file_from_url
 from modules.path import modelfile_path, lorafile_path, clip_vision_path, controlnet_path
 
 REINSTALL_ALL = False
+DEFAULT_ARGS = ['--disable-smart-memory']
 
 
 def prepare_environment():
@@ -20,7 +22,7 @@ def prepare_environment():
     xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.21')
 
     comfy_repo = os.environ.get('COMFY_REPO', "https://github.com/comfyanonymous/ComfyUI")
-    comfy_commit_hash = os.environ.get('COMFY_COMMIT_HASH', "f88f7f413afbe04b42c4422e9deedbaa3269ce76")
+    comfy_commit_hash = os.environ.get('COMFY_COMMIT_HASH', "07691e80c3bf9be16c629169e259105ca5327bf0")
 
     print(f"Python {sys.version}")
     print(f"Fooocus version: {fooocus_version.version}")
@@ -92,20 +94,27 @@ def download_models():
     return
 
 
-def clear_comfy_args():
-    argv = sys.argv
+def parse_args():
+    argv = sys.argv + DEFAULT_ARGS
     sys.argv = [sys.argv[0]]
     import comfy.cli_args
     sys.argv = argv
 
+    parser = argparse.ArgumentParser('launch.py', parents=[comfy.cli_args.parser], conflict_handler='resolve')
+    parser.add_argument("--port", type=int, default=None, help="Set the listen port.")
+    parser.add_argument("--share", action='store_true', help="Set whether to share on Gradio.")
+    parser.add_argument("--listen", type=str, default=None, metavar="IP", nargs="?", const="0.0.0.0", help="Set the listen interface.")
+
+    comfy.cli_args.args = parser.parse_args()
+
 
 def cuda_malloc():
     import cuda_malloc
 
 
 prepare_environment()
 
-clear_comfy_args()
+parse_args()
 # cuda_malloc()
 
 download_models()

modules/core.py

@@ -17,7 +17,6 @@
 from modules.patch import patch_all
 from modules.path import embeddings_path
 
-comfy.model_management.DISABLE_SMART_MEMORY = True
 
 patch_all()
 opCLIPTextEncode = CLIPTextEncode()

update_log_mre.md

@@ -3,6 +3,7 @@
 * Added support for reading styles from JSON files.
 * Fixed joining negative prompts.
 * Increased Control-LoRAs strength range.
+* Allowed passing parameters to Comfy.
 * Added links in Misc tab
 * Updated Comfy.
 

webui.py

@@ -2,7 +2,6 @@
 import random
 import time
 import shared
-import argparse
 import modules.path
 import fooocus_version
 import modules.html
@@ -16,6 +15,7 @@
 from collections.abc import Mapping
 from PIL import Image
 from comfy.model_management import interrupt_current_processing
+from comfy.cli_args import args
 from fastapi import FastAPI
 from modules.ui_gradio_extensions import reload_javascript
 from modules.util import get_current_log_path, get_previous_log_path
@@ -467,10 +467,5 @@ def stop_clicked():
         stop_button.click(fn=stop_clicked, queue=False)
 
 
-parser = argparse.ArgumentParser()
-parser.add_argument("--port", type=int, default=None, help="Set the listen port.")
-parser.add_argument("--share", action='store_true', help="Set whether to share on Gradio.")
-parser.add_argument("--listen", type=str, default=None, metavar="IP", nargs="?", const="0.0.0.0", help="Set the listen interface.")
-args = parser.parse_args()
 app = gr.mount_gradio_app(app, shared.gradio_root, '/')
 shared.gradio_root.launch(inbrowser=True, server_name=args.listen, server_port=args.port, share=args.share)