Merge branch 'develop'

Author: Tony Dorfmeister

README.md

@@ -1,41 +1,44 @@
 # ayon-comfyui
 An AYON Addon for launching ComfyUI locally via TrayLauncher.
 
-Loads `ComfyUI` from offical GitHub repo and comes with `ComfyUI-Manager` preconfigured.
+Clones `ComfyUI` from offical GitHub repo and comes with `ComfyUI-Manager` preconfigured.
+`uv` is used for installing all required dependencies and environment solving in a separate terminal session. This session is used to launch a local `ComfyUI` server.
 
-> ⚠️ **Warning:** This addon is Windows-only and depends on `uv` to be executable on your system.
+> ⚠️ This addon is Windows-only and depends on `uv` and `git` to be executable on your system.
 > If `uv` is not found it will run the installation script from https://astral.sh/uv/install.ps1 for the current user.
 
+## Plugin and Dependency Management
+The addon automatically manages plugins and their dependencies to maintain a clean and reproducible ComfyUI environment.
+This is achieved by tracking the currently active venv against an additional temporary `.baseline-venv` containing only core ComfyUI dependencies.
+Any folder found in the `custom_nodes` directory that is not in the configured plugins list are automatically deleted.
+
+> ⚠️ The cleanup process is automatic and cannot be disabled. Ensure your plugin configuration is correct before launching to avoid unintended plugin removal.
 
-It's Launcher Action uses `git` from AYON's dependency package to clone `ComfyUI` and any custom plugins that are configured.
-`uv` is used for installing all required dependencies and environment solving in a separate terminal session. This session is used to launch a local `ComfyUI` server.
+## Setup
+This addon requires an "Additional Application" in AYON's application settings to be created.
+Its `name` and `host_name` must be `comfyui`.
+Use the variant names to specify an available ComfyUI branch or tag. Finally, set the windows executable path to `powershell.exe`.
+This is to launch beforementioned separate terminal session. I know, it's a bit hacky.
+
+
+### Settings
+Use Extra Flags to add any custom launch flags to the webserver, e.g. `--use-cpu`.
 
-## Settings
-> ✏️ All directory inputs support anatomy template strings and absolute paths.
+#### Virtual Environment Settings
+Configure the python version to use and whether to pull nightly PyTorch builds.
+You can also set a specific path to `uv` if it's not in `$PATH`.
 
-### Repository Settings
+#### Repository Settings
 Configure where to pull ComfyUI sources, its target directory and additional plugins.
 You can specify extra dependencies to be installed as some custom nodes don't maintain a `requirements.txt`. All configured plugin dependencies will be collected and installed in a single `uv pip install`.
 
-![image](https://github.com/user-attachments/assets/a7ce0a8b-edac-4727-9df2-993d90150ba6)
-
-### General Settings
-Toggle CPU-only mode and configure custom models. Toggle extra models to consider them during launch. You can add multiple directories per model type. They will be added to the ComfyUI repo directory's `extra_model_paths.yaml`. When using `copy_to_base` the directories won't be added to the config yaml but copied into the repo base's `models/{model_type}`.
+#### Extra Models
+Toggle to define a source directory to all your custom models to consider them during launch.
+All found folders will be added to the ComfyUI repo directory's `extra_model_paths.yaml`. When using `copy_to_base` the directories won't be added to the config yaml but copied into the repo base's `models/{model_type}`.
 
 > ⚠️ `copy_to_base` currently just blindly copies every file found in the directory. No filtering for files yet.
 
-![image](https://github.com/user-attachments/assets/ac2053a8-a751-4e07-bbcf-c53bcd5527d6)
-
-### Caching Settings
+#### Caching Settings
 Configure whether `uv` should use a specific cache location to read and write to. Currently only configures `UV_CACHE_DIR` during the launch script but it seems to do the job.
 Could be used in air-gapped scenarios.
 
-
-![image](https://github.com/user-attachments/assets/28b558ee-a4f9-4e57-9961-570104b1f8d0)
-
-### Plugin and Dependency Management
-The addon automatically manages plugins and their dependencies to maintain a clean and reproducible ComfyUI environment.
-This is achieved by tracking the currently active venv against an additional temporary `.baseline-venv` containing only core ComfyUI dependencies.
-Any folder found in the `custom_nodes` directory that is not in the configured plugins list are automatically deleted.
-
-> ⚠️ **Note:** The cleanup process is automatic and cannot be disabled. Ensure your plugin configuration is correct before launching to avoid unintended plugin removal.

client/ayon_comfyui/hooks/pre_launch.py

@@ -252,7 +252,6 @@ def git_clone(url: str, dest: Path, tag: str = "") -> git.Repo:
             plugin_name = Path(plugin["url"]).stem
             progress_callback(f"Setting up Plugin: {plugin_name}")
             plugin_root = self.comfy_root / "custom_nodes" / plugin_name
-            plugin.update({"root": plugin_root})
             git_clone(
                 url=plugin["url"],
                 dest=plugin_root,
@@ -322,7 +321,7 @@ def run_server(self):
             launch_args.append(self.uv_path)
         if self.plugins:
             launch_args.append("-plugins")
-            plugin_names = [plugin["root"].name for plugin in self.plugins]
+            plugin_names = [Path(plugin["url"]).stem for plugin in self.plugins]
             launch_args.append(",".join(plugin_names))
         if self.extra_dependencies:
             launch_args.append("-extraDependencies")

client/ayon_comfyui/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring ComfyUI addon version."""
-__version__ = "0.0.6"
+__version__ = "0.0.7-dev"

package.py

@@ -1,6 +1,6 @@
 name = "comfyui"
 title = "ComfyUI"
-version = "0.0.6"
+version = "0.0.7-dev"
 
 client_dir = "ayon_comfyui"