Feat. temporary install script using functions in cm-cli

This should be moved to cm-cli to handle everything there.

Author: yoland68

comfy_cli/cmdline.py

@@ -280,7 +280,7 @@ def install(
             raise typer.Exit(code=1)
         if intel_arc is None:
             confirm_result = ui.prompt_confirm_action(
-                "Are you sure you want to try beta install feature on Intel ARC?"
+                "Are you sure you want to try beta install feature on Intel ARC?", True
             )
             if not confirm_result:
                 raise typer.Exit(code=0)

comfy_cli/command/custom_nodes/command.py

@@ -1,5 +1,7 @@
 import os
 import pathlib
+import platform
+import re
 import subprocess
 import sys
 import uuid
@@ -100,6 +102,125 @@ def validate_comfyui_manager(_env_checker):
         raise typer.Exit(code=1)
 
 
+def run_script(cmd, cwd="."):
+    if len(cmd) > 0 and cmd[0].startswith("#"):
+        print(f"[ComfyUI-Manager] Unexpected behavior: `{cmd}`")
+        return 0
+
+    subprocess.check_call(cmd, cwd=cwd)
+
+    return 0
+
+
+pip_map = None
+
+
+def get_installed_packages():
+    global pip_map
+
+    if pip_map is None:
+        try:
+            result = subprocess.check_output(
+                [sys.executable, "-m", "pip", "list"], universal_newlines=True
+            )
+
+            pip_map = {}
+            for line in result.split("\n"):
+                x = line.strip()
+                if x:
+                    y = line.split()
+                    if y[0] == "Package" or y[0].startswith("-"):
+                        continue
+
+                    pip_map[y[0]] = y[1]
+        except subprocess.CalledProcessError as e:
+            print(
+                f"[ComfyUI-Manager] Failed to retrieve the information of installed pip packages."
+            )
+            return set()
+
+    return pip_map
+
+
+def try_install_script(repo_path, install_cmd, instant_execution=False):
+    startup_script_path = os.path.join(
+        workspace_manager.workspace_path, "startup-scripts"
+    )
+    if not instant_execution and (
+        (len(install_cmd) > 0 and install_cmd[0].startswith("#"))
+        or (
+            platform.system()
+            == "Windows"
+            # From Yoland: disable commit compare
+            # and comfy_ui_commit_datetime.date()
+            # >= comfy_ui_required_commit_datetime.date()
+        )
+    ):
+        if not os.path.exists(startup_script_path):
+            os.makedirs(startup_script_path)
+
+        script_path = os.path.join(startup_script_path, "install-scripts.txt")
+        with open(script_path, "a", encoding="utf-8") as file:
+            obj = [repo_path] + install_cmd
+            file.write(f"{obj}\n")
+
+        return True
+    else:
+        # From Yoland: Disable blacklisting
+        # if len(install_cmd) == 5 and install_cmd[2:4] == ['pip', 'install']:
+        #     if is_blacklisted(install_cmd[4]):
+        #         print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[4]}'")
+        #         return True
+
+        print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}")
+        code = run_script(install_cmd, cwd=repo_path)
+
+        # From Yoland: Disable warning
+        # if platform.system() != "Windows":
+        #     try:
+        #         if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
+        #             print("\n\n###################################################################")
+        #             print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
+        #             print(f"[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
+        #             print("###################################################################\n\n")
+        #     except:
+        #         pass
+
+        if code != 0:
+            print("install script failed")
+            return False
+
+
+def execute_install_script(repo_path):
+    install_script_path = os.path.join(repo_path, "install.py")
+    requirements_path = os.path.join(repo_path, "requirements.txt")
+
+    # From Yoland: disable lazy mode
+    # if lazy_mode:
+    #     install_cmd = ["#LAZY-INSTALL-SCRIPT",  sys.executable]
+    #     try_install_script(repo_path, install_cmd)
+    # else:
+
+    if os.path.exists(requirements_path):
+        # import pdb
+        # pdb.set_trace()
+        print("Install: pip packages")
+        with open(requirements_path, "r", encoding="utf-8") as requirements_file:
+            for line in requirements_file:
+                # From Yoland: disable pip override
+                # package_name = remap_pip_package(line.strip())
+                package_name = line.strip()
+                if package_name and not package_name.startswith("#"):
+                    install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                    if package_name.strip() != "":
+                        try_install_script(repo_path, install_cmd)
+
+    if os.path.exists(install_script_path):
+        print("Install: install script")
+        install_cmd = [sys.executable, "install.py"]
+        try_install_script(repo_path, install_cmd)
+
+
 @app.command("save-snapshot", help="Save a snapshot of the current ComfyUI environment")
 @tracking.track_command("node")
 def save_snapshot(
@@ -745,9 +866,23 @@ def display_all_nodes():
     )
 
 
-@app.command("registry-install", help="Install a node from the registry", hidden=True)
+@app.command(
+    "registry-install",
+    help="Install a node from the registry",
+    hidden=True,
+)
 @tracking.track_command("node")
-def registry_install(node_id: str, version: Optional[str] = None):
+def registry_install(
+    node_id: str,
+    version: Optional[str] = None,
+    force_download: Annotated[
+        bool,
+        typer.Option(
+            "--force-download",
+            help="Force download the node even if it is already installed",
+        ),
+    ] = False,
+):
     """
     Install a node from the registry.
     Args:
@@ -778,6 +913,17 @@ def registry_install(node_id: str, version: Optional[str] = None):
     # Download the node archive
     custom_nodes_path = pathlib.Path(workspace_manager.workspace_path) / "custom_nodes"
     node_specific_path = custom_nodes_path / node_id  # Subdirectory for the node
+    if node_specific_path.exists():
+        print(
+            f"[bold red] The node {node_id} already exists in the workspace. This migit delete any model files in the node.[/bold red]"
+        )
+
+        confirm = ui.prompt_confirm_action(
+            "Do you want to overwrite it?",
+            force_download,
+        )
+        if not confirm:
+            return
     node_specific_path.mkdir(
         parents=True, exist_ok=True
     )  # Create the directory if it doesn't exist
@@ -794,6 +940,9 @@ def registry_install(node_id: str, version: Optional[str] = None):
     )
     extract_package_as_zip(local_filename, node_specific_path)
 
+    # TODO: temoporary solution to run requirement.txt and install script
+    execute_install_script(node_specific_path)
+
     # Delete the downloaded archive
     logging.debug(f"Deleting the downloaded archive {local_filename}")
     os.remove(local_filename)

comfy_cli/command/install.py

@@ -157,7 +157,7 @@ def execute(
 ):
 
     if not workspace_manager.skip_prompting:
-        res = ui.prompt_confirm_action(f"Install from {url} to {comfy_path}?")
+        res = ui.prompt_confirm_action(f"Install from {url} to {comfy_path}?", True)
 
         if not res:
             print("Aborting...")

comfy_cli/command/models/models.py

@@ -309,7 +309,7 @@ def remove(
 
     # Confirm deletion
     if to_delete and ui.prompt_confirm_action(
-        "Are you sure you want to delete the selected files?"
+        "Are you sure you want to delete the selected files?", False
     ):
         for model_path in to_delete:
             model_path.unlink()

comfy_cli/file_utils.py

@@ -41,7 +41,7 @@ def parse_json(input_data):
     elif status_code == 403:
         return f"Forbidden url ({status_code}), you might need to manually log into browser to download one"
     elif status_code == 404:
-        return "Sorry, your model is in another castle (404)"
+        return "Sorry, your file is in another castle (404)"
     return f"Unknown error occurred (status code: {status_code})"
 
 
@@ -69,7 +69,7 @@ def download_file(
                         f.write(data)
             except KeyboardInterrupt:
                 delete_eh = ui.prompt_confirm_action(
-                    "Download interrupted, cleanup files?"
+                    "Download interrupted, cleanup files?", True
                 )
                 if delete_eh:
                     local_filepath.unlink()

comfy_cli/tracking.py

@@ -101,7 +101,7 @@ def prompt_tracking_consent(skip_prompt: bool = False, default_value: bool = Fal
         init_tracking(default_value)
     else:
         enable_tracking = ui.prompt_confirm_action(
-            "Do you agree to enable tracking to improve the application?"
+            "Do you agree to enable tracking to improve the application?", True
         )
         init_tracking(enable_tracking)
 

comfy_cli/ui.py

@@ -110,7 +110,7 @@ def prompt_multi_select(prompt: str, choices: List[str]) -> List[str]:
     return selections if selections else []
 
 
-def prompt_confirm_action(prompt: str) -> bool:
+def prompt_confirm_action(prompt: str, default: bool) -> bool:
     """
     Prompts the user for confirmation before proceeding with an action.
 
@@ -120,6 +120,8 @@ def prompt_confirm_action(prompt: str) -> bool:
     Returns:
         bool: True if the user confirms, False otherwise.
     """
+    if workspace_manager.skip_prompting:
+        return default
 
     return typer.confirm(prompt)