Compare commits

..

10 Commits

Author SHA1 Message Date
Dr.Lt.Data
29ab428979 fixed: /customnode/versions - Issue where a 400 error occurred when no versions were available in CNR.
https://github.com/ltdrdata/ComfyUI-Manager/issues/1397
2025-01-05 09:17:54 +09:00
Dr.Lt.Data
4e92b06baa update DB 2025-01-05 08:50:26 +09:00
Dr.Lt.Data
faf1209eba fixed: switch_to_default_branch - robust patch
https://github.com/ltdrdata/ComfyUI-Manager/issues/1392#issuecomment-2569675066
2025-01-04 09:48:56 +09:00
Dr.Lt.Data
4dee009d51 update DB 2025-01-04 09:26:22 +09:00
Dr.Lt.Data
9ad54bb86c version marker 2025-01-04 09:03:38 +09:00
PONOTECH
2710d72e07 Fix NameError in get_custom_nodes_paths method (#1393)
This commit addresses the NameError that occurs in the get_custom_nodes_paths method of the Ctx class. The error was caused by the folder_paths module not being properly imported or accessible within the static method. The fix involves the following changes:

1. Add a class variable folder_paths to the Ctx class.
2. Import the folder_paths module in the __init__ method using importlib.
3. Update the get_custom_nodes_paths method to use the class variable.
4. Add error handling to gracefully handle cases where the folder_paths module cannot be imported.

These changes ensure that the folder_paths module is properly imported and accessible within the Ctx class, resolving the NameError and improving the overall stability of the ComfyUI-Manager CLI tool.

Co-authored-by: yhayano-ponotech <yhayano.biz@gmail.com>
2025-01-04 09:02:45 +09:00
Robin Huang
c3a1401960 Only show node versions in active or pending state for installation. (#1395)
* Only list active, pending, and flagged versions.

* Remove flagged versions.
2025-01-04 09:01:33 +09:00
Dr.Lt.Data
585cc0d991 fixed: invalid skipping of pip dependencies installation if ==, ~=
removed: useless badge related code
2025-01-04 03:07:36 +09:00
Dr.Lt.Data
15ecb5b1d4 Fixed: a bug where the updating message for the CNR node pack was not displayed. 2025-01-04 01:41:05 +09:00
Dr.Lt.Data
00a2ac7f2f fixed: switch comfyui error 2025-01-04 01:18:34 +09:00
17 changed files with 2921 additions and 2668 deletions

View File

@@ -12,6 +12,7 @@ from rich import print
from typing_extensions import List, Annotated
import re
import git
import importlib
sys.path.append(os.path.dirname(__file__))
@@ -88,12 +89,20 @@ read_downgrade_blacklist() # This is a preparation step for manager_core
class Ctx:
folder_paths = None
def __init__(self):
self.channel = 'default'
self.no_deps = False
self.mode = 'cache'
self.user_directory = None
self.custom_nodes_paths = [os.path.join(core.comfy_path, 'custom_nodes')]
if Ctx.folder_paths is None:
try:
Ctx.folder_paths = importlib.import_module('folder_paths')
except ImportError:
print("Warning: Unable to import folder_paths module")
def set_channel_mode(self, channel, mode):
if mode is not None:
@@ -145,7 +154,10 @@ class Ctx:
@staticmethod
def get_custom_nodes_paths():
return folder_paths.get_folder_paths('custom_nodes')
if Ctx.folder_paths is None:
print("Error: folder_paths module is not available")
return []
return Ctx.folder_paths.get_folder_paths('custom_nodes')
cmd_ctx = Ctx()

View File

@@ -4004,6 +4004,17 @@
"install_type": "git-clone",
"description": "Integrates GLSL shader support."
},
{
"author": "amorano",
"title": "Jovi_Spout",
"id": "jovi_spout",
"reference": "https://github.com/Amorano/Jovi_Spout",
"files": [
"https://github.com/Amorano/Jovi_Spout"
],
"install_type": "git-clone",
"description": "ComfyUI Nodes for using Spout streams."
},
{
"author": "Umikaze-job",
"title": "select_folder_path_easy",
@@ -17899,13 +17910,23 @@
{
"author": "5x00",
"title": "ComfyUI-VLM_Captions",
"reference": "https://github.com/5x00/ComfyUI-VLM_Captions",
"reference": "https://github.com/5x00/ComfyUI-VLM-Captions",
"files": [
"https://github.com/5x00/ComfyUI-VLM_Captions"
"https://github.com/5x00/ComfyUI-VLM-Captions"
],
"install_type": "git-clone",
"description": "A simple ComfyUI node that let's you use Claude or ChatGPT 4o's VLM capabilities to generate captions/tags for images."
},
{
"author": "5x00",
"title": "ComfyUI-PiAPI-Faceswap",
"reference": "https://github.com/5x00/ComfyUI-PiAPI-Faceswap",
"files": [
"https://github.com/5x00/ComfyUI-PiAPI-Faceswap"
],
"install_type": "git-clone",
"description": "A simple ComfyUI nodes that integrates [a/PiAPI faceswap](https://piapi.ai/faceswap-api) service into ComfyUI. This can be helpful if you're trying to create a workflow that includes faceswap for commercial usage."
},
{
"author": "ClownsharkBatwing",
"title": "RES4LYF",
@@ -18797,6 +18818,58 @@
"install_type": "git-clone",
"description": "Run DDUF in ComfyUI - powered by Diffusers."
},
{
"author": "AconexOfficial",
"title": "ComfyUI GOAT Nodes",
"reference": "https://github.com/AconexOfficial/ComfyUI_GOAT_Nodes",
"files": [
"https://github.com/AconexOfficial/ComfyUI_GOAT_Nodes"
],
"install_type": "git-clone",
"description": "Nodes to level up your workflows performance and streamline specific functions."
},
{
"author": "Jaminanim",
"title": "ComfyUI-Random-Int-Divisor-Node",
"reference": "https://github.com/Jaminanim/ComfyUI-Random-Int-Divisor-Node",
"files": [
"https://github.com/Jaminanim/ComfyUI-Random-Int-Divisor-Node"
],
"install_type": "git-clone",
"description": "A set of custom ComfyUI nodes for generating random integers within a range, adjusted to the nearest multiple of a user-defined divisor. Needlessly includes both an efficient and simple list implementation. Updates with each generation."
},
{
"author": "cenzijing",
"title": "ComfyUI-Markmap",
"reference": "https://github.com/cenzijing/ComfyUI-Markmap",
"files": [
"https://github.com/cenzijing/ComfyUI-Markmap"
],
"install_type": "git-clone",
"description": "A ComfyUI custom node for creating mindmaps from markdown"
},
{
"author": "bongsang",
"title": "ComfyUI-Bongsang",
"reference": "https://github.com/bongsang/ComfyUI-Bongsang",
"files": [
"https://github.com/bongsang/ComfyUI-Bongsang"
],
"install_type": "git-clone",
"description": "The 'ComfyUI-Bongsang' is very useful tools for a diffusion model developer."
},
{
"author": "muxueChen",
"title": "CosyVoice2 for ComfyUI",
"reference": "https://github.com/muxueChen/ComfyUI_NTCosyVoice",
"files": [
"https://github.com/muxueChen/ComfyUI_NTCosyVoice"
],
"install_type": "git-clone",
"description": "ComfyUI_NTCosyVoice is a plugin of ComfyUI for Cosysvoice2"
},

View File

@@ -299,7 +299,15 @@
"title_aux": "ComfyUI-DareMerge"
}
],
"https://github.com/5x00/ComfyUI-VLM_Captions": [
"https://github.com/5x00/ComfyUI-PiAPI-Faceswap": [
[
"Face Swapper"
],
{
"title_aux": "ComfyUI-PiAPI-Faceswap"
}
],
"https://github.com/5x00/ComfyUI-VLM-Captions": [
[
"Image To Caption"
],
@@ -1226,6 +1234,27 @@
"title_aux": "ComfyUI Nodes for External Tooling"
}
],
"https://github.com/AconexOfficial/ComfyUI_GOAT_Nodes": [
[
"Advanced_Upscale_Image_Using_Model",
"Capped_Float_Positive",
"Capped_Int_Positive",
"Embedding_Selector",
"Fast_Color_Match",
"Fast_Film_Grain",
"Get_Side_Length_Of_Image",
"Image_Dimensions",
"Image_Tiler",
"Image_Untiler",
"Int_Divide_Rounded",
"Sampler_Settings",
"Smart_Seed",
"Triple_Prompt"
],
{
"title_aux": "ComfyUI GOAT Nodes"
}
],
"https://github.com/Aerse/ComfyUI-Seed-Nodes": [
[
"Seed-Nodes: ImagePixelator",
@@ -1349,6 +1378,15 @@
"title_aux": "Jovi_GLSL"
}
],
"https://github.com/Amorano/Jovi_Spout": [
[
"SPOUT READER (JOV_SP) \ud83d\udcfa",
"SPOUT WRITER (JOV_SP) \ud83c\udfa5"
],
{
"title_aux": "Jovi_Spout"
}
],
"https://github.com/Amorano/Jovimetrix": [
[
"ADJUST (JOV) \ud83d\udd78\ufe0f",
@@ -4143,7 +4181,6 @@
"Isulion Civitai Image Display",
"Isulion Civitai Model Explorer",
"Isulion Civitai Trending",
"Isulion Video Prompt Generator \ud83c\udfa5",
"IsulionActionGenerator",
"IsulionAlienWorldGenerator",
"IsulionAnimalBehaviorGenerator",
@@ -4172,6 +4209,7 @@
"IsulionStyleMixer",
"IsulionTechGenerator",
"IsulionTimeOfDayGenerator",
"IsulionVideoPromptGenerator",
"IsulionWeatherGenerator",
"\ud83d\udca4 IsulionShutdown"
],
@@ -4337,6 +4375,15 @@
"title_aux": "ComfyUI-AI-Assistant"
}
],
"https://github.com/Jaminanim/ComfyUI-Random-Int-Divisor-Node": [
[
"RandomIntegerNodeEfficient",
"RandomIntegerNodeList"
],
{
"title_aux": "ComfyUI-Random-Int-Divisor-Node"
}
],
"https://github.com/Jannchie/ComfyUI-J": [
[
"DiffusersCompelPromptEmbedding",
@@ -5782,24 +5829,37 @@
"DJZ-LoadLatentV2",
"DJZDatamosh",
"DJZDatamoshV2",
"DatasetWordcloud",
"DinskyPlus",
"DinskyPlusV2",
"DjzDatamoshV3",
"DjzDatamoshV4",
"DjzDatamoshV5",
"DjzDatamoshV6",
"DjzDatamoshV7",
"FractalGenerator",
"FractalGeneratorV2",
"FractalGeneratorV3",
"ImageSizeAdjuster",
"ImageSizeAdjusterV2",
"ImageSizeAdjusterV3",
"LoadVideoDirectory",
"ParametricMeshGen",
"ParametricMeshGenV2",
"ProjectFilePathNode",
"PromptCleaner",
"PromptSwap",
"SequentialNumberGenerator",
"StringWeights",
"TrianglesPlus",
"TrianglesPlusV2",
"ZenkaiPrompt",
"ZenkaiPromptV2",
"ZenkaiWildcard",
"ZenkaiWildcardV2"
],
{
"author": "DJZ-Nodes",
"title_aux": "DJZ-Nodes"
}
],
@@ -7865,6 +7925,7 @@
"Divide Image and Select Tile",
"Divide and Conquer Algorithm",
"Divide and Conquer Algorithm (No Upscale)",
"Load Images into List",
"Make Size"
],
{
@@ -9160,7 +9221,9 @@
"InstaCText",
"InstaCTextML",
"InstaPromptMultipleStyleSelector",
"InstaPromptStyleSelector"
"InstaPromptStyleSelector",
"LoadVideo",
"PreViewVideo"
],
{
"title_aux": "InstaSD nodes for ComfyUI"
@@ -11141,6 +11204,14 @@
"title_aux": "Remembering utils"
}
],
"https://github.com/bongsang/ComfyUI-Bongsang": [
[
"AnyInfo"
],
{
"title_aux": "ComfyUI-Bongsang"
}
],
"https://github.com/boredofnames/ComfyUI-ntfy": [
[
"Ntfy",
@@ -11395,6 +11466,15 @@
"title_aux": "ComfyUI SimpleTools Suit"
}
],
"https://github.com/cenzijing/ComfyUI-Markmap": [
[
"MarkmapNode",
"ReadHtmlNode"
],
{
"title_aux": "ComfyUI-Markmap"
}
],
"https://github.com/cerspense/ComfyUI_cspnodes": [
[
"DepthToNormalMap",
@@ -12572,12 +12652,8 @@
],
"https://github.com/civen-cn/ComfyUI-Whisper-Translator": [
[
"Add Subtitles To Background",
"Add Subtitles To Frames",
"Add Subtitles To FramesX",
"Apply Whisper",
"Apply WhisperX",
"Resize Cropped Subtitles"
"Apply WhisperX"
],
{
"title_aux": "ComfyUI Whisper Translator"
@@ -15407,6 +15483,7 @@
"Griptape Util: Create Agent Modelfile",
"Griptape Util: Create Model from Modelfile",
"Griptape Util: Remove Ollama Model",
"Griptape Util: Switch Node",
"Griptape Vector Store Driver: Amazon OpenSearch",
"Griptape Vector Store Driver: Azure MongoDB",
"Griptape Vector Store Driver: Griptape Cloud",
@@ -18843,6 +18920,8 @@
"https://github.com/lldacing/ComfyUI_BiRefNet_ll": [
[
"AutoDownloadBiRefNetModel",
"BlurFusionForegroundEstimation",
"GetMaskByBiRefNet",
"LoadRembgByBiRefNetModel",
"RembgByBiRefNet",
"RembgByBiRefNetAdvanced"
@@ -20737,6 +20816,16 @@
"title_aux": "comfyui_dynamic_util_nodes"
}
],
"https://github.com/muxueChen/ComfyUI_NTCosyVoice": [
[
"NTCosyVoiceCrossLingualSampler",
"NTCosyVoiceInstruct2Sampler",
"NTCosyVoiceZeroShotSampler"
],
{
"title_aux": "CosyVoice2 for ComfyUI"
}
],
"https://github.com/muzi12888/ComfyUI-PoseKeypoint-Mask": [
[
"Image Brightness",
@@ -23209,9 +23298,7 @@
"https://github.com/smthemex/ComfyUI_EchoMimic": [
[
"Echo_LoadModel",
"Echo_Sampler",
"Echo_Upscaleloader",
"Echo_VideoUpscale"
"Echo_Sampler"
],
{
"title_aux": "ComfyUI_EchoMimic"

View File

@@ -127,8 +127,17 @@ def gitcheck(path, do_fetch=False):
def switch_to_default_branch(repo):
default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
repo.git.checkout(default_branch)
try:
default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
repo.git.checkout(default_branch)
except:
try:
repo.git.checkout(repo.heads.master)
except:
try:
repo.git.checkout(repo.heads.main)
except:
print("[ComfyUI Manager] Failed to switch to the default branch (master or main)")
def gitpull(path):

View File

File diff suppressed because it is too large Load Diff

View File

@@ -92,7 +92,7 @@ def install_node(node_id, version=None):
def all_versions_of_node(node_id):
url = f"https://api.comfy.org/nodes/{node_id}/versions"
url = f"https://api.comfy.org/nodes/{node_id}/versions?statuses=NodeVersionStatusActive&statuses=NodeVersionStatusPending"
response = requests.get(url)
if response.status_code == 200:

View File

@@ -36,7 +36,7 @@ import manager_downloader
from node_package import InstalledNodePackage
version_code = [3, 3, 4]
version_code = [3, 3, 10]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@@ -263,6 +263,27 @@ def is_installed(name):
print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
return True
pkg = manager_util.get_installed_packages().get(name.lower())
if pkg is None:
return False # update if not installed
if match is None:
return True # don't update if version is not specified
if match.group(2) in ['>', '>=']:
if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
return False
elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")
if match.group(2) == '==':
if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
return False
if match.group(2) == '~=':
if manager_util.StrictVersion(pkg) == manager_util.StrictVersion(match.group(3)):
return False
return name.lower() in manager_util.get_installed_packages()
@@ -1237,6 +1258,8 @@ class UnifiedManager:
return ManagedResult('skip').with_msg('Up to date')
def unified_update(self, node_id, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
orig_print(f"\x1b[2K\rUpdating: {node_id}", end='')
if version_spec is None:
version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')
@@ -1403,7 +1426,6 @@ def write_config():
config = configparser.ConfigParser()
config['default'] = {
'preview_method': manager_funcs.get_current_preview_method(),
'badge_mode': get_config()['badge_mode'],
'git_exe': get_config()['git_exe'],
'channel_url': get_config()['channel_url'],
'share_option': get_config()['share_option'],
@@ -1444,7 +1466,6 @@ def read_config():
return {
'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else manager_funcs.get_current_preview_method(),
'badge_mode': default_conf['badge_mode'] if 'badge_mode' in default_conf else 'none',
'git_exe': default_conf['git_exe'] if 'git_exe' in default_conf else '',
'channel_url': default_conf['channel_url'] if 'channel_url' in default_conf else DEFAULT_CHANNEL,
'share_option': default_conf['share_option'] if 'share_option' in default_conf else 'all',
@@ -1463,7 +1484,6 @@ def read_config():
except Exception:
return {
'preview_method': manager_funcs.get_current_preview_method(),
'badge_mode': 'none',
'git_exe': '',
'channel_url': DEFAULT_CHANNEL,
'share_option': 'all',
@@ -1490,8 +1510,17 @@ def get_config():
def switch_to_default_branch(repo):
default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
repo.git.checkout(default_branch)
try:
default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
repo.git.checkout(default_branch)
except:
try:
repo.git.checkout(repo.heads.master)
except:
try:
repo.git.checkout(repo.heads.main)
except:
print("[ComfyUI Manager] Failed to switch to the default branch (master or main)")
def try_install_script(url, repo_path, install_cmd, instant_execution=False):
@@ -1698,7 +1727,7 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
if do_update:
if repo.is_dirty():
print(f"STASH: '{path}' is dirty.")
print(f"\nSTASH: '{path}' is dirty.")
repo.git.stash()
if f'{remote_name}/{branch_name}' not in repo.refs:
@@ -2949,7 +2978,7 @@ def get_comfyui_versions():
versions = sorted(versions + [current_tag], reverse=True)
versions = versions[:4]
main_branch = repo.heads.main
main_branch = repo.heads.master
latest_commit = main_branch.commit
latest_tag = repo.git.describe('--tags', latest_commit.hexsha)

View File

@@ -153,10 +153,6 @@ def set_preview_method(method):
set_preview_method(core.get_config()['preview_method'])
def set_badge_mode(mode):
core.get_config()['badge_mode'] = mode
def set_default_ui_mode(mode):
core.get_config()['default_ui'] = mode
@@ -820,7 +816,7 @@ async def get_cnr_versions(request):
node_name = request.match_info.get("node_name", None)
versions = core.cnr_utils.all_versions_of_node(node_name)
if versions:
if versions is not None:
return web.json_response(versions, content_type='application/json')
return web.Response(status=400)
@@ -1153,17 +1149,6 @@ async def preview_method(request):
return web.Response(status=200)
@routes.get("/manager/badge_mode")
async def badge_mode(request):
if "value" in request.rel_url.query:
set_badge_mode(request.rel_url.query['value'])
core.write_config()
else:
return web.Response(text=core.get_config()['badge_mode'], status=200)
return web.Response(status=200)
@routes.get("/manager/default_ui")
async def default_ui_mode(request):
if "value" in request.rel_url.query:

View File

@@ -103,24 +103,6 @@ docStyle.innerHTML = `
vertical-align: middle;
}
#cm-channel-badge {
color: white;
background-color: #AA0000;
width: 220px;
height: 23px;
font-size: 13px;
border-radius: 5px;
left: 5px;
top: 5px;
align-content: center;
justify-content: center;
text-align: center;
font-weight: bold;
float: left;
vertical-align: middle;
position: relative;
}
#custom-nodes-grid a {
color: #5555FF;
font-weight: bold;
@@ -244,7 +226,6 @@ var update_comfyui_button = null;
var switch_comfyui_button = null;
var fetch_updates_button = null;
var update_all_button = null;
var badge_mode = "none";
let share_option = 'all';
// copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -426,14 +407,6 @@ const style = `
}
`;
async function init_badge_mode() {
api.fetchApi('/manager/badge_mode')
.then(response => response.text())
.then(data => { badge_mode = data; })
}
async function init_share_option() {
api.fetchApi('/manager/share_option')
.then(response => response.text())
@@ -450,7 +423,6 @@ async function init_notice(notice) {
})
}
await init_badge_mode();
await init_share_option();
async function fetchNicknames() {
@@ -517,65 +489,6 @@ function getNickname(node, nodename) {
}
}
function drawBadge(node, orig, restArgs) {
let ctx = restArgs[0];
const r = orig?.apply?.(node, restArgs);
if (!node.flags.collapsed && badge_mode != 'none' && node.constructor.title_mode != LiteGraph.NO_TITLE) {
let text = "";
if (badge_mode.startsWith('id_nick'))
text = `#${node.id} `;
let nick = node.getNickname();
if (nick) {
if (nick == 'ComfyUI') {
if(badge_mode.endsWith('hide')) {
nick = "";
}
else {
nick = "🦊"
}
}
if (nick.length > 25) {
text += nick.substring(0, 23) + "..";
}
else {
text += nick;
}
}
if (text != "") {
let fgColor = "white";
let bgColor = "#0F1F0F";
let visible = true;
ctx.save();
ctx.font = "12px sans-serif";
const sz = ctx.measureText(text);
ctx.fillStyle = bgColor;
ctx.beginPath();
ctx.roundRect(node.size[0] - sz.width - 12, -LiteGraph.NODE_TITLE_HEIGHT - 20, sz.width + 12, 20, 5);
ctx.fill();
ctx.fillStyle = fgColor;
ctx.fillText(text, node.size[0] - sz.width - 6, -LiteGraph.NODE_TITLE_HEIGHT - 6);
ctx.restore();
if (node.has_errors) {
ctx.save();
ctx.font = "bold 14px sans-serif";
const sz2 = ctx.measureText(node.type);
ctx.fillStyle = 'white';
ctx.fillText(node.type, node.size[0] / 2 - sz2.width / 2, node.size[1] / 2);
ctx.restore();
}
}
}
return r;
}
async function updateComfyUI() {
let prev_text = update_comfyui_button.innerText;
update_comfyui_button.innerText = "Updating ComfyUI...";
@@ -1069,32 +982,9 @@ class ManagerMenuDialog extends ComfyDialog {
api.fetchApi(`/manager/preview_method?value=${event.target.value}`);
});
// nickname
let badge_combo = "";
if(is_legacy_front()) {
badge_combo = document.createElement("select");
badge_combo.setAttribute("title", "Configure the content to be displayed on the badge at the top right corner of the node. The ID is the identifier of the node. If 'hide built-in' is selected, both unknown nodes and built-in nodes will be omitted, making them indistinguishable");
badge_combo.className = "cm-menu-combo";
badge_combo.appendChild($el('option', { value: 'none', text: 'Badge: None' }, []));
badge_combo.appendChild($el('option', { value: 'nick', text: 'Badge: Nickname' }, []));
badge_combo.appendChild($el('option', { value: 'nick_hide', text: 'Badge: Nickname (hide built-in)' }, []));
badge_combo.appendChild($el('option', { value: 'id_nick', text: 'Badge: #ID Nickname' }, []));
badge_combo.appendChild($el('option', { value: 'id_nick_hide', text: 'Badge: #ID Nickname (hide built-in)' }, []));
api.fetchApi('/manager/badge_mode')
.then(response => response.text())
.then(data => { badge_combo.value = data; badge_mode = data; });
badge_combo.addEventListener('change', function (event) {
api.fetchApi(`/manager/badge_mode?value=${event.target.value}`);
badge_mode = event.target.value;
app.graph.setDirtyCanvas(true);
});
}
// channel
let channel_combo = document.createElement("select");
channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list. Note that the badge utilizes local information.");
channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list.");
channel_combo.className = "cm-menu-combo";
api.fetchApi('/manager/channel_url_list')
.then(response => response.json())
@@ -1218,7 +1108,6 @@ class ManagerMenuDialog extends ComfyDialog {
this.datasrc_combo,
channel_combo,
preview_combo,
badge_combo,
default_ui_combo,
share_combo,
component_policy_combo,
@@ -1663,32 +1552,6 @@ app.registerExtension({
this._addExtraNodeContextMenu(nodeType, app);
},
async nodeCreated(node, app) {
if(is_legacy_front()) {
if(!node.badge_enabled) {
node.getNickname = function () { return getNickname(node, node.comfyClass.trim()) };
let orig = node.onDrawForeground;
if(!orig)
orig = node.__proto__.onDrawForeground;
node.onDrawForeground = function (ctx) {
drawBadge(node, orig, arguments)
};
node.badge_enabled = true;
}
}
},
async loadedGraphNode(node, app) {
if(is_legacy_front()) {
if(!node.badge_enabled) {
const orig = node.onDrawForeground;
node.getNickname = function () { return getNickname(node, node.type.trim()) };
node.onDrawForeground = function (ctx) { drawBadge(node, orig, arguments) };
}
}
},
_addExtraNodeContextMenu(node, app) {
const origGetExtraMenuOptions = node.prototype.getExtraMenuOptions;
node.prototype.cm_menu_added = true;

View File

@@ -1190,7 +1190,7 @@ export class CustomNodesManager {
version_cnt++;
}
if(rowItem.cnr_latest != rowItem.originalData.active_version) {
if(rowItem.cnr_latest != rowItem.originalData.active_version && obj.length > 0) {
versions.push('latest');
}
}

View File

@@ -10,6 +10,27 @@
},
{
"author": "power88",
"title": "ComfyUI-PDiD-Nodes [WIP]",
"reference": "https://github.com/power88/ComfyUI-PDiD-Nodes",
"files": [
"https://github.com/power88/ComfyUI-PDiD-Nodes"
],
"install_type": "git-clone",
"description": "NODES: Get Image Size, Check Character Tag, Nearest SDXL Resolution divided by 64, Get Image Main Color, Blend Images, List Operations, Make Image Gray.\nNOTE: not working"
},
{
"author": "FinetunersAI",
"title": "ComfyUI Finetuners [WIP]",
"reference": "https://github.com/FinetunersAI/finetuners",
"files": [
"https://github.com/FinetunersAI/finetuners"
],
"install_type": "git-clone",
"description": "A collection of utility nodes for ComfyUI to enhance your workflow.\nNOTE: The files in the repo are not organized."
},
{
"author": "sourceful-official",
"title": "ComfyUI_InstructPixToPixConditioningLatent [WIP]",
@@ -243,13 +264,13 @@
},
{
"author": "Maxim-Dey",
"title": "ComfyUI-MS_Tools",
"title": "ComfyUI-MS_Tools [WIP]",
"reference": "https://github.com/Maxim-Dey/ComfyUI-MaksiTools",
"files": [
"https://github.com/Maxim-Dey/ComfyUI-MaksiTools"
],
"install_type": "git-clone",
"description": "NODES: MS Time Measure Node"
"description": "NODES: MS Time Measure NodeMaksiTools"
},
{
"author": "jammyfu",

View File

@@ -513,6 +513,7 @@
"VTS Clip Text Encode",
"VTS Color Mask To Mask",
"VTS Conditioning Set Batch Mask",
"VTS Images Crop From Masks",
"VTS Merge Delimited Text",
"VTS Reduce Batch Size",
"VTS To Text",
@@ -563,8 +564,10 @@
"DevToolsNodeWithOnlyOptionalInput",
"DevToolsNodeWithOptionalInput",
"DevToolsNodeWithOutputList",
"DevToolsNodeWithSeedInput",
"DevToolsNodeWithStringInput",
"DevToolsNodeWithUnionInput",
"DevToolsObjectPatchNode",
"DevToolsSimpleSlider"
],
{
@@ -653,7 +656,7 @@
],
"https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit": [
[
"GetBooruImageInfo",
"GetBooruPost",
"TagEncode"
],
{
@@ -743,6 +746,16 @@
"title_aux": "Fast Group Link [WIP]"
}
],
"https://github.com/FinetunersAI/finetuners": [
[
"AutoImageResize",
"GroupLink",
"VariablesInjector"
],
{
"title_aux": "ComfyUI Finetuners [WIP]"
}
],
"https://github.com/Fucci-Mateo/ComfyUI-Airtable": [
[
"Push pose to Airtable"
@@ -1079,7 +1092,7 @@
"MT Time Measure Node"
],
{
"title_aux": "ComfyUI-MS_Tools"
"title_aux": "ComfyUI-MS_Tools [WIP]"
}
],
"https://github.com/MrAdamBlack/CheckProgress": [
@@ -1243,6 +1256,7 @@
"https://github.com/ShahFaisalWani/ComfyUI-Mojen-Nodeset": [
[
"MojenAnalyzeProcessor",
"MojenAspectRatio",
"MojenImageLoader",
"MojenLogPercent",
"MojenNSFWClassifier",
@@ -2813,12 +2827,14 @@
"ClickPopup",
"ColorPicker",
"DynamicImageCombiner",
"DynamicMaskCombiner",
"ImageResolutionAdjuster",
"MaskPreview",
"MultilineTextInput",
"RemoveEmptyLinesAndLeadingSpaces",
"RemoveEmptyLinesAndLeadingSpacesAdvance",
"ShowTextPlus",
"SimpleTextInput",
"TextCombiner"
],
{
@@ -3821,6 +3837,20 @@
"title_aux": "NudeNet-Detector-Provider [WIP]"
}
],
"https://github.com/power88/ComfyUI-PDiD-Nodes": [
[
"Blend Images",
"Check Character Tag",
"Get Image Colors",
"Get image size",
"List Operations",
"Make Image Gray",
"Nearest SDXL Resolution divided by 64"
],
{
"title_aux": "ComfyUI-PDiD-Nodes [WIP]"
}
],
"https://github.com/prabinpebam/anyPython": [
[
"Any Python"

View File

File diff suppressed because it is too large Load Diff

View File

@@ -9,6 +9,77 @@
},
{
"author": "bongsang",
"title": "ComfyUI-Bongsang",
"reference": "https://github.com/bongsang/ComfyUI-Bongsang",
"files": [
"https://github.com/bongsang/ComfyUI-Bongsang"
],
"install_type": "git-clone",
"description": "The 'ComfyUI-Bongsang' is very useful tools for a diffusion model developer."
},
{
"author": "5x00",
"title": "ComfyUI-PiAPI-Faceswap",
"reference": "https://github.com/5x00/ComfyUI-PiAPI-Faceswap",
"files": [
"https://github.com/5x00/ComfyUI-PiAPI-Faceswap"
],
"install_type": "git-clone",
"description": "A simple ComfyUI nodes that integrates [a/PiAPI faceswap](https://piapi.ai/faceswap-api) service into ComfyUI. This can be helpful if you're trying to create a workflow that includes faceswap for commercial usage."
},
{
"author": "muxueChen",
"title": "CosyVoice2 for ComfyUI",
"reference": "https://github.com/muxueChen/ComfyUI_NTCosyVoice",
"files": [
"https://github.com/muxueChen/ComfyUI_NTCosyVoice"
],
"install_type": "git-clone",
"description": "ComfyUI_NTCosyVoice is a plugin of ComfyUI for Cosysvoice2"
},
{
"author": "cenzijing",
"title": "ComfyUI-Markmap",
"reference": "https://github.com/cenzijing/ComfyUI-Markmap",
"files": [
"https://github.com/cenzijing/ComfyUI-Markmap"
],
"install_type": "git-clone",
"description": "A ComfyUI custom node for creating mindmaps from markdown"
},
{
"author": "amorano",
"title": "Jovi_Spout",
"id": "jovi_spout",
"reference": "https://github.com/Amorano/Jovi_Spout",
"files": [
"https://github.com/Amorano/Jovi_Spout"
],
"install_type": "git-clone",
"description": "ComfyUI Nodes for using Spout streams."
},
{
"author": "AconexOfficial",
"title": "ComfyUI GOAT Nodes",
"reference": "https://github.com/AconexOfficial/ComfyUI_GOAT_Nodes",
"files": [
"https://github.com/AconexOfficial/ComfyUI_GOAT_Nodes"
],
"install_type": "git-clone",
"description": "Nodes to level up your workflows performance and streamline specific functions."
},
{
"author": "Jaminanim",
"title": "ComfyUI-Random-Int-Divisor-Node",
"reference": "https://github.com/Jaminanim/ComfyUI-Random-Int-Divisor-Node",
"files": [
"https://github.com/Jaminanim/ComfyUI-Random-Int-Divisor-Node"
],
"install_type": "git-clone",
"description": "A set of custom ComfyUI nodes for generating random integers within a range, adjusted to the nearest multiple of a user-defined divisor. Needlessly includes both an efficient and simple list implementation. Updates with each generation."
},
{
"author": "LucipherDev",
"title": "ComfyUI-AniDoc",
@@ -623,78 +694,6 @@
],
"install_type": "git-clone",
"description": "These are custom nodes for ComfyUI for the loading and saving of metadata in XMP format. XMP metadata is embedded in the images created by these nodes; it travels along wherever the image does. Both macOS and Windows index XMP metadata automatically, making it searchable from the Finder on the Mac or the File Explorer in Windows. Apps like Photoshop or Lightroom (and presumably many others) expose XMP metadata and allow it to be edited."
},
{
"author": "AEmotionStudio",
"title": "ComfyUI Christmas Theme 🎄✨",
"reference": "https://github.com/AEmotionStudio/ComfyUI-ChristmasTheme",
"files": [
"https://github.com/AEmotionStudio/ComfyUI-ChristmasTheme"
],
"install_type": "git-clone",
"description": "A beautiful theme extension for ComfyUI that adds festive touches with dynamic backgrounds, snowfall effects, and animated node connections"
},
{
"author": "Black Forest Labs",
"title": "Black Forest Labs API Nodes",
"reference": "https://github.com/black-forest-labs/bfl-comfy-nodes",
"files": [
"https://github.com/black-forest-labs/bfl-comfy-nodes"
],
"install_type": "git-clone",
"description": "ComfyUI nodes for Black Forest Labs API Services"
},
{
"author": "Light-x02",
"title": "Image Metadata Nodes",
"id": "image_metadata_nodes",
"reference": "https://github.com/Light-x02/ComfyUI-Image-Metadata-Nodes",
"files": [
"https://github.com/Light-x02/ComfyUI-Image-Metadata-Nodes"
],
"install_type": "git-clone",
"description": "Nodes for loading and saving images with metadata in ComfyUI."
},
{
"author": "marcoc2",
"title": "Image Processing Suite for ComfyUI",
"reference": "https://github.com/marcoc2/ComfyUI-AnotherUtils",
"files": [
"https://github.com/marcoc2/ComfyUI-AnotherUtils"
],
"install_type": "git-clone",
"description": "A collection of specialized image processing nodes for ComfyUI, focused on dataset preparation and pixel art manipulation."
},
{
"author": "BIMer-99",
"title": "ComfyUI_FishSpeech_EX",
"reference": "https://github.com/BIMer-99/ComfyUI_FishSpeech_EX",
"files": [
"https://github.com/BIMer-99/ComfyUI_FishSpeech_EX"
],
"install_type": "git-clone",
"description": "This plugin is optimized for Fish-Speech-1.5 version and is only applicable to version 1.5"
},
{
"author": "CyanAutumn",
"title": "ComfyUi Random Manage Cyan",
"id": "CyanAutumn",
"reference": "https://github.com/CyanAutumn/ComfyUi_Random_Manage_Cyan",
"files": [
"https://github.com/CyanAutumn/ComfyUi_Random_Manage_Cyan"
],
"install_type": "git-clone",
"description": "A random prompt node"
},
{
"author": "kazeyori",
"title": "Quick Image Sequence Process",
"reference": "https://github.com/kazeyori/ComfyUI-QuickImageSequenceProcess",
"files": [
"https://github.com/kazeyori/ComfyUI-QuickImageSequenceProcess"
],
"install_type": "git-clone",
"description": "A ComfyUI plugin for quick image sequence processing. This plugin allows users to manipulate frame sequences with various operations including frame insertion, deletion, and duplication."
}
]
}

View File

@@ -299,7 +299,15 @@
"title_aux": "ComfyUI-DareMerge"
}
],
"https://github.com/5x00/ComfyUI-VLM_Captions": [
"https://github.com/5x00/ComfyUI-PiAPI-Faceswap": [
[
"Face Swapper"
],
{
"title_aux": "ComfyUI-PiAPI-Faceswap"
}
],
"https://github.com/5x00/ComfyUI-VLM-Captions": [
[
"Image To Caption"
],
@@ -1226,6 +1234,27 @@
"title_aux": "ComfyUI Nodes for External Tooling"
}
],
"https://github.com/AconexOfficial/ComfyUI_GOAT_Nodes": [
[
"Advanced_Upscale_Image_Using_Model",
"Capped_Float_Positive",
"Capped_Int_Positive",
"Embedding_Selector",
"Fast_Color_Match",
"Fast_Film_Grain",
"Get_Side_Length_Of_Image",
"Image_Dimensions",
"Image_Tiler",
"Image_Untiler",
"Int_Divide_Rounded",
"Sampler_Settings",
"Smart_Seed",
"Triple_Prompt"
],
{
"title_aux": "ComfyUI GOAT Nodes"
}
],
"https://github.com/Aerse/ComfyUI-Seed-Nodes": [
[
"Seed-Nodes: ImagePixelator",
@@ -1349,6 +1378,15 @@
"title_aux": "Jovi_GLSL"
}
],
"https://github.com/Amorano/Jovi_Spout": [
[
"SPOUT READER (JOV_SP) \ud83d\udcfa",
"SPOUT WRITER (JOV_SP) \ud83c\udfa5"
],
{
"title_aux": "Jovi_Spout"
}
],
"https://github.com/Amorano/Jovimetrix": [
[
"ADJUST (JOV) \ud83d\udd78\ufe0f",
@@ -4143,7 +4181,6 @@
"Isulion Civitai Image Display",
"Isulion Civitai Model Explorer",
"Isulion Civitai Trending",
"Isulion Video Prompt Generator \ud83c\udfa5",
"IsulionActionGenerator",
"IsulionAlienWorldGenerator",
"IsulionAnimalBehaviorGenerator",
@@ -4172,6 +4209,7 @@
"IsulionStyleMixer",
"IsulionTechGenerator",
"IsulionTimeOfDayGenerator",
"IsulionVideoPromptGenerator",
"IsulionWeatherGenerator",
"\ud83d\udca4 IsulionShutdown"
],
@@ -4337,6 +4375,15 @@
"title_aux": "ComfyUI-AI-Assistant"
}
],
"https://github.com/Jaminanim/ComfyUI-Random-Int-Divisor-Node": [
[
"RandomIntegerNodeEfficient",
"RandomIntegerNodeList"
],
{
"title_aux": "ComfyUI-Random-Int-Divisor-Node"
}
],
"https://github.com/Jannchie/ComfyUI-J": [
[
"DiffusersCompelPromptEmbedding",
@@ -5782,24 +5829,37 @@
"DJZ-LoadLatentV2",
"DJZDatamosh",
"DJZDatamoshV2",
"DatasetWordcloud",
"DinskyPlus",
"DinskyPlusV2",
"DjzDatamoshV3",
"DjzDatamoshV4",
"DjzDatamoshV5",
"DjzDatamoshV6",
"DjzDatamoshV7",
"FractalGenerator",
"FractalGeneratorV2",
"FractalGeneratorV3",
"ImageSizeAdjuster",
"ImageSizeAdjusterV2",
"ImageSizeAdjusterV3",
"LoadVideoDirectory",
"ParametricMeshGen",
"ParametricMeshGenV2",
"ProjectFilePathNode",
"PromptCleaner",
"PromptSwap",
"SequentialNumberGenerator",
"StringWeights",
"TrianglesPlus",
"TrianglesPlusV2",
"ZenkaiPrompt",
"ZenkaiPromptV2",
"ZenkaiWildcard",
"ZenkaiWildcardV2"
],
{
"author": "DJZ-Nodes",
"title_aux": "DJZ-Nodes"
}
],
@@ -7865,6 +7925,7 @@
"Divide Image and Select Tile",
"Divide and Conquer Algorithm",
"Divide and Conquer Algorithm (No Upscale)",
"Load Images into List",
"Make Size"
],
{
@@ -9160,7 +9221,9 @@
"InstaCText",
"InstaCTextML",
"InstaPromptMultipleStyleSelector",
"InstaPromptStyleSelector"
"InstaPromptStyleSelector",
"LoadVideo",
"PreViewVideo"
],
{
"title_aux": "InstaSD nodes for ComfyUI"
@@ -11141,6 +11204,14 @@
"title_aux": "Remembering utils"
}
],
"https://github.com/bongsang/ComfyUI-Bongsang": [
[
"AnyInfo"
],
{
"title_aux": "ComfyUI-Bongsang"
}
],
"https://github.com/boredofnames/ComfyUI-ntfy": [
[
"Ntfy",
@@ -11395,6 +11466,15 @@
"title_aux": "ComfyUI SimpleTools Suit"
}
],
"https://github.com/cenzijing/ComfyUI-Markmap": [
[
"MarkmapNode",
"ReadHtmlNode"
],
{
"title_aux": "ComfyUI-Markmap"
}
],
"https://github.com/cerspense/ComfyUI_cspnodes": [
[
"DepthToNormalMap",
@@ -12572,12 +12652,8 @@
],
"https://github.com/civen-cn/ComfyUI-Whisper-Translator": [
[
"Add Subtitles To Background",
"Add Subtitles To Frames",
"Add Subtitles To FramesX",
"Apply Whisper",
"Apply WhisperX",
"Resize Cropped Subtitles"
"Apply WhisperX"
],
{
"title_aux": "ComfyUI Whisper Translator"
@@ -15407,6 +15483,7 @@
"Griptape Util: Create Agent Modelfile",
"Griptape Util: Create Model from Modelfile",
"Griptape Util: Remove Ollama Model",
"Griptape Util: Switch Node",
"Griptape Vector Store Driver: Amazon OpenSearch",
"Griptape Vector Store Driver: Azure MongoDB",
"Griptape Vector Store Driver: Griptape Cloud",
@@ -18843,6 +18920,8 @@
"https://github.com/lldacing/ComfyUI_BiRefNet_ll": [
[
"AutoDownloadBiRefNetModel",
"BlurFusionForegroundEstimation",
"GetMaskByBiRefNet",
"LoadRembgByBiRefNetModel",
"RembgByBiRefNet",
"RembgByBiRefNetAdvanced"
@@ -20737,6 +20816,16 @@
"title_aux": "comfyui_dynamic_util_nodes"
}
],
"https://github.com/muxueChen/ComfyUI_NTCosyVoice": [
[
"NTCosyVoiceCrossLingualSampler",
"NTCosyVoiceInstruct2Sampler",
"NTCosyVoiceZeroShotSampler"
],
{
"title_aux": "CosyVoice2 for ComfyUI"
}
],
"https://github.com/muzi12888/ComfyUI-PoseKeypoint-Mask": [
[
"Image Brightness",
@@ -23209,9 +23298,7 @@
"https://github.com/smthemex/ComfyUI_EchoMimic": [
[
"Echo_LoadModel",
"Echo_Sampler",
"Echo_Upscaleloader",
"Echo_VideoUpscale"
"Echo_Sampler"
],
{
"title_aux": "ComfyUI_EchoMimic"

View File

@@ -437,6 +437,14 @@ def is_installed(name):
elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")
if match.group(2) == '==':
if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
return False
if match.group(2) == '~=':
if manager_util.StrictVersion(pkg) == manager_util.StrictVersion(match.group(3)):
return False
return True # prevent downgrade

View File

@@ -1,7 +1,7 @@
[project]
name = "comfyui-manager"
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
version = "3.3.4"
version = "3.3.10"
license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]