Compare commits

..

No commits in common. "e4c370a7d9747f2dc4dbabb79f99990cbce514a6" and "10211d1a938474630b91cefd5f6e354b257c4008" have entirely different histories.

11 changed files with 5016 additions and 5197 deletions

View File

@ -238,8 +238,7 @@
], ],
"https://github.com/1038lab/ComfyUI-VoxCPMTTS": [ "https://github.com/1038lab/ComfyUI-VoxCPMTTS": [
[ [
"AILab_VoxCPMTTS", "AILab_VoxCPMTTS"
"AILab_VoxCPMTTS_Advanced"
], ],
{ {
"title_aux": "ComfyUI-VoxCPMTTS" "title_aux": "ComfyUI-VoxCPMTTS"
@ -16320,7 +16319,6 @@
"BboxSplit", "BboxSplit",
"Cascade", "Cascade",
"ImageFilters", "ImageFilters",
"LMS_VisionController",
"Luts", "Luts",
"LutsAdvanced", "LutsAdvanced",
"RemoveAreaByMask", "RemoveAreaByMask",
@ -16698,9 +16696,6 @@
"https://github.com/ShootTheSound/comfyUI-Realtime-Lora": [ "https://github.com/ShootTheSound/comfyUI-Realtime-Lora": [
[ [
"ApplyTrainedLora", "ApplyTrainedLora",
"MusubiQwenImageEditLoraTrainer",
"MusubiQwenImageLoraTrainer",
"MusubiWanLoraTrainer",
"MusubiZImageLoraTrainer", "MusubiZImageLoraTrainer",
"RealtimeLoraTrainer", "RealtimeLoraTrainer",
"SD15LoraTrainer", "SD15LoraTrainer",
@ -22630,21 +22625,13 @@
"HSVAdjuster", "HSVAdjuster",
"HeightAmplifier", "HeightAmplifier",
"HeightCombiner", "HeightCombiner",
"HeightToNormal",
"ImageBitDepthChecker", "ImageBitDepthChecker",
"ImageEnhancement", "ImageEnhancement",
"LevelsAdjustment", "LevelsAdjustment",
"LotusHeightProcessor", "LotusHeightProcessor",
"LotusNormalProcessor",
"MicroDetailOverlay", "MicroDetailOverlay",
"MultiTextureBlender", "MultiTextureBlender",
"NormalConverter",
"NormalFormatAuto",
"NormalFormatBruteForce",
"NormalFormatValidator",
"NormalIntensity",
"NormalMapCombiner", "NormalMapCombiner",
"NormalToDepth",
"PBRAdjuster", "PBRAdjuster",
"PBRBatchToPipe", "PBRBatchToPipe",
"PBRCombiner", "PBRCombiner",
@ -22664,8 +22651,6 @@
"SSSMapGenerator", "SSSMapGenerator",
"ScratchesGenerator", "ScratchesGenerator",
"SeamlessTiling", "SeamlessTiling",
"SharpenDepth",
"SharpenNormal",
"SimpleRecolor", "SimpleRecolor",
"SmartBlur", "SmartBlur",
"SmartTextureResizer", "SmartTextureResizer",
@ -50285,7 +50270,6 @@
"vsLinx_BooleanOrOperator", "vsLinx_BooleanOrOperator",
"vsLinx_BypassOnBool", "vsLinx_BypassOnBool",
"vsLinx_FitImageIntoBBoxMask", "vsLinx_FitImageIntoBBoxMask",
"vsLinx_ImpactMultilineWildcardText",
"vsLinx_LoadSelectedImagesBatch", "vsLinx_LoadSelectedImagesBatch",
"vsLinx_LoadSelectedImagesList", "vsLinx_LoadSelectedImagesList",
"vsLinx_MuteOnBool" "vsLinx_MuteOnBool"

View File

@ -2,7 +2,6 @@ import subprocess
import sys import sys
import os import os
import traceback import traceback
import time
import git import git
import json import json
@ -220,14 +219,7 @@ def gitpull(path):
repo.close() repo.close()
return return
try: remote.pull()
repo.git.pull('--ff-only')
except git.GitCommandError:
backup_name = f'backup_{time.strftime("%Y%m%d_%H%M%S")}'
repo.create_head(backup_name)
print(f"[ComfyUI-Manager] Cannot fast-forward. Backup created: {backup_name}")
repo.git.reset('--hard', f'{remote_name}/{branch_name}')
print(f"[ComfyUI-Manager] Reset to {remote_name}/{branch_name}")
repo.git.submodule('update', '--init', '--recursive') repo.git.submodule('update', '--init', '--recursive')
new_commit_hash = repo.head.commit.hexsha new_commit_hash = repo.head.commit.hexsha

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -44,7 +44,7 @@ import manager_migration
from node_package import InstalledNodePackage from node_package import InstalledNodePackage
version_code = [3, 38, 2] version_code = [3, 38, 1]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@ -2253,17 +2253,9 @@ def git_pull(path):
current_branch = repo.active_branch current_branch = repo.active_branch
remote_name = current_branch.tracking_branch().remote_name remote_name = current_branch.tracking_branch().remote_name
remote = repo.remote(name=remote_name)
try: remote.pull()
repo.git.pull('--ff-only')
except git.GitCommandError:
branch_name = current_branch.name
backup_name = f'backup_{time.strftime("%Y%m%d_%H%M%S")}'
repo.create_head(backup_name)
logging.info(f"[ComfyUI-Manager] Cannot fast-forward. Backup created: {backup_name}")
repo.git.reset('--hard', f'{remote_name}/{branch_name}')
logging.info(f"[ComfyUI-Manager] Reset to {remote_name}/{branch_name}")
repo.git.submodule('update', '--init', '--recursive') repo.git.submodule('update', '--init', '--recursive')
repo.close() repo.close()

View File

@ -82,7 +82,7 @@ def validate_required_fields(entry: Dict, entry_index: int, required_fields: Lis
elif isinstance(entry[field], str) and not entry[field].strip(): elif isinstance(entry[field], str) and not entry[field].strip():
errors.append(f"Field '{field}' is empty") errors.append(f"Field '{field}' is empty")
elif field == 'files' and not entry[field]: # Empty array elif field == 'files' and not entry[field]: # Empty array
errors.append("Field 'files' is empty array") errors.append(f"Field 'files' is empty array")
return errors return errors

View File

@ -9000,9 +9000,6 @@
"AudioResampler", "AudioResampler",
"CollectKeyedVideosNode", "CollectKeyedVideosNode",
"CollectVideosNode", "CollectVideosNode",
"ConformAudio",
"ConformVideo",
"ExtendVideoNearestFrame",
"ImageDelay", "ImageDelay",
"IntToString", "IntToString",
"KlingVideoHandler", "KlingVideoHandler",
@ -9013,6 +9010,7 @@
"StringSplitSelect", "StringSplitSelect",
"Unbroken-Video-Handler", "Unbroken-Video-Handler",
"VideoHandler", "VideoHandler",
"VideoSanitizer",
"WorkflowLoggerNode" "WorkflowLoggerNode"
], ],
{ {

File diff suppressed because it is too large Load Diff

View File

@ -238,8 +238,7 @@
], ],
"https://github.com/1038lab/ComfyUI-VoxCPMTTS": [ "https://github.com/1038lab/ComfyUI-VoxCPMTTS": [
[ [
"AILab_VoxCPMTTS", "AILab_VoxCPMTTS"
"AILab_VoxCPMTTS_Advanced"
], ],
{ {
"title_aux": "ComfyUI-VoxCPMTTS" "title_aux": "ComfyUI-VoxCPMTTS"
@ -16320,7 +16319,6 @@
"BboxSplit", "BboxSplit",
"Cascade", "Cascade",
"ImageFilters", "ImageFilters",
"LMS_VisionController",
"Luts", "Luts",
"LutsAdvanced", "LutsAdvanced",
"RemoveAreaByMask", "RemoveAreaByMask",
@ -16698,9 +16696,6 @@
"https://github.com/ShootTheSound/comfyUI-Realtime-Lora": [ "https://github.com/ShootTheSound/comfyUI-Realtime-Lora": [
[ [
"ApplyTrainedLora", "ApplyTrainedLora",
"MusubiQwenImageEditLoraTrainer",
"MusubiQwenImageLoraTrainer",
"MusubiWanLoraTrainer",
"MusubiZImageLoraTrainer", "MusubiZImageLoraTrainer",
"RealtimeLoraTrainer", "RealtimeLoraTrainer",
"SD15LoraTrainer", "SD15LoraTrainer",
@ -22630,21 +22625,13 @@
"HSVAdjuster", "HSVAdjuster",
"HeightAmplifier", "HeightAmplifier",
"HeightCombiner", "HeightCombiner",
"HeightToNormal",
"ImageBitDepthChecker", "ImageBitDepthChecker",
"ImageEnhancement", "ImageEnhancement",
"LevelsAdjustment", "LevelsAdjustment",
"LotusHeightProcessor", "LotusHeightProcessor",
"LotusNormalProcessor",
"MicroDetailOverlay", "MicroDetailOverlay",
"MultiTextureBlender", "MultiTextureBlender",
"NormalConverter",
"NormalFormatAuto",
"NormalFormatBruteForce",
"NormalFormatValidator",
"NormalIntensity",
"NormalMapCombiner", "NormalMapCombiner",
"NormalToDepth",
"PBRAdjuster", "PBRAdjuster",
"PBRBatchToPipe", "PBRBatchToPipe",
"PBRCombiner", "PBRCombiner",
@ -22664,8 +22651,6 @@
"SSSMapGenerator", "SSSMapGenerator",
"ScratchesGenerator", "ScratchesGenerator",
"SeamlessTiling", "SeamlessTiling",
"SharpenDepth",
"SharpenNormal",
"SimpleRecolor", "SimpleRecolor",
"SmartBlur", "SmartBlur",
"SmartTextureResizer", "SmartTextureResizer",
@ -50285,7 +50270,6 @@
"vsLinx_BooleanOrOperator", "vsLinx_BooleanOrOperator",
"vsLinx_BypassOnBool", "vsLinx_BypassOnBool",
"vsLinx_FitImageIntoBBoxMask", "vsLinx_FitImageIntoBBoxMask",
"vsLinx_ImpactMultilineWildcardText",
"vsLinx_LoadSelectedImagesBatch", "vsLinx_LoadSelectedImagesBatch",
"vsLinx_LoadSelectedImagesList", "vsLinx_LoadSelectedImagesList",
"vsLinx_MuteOnBool" "vsLinx_MuteOnBool"

View File

@ -1,7 +1,7 @@
[project] [project]
name = "comfyui-manager" 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." description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
version = "3.38.2" version = "3.38.1"
license = { file = "LICENSE.txt" } license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-nio", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"] dependencies = ["GitPython", "PyGithub", "matrix-nio", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]

View File

@ -377,7 +377,7 @@ def extract_nodes_from_repo(repo_path: Path, verbose: bool = False, force_rescan
# Extract metadata from this file # Extract metadata from this file
metadata = extract_metadata_only(str(py_file)) metadata = extract_metadata_only(str(py_file))
all_metadata.update(metadata) all_metadata.update(metadata)
except Exception: except Exception as e:
# Silently skip files that can't be read # Silently skip files that can't be read
continue continue