Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df2a7ddca4 | ||
|
|
ba9c71ffa4 | ||
|
|
21b6c6569c | ||
|
|
92aba9565a | ||
|
|
6ea0aebb0b | ||
|
|
b5cdcb75b4 | ||
|
|
bd9aae40b8 | ||
|
|
33f931c0a4 | ||
|
|
ede8279c17 | ||
|
|
268b84a2b6 | ||
|
|
0a67145d80 | ||
|
|
2e55bc470c | ||
|
|
cf0d038978 | ||
|
|
92e7db1082 | ||
|
|
c45c47f935 | ||
|
|
341e27f9a3 | ||
|
|
ab167175c9 | ||
|
|
3c2933338f | ||
|
|
829784fa50 | ||
|
|
3c45f8dc91 | ||
|
|
f8ebf7c6ad | ||
|
|
510c364607 | ||
|
|
a3d6fcccb7 | ||
|
|
42c8082edd | ||
|
|
1a7edf7f0e | ||
|
|
4760deaf9c | ||
|
|
0f7b9d02a0 | ||
|
|
adc86c7945 |
20
README.md
20
README.md
@@ -5,6 +5,7 @@
|
||||

|
||||
|
||||
## NOTICE
|
||||
* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
|
||||
* V3.10: `double-click feature` is removed
|
||||
* This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
|
||||
* V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
|
||||
@@ -246,6 +247,25 @@ The following settings are applied based on the section marked as `is_default`.
|
||||

|
||||
|
||||
|
||||
# Config
|
||||
* You can modify the `config.ini` file to apply the settings for ComfyUI-Manager.
|
||||
* The path to the `config.ini` used by ComfyUI-Manager is displayed in the startup log messages.
|
||||
* See also: [https://github.com/ltdrdata/ComfyUI-Manager#paths]
|
||||
* Configuration options:
|
||||
```
|
||||
[default]
|
||||
git_exe = <Manually specify the path to the git executable. If left empty, the default git executable path will be used.>
|
||||
use_uv = <Use uv instead of pip for dependency installation.>
|
||||
channel_url = https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main
|
||||
bypass_ssl = <Set to True if SSL errors occur to disable SSL.>
|
||||
file_logging = <Configure whether to create a log file used by ComfyUI-Manager.>
|
||||
windows_selector_event_loop_policy = <If an event loop error occurs on Windows, set this to True.>
|
||||
model_download_by_agent = <When downloading models, use an agent instead of torchvision_download_url.>
|
||||
downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
|
||||
security_level = <Set the security level.>
|
||||
always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
|
||||
```
|
||||
|
||||
## Additional Feature
|
||||
* Logging to file feature
|
||||
* This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.
|
||||
|
||||
@@ -4067,6 +4067,17 @@
|
||||
"install_type": "git-clone",
|
||||
"description": "Image metrics nodes for ComfyUI"
|
||||
},
|
||||
{
|
||||
"author": "amorano",
|
||||
"title": "Jovi_MIDI",
|
||||
"id": "jovi_midi",
|
||||
"reference": "https://github.com/Amorano/Jovi_MIDI",
|
||||
"files": [
|
||||
"https://github.com/Amorano/Jovi_MIDI"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Read and Process data from MIDI devices inside of ComfyUI."
|
||||
},
|
||||
{
|
||||
"author": "Umikaze-job",
|
||||
"title": "select_folder_path_easy",
|
||||
@@ -6496,6 +6507,16 @@
|
||||
"install_type": "git-clone",
|
||||
"description": "Add nodes that generates danbooru tags by [a/Dart(Danbooru Tags Transformer)](https://huggingface.co/p1atdev/dart-v1-sft)."
|
||||
},
|
||||
{
|
||||
"author": "nkchocoai",
|
||||
"title": "ComfyUI-DanbooruPromptQuiz",
|
||||
"reference": "https://github.com/nkchocoai/ComfyUI-DanbooruPromptQuiz",
|
||||
"files": [
|
||||
"https://github.com/nkchocoai/ComfyUI-DanbooruPromptQuiz"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This node is for playing the game of guessing prompts by looking at images generated from prompts output by TIPO, Tagger, etc.."
|
||||
},
|
||||
{
|
||||
"author": "JaredTherriault",
|
||||
"title": "ComfyUI-JNodes",
|
||||
@@ -11042,6 +11063,16 @@
|
||||
"install_type": "git-clone",
|
||||
"description": "Custom node for using Prompt S/R in XY Plot\nAlso includes nodes for listing generic parameters like seed and cfg\nEasy to manipulate as elements are separated by line breaks\nDesigned for use with the XY Plot custom node qq-nodes-comfyui, but may work with other custom nodes as well"
|
||||
},
|
||||
{
|
||||
"author": "da2el-ai",
|
||||
"title": "D2-PromptSelector-comfyUI",
|
||||
"reference": "https://github.com/da2el-ai/D2-PromptSelector-comfyUI",
|
||||
"files": [
|
||||
"https://github.com/da2el-ai/D2-PromptSelector-comfyUI"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This is a version of [a/sd-d2-prompt-selector](https://github.com/da2el-ai/sd-d2-prompt-selector) reworked for ComfyUI. It's just a prototype that I've put together for now. The random syntax of sd-d2-prompt-selector cannot be used; instead, the DynamicPrompt syntax is used"
|
||||
},
|
||||
{
|
||||
"author": "nat-chan",
|
||||
"title": "ComfyUI-Transceiver📡",
|
||||
@@ -15468,7 +15499,7 @@
|
||||
"https://github.com/SeanScripts/ComfyUI-PixtralLlamaMolmoVision"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "For loading and running Pixtral, Llama 3.2 Vision, and Molmo models. Put models in the models/LLM folder.\n[w/Renamed from ComfyUI-PixtralLlamaVision. Please reinstall.]"
|
||||
"description": "For loading and running Pixtral, Llama 3.2 Vision, and Molmo models. Put models in the models/LLM folder."
|
||||
},
|
||||
{
|
||||
"author": "ExterminanzHS",
|
||||
@@ -19966,7 +19997,7 @@
|
||||
"https://github.com/DJ-Tribefull/Comfyui_FOCUS_nodes"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This is a small collection of nodes designed for efficiency and the reduction of screen clutter. I work primarily with a two-stage SDXL workflow, so some of the nodes are tailored to that, but many of the most useful nodes can be used in any context."
|
||||
"description": "A collection of nodes designed for efficiency and the reduction of screen-clutter. Includes a Global Seed controller with boolean toggles, SDXL All-in-One conditioner, a custom SDXL control module, Wildcard processor, Style Injector, and more. [w/WARNING: Updating this node-pack wil overwrite any changes you've made to the included wildcards and styles. Please backup your folders before updating.]"
|
||||
},
|
||||
{
|
||||
"author": "KLL535",
|
||||
@@ -20190,7 +20221,18 @@
|
||||
"https://github.com/ProGamerGov/ComfyUI_pytorch360convert"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "A collection of custom nodes for working with and converting between 360 degree equirectangular images, cubemap, and perspective images. Panoramic 360 images are also sometimes known as VR photography (virtual reality), HDRI environments (ex: skyboxes), image spheres, spherical images, 360 pano."
|
||||
"description": "A collection of custom nodes for working with and converting between 360 degree equirectangular images, cubemap, and perspective images. Panoramic 360 images are also sometimes known as VR photography (virtual reality), HDRI environments (ex: skyboxes), image spheres, spherical images, 360 pano, and 360 degree photos."
|
||||
},
|
||||
{
|
||||
"author": "ProGamerGov",
|
||||
"title": "Preview 360 Panorama for ComfyUI",
|
||||
"id": "comfyui-preview360panorama",
|
||||
"reference": "https://github.com/ProGamerGov/ComfyUI_preview360panorama",
|
||||
"files": [
|
||||
"https://github.com/ProGamerGov/ComfyUI_preview360panorama"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "A custom ComfyUI node for interactive 360° panorama image previews. Panoramic 360 images are also sometimes known as VR photography (virtual reality), HDRI environments (ex: skyboxes), image spheres, spherical images, 360 pano, and 360 degree photos."
|
||||
},
|
||||
{
|
||||
"author": "burnsbert",
|
||||
@@ -20251,7 +20293,7 @@
|
||||
"https://github.com/willmiao/ComfyUI-Lora-Manager"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "LoRA Manager for ComfyUI - An extension for managing LoRA models with previews and metadata integration."
|
||||
"description": "LoRA Manager for ComfyUI - Access it at http://localhost:8188/loras for managing LoRA models with previews and metadata integration."
|
||||
},
|
||||
{
|
||||
"author": "tigeryy2",
|
||||
@@ -20364,6 +20406,28 @@
|
||||
"install_type": "git-clone",
|
||||
"description": "This node group contains a series of ComfyUI nodes with built-in counters and specific output results based on the counter's output, aimed at implementing folder traversal functionality in the ComfyUI frontend. For specific examples, please refer to the sample workflow. Of course, you can also use your imagination to create other interesting things."
|
||||
},
|
||||
{
|
||||
"author": "agilly1989",
|
||||
"title": "ComfyUI_agilly1989_motorway",
|
||||
"reference": "https://github.com/agilly1989/ComfyUI_agilly1989_motorway",
|
||||
"files": [
|
||||
"https://github.com/agilly1989/ComfyUI_agilly1989_motorway"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This my implemenation of a `pipe` in ComfyUI. Is it better or worse than others? No idea."
|
||||
},
|
||||
{
|
||||
"author": "AiartvnTeam",
|
||||
"title": "A2V Multi Image Composite",
|
||||
"id": "Aiartvn",
|
||||
"reference": "https://github.com/aiartvn/A2V_Multi_Image_Composite",
|
||||
"files": [
|
||||
"https://github.com/aiartvn/A2V_Multi_Image_Composite"
|
||||
],
|
||||
"description": "Node for compositing multiple images with interactive preview and layer management",
|
||||
"install_type": "git-clone",
|
||||
"tags": ["image", "composite", "layer", "blend", "transform"]
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -493,6 +493,7 @@
|
||||
"https://github.com/852wa/ComfyUI-ColorshiftColor": [
|
||||
[
|
||||
"ColorshiftColor",
|
||||
"CsCFill",
|
||||
"CsCPaletteEditor"
|
||||
],
|
||||
{
|
||||
@@ -1427,6 +1428,18 @@
|
||||
"title_aux": "Jovi_GLSL"
|
||||
}
|
||||
],
|
||||
"https://github.com/Amorano/Jovi_MIDI": [
|
||||
[
|
||||
"MIDI FILTER (JOV_MIDI)",
|
||||
"MIDI FILTER EZ (JOV_MIDI)",
|
||||
"MIDI LOADER (JOV_MIDI)",
|
||||
"MIDI MESSAGE (JOV_MIDI)",
|
||||
"MIDI READER (JOV_MIDI)"
|
||||
],
|
||||
{
|
||||
"title_aux": "Jovi_MIDI"
|
||||
}
|
||||
],
|
||||
"https://github.com/Amorano/Jovi_Measure": [
|
||||
[
|
||||
"BLUR EFFECT (JOV_MEASURE)",
|
||||
@@ -2379,7 +2392,9 @@
|
||||
"ClownsharKSamplerAutomation",
|
||||
"ClownsharKSamplerAutomation_Beta",
|
||||
"ClownsharKSamplerGuide",
|
||||
"ClownsharKSamplerGuide_Beta",
|
||||
"ClownsharKSamplerGuides",
|
||||
"ClownsharKSamplerGuides_Beta",
|
||||
"ClownsharKSamplerOptions",
|
||||
"ClownsharKSamplerOptions_SDE_Noise",
|
||||
"ClownsharkSamplerOptions_FrameWeights",
|
||||
@@ -2816,11 +2831,17 @@
|
||||
],
|
||||
"https://github.com/DesertPixelAi/ComfyUI-Desert-Pixel-Nodes": [
|
||||
[
|
||||
"DP 10 String Switch",
|
||||
"DP 10 Images Switch Or Batch",
|
||||
"DP 10 String Switch Or Connect",
|
||||
"DP 2 String Switch",
|
||||
"DP 3 Images Switch Or Batch",
|
||||
"DP 3 String Switch Or Connect",
|
||||
"DP 5 Find And Replace",
|
||||
"DP 5 String Switch",
|
||||
"DP 5 Images Switch Or Batch",
|
||||
"DP 5 String Switch Or Connect",
|
||||
"DP Add Background To Png",
|
||||
"DP Add Weight To String Sdxl",
|
||||
"DP Advanced Sampler",
|
||||
"DP Advanced Weight String Sdxl",
|
||||
"DP Animation Calculator 10 Inputs",
|
||||
"DP Animation Calculator 5 Inputs",
|
||||
@@ -2830,8 +2851,7 @@
|
||||
"DP Broken Token",
|
||||
"DP Clean Prompt",
|
||||
"DP Clean Prompt Travel",
|
||||
"DP Combo Controller",
|
||||
"DP Condition Mixer",
|
||||
"DP Condition Switch",
|
||||
"DP ControlNet Apply Advanced",
|
||||
"DP Crazy Prompt Mixer",
|
||||
"DP Create Json File",
|
||||
@@ -2843,6 +2863,7 @@
|
||||
"DP Fast Slow Motion",
|
||||
"DP Five Lora",
|
||||
"DP Five Lora Random",
|
||||
"DP Float Stepper",
|
||||
"DP Image And String Pairs Switch",
|
||||
"DP Image Color Analyzer",
|
||||
"DP Image Color Analyzer Small",
|
||||
@@ -2853,12 +2874,10 @@
|
||||
"DP Image Empty Latent Switch SDXL",
|
||||
"DP Image Slide Show",
|
||||
"DP Image Strip",
|
||||
"DP Image Switch 10",
|
||||
"DP Image Switch 3",
|
||||
"DP Image Switch 5",
|
||||
"DP Int 0-1000",
|
||||
"DP Int 0-1000 4 Step",
|
||||
"DP Int 0-1000 8 Step",
|
||||
"DP Latent Split",
|
||||
"DP Line Cycler",
|
||||
"DP Load Checkpoint With Info",
|
||||
"DP Load Controlnet Model With Name",
|
||||
@@ -2868,13 +2887,10 @@
|
||||
"DP Load Image Minimal",
|
||||
"DP Load UNET With Info",
|
||||
"DP Logo Animator",
|
||||
"DP Logo Animator Advanced",
|
||||
"DP Lora Random Strength Controller",
|
||||
"DP Lora Strength Controller",
|
||||
"DP Lora Strength Stepper",
|
||||
"DP Mask Settings",
|
||||
"DP Prompt Inverter",
|
||||
"DP Prompt Manager",
|
||||
"DP Prompt Manager Small",
|
||||
"DP Prompt Mode Controller",
|
||||
"DP Prompt Styler",
|
||||
@@ -2892,9 +2908,7 @@
|
||||
"DP Save Preview Image",
|
||||
"DP Set New Model Folder Link",
|
||||
"DP String Text",
|
||||
"DP String Text With Weight",
|
||||
"DP String With Switch",
|
||||
"DP Strings Connector",
|
||||
"DP String Text With Sdxl Weight",
|
||||
"DP Strip Edge Masks",
|
||||
"DP Switch Controller",
|
||||
"DP Text Preview",
|
||||
@@ -2905,10 +2919,8 @@
|
||||
"DP Video Looper",
|
||||
"DP Video Transition",
|
||||
"DP_Crazy_Prompt_Mixer",
|
||||
"DP_Logo_Animator_Advanced",
|
||||
"DP_Lora_Strength_Stepper",
|
||||
"DP_Prompt_Inverter",
|
||||
"DP_Strings_Connector"
|
||||
"DP_Float_Stepper",
|
||||
"DP_Prompt_Inverter"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-Desert-Pixel-Nodes"
|
||||
@@ -4712,6 +4724,8 @@
|
||||
],
|
||||
"https://github.com/JTriggerFish/ComfyLatentTools": [
|
||||
[
|
||||
"DownsampledAttentionGuidance",
|
||||
"DownsampledLatentGuidance",
|
||||
"LatentNormalizedLanczosResize",
|
||||
"RescaledPAG",
|
||||
"RescaledSEG"
|
||||
@@ -5016,6 +5030,7 @@
|
||||
[
|
||||
"Simple Extract Lora From Text",
|
||||
"Simple Image Saver (as Forge)",
|
||||
"Simple Load Image With Metadata",
|
||||
"Simple Load Line From Text File",
|
||||
"Simple Lora Loader"
|
||||
],
|
||||
@@ -5988,7 +6003,8 @@
|
||||
],
|
||||
"https://github.com/Mattabyte/ComfyUI-SecureApiCall": [
|
||||
[
|
||||
"SecureAPI-SecureAPI"
|
||||
"SecureAPI-SecureAPI",
|
||||
"SecureAPI-SecureAPI-AWS"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI Secure API Call"
|
||||
@@ -6431,10 +6447,13 @@
|
||||
],
|
||||
"https://github.com/MzMaXaM/ComfyUi-MzMaXaM": [
|
||||
[
|
||||
"ImageToText",
|
||||
"KSamplerWithVAE",
|
||||
"SelectLatentSize1MP",
|
||||
"SelectLatentSize2MP",
|
||||
"TextEncode3in1",
|
||||
"TextToText",
|
||||
"UpscaleImageBy1_5x",
|
||||
"UpscaleLatentBy1_5x"
|
||||
],
|
||||
{
|
||||
@@ -7058,6 +7077,14 @@
|
||||
"title_aux": "ComfyUI-StringsAndThings"
|
||||
}
|
||||
],
|
||||
"https://github.com/ProGamerGov/ComfyUI_preview360panorama": [
|
||||
[
|
||||
"PanoramaViewerNode"
|
||||
],
|
||||
{
|
||||
"title_aux": "Preview 360 Panorama for ComfyUI"
|
||||
}
|
||||
],
|
||||
"https://github.com/ProGamerGov/ComfyUI_pytorch360convert": [
|
||||
[
|
||||
"Crop Image with Coords",
|
||||
@@ -7348,6 +7375,7 @@
|
||||
"AspectRatioAdvanced",
|
||||
"DisplayEverything",
|
||||
"ImageComparer",
|
||||
"LensFlare",
|
||||
"MultiFloat",
|
||||
"MultiTextNode",
|
||||
"SKB_AnySwitch",
|
||||
@@ -8447,8 +8475,10 @@
|
||||
"SD35StartSettings",
|
||||
"SDXLStartSettings",
|
||||
"SDstarsampler",
|
||||
"Star Face Loader",
|
||||
"StarFiveWildcards",
|
||||
"StarImageSwitch",
|
||||
"StarLatentSwitch",
|
||||
"StarTextFilter",
|
||||
"StarTextInput",
|
||||
"Starupscale"
|
||||
@@ -10643,6 +10673,18 @@
|
||||
"title_aux": "ComfyUI-styles-all"
|
||||
}
|
||||
],
|
||||
"https://github.com/agilly1989/ComfyUI_agilly1989_motorway": [
|
||||
[
|
||||
"MotorwayFloat",
|
||||
"MotorwayInt",
|
||||
"MotorwaySeed",
|
||||
"MotorwayStr",
|
||||
"MotorwayStrMulti"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI_agilly1989_motorway"
|
||||
}
|
||||
],
|
||||
"https://github.com/ahernandezmiro/ComfyUI-GCP_Storage_tools": [
|
||||
[
|
||||
"GCPReadImageNode",
|
||||
@@ -10718,8 +10760,17 @@
|
||||
"title_aux": "Comfy UI FatLabels"
|
||||
}
|
||||
],
|
||||
"https://github.com/aiartvn/A2V_Multi_Image_Composite": [
|
||||
[
|
||||
"A2V_Multi_Image_Composite"
|
||||
],
|
||||
{
|
||||
"title_aux": "A2V Multi Image Composite"
|
||||
}
|
||||
],
|
||||
"https://github.com/aidec/Comfyui_TextBatch_aidec": [
|
||||
[
|
||||
"ImageQueueProcessor",
|
||||
"TextBatch",
|
||||
"TextQueueProcessor",
|
||||
"TextSplitCounter"
|
||||
@@ -11877,18 +11928,22 @@
|
||||
"SamplerSonarEuler",
|
||||
"SamplerSonarEulerA",
|
||||
"SonarAdvanced1fNoise",
|
||||
"SonarAdvancedDistroNoise",
|
||||
"SonarAdvancedPowerLawNoise",
|
||||
"SonarAdvancedPyramidNoise",
|
||||
"SonarBlendedNoise",
|
||||
"SonarChannelNoise",
|
||||
"SonarCompositeNoise",
|
||||
"SonarCustomNoise",
|
||||
"SonarCustomNoiseAdv",
|
||||
"SonarGuidanceConfig",
|
||||
"SonarGuidedNoise",
|
||||
"SonarModulatedNoise",
|
||||
"SonarRandomNoise",
|
||||
"SonarRepeatedNoise",
|
||||
"SonarScheduledNoise"
|
||||
"SonarResizedNoise",
|
||||
"SonarScheduledNoise",
|
||||
"SonarWaveletFilteredNoise"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-sonar"
|
||||
@@ -12939,6 +12994,7 @@
|
||||
"chaosaiart_controlnet_weidgth",
|
||||
"chaosaiart_convert",
|
||||
"chaosaiart_convert_Prompt",
|
||||
"chaosaiart_deepseek_fix",
|
||||
"chaosaiart_forPreview",
|
||||
"chaosaiart_image_loop",
|
||||
"chaosaiart_img2gif",
|
||||
@@ -13892,6 +13948,7 @@
|
||||
"PolyexponentialScheduler",
|
||||
"PorterDuffImageComposite",
|
||||
"Preview3D",
|
||||
"Preview3DAnimation",
|
||||
"PreviewAudio",
|
||||
"PreviewImage",
|
||||
"RandomNoise",
|
||||
@@ -15447,7 +15504,8 @@
|
||||
"SelOutModel",
|
||||
"SelOutPolar",
|
||||
"Selector",
|
||||
"Selector Advanced"
|
||||
"Selector Advanced",
|
||||
"Selector Hub"
|
||||
],
|
||||
{
|
||||
"author": "\"\u02f6\ud835\udfa2\u292c\u2ad2\u2d56s\u143c\u02f6\"",
|
||||
@@ -15705,6 +15763,7 @@
|
||||
[
|
||||
"FL_API_Base64_ImageLoader",
|
||||
"FL_API_ImageSaver",
|
||||
"FL_AnimeLineExtractor",
|
||||
"FL_ApplyMask",
|
||||
"FL_Ascii",
|
||||
"FL_BatchAlign",
|
||||
@@ -16632,8 +16691,10 @@
|
||||
"Griptape Replace: Rulesets on Agent",
|
||||
"Griptape Replace: Tools on Agent",
|
||||
"Griptape Rerank Driver: Cohere",
|
||||
"Griptape Retrieve: Cloud Ruleset",
|
||||
"Griptape Run: Agent",
|
||||
"Griptape Run: Audio Transcription",
|
||||
"Griptape Run: Cloud Assistant",
|
||||
"Griptape Run: Image Description",
|
||||
"Griptape Run: Parallel Image Description",
|
||||
"Griptape Run: Prompt Task",
|
||||
@@ -19300,6 +19361,7 @@
|
||||
"GetImageRangeFromBatch",
|
||||
"GetImageSizeAndCount",
|
||||
"GetImagesFromBatchIndexed",
|
||||
"GetLatentRangeFromBatch",
|
||||
"GetLatentsFromBatchIndexed",
|
||||
"GetMaskSizeAndCount",
|
||||
"GradientToFloat",
|
||||
@@ -19318,6 +19380,7 @@
|
||||
"ImageGridComposite2x2",
|
||||
"ImageGridComposite3x3",
|
||||
"ImageGridtoBatch",
|
||||
"ImageNoiseAugmentation",
|
||||
"ImageNormalize_Neg1_To_1",
|
||||
"ImagePadForOutpaintMasked",
|
||||
"ImagePadForOutpaintTargetSize",
|
||||
@@ -19333,6 +19396,7 @@
|
||||
"Intrinsic_lora_sampling",
|
||||
"JoinStringMulti",
|
||||
"JoinStrings",
|
||||
"LeapfusionHunyuanI2VPatcher",
|
||||
"LoadAndResizeImage",
|
||||
"LoadImagesFromFolderKJ",
|
||||
"LoadResAdapterNormalization",
|
||||
@@ -20727,6 +20791,7 @@
|
||||
"Enhanced Random Light Source",
|
||||
"Float Relay",
|
||||
"HLFrequencyDetailRestore",
|
||||
"Hex to Color",
|
||||
"Image Add Alpha",
|
||||
"Image Frequency Analyzer",
|
||||
"Image Relay",
|
||||
@@ -22568,6 +22633,15 @@
|
||||
"title_aux": "ComfyUI OpenAI Prompter"
|
||||
}
|
||||
],
|
||||
"https://github.com/nkchocoai/ComfyUI-DanbooruPromptQuiz": [
|
||||
[
|
||||
"DanbooruPromptComparison",
|
||||
"DanbooruPromptQuiz"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-DanbooruPromptQuiz"
|
||||
}
|
||||
],
|
||||
"https://github.com/nkchocoai/ComfyUI-Dart": [
|
||||
[
|
||||
"DanbooruTagsTransformerBanTagsFromRegex",
|
||||
@@ -22673,6 +22747,7 @@
|
||||
],
|
||||
"https://github.com/nofunstudio/Node_Fun_ComfyUI": [
|
||||
[
|
||||
"IframeView",
|
||||
"LayeredInfiniteZoom",
|
||||
"Replicate flux 1.1 pro ultra",
|
||||
"ReplicateAPI_flux_1_1_pro_ultra",
|
||||
@@ -26156,6 +26231,7 @@
|
||||
"quadmoonChangeBackground",
|
||||
"quadmoonConvertBoolToString",
|
||||
"quadmoonConvertFloatToString",
|
||||
"quadmoonConvertImageToPrompt",
|
||||
"quadmoonConvertIntToString",
|
||||
"quadmoonConvertNormalizeHW",
|
||||
"quadmoonConvertNumberToString",
|
||||
@@ -27132,6 +27208,7 @@
|
||||
],
|
||||
"https://github.com/xlinx/ComfyUI-decadetw-auto-prompt-llm": [
|
||||
[
|
||||
"Auto-LLM-Chat",
|
||||
"Auto-LLM-Text",
|
||||
"Auto-LLM-Text-Vision",
|
||||
"Auto-LLM-Vision"
|
||||
|
||||
4546
github-stats.json
4546
github-stats.json
File diff suppressed because it is too large
Load Diff
@@ -4,6 +4,7 @@ description:
|
||||
"""
|
||||
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
@@ -41,7 +42,7 @@ import manager_downloader
|
||||
from node_package import InstalledNodePackage
|
||||
|
||||
|
||||
version_code = [3, 11, 2]
|
||||
version_code = [3, 17, 3]
|
||||
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
|
||||
|
||||
|
||||
@@ -173,7 +174,7 @@ git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py
|
||||
manager_files_path = None
|
||||
manager_config_path = None
|
||||
manager_channel_list_path = None
|
||||
manager_startup_script_path = None
|
||||
manager_startup_script_path:str = None
|
||||
manager_snapshot_path = None
|
||||
manager_pip_overrides_path = None
|
||||
manager_components_path = None
|
||||
@@ -324,6 +325,8 @@ def normalize_channel(channel):
|
||||
return None
|
||||
elif channel.startswith('https://'):
|
||||
return channel
|
||||
elif channel.startswith('http://') and get_config()['http_channel_enabled'] == True:
|
||||
return channel
|
||||
|
||||
tmp_dict = get_channel_dict()
|
||||
channel_url = tmp_dict.get(channel)
|
||||
@@ -808,7 +811,7 @@ class UnifiedManager:
|
||||
package_name = remap_pip_package(line.strip())
|
||||
if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
|
||||
self.processed_install.add(package_name)
|
||||
install_cmd = [sys.executable, "-m", "pip", "install", package_name]
|
||||
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
||||
if package_name.strip() != "" and not package_name.startswith('#'):
|
||||
res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
|
||||
|
||||
@@ -818,7 +821,7 @@ class UnifiedManager:
|
||||
if os.path.exists(install_script_path) and install_script_path not in self.processed_install:
|
||||
self.processed_install.add(install_script_path)
|
||||
print("Install: install script")
|
||||
install_cmd = [sys.executable, "install.py"]
|
||||
install_cmd = manager_util.make_pip_cmd(["install.py"])
|
||||
return try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
|
||||
|
||||
return True
|
||||
@@ -1544,18 +1547,19 @@ def write_config():
|
||||
config = configparser.ConfigParser()
|
||||
config['default'] = {
|
||||
'preview_method': manager_funcs.get_current_preview_method(),
|
||||
'git_exe': get_config()['git_exe'],
|
||||
'git_exe': get_config()['git_exe'],
|
||||
'use_uv': get_config()['use_uv'],
|
||||
'channel_url': get_config()['channel_url'],
|
||||
'share_option': get_config()['share_option'],
|
||||
'bypass_ssl': get_config()['bypass_ssl'],
|
||||
"file_logging": get_config()['file_logging'],
|
||||
'default_ui': get_config()['default_ui'],
|
||||
'component_policy': get_config()['component_policy'],
|
||||
'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
|
||||
'model_download_by_agent': get_config()['model_download_by_agent'],
|
||||
'downgrade_blacklist': get_config()['downgrade_blacklist'],
|
||||
'security_level': get_config()['security_level'],
|
||||
'skip_migration_check': get_config()['skip_migration_check'],
|
||||
'always_lazy_install': get_config()['always_lazy_install']
|
||||
}
|
||||
|
||||
directory = os.path.dirname(manager_config_path)
|
||||
@@ -1581,36 +1585,43 @@ def read_config():
|
||||
else:
|
||||
security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'
|
||||
|
||||
manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
|
||||
|
||||
return {
|
||||
'http_channel_enabled': default_conf['http_channel_enabled'].lower() == 'true' if 'http_channel_enabled' in default_conf else False,
|
||||
'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else manager_funcs.get_current_preview_method(),
|
||||
'git_exe': default_conf['git_exe'] if 'git_exe' in default_conf else '',
|
||||
'use_uv': default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False,
|
||||
'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',
|
||||
'bypass_ssl': default_conf['bypass_ssl'].lower() == 'true' if 'bypass_ssl' in default_conf else False,
|
||||
'file_logging': default_conf['file_logging'].lower() == 'true' if 'file_logging' in default_conf else True,
|
||||
'default_ui': default_conf['default_ui'] if 'default_ui' in default_conf else 'none',
|
||||
'component_policy': default_conf['component_policy'] if 'component_policy' in default_conf else 'workflow',
|
||||
'windows_selector_event_loop_policy': default_conf['windows_selector_event_loop_policy'].lower() == 'true' if 'windows_selector_event_loop_policy' in default_conf else False,
|
||||
'model_download_by_agent': default_conf['model_download_by_agent'].lower() == 'true' if 'model_download_by_agent' in default_conf else False,
|
||||
'downgrade_blacklist': default_conf['downgrade_blacklist'] if 'downgrade_blacklist' in default_conf else '',
|
||||
'skip_migration_check': default_conf['skip_migration_check'].lower() == 'true' if 'skip_migration_check' in default_conf else False,
|
||||
'security_level': security_level
|
||||
'always_lazy_install': default_conf['always_lazy_install'].lower() == 'true' if 'always_lazy_install' in default_conf else False,
|
||||
'security_level': security_level,
|
||||
}
|
||||
|
||||
except Exception:
|
||||
manager_util.use_uv = False
|
||||
return {
|
||||
'http_channel_enabled': False,
|
||||
'preview_method': manager_funcs.get_current_preview_method(),
|
||||
'git_exe': '',
|
||||
'use_uv': False,
|
||||
'channel_url': DEFAULT_CHANNEL,
|
||||
'share_option': 'all',
|
||||
'bypass_ssl': False,
|
||||
'file_logging': True,
|
||||
'default_ui': 'none',
|
||||
'component_policy': 'workflow',
|
||||
'windows_selector_event_loop_policy': False,
|
||||
'model_download_by_agent': False,
|
||||
'downgrade_blacklist': '',
|
||||
'skip_migration_check': False,
|
||||
'always_lazy_install': False,
|
||||
'security_level': 'normal',
|
||||
}
|
||||
|
||||
@@ -1620,6 +1631,8 @@ def get_config():
|
||||
|
||||
if cached_config is None:
|
||||
cached_config = read_config()
|
||||
if cached_config['http_channel_enabled']:
|
||||
print("[ComfyUI-Manager] Warning: http channel enabled, make sure server in secure env")
|
||||
|
||||
return cached_config
|
||||
|
||||
@@ -1668,7 +1681,9 @@ def switch_to_default_branch(repo):
|
||||
|
||||
|
||||
def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
||||
if not instant_execution and ((len(install_cmd) > 0 and install_cmd[0].startswith('#')) or (platform.system() == "Windows" and comfy_ui_commit_datetime.date() >= comfy_ui_required_commit_datetime.date())):
|
||||
if not instant_execution and (
|
||||
(len(install_cmd) > 0 and install_cmd[0].startswith('#')) or platform.system() == "Windows" or get_config()['always_lazy_install']
|
||||
):
|
||||
if not os.path.exists(manager_startup_script_path):
|
||||
os.makedirs(manager_startup_script_path)
|
||||
|
||||
@@ -1683,6 +1698,10 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
|
||||
if is_blacklisted(install_cmd[4]):
|
||||
print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[4]}'")
|
||||
return True
|
||||
elif len(install_cmd) == 6 and install_cmd[3:5] == ['pip', 'install']: # uv mode
|
||||
if is_blacklisted(install_cmd[5]):
|
||||
print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[5]}'")
|
||||
return True
|
||||
|
||||
print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}")
|
||||
code = manager_funcs.run_script(install_cmd, cwd=repo_path)
|
||||
@@ -1799,9 +1818,9 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
|
||||
if package_name and not package_name.startswith('#'):
|
||||
if '--index-url' in package_name:
|
||||
s = package_name.split('--index-url')
|
||||
install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
|
||||
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
|
||||
else:
|
||||
install_cmd = [sys.executable, "-m", "pip", "install", package_name]
|
||||
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
||||
|
||||
if package_name.strip() != "" and not package_name.startswith('#'):
|
||||
try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
|
||||
@@ -2073,14 +2092,8 @@ async def get_data_by_mode(mode, filename, channel_url=None):
|
||||
cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
|
||||
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
|
||||
|
||||
if mode == "cache":
|
||||
if manager_util.is_file_created_within_one_day(cache_uri):
|
||||
if mode == "cache" and manager_util.is_file_created_within_one_day(cache_uri):
|
||||
json_obj = await manager_util.get_data(cache_uri)
|
||||
else:
|
||||
json_obj = await manager_util.get_data(uri)
|
||||
with manager_util.cache_lock:
|
||||
with open(cache_uri, "w", encoding='utf-8') as file:
|
||||
json.dump(json_obj, file, indent=4, sort_keys=True)
|
||||
else:
|
||||
json_obj = await manager_util.get_data(uri)
|
||||
with manager_util.cache_lock:
|
||||
@@ -2122,7 +2135,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
|
||||
|
||||
|
||||
def pip_install(packages):
|
||||
install_cmd = ['#FORCE', sys.executable, "-m", "pip", "install", '-U'] + packages
|
||||
install_cmd = ['#FORCE'] + manager_util.make_pip_cmd(["install", '-U']) + packages
|
||||
try_install_script('pip install via manager', '..', install_cmd)
|
||||
|
||||
|
||||
@@ -2419,7 +2432,8 @@ def check_state_of_git_node_pack_single(item, do_fetch=False, do_update_check=Tr
|
||||
|
||||
def get_installed_pip_packages():
|
||||
# extract pip package infos
|
||||
pips = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'], text=True).split('\n')
|
||||
cmd = manager_util.make_pip_cmd(['freeze'])
|
||||
pips = subprocess.check_output(cmd, text=True).split('\n')
|
||||
|
||||
res = {}
|
||||
for x in pips:
|
||||
@@ -2835,15 +2849,18 @@ async def get_unified_total_nodes(channel, mode, regsitry_cache_mode='cache'):
|
||||
|
||||
def populate_github_stats(node_packs, json_obj_github):
|
||||
for k, v in node_packs.items():
|
||||
url = v['reference']
|
||||
if url in json_obj_github:
|
||||
v['stars'] = json_obj_github[url]['stars']
|
||||
v['last_update'] = json_obj_github[url]['last_update']
|
||||
v['trust'] = json_obj_github[url]['author_account_age_days'] > 600
|
||||
else:
|
||||
v['stars'] = -1
|
||||
v['last_update'] = -1
|
||||
v['trust'] = False
|
||||
try:
|
||||
url = v['reference']
|
||||
if url in json_obj_github:
|
||||
v['stars'] = json_obj_github[url]['stars']
|
||||
v['last_update'] = json_obj_github[url]['last_update']
|
||||
v['trust'] = json_obj_github[url]['author_account_age_days'] > 600
|
||||
else:
|
||||
v['stars'] = -1
|
||||
v['last_update'] = -1
|
||||
v['trust'] = False
|
||||
except:
|
||||
logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")
|
||||
|
||||
|
||||
def populate_favorites(node_packs, json_obj_extras):
|
||||
|
||||
@@ -18,6 +18,8 @@ import manager_core as core
|
||||
import manager_util
|
||||
import cm_global
|
||||
import logging
|
||||
import asyncio
|
||||
import queue
|
||||
|
||||
|
||||
logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})")
|
||||
@@ -31,7 +33,6 @@ SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this secu
|
||||
|
||||
routes = PromptServer.instance.routes
|
||||
|
||||
|
||||
def handle_stream(stream, prefix):
|
||||
stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
|
||||
for msg in stream:
|
||||
@@ -174,10 +175,6 @@ def set_preview_method(method):
|
||||
set_preview_method(core.get_config()['preview_method'])
|
||||
|
||||
|
||||
def set_default_ui_mode(mode):
|
||||
core.get_config()['default_ui'] = mode
|
||||
|
||||
|
||||
def set_component_policy(mode):
|
||||
core.get_config()['component_policy'] = mode
|
||||
|
||||
@@ -368,6 +365,204 @@ def nickname_filter(json_obj):
|
||||
return json_obj
|
||||
|
||||
|
||||
task_queue = queue.Queue()
|
||||
nodepack_result = {}
|
||||
model_result = {}
|
||||
tasks_in_progress = set()
|
||||
task_worker_lock = threading.Lock()
|
||||
|
||||
async def task_worker():
|
||||
global task_queue
|
||||
global nodepack_result
|
||||
global model_result
|
||||
global tasks_in_progress
|
||||
|
||||
async def do_install(item) -> str:
|
||||
ui_id, node_spec_str, channel, mode, skip_post_install = item
|
||||
|
||||
try:
|
||||
node_spec = core.unified_manager.resolve_node_spec(node_spec_str)
|
||||
|
||||
if node_spec is None:
|
||||
logging.error(f"Cannot resolve install target: '{node_spec_str}'")
|
||||
return f"Cannot resolve install target: '{node_spec_str}'"
|
||||
|
||||
node_name, version_spec, is_specified = node_spec
|
||||
res = await core.unified_manager.install_by_id(node_name, version_spec, channel, mode, return_postinstall=skip_post_install)
|
||||
# discard post install if skip_post_install mode
|
||||
|
||||
if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
|
||||
logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
|
||||
return res.msg
|
||||
|
||||
elif not res.result:
|
||||
logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
|
||||
return res.msg
|
||||
|
||||
return 'success'
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
return f"Installation failed:\n{node_spec_str}"
|
||||
|
||||
async def do_update(item) -> str:
|
||||
ui_id, node_name, node_ver = item
|
||||
|
||||
try:
|
||||
res = core.unified_manager.unified_update(node_name, node_ver)
|
||||
|
||||
manager_util.clear_pip_cache()
|
||||
|
||||
if res.result:
|
||||
return 'success'
|
||||
|
||||
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
|
||||
return f"An error occurred while updating '{node_name}'."
|
||||
|
||||
async def do_fix(item) -> str:
|
||||
ui_id, node_name, node_ver = item
|
||||
|
||||
try:
|
||||
res = core.unified_manager.unified_fix(node_name, node_ver)
|
||||
|
||||
if res.result:
|
||||
return 'success'
|
||||
else:
|
||||
logging.error(res.msg)
|
||||
|
||||
logging.error(f"\nERROR: An error occurred while fixing '{node_name}@{node_ver}'.")
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
|
||||
return f"An error occurred while fixing '{node_name}@{node_ver}'."
|
||||
|
||||
async def do_uninstall(item) -> str:
|
||||
ui_id, node_name, is_unknown = item
|
||||
|
||||
try:
|
||||
res = core.unified_manager.unified_uninstall(node_name, is_unknown)
|
||||
|
||||
if res.result:
|
||||
return 'success'
|
||||
|
||||
logging.error(f"\nERROR: An error occurred while uninstalling '{node_name}'.")
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
|
||||
return f"An error occurred while uninstalling '{node_name}'."
|
||||
|
||||
async def do_disable(item) -> str:
|
||||
ui_id, node_name, is_unknown = item
|
||||
|
||||
try:
|
||||
res = core.unified_manager.unified_disable(node_name, is_unknown)
|
||||
|
||||
if res:
|
||||
return 'success'
|
||||
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
|
||||
return f"Failed to disable: '{node_name}'"
|
||||
|
||||
async def do_install_model(item) -> str:
|
||||
ui_id, json_data = item
|
||||
|
||||
model_path = get_model_path(json_data)
|
||||
model_url = json_data['url']
|
||||
|
||||
res = False
|
||||
|
||||
try:
|
||||
if model_path is not None:
|
||||
logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'")
|
||||
if not core.get_config()['model_download_by_agent'] and (
|
||||
model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
|
||||
model_dir = get_model_dir(json_data, True)
|
||||
download_url(model_url, model_dir, filename=json_data['filename'])
|
||||
if model_path.endswith('.zip'):
|
||||
res = core.unzip(model_path)
|
||||
else:
|
||||
res = True
|
||||
|
||||
if res:
|
||||
return 'success'
|
||||
else:
|
||||
res = download_url_with_agent(model_url, model_path)
|
||||
if res and model_path.endswith('.zip'):
|
||||
res = core.unzip(model_path)
|
||||
else:
|
||||
logging.error(f"Model installation error: invalid model type - {json_data['type']}")
|
||||
|
||||
if res:
|
||||
return 'success'
|
||||
|
||||
except Exception as e:
|
||||
logging.error(f"[ERROR] {e}", file=sys.stderr)
|
||||
|
||||
return f"Model installation error: {model_url}"
|
||||
|
||||
stats = {}
|
||||
|
||||
while True:
|
||||
done_count = len(nodepack_result) + len(model_result)
|
||||
total_count = done_count + task_queue.qsize()
|
||||
|
||||
if task_queue.empty():
|
||||
logging.info(f"\n[ComfyUI-Manager] Queued works are completed.\n{stats}")
|
||||
|
||||
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
|
||||
PromptServer.instance.send_sync("cm-queue-status",
|
||||
{'status': 'done',
|
||||
'nodepack_result': nodepack_result, 'model_result': model_result,
|
||||
'total_count': total_count, 'done_count': done_count})
|
||||
nodepack_result = {}
|
||||
task_queue = queue.Queue()
|
||||
return # terminate worker thread
|
||||
|
||||
with task_worker_lock:
|
||||
kind, item = task_queue.get()
|
||||
tasks_in_progress.add((kind, item[0]))
|
||||
|
||||
try:
|
||||
if kind == 'install':
|
||||
msg = await do_install(item)
|
||||
elif kind == 'install-model':
|
||||
msg = await do_install_model(item)
|
||||
elif kind == 'update':
|
||||
msg = await do_update(item)
|
||||
elif kind == 'fix':
|
||||
msg = await do_fix(item)
|
||||
elif kind == 'uninstall':
|
||||
msg = await do_uninstall(item)
|
||||
elif kind == 'disable':
|
||||
msg = await do_disable(item)
|
||||
else:
|
||||
msg = "Unexpected kind: " + kind
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
msg = f"Exception: {(kind, item)}"
|
||||
|
||||
with task_worker_lock:
|
||||
tasks_in_progress.remove((kind, item[0]))
|
||||
|
||||
ui_id = item[0]
|
||||
if kind == 'install-model':
|
||||
model_result[ui_id] = msg
|
||||
ui_target = "model_manager"
|
||||
else:
|
||||
nodepack_result[ui_id] = msg
|
||||
ui_target = "nodepack_manager"
|
||||
|
||||
stats[kind] = stats.get(kind, 0) + 1
|
||||
|
||||
PromptServer.instance.send_sync("cm-queue-status",
|
||||
{'status': 'in_progress', 'target': item[0], 'ui_target': ui_target,
|
||||
'total_count': total_count, 'done_count': done_count})
|
||||
|
||||
|
||||
@routes.get("/customnode/getmappings")
|
||||
async def fetch_customnode_mappings(request):
|
||||
"""
|
||||
@@ -864,13 +1059,35 @@ async def import_fail_info(request):
|
||||
return web.Response(status=400)
|
||||
|
||||
|
||||
@routes.post("/customnode/reinstall")
|
||||
@routes.post("/manager/queue/reinstall")
|
||||
async def reinstall_custom_node(request):
|
||||
await uninstall_custom_node(request)
|
||||
await install_custom_node(request)
|
||||
|
||||
|
||||
@routes.post("/customnode/install")
|
||||
@routes.get("/manager/queue/reset")
|
||||
async def reset_queue(request):
|
||||
global task_queue
|
||||
task_queue = queue.Queue()
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/queue/status")
|
||||
async def queue_count(request):
|
||||
global task_queue
|
||||
|
||||
with task_worker_lock:
|
||||
done_count = len(nodepack_result) + len(model_result)
|
||||
in_progress_count = len(tasks_in_progress)
|
||||
total_count = done_count + in_progress_count + task_queue.qsize()
|
||||
is_processing = task_worker_thread is not None and task_worker_thread.is_alive()
|
||||
|
||||
return web.json_response({
|
||||
'total_count': total_count, 'done_count': done_count, 'in_progress_count': in_progress_count,
|
||||
'is_processing': is_processing})
|
||||
|
||||
|
||||
@routes.post("/manager/queue/install")
|
||||
async def install_custom_node(request):
|
||||
if not is_allowed_security_level('middle'):
|
||||
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
|
||||
@@ -913,26 +1130,33 @@ async def install_custom_node(request):
|
||||
logging.error(SECURITY_MESSAGE_GENERAL)
|
||||
return web.Response(status=404, text="A security error has occurred. Please check the terminal logs")
|
||||
|
||||
node_spec = core.unified_manager.resolve_node_spec(node_spec_str)
|
||||
install_item = json_data.get('ui_id'), node_spec_str, json_data['channel'], json_data['mode'], skip_post_install
|
||||
task_queue.put(("install", install_item))
|
||||
|
||||
if node_spec is None:
|
||||
return web.Response(status=400, text=f"Cannot resolve install target: '{node_spec_str}'")
|
||||
|
||||
node_name, version_spec, is_specified = node_spec
|
||||
res = await core.unified_manager.install_by_id(node_name, version_spec, json_data['channel'], json_data['mode'], return_postinstall=skip_post_install)
|
||||
# discard post install if skip_post_install mode
|
||||
|
||||
if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
|
||||
logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
|
||||
return web.Response(status=400, text=res.msg)
|
||||
elif not res.result:
|
||||
logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
|
||||
return web.Response(status=400, text=res.msg)
|
||||
|
||||
return web.Response(status=200, text="Installation success.")
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.post("/customnode/fix")
|
||||
task_worker_thread:threading.Thread = None
|
||||
|
||||
@routes.get("/manager/queue/start")
|
||||
async def queue_start(request):
|
||||
global nodepack_result
|
||||
global model_result
|
||||
global task_worker_thread
|
||||
|
||||
if task_worker_thread is not None and task_worker_thread.is_alive():
|
||||
return web.Response(status=201) # already in-progress
|
||||
|
||||
nodepack_result = {}
|
||||
model_result = {}
|
||||
|
||||
task_worker_thread = threading.Thread(target=lambda: asyncio.run(task_worker()))
|
||||
task_worker_thread.start()
|
||||
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.post("/manager/queue/fix")
|
||||
async def fix_custom_node(request):
|
||||
if not is_allowed_security_level('middle'):
|
||||
logging.error(SECURITY_MESSAGE_GENERAL)
|
||||
@@ -948,16 +1172,10 @@ async def fix_custom_node(request):
|
||||
# unknown
|
||||
node_name = os.path.basename(json_data['files'][0])
|
||||
|
||||
res = core.unified_manager.unified_fix(node_name, node_ver)
|
||||
update_item = json_data.get('ui_id'), node_name, json_data['version']
|
||||
task_queue.put(("fix", update_item))
|
||||
|
||||
if res.result:
|
||||
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
|
||||
return web.json_response({}, content_type='application/json')
|
||||
else:
|
||||
logging.error(res.msg)
|
||||
|
||||
logging.error(f"\nERROR: An error occurred while fixing '{node_name}@{node_ver}'.")
|
||||
return web.Response(status=400, text=f"An error occurred while fixing '{node_name}@{node_ver}'.")
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.post("/customnode/install/git_url")
|
||||
@@ -992,7 +1210,7 @@ async def install_custom_node_pip(request):
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.post("/customnode/uninstall")
|
||||
@routes.post("/manager/queue/uninstall")
|
||||
async def uninstall_custom_node(request):
|
||||
if not is_allowed_security_level('middle'):
|
||||
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
|
||||
@@ -1009,17 +1227,13 @@ async def uninstall_custom_node(request):
|
||||
is_unknown = True
|
||||
node_name = os.path.basename(json_data['files'][0])
|
||||
|
||||
res = core.unified_manager.unified_uninstall(node_name, is_unknown)
|
||||
uninstall_item = json_data.get('ui_id'), node_name, is_unknown
|
||||
task_queue.put(("uninstall", uninstall_item))
|
||||
|
||||
if res.result:
|
||||
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
|
||||
return web.json_response({}, content_type='application/json')
|
||||
|
||||
logging.error(f"\nERROR: An error occurred while uninstalling '{node_name}'.")
|
||||
return web.Response(status=400, text=f"An error occurred while uninstalling '{node_name}'.")
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.post("/customnode/update")
|
||||
@routes.post("/manager/queue/update")
|
||||
async def update_custom_node(request):
|
||||
if not is_allowed_security_level('middle'):
|
||||
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
|
||||
@@ -1034,16 +1248,10 @@ async def update_custom_node(request):
|
||||
# unknown
|
||||
node_name = os.path.basename(json_data['files'][0])
|
||||
|
||||
res = core.unified_manager.unified_update(node_name, json_data['version'])
|
||||
update_item = json_data.get('ui_id'), node_name, json_data['version']
|
||||
task_queue.put(("update", update_item))
|
||||
|
||||
manager_util.clear_pip_cache()
|
||||
|
||||
if res.result:
|
||||
logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
|
||||
return web.json_response({}, content_type='application/json')
|
||||
|
||||
logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
|
||||
return web.Response(status=400, text=f"An error occurred while updating '{node_name}'.")
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/comfyui_manager/update_comfyui")
|
||||
@@ -1057,8 +1265,10 @@ async def update_comfyui(request):
|
||||
logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
|
||||
return web.Response(status=400)
|
||||
elif res == "updated":
|
||||
logging.info("ComfyUI is updated.")
|
||||
return web.Response(status=201)
|
||||
else: # skipped
|
||||
logging.info("ComfyUI is up-to-date.")
|
||||
return web.Response(status=200)
|
||||
except Exception as e:
|
||||
logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
|
||||
@@ -1090,7 +1300,7 @@ async def comfyui_switch_version(request):
|
||||
return web.Response(status=400)
|
||||
|
||||
|
||||
@routes.post("/customnode/disable")
|
||||
@routes.post("/manager/queue/disable")
|
||||
async def disable_node(request):
|
||||
json_data = await request.json()
|
||||
|
||||
@@ -1103,12 +1313,10 @@ async def disable_node(request):
|
||||
is_unknown = True
|
||||
node_name = os.path.basename(json_data['files'][0])
|
||||
|
||||
res = core.unified_manager.unified_disable(node_name, is_unknown)
|
||||
update_item = json_data.get('ui_id'), node_name, is_unknown
|
||||
task_queue.put(("disable", update_item))
|
||||
|
||||
if res:
|
||||
return web.json_response({}, content_type='application/json')
|
||||
|
||||
return web.Response(status=400, text="Failed to disable")
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/migrate_unmanaged_nodes")
|
||||
@@ -1124,12 +1332,10 @@ async def need_to_migrate(request):
|
||||
return web.Response(text=str(core.need_to_migrate), status=200)
|
||||
|
||||
|
||||
@routes.post("/model/install")
|
||||
@routes.post("/manager/queue/install_model")
|
||||
async def install_model(request):
|
||||
json_data = await request.json()
|
||||
|
||||
model_path = get_model_path(json_data)
|
||||
|
||||
if not is_allowed_security_level('middle'):
|
||||
logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
|
||||
return web.Response(status=403)
|
||||
@@ -1147,37 +1353,10 @@ async def install_model(request):
|
||||
logging.error(SECURITY_MESSAGE_NORMAL_MINUS)
|
||||
return web.Response(status=403)
|
||||
|
||||
res = False
|
||||
install_item = json_data.get('ui_id'), json_data
|
||||
task_queue.put(("install-model", install_item))
|
||||
|
||||
try:
|
||||
if model_path is not None:
|
||||
|
||||
model_url = json_data['url']
|
||||
logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'")
|
||||
if not core.get_config()['model_download_by_agent'] and (
|
||||
model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
|
||||
model_dir = get_model_dir(json_data, True)
|
||||
download_url(model_url, model_dir, filename=json_data['filename'])
|
||||
if model_path.endswith('.zip'):
|
||||
res = core.unzip(model_path)
|
||||
else:
|
||||
res = True
|
||||
|
||||
if res:
|
||||
return web.json_response({}, content_type='application/json')
|
||||
else:
|
||||
res = download_url_with_agent(model_url, model_path)
|
||||
if res and model_path.endswith('.zip'):
|
||||
res = core.unzip(model_path)
|
||||
else:
|
||||
logging.error(f"Model installation error: invalid model type - {json_data['type']}")
|
||||
|
||||
if res:
|
||||
return web.json_response({}, content_type='application/json')
|
||||
except Exception as e:
|
||||
logging.error(f"[ERROR] {e}", file=sys.stderr)
|
||||
|
||||
return web.Response(status=400)
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/preview_method")
|
||||
@@ -1191,17 +1370,6 @@ async def preview_method(request):
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/default_ui")
|
||||
async def default_ui_mode(request):
|
||||
if "value" in request.rel_url.query:
|
||||
set_default_ui_mode(request.rel_url.query['value'])
|
||||
core.write_config()
|
||||
else:
|
||||
return web.Response(text=core.get_config()['default_ui'], status=200)
|
||||
|
||||
return web.Response(status=200)
|
||||
|
||||
|
||||
@routes.get("/manager/component/policy")
|
||||
async def component_policy(request):
|
||||
if "value" in request.rel_url.query:
|
||||
@@ -1406,12 +1574,11 @@ def confirm_try_install(sender, custom_node_url, msg):
|
||||
|
||||
cm_global.register_api('cm.try-install-custom-node', confirm_try_install)
|
||||
|
||||
import asyncio
|
||||
|
||||
|
||||
async def default_cache_update():
|
||||
channel_url = core.get_config()['channel_url']
|
||||
async def get_cache(filename):
|
||||
uri = f"{core.DEFAULT_CHANNEL}/{filename}"
|
||||
uri = f"{channel_url}/{filename}"
|
||||
cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
|
||||
cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
|
||||
|
||||
@@ -1432,7 +1599,9 @@ async def default_cache_update():
|
||||
|
||||
# load at least once
|
||||
await core.unified_manager.reload('remote', dont_wait=False)
|
||||
await core.unified_manager.get_custom_nodes('default', 'remote')
|
||||
await core.unified_manager.get_custom_nodes(channel_url, 'remote')
|
||||
|
||||
logging.info("[ComfyUI-Manager] All startup tasks have been completed.")
|
||||
|
||||
# NOTE: hide migration button temporarily.
|
||||
# if not core.get_config()['skip_migration_check']:
|
||||
|
||||
@@ -19,6 +19,14 @@ cache_lock = threading.Lock()
|
||||
comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
|
||||
cache_dir = os.path.join(comfyui_manager_path, '.cache') # This path is also updated together in **manager_core.update_user_directory**.
|
||||
|
||||
use_uv = False
|
||||
|
||||
def make_pip_cmd(cmd):
|
||||
if use_uv:
|
||||
return [sys.executable, '-m', 'uv', 'pip'] + cmd
|
||||
else:
|
||||
return [sys.executable, '-m', 'pip'] + cmd
|
||||
|
||||
|
||||
# DON'T USE StrictVersion - cannot handle pre_release version
|
||||
# try:
|
||||
@@ -209,7 +217,7 @@ def get_installed_packages(renew=False):
|
||||
|
||||
if renew or pip_map is None:
|
||||
try:
|
||||
result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True)
|
||||
result = subprocess.check_output(make_pip_cmd(['list']), universal_newlines=True)
|
||||
|
||||
pip_map = {}
|
||||
for line in result.split('\n'):
|
||||
@@ -260,7 +268,7 @@ class PIPFixer:
|
||||
if len(spec) > 0:
|
||||
platform = spec[1]
|
||||
else:
|
||||
cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio']
|
||||
cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
|
||||
subprocess.check_output(cmd, universal_newlines=True)
|
||||
logging.error(cmd)
|
||||
return
|
||||
@@ -270,15 +278,13 @@ class PIPFixer:
|
||||
torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
|
||||
|
||||
if torch_torchvision_torchaudio_ver is None:
|
||||
cmd = [sys.executable, '-m', 'pip', 'install', '--pre',
|
||||
'torch', 'torchvision', 'torchaudio',
|
||||
'--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"]
|
||||
cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
|
||||
'--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"])
|
||||
logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
|
||||
else:
|
||||
torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
|
||||
cmd = [sys.executable, '-m', 'pip', 'install',
|
||||
f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
|
||||
'--index-url', f"https://download.pytorch.org/whl/{platform}"]
|
||||
cmd = make_pip_cmd(['install', f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
|
||||
'--index-url', f"https://download.pytorch.org/whl/{platform}"])
|
||||
logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
|
||||
|
||||
subprocess.check_output(cmd, universal_newlines=True)
|
||||
@@ -289,7 +295,7 @@ class PIPFixer:
|
||||
# remove `comfy` python package
|
||||
try:
|
||||
if 'comfy' in new_pip_versions:
|
||||
cmd = [sys.executable, '-m', 'pip', 'uninstall', 'comfy']
|
||||
cmd = make_pip_cmd(['uninstall', 'comfy'])
|
||||
subprocess.check_output(cmd, universal_newlines=True)
|
||||
|
||||
logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
|
||||
@@ -335,7 +341,7 @@ class PIPFixer:
|
||||
|
||||
if len(targets) > 0:
|
||||
for x in targets:
|
||||
cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"]
|
||||
cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
|
||||
subprocess.check_output(cmd, universal_newlines=True)
|
||||
|
||||
logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
|
||||
@@ -348,7 +354,8 @@ class PIPFixer:
|
||||
np = new_pip_versions.get('numpy')
|
||||
if np is not None:
|
||||
if StrictVersion(np) >= StrictVersion('2'):
|
||||
subprocess.check_output([sys.executable, '-m', 'pip', 'install', "numpy<2"], universal_newlines=True)
|
||||
cmd = make_pip_cmd(['install', "numpy<2"])
|
||||
subprocess.check_output(cmd , universal_newlines=True)
|
||||
except Exception as e:
|
||||
logging.error("[ComfyUI-Manager] Failed to restore numpy")
|
||||
logging.error(e)
|
||||
|
||||
@@ -17,7 +17,6 @@ import {
|
||||
import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
|
||||
import { CustomNodesManager } from "./custom-nodes-manager.js";
|
||||
import { ModelManager } from "./model-manager.js";
|
||||
import { set_double_click_policy } from "./node_fixer.js";
|
||||
import { SnapshotManager } from "./snapshot.js";
|
||||
|
||||
var docStyle = document.createElement('style');
|
||||
@@ -41,7 +40,7 @@ docStyle.innerHTML = `
|
||||
|
||||
#cm-manager-dialog {
|
||||
width: 1000px;
|
||||
height: 520px;
|
||||
height: 450px;
|
||||
box-sizing: content-box;
|
||||
z-index: 1000;
|
||||
overflow-y: auto;
|
||||
@@ -138,7 +137,7 @@ docStyle.innerHTML = `
|
||||
|
||||
.cm-notice-board {
|
||||
width: 290px;
|
||||
height: 270px;
|
||||
height: 210px;
|
||||
overflow: auto;
|
||||
color: var(--input-text);
|
||||
border: 1px solid var(--descrip-text);
|
||||
@@ -812,11 +811,15 @@ const isOutputNode = (node) => {
|
||||
class ManagerMenuDialog extends ComfyDialog {
|
||||
createControlsMid() {
|
||||
let self = this;
|
||||
const isElectron = 'electronAPI' in window;
|
||||
|
||||
update_comfyui_button =
|
||||
$el("button.cm-button", {
|
||||
type: "button",
|
||||
textContent: "Update ComfyUI",
|
||||
style: {
|
||||
display: isElectron ? 'none' : 'block'
|
||||
},
|
||||
onclick:
|
||||
() => updateComfyUI()
|
||||
});
|
||||
@@ -825,6 +828,9 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
$el("button.cm-button", {
|
||||
type: "button",
|
||||
textContent: "Switch ComfyUI",
|
||||
style: {
|
||||
display: isElectron ? 'none' : 'block'
|
||||
},
|
||||
onclick:
|
||||
() => switchComfyUI()
|
||||
});
|
||||
@@ -902,19 +908,6 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
switch_comfyui_button,
|
||||
fetch_updates_button,
|
||||
|
||||
$el("br", {}, []),
|
||||
$el("button.cm-button", {
|
||||
type: "button",
|
||||
textContent: "Alternatives of A1111",
|
||||
onclick:
|
||||
() => {
|
||||
if(!CustomNodesManager.instance) {
|
||||
CustomNodesManager.instance = new CustomNodesManager(app, self);
|
||||
}
|
||||
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.ALTERNATIVES);
|
||||
}
|
||||
}),
|
||||
|
||||
$el("br", {}, []),
|
||||
$el("button.cm-button-red", {
|
||||
type: "button",
|
||||
@@ -1009,21 +1002,6 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
}
|
||||
});
|
||||
|
||||
// default ui state
|
||||
let default_ui_combo = document.createElement("select");
|
||||
default_ui_combo.setAttribute("title", "Set the default state to be displayed in the main menu when the browser starts.");
|
||||
default_ui_combo.className = "cm-menu-combo";
|
||||
default_ui_combo.appendChild($el('option', { value: 'none', text: 'Default UI: None' }, []));
|
||||
default_ui_combo.appendChild($el('option', { value: 'history', text: 'Default UI: History' }, []));
|
||||
default_ui_combo.appendChild($el('option', { value: 'queue', text: 'Default UI: Queue' }, []));
|
||||
api.fetchApi('/manager/default_ui')
|
||||
.then(response => response.text())
|
||||
.then(data => { default_ui_combo.value = data; });
|
||||
|
||||
default_ui_combo.addEventListener('change', function (event) {
|
||||
api.fetchApi(`/manager/default_ui?value=${event.target.value}`);
|
||||
});
|
||||
|
||||
|
||||
// share
|
||||
let share_combo = document.createElement("select");
|
||||
@@ -1086,7 +1064,6 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
this.datasrc_combo,
|
||||
channel_combo,
|
||||
preview_combo,
|
||||
default_ui_combo,
|
||||
share_combo,
|
||||
component_policy_combo,
|
||||
$el("br", {}, []),
|
||||
@@ -1269,10 +1246,22 @@ class ManagerMenuDialog extends ComfyDialog {
|
||||
this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]);
|
||||
}
|
||||
|
||||
get isVisible() {
|
||||
return this.element?.style?.display !== "none";
|
||||
}
|
||||
|
||||
show() {
|
||||
this.element.style.display = "block";
|
||||
}
|
||||
|
||||
toggleVisibility() {
|
||||
if (this.isVisible) {
|
||||
this.close();
|
||||
} else {
|
||||
this.show();
|
||||
}
|
||||
}
|
||||
|
||||
handleWorkflowGalleryButtonClick(e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
@@ -1390,6 +1379,41 @@ app.registerExtension({
|
||||
}
|
||||
],
|
||||
|
||||
commands: [
|
||||
{
|
||||
id: "Comfy.Manager.Menu.ToggleVisibility",
|
||||
label: "Toggle Manager Menu Visibility",
|
||||
icon: "mdi mdi-puzzle",
|
||||
function: () => {
|
||||
if (!manager_instance) {
|
||||
setManagerInstance(new ManagerMenuDialog());
|
||||
manager_instance.show();
|
||||
} else {
|
||||
manager_instance.toggleVisibility();
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
id: "Comfy.Manager.CustomNodesManager.ToggleVisibility",
|
||||
label: "Toggle Custom Nodes Manager Visibility",
|
||||
icon: "pi pi-server",
|
||||
function: () => {
|
||||
if (CustomNodesManager.instance?.isVisible) {
|
||||
CustomNodesManager.instance.close();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!manager_instance) {
|
||||
setManagerInstance(new ManagerMenuDialog());
|
||||
}
|
||||
if (!CustomNodesManager.instance) {
|
||||
CustomNodesManager.instance = new CustomNodesManager(app, self);
|
||||
}
|
||||
CustomNodesManager.instance.show(CustomNodesManager.ShowMode.NORMAL);
|
||||
},
|
||||
}
|
||||
],
|
||||
|
||||
init() {
|
||||
$el("style", {
|
||||
textContent: style,
|
||||
@@ -1584,27 +1608,3 @@ app.registerExtension({
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
async function set_default_ui()
|
||||
{
|
||||
let res = await api.fetchApi('/manager/default_ui');
|
||||
if(res.status == 200) {
|
||||
let mode = await res.text();
|
||||
switch(mode) {
|
||||
case 'history':
|
||||
app.ui.queue.hide();
|
||||
app.ui.history.show();
|
||||
break;
|
||||
case 'queue':
|
||||
app.ui.queue.show();
|
||||
app.ui.history.hide();
|
||||
break;
|
||||
default:
|
||||
// do nothing
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
set_default_ui();
|
||||
14
js/common.js
14
js/common.js
@@ -130,6 +130,20 @@ export function customAlert(message) {
|
||||
}
|
||||
}
|
||||
|
||||
export function infoToast(summary, message) {
|
||||
try {
|
||||
app.extensionManager.toast.add({
|
||||
severity: 'info',
|
||||
summary: summary,
|
||||
detail: message,
|
||||
life: 3000
|
||||
})
|
||||
}
|
||||
catch {
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export async function customPrompt(title, message) {
|
||||
try {
|
||||
|
||||
@@ -4,7 +4,7 @@ import { api } from "../../scripts/api.js";
|
||||
|
||||
import {
|
||||
manager_instance, rebootAPI, install_via_git_url,
|
||||
fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt, sanitizeHTML
|
||||
fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt, sanitizeHTML, infoToast
|
||||
} from "./common.js";
|
||||
|
||||
// https://cenfun.github.io/turbogrid/api.html
|
||||
@@ -55,6 +55,12 @@ const pageCss = `
|
||||
color: white;
|
||||
}
|
||||
|
||||
.cn-manager .cn-manager-stop {
|
||||
display: none;
|
||||
background-color: #500000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.cn-manager .cn-manager-back {
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@@ -344,13 +350,14 @@ const pageHtml = `
|
||||
<div class="cn-manager-selection"></div>
|
||||
<div class="cn-manager-message"></div>
|
||||
<div class="cn-manager-footer">
|
||||
<button class="cn-manager-back">
|
||||
<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
Back
|
||||
</button>
|
||||
<button class="cn-manager-back">
|
||||
<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
Back
|
||||
</button>
|
||||
<button class="cn-manager-restart">Restart</button>
|
||||
<button class="cn-manager-stop">Stop</button>
|
||||
<div class="cn-flex-auto"></div>
|
||||
<button class="cn-manager-check-update">Check Update</button>
|
||||
<button class="cn-manager-check-missing">Check Missing</button>
|
||||
@@ -391,6 +398,9 @@ export class CustomNodesManager {
|
||||
this.restartMap = {};
|
||||
|
||||
this.init();
|
||||
|
||||
api.addEventListener("cm-queue-status", this.onQueueStatus);
|
||||
api.addEventListener('reconnected', this.onReconnected);
|
||||
}
|
||||
|
||||
init() {
|
||||
@@ -753,10 +763,16 @@ export class CustomNodesManager {
|
||||
|
||||
".cn-manager-restart": {
|
||||
click: () => {
|
||||
if(rebootAPI()) {
|
||||
this.close();
|
||||
this.manager_dialog.close();
|
||||
}
|
||||
this.close();
|
||||
this.manager_dialog.close();
|
||||
rebootAPI();
|
||||
}
|
||||
},
|
||||
|
||||
".cn-manager-stop": {
|
||||
click: () => {
|
||||
api.fetchApi('/manager/queue/reset');
|
||||
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1204,7 +1220,7 @@ export class CustomNodesManager {
|
||||
}
|
||||
|
||||
focusInstall(item, mode) {
|
||||
const cellNode = this.grid.getCellNode(item, "installed");
|
||||
const cellNode = this.grid.getCellNode(item, "action");
|
||||
if (cellNode) {
|
||||
const cellBtn = cellNode.querySelector(`button[mode="${mode}"]`);
|
||||
if (cellBtn) {
|
||||
@@ -1269,6 +1285,13 @@ export class CustomNodesManager {
|
||||
}
|
||||
|
||||
async installNodes(list, btn, title, selected_version) {
|
||||
let stats = await api.fetchApi('/manager/queue/status');
|
||||
stats = await stats.json();
|
||||
if(stats.is_processing) {
|
||||
customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
|
||||
return;
|
||||
}
|
||||
|
||||
const { target, label, mode} = btn;
|
||||
|
||||
if(mode === "uninstall") {
|
||||
@@ -1294,8 +1317,15 @@ export class CustomNodesManager {
|
||||
|
||||
let needRestart = false;
|
||||
let errorMsg = "";
|
||||
|
||||
await api.fetchApi('/manager/queue/reset');
|
||||
|
||||
let target_items = [];
|
||||
|
||||
for (const hash of list) {
|
||||
const item = this.grid.getRowItemBy("hash", hash);
|
||||
target_items.push(item);
|
||||
|
||||
if (!item) {
|
||||
errorMsg = `Not found custom node: ${hash}`;
|
||||
break;
|
||||
@@ -1315,6 +1345,7 @@ export class CustomNodesManager {
|
||||
data.selected_version = selected_version;
|
||||
data.channel = this.channel;
|
||||
data.mode = this.mode;
|
||||
data.ui_id = hash;
|
||||
|
||||
let install_mode = mode;
|
||||
if(mode == 'switch') {
|
||||
@@ -1332,14 +1363,14 @@ export class CustomNodesManager {
|
||||
api_mode = 'reinstall';
|
||||
}
|
||||
|
||||
const res = await api.fetchApi(`/customnode/${api_mode}`, {
|
||||
const res = await api.fetchApi(`/manager/queue/${api_mode}`, {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(data)
|
||||
});
|
||||
|
||||
if (res.status != 200) {
|
||||
|
||||
errorMsg = `${item.title} ${mode} failed: `;
|
||||
|
||||
if(res.status == 403) {
|
||||
errorMsg += `This action is not allowed with this security level configuration.`;
|
||||
} else if(res.status == 404) {
|
||||
@@ -1350,32 +1381,101 @@ export class CustomNodesManager {
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
needRestart = true;
|
||||
|
||||
this.grid.setRowSelected(item, false);
|
||||
item.restart = true;
|
||||
this.restartMap[item.hash] = true;
|
||||
this.grid.updateCell(item, "action");
|
||||
|
||||
//console.log(res.data);
|
||||
|
||||
}
|
||||
|
||||
target.classList.remove("cn-btn-loading");
|
||||
this.install_context = {btn: btn, targets: target_items};
|
||||
|
||||
if (errorMsg) {
|
||||
if(errorMsg) {
|
||||
this.showError(errorMsg);
|
||||
show_message("Installation Error:\n"+errorMsg);
|
||||
|
||||
// reset
|
||||
for(let k in target_items) {
|
||||
let item = this.install_context.targets[k];
|
||||
this.grid.updateCell(item, "action");
|
||||
}
|
||||
}
|
||||
else {
|
||||
await api.fetchApi('/manager/queue/start');
|
||||
this.showStop();
|
||||
}
|
||||
}
|
||||
|
||||
async onReconnected(event) {
|
||||
let self = CustomNodesManager.instance;
|
||||
|
||||
if(self.need_restart) {
|
||||
self.need_restart = false;
|
||||
|
||||
const confirmed = await customConfirm("To apply the changes to the node pack's installation status, you need to refresh the browser. Would you like to refresh?");
|
||||
if (!confirmed) {
|
||||
return;
|
||||
}
|
||||
|
||||
window.location.reload(true);
|
||||
}
|
||||
}
|
||||
|
||||
async onQueueStatus(event) {
|
||||
let self = CustomNodesManager.instance;
|
||||
if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
|
||||
const hash = event.detail.target;
|
||||
|
||||
const item = self.grid.getRowItemBy("hash", hash);
|
||||
|
||||
item.restart = true;
|
||||
self.restartMap[item.hash] = true;
|
||||
self.grid.updateCell(item, "action");
|
||||
self.grid.setRowSelected(item, false);
|
||||
}
|
||||
else if(event.detail.status == 'done') {
|
||||
self.hideStop();
|
||||
self.onQueueCompleted(event.detail);
|
||||
}
|
||||
}
|
||||
|
||||
async onQueueCompleted(info) {
|
||||
let result = info.nodepack_result;
|
||||
|
||||
if(result.length == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
let self = CustomNodesManager.instance;
|
||||
|
||||
if(!self.install_context) {
|
||||
return;
|
||||
}
|
||||
|
||||
const { target, label, mode } = self.install_context.btn;
|
||||
target.classList.remove("cn-btn-loading");
|
||||
|
||||
let errorMsg = "";
|
||||
|
||||
for(let hash in result){
|
||||
let v = result[hash];
|
||||
|
||||
if(v != 'success')
|
||||
errorMsg += v+'\n';
|
||||
}
|
||||
|
||||
for(let k in self.install_context.targets) {
|
||||
let item = self.install_context.targets[k];
|
||||
self.grid.updateCell(item, "action");
|
||||
}
|
||||
|
||||
if (errorMsg) {
|
||||
self.showError(errorMsg);
|
||||
show_message("Installation Error:\n"+errorMsg);
|
||||
} else {
|
||||
this.showStatus(`${label} ${list.length} custom node(s) successfully`);
|
||||
self.showStatus(`${label} ${result.length} custom node(s) successfully`);
|
||||
}
|
||||
|
||||
if (needRestart) {
|
||||
this.showRestart();
|
||||
this.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red")
|
||||
}
|
||||
self.showRestart();
|
||||
self.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red");
|
||||
|
||||
infoToast(`[ComfyUI-Manager] All node pack tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
|
||||
self.install_context = undefined;
|
||||
}
|
||||
|
||||
// ===========================================================================================
|
||||
@@ -1756,9 +1856,9 @@ export class CustomNodesManager {
|
||||
}
|
||||
|
||||
setDisabled(disabled) {
|
||||
|
||||
const $close = this.element.querySelector(".cn-manager-close");
|
||||
const $restart = this.element.querySelector(".cn-manager-restart");
|
||||
const $stop = this.element.querySelector(".cn-manager-stop");
|
||||
|
||||
const list = [
|
||||
".cn-manager-header input",
|
||||
@@ -1770,7 +1870,7 @@ export class CustomNodesManager {
|
||||
})
|
||||
.flat()
|
||||
.filter(it => {
|
||||
return it !== $close && it !== $restart;
|
||||
return it !== $close && it !== $restart && it !== $stop;
|
||||
});
|
||||
|
||||
list.forEach($elem => {
|
||||
@@ -1789,6 +1889,15 @@ export class CustomNodesManager {
|
||||
|
||||
showRestart() {
|
||||
this.element.querySelector(".cn-manager-restart").style.display = "block";
|
||||
this.need_restart = true;
|
||||
}
|
||||
|
||||
showStop() {
|
||||
this.element.querySelector(".cn-manager-stop").style.display = "block";
|
||||
}
|
||||
|
||||
hideStop() {
|
||||
this.element.querySelector(".cn-manager-stop").style.display = "none";
|
||||
}
|
||||
|
||||
setFilter(filterValue) {
|
||||
@@ -1818,4 +1927,8 @@ export class CustomNodesManager {
|
||||
close() {
|
||||
this.element.style.display = "none";
|
||||
}
|
||||
|
||||
get isVisible() {
|
||||
return this.element?.style?.display !== "none";
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
import { app } from "../../scripts/app.js";
|
||||
import { $el } from "../../scripts/ui.js";
|
||||
import {
|
||||
manager_instance, rebootAPI,
|
||||
fetchData, md5, icons
|
||||
fetchData, md5, icons, show_message, customAlert, infoToast
|
||||
} from "./common.js";
|
||||
import { api } from "../../scripts/api.js";
|
||||
|
||||
// https://cenfun.github.io/turbogrid/api.html
|
||||
import TG from "./turbogrid.esm.js";
|
||||
@@ -46,6 +48,18 @@ const pageCss = `
|
||||
background-color: var(--comfy-input-bg);
|
||||
}
|
||||
|
||||
.cmm-manager .cmm-manager-refresh {
|
||||
display: none;
|
||||
background-color: #000080;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.cmm-manager .cmm-manager-stop {
|
||||
display: none;
|
||||
background-color: #500000;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.cmm-manager-header {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
@@ -235,7 +249,14 @@ const pageHtml = `
|
||||
<div class="cmm-manager-selection"></div>
|
||||
<div class="cmm-manager-message"></div>
|
||||
<div class="cmm-manager-footer">
|
||||
<button class="cmm-manager-back">Back</button>
|
||||
<button class="cmm-manager-back">
|
||||
<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
</svg>
|
||||
Back
|
||||
</button>
|
||||
<button class="cmm-manager-refresh">Refresh</button>
|
||||
<button class="cmm-manager-stop">Stop</button>
|
||||
<div class="cmm-flex-auto"></div>
|
||||
</div>
|
||||
`;
|
||||
@@ -254,6 +275,8 @@ export class ModelManager {
|
||||
this.keywords = '';
|
||||
|
||||
this.init();
|
||||
|
||||
api.addEventListener("cm-queue-status", this.onQueueStatus);
|
||||
}
|
||||
|
||||
init() {
|
||||
@@ -365,12 +388,25 @@ export class ModelManager {
|
||||
}
|
||||
},
|
||||
|
||||
".cmm-manager-refresh": {
|
||||
click: () => {
|
||||
app.refreshComboInNodes();
|
||||
}
|
||||
},
|
||||
|
||||
".cmm-manager-stop": {
|
||||
click: () => {
|
||||
api.fetchApi('/manager/queue/reset');
|
||||
infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
|
||||
}
|
||||
},
|
||||
|
||||
".cmm-manager-back": {
|
||||
click: (e) => {
|
||||
this.close()
|
||||
manager_instance.show();
|
||||
}
|
||||
},
|
||||
}
|
||||
};
|
||||
Object.keys(eventsMap).forEach(selector => {
|
||||
const target = this.element.querySelector(selector);
|
||||
@@ -595,17 +631,28 @@ export class ModelManager {
|
||||
}
|
||||
|
||||
async installModels(list, btn) {
|
||||
|
||||
let stats = await api.fetchApi('/manager/queue/status');
|
||||
|
||||
stats = await stats.json();
|
||||
if(stats.is_processing) {
|
||||
customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
|
||||
return;
|
||||
}
|
||||
|
||||
btn.classList.add("cmm-btn-loading");
|
||||
this.showLoading();
|
||||
this.showError("");
|
||||
|
||||
let needRestart = false;
|
||||
let needRefresh = false;
|
||||
let errorMsg = "";
|
||||
|
||||
await api.fetchApi('/manager/queue/reset');
|
||||
|
||||
let target_items = [];
|
||||
|
||||
for (const item of list) {
|
||||
|
||||
this.grid.scrollRowIntoView(item);
|
||||
target_items.push(item);
|
||||
|
||||
if (!this.focusInstall(item)) {
|
||||
this.grid.onNextUpdated(() => {
|
||||
@@ -616,48 +663,104 @@ export class ModelManager {
|
||||
this.showStatus(`Install ${item.name} ...`);
|
||||
|
||||
const data = item.originalData;
|
||||
const res = await fetchData('/model/install', {
|
||||
data.ui_id = item.hash;
|
||||
|
||||
const res = await api.fetchApi(`/manager/queue/install_model`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(data)
|
||||
});
|
||||
|
||||
|
||||
if (res.error) {
|
||||
if (res.status != 200) {
|
||||
errorMsg = `Install failed: ${item.name} ${res.error.message}`;
|
||||
break;;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
needRestart = true;
|
||||
this.install_context = {btn: btn, targets: target_items};
|
||||
|
||||
this.grid.setRowSelected(item, false);
|
||||
if(errorMsg) {
|
||||
this.showError(errorMsg);
|
||||
show_message("Installation Error:\n"+errorMsg);
|
||||
|
||||
// reset
|
||||
for (const hash of list) {
|
||||
const item = this.grid.getRowItemBy("hash", hash);
|
||||
this.grid.updateCell(item, "installed");
|
||||
}
|
||||
}
|
||||
else {
|
||||
await api.fetchApi('/manager/queue/start');
|
||||
this.showStop();
|
||||
}
|
||||
}
|
||||
|
||||
async onQueueStatus(event) {
|
||||
let self = ModelManager.instance;
|
||||
|
||||
if(event.detail.status == 'in_progress' && event.detail.ui_target == 'model_manager') {
|
||||
const hash = event.detail.target;
|
||||
|
||||
const item = self.grid.getRowItemBy("hash", hash);
|
||||
|
||||
item.refresh = true;
|
||||
self.grid.setRowSelected(item, false);
|
||||
item.selectable = false;
|
||||
this.grid.updateCell(item, "installed");
|
||||
this.grid.updateCell(item, "tg-column-select");
|
||||
// self.grid.updateCell(item, "tg-column-select");
|
||||
self.grid.updateRow(item);
|
||||
}
|
||||
else if(event.detail.status == 'done') {
|
||||
self.hideStop();
|
||||
self.onQueueCompleted(event.detail);
|
||||
}
|
||||
}
|
||||
|
||||
this.showStatus(`Install ${item.name} successfully`);
|
||||
async onQueueCompleted(info) {
|
||||
let result = info.model_result;
|
||||
|
||||
if(result.length == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.hideLoading();
|
||||
let self = ModelManager.instance;
|
||||
|
||||
if(!self.install_context) {
|
||||
return;
|
||||
}
|
||||
|
||||
let btn = self.install_context.btn;
|
||||
|
||||
self.hideLoading();
|
||||
btn.classList.remove("cmm-btn-loading");
|
||||
|
||||
let errorMsg = "";
|
||||
|
||||
for(let hash in result){
|
||||
let v = result[hash];
|
||||
|
||||
if(v != 'success')
|
||||
errorMsg += v + '\n';
|
||||
}
|
||||
|
||||
for(let k in self.install_context.targets) {
|
||||
let item = self.install_context.targets[k];
|
||||
self.grid.updateCell(item, "installed");
|
||||
}
|
||||
|
||||
if (errorMsg) {
|
||||
this.showError(errorMsg);
|
||||
self.showError(errorMsg);
|
||||
show_message("Installation Error:\n"+errorMsg);
|
||||
} else {
|
||||
this.showStatus(`Install ${list.length} models successfully`);
|
||||
self.showStatus(`Install ${result.length} models successfully`);
|
||||
}
|
||||
|
||||
if (needRestart) {
|
||||
this.showMessage(`To apply the installed model, please click the 'Refresh' button on the main menu.`, "red")
|
||||
}
|
||||
self.showRefresh();
|
||||
self.showMessage(`To apply the installed model, please click the 'Refresh' button.`, "red")
|
||||
|
||||
infoToast('Tasks done', `[ComfyUI-Manager] All model downloading tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
|
||||
self.install_context = undefined;
|
||||
}
|
||||
|
||||
getModelList(models) {
|
||||
|
||||
const typeMap = new Map();
|
||||
const baseMap = new Map();
|
||||
|
||||
@@ -826,7 +929,7 @@ export class ModelManager {
|
||||
}
|
||||
|
||||
showLoading() {
|
||||
this.setDisabled(true);
|
||||
// this.setDisabled(true);
|
||||
if (this.grid) {
|
||||
this.grid.showLoading();
|
||||
this.grid.showMask({
|
||||
@@ -836,7 +939,7 @@ export class ModelManager {
|
||||
}
|
||||
|
||||
hideLoading() {
|
||||
this.setDisabled(false);
|
||||
// this.setDisabled(false);
|
||||
if (this.grid) {
|
||||
this.grid.hideLoading();
|
||||
this.grid.hideMask();
|
||||
@@ -844,8 +947,9 @@ export class ModelManager {
|
||||
}
|
||||
|
||||
setDisabled(disabled) {
|
||||
|
||||
const $close = this.element.querySelector(".cmm-manager-close");
|
||||
const $refresh = this.element.querySelector(".cmm-manager-refresh");
|
||||
const $stop = this.element.querySelector(".cmm-manager-stop");
|
||||
|
||||
const list = [
|
||||
".cmm-manager-header input",
|
||||
@@ -857,7 +961,7 @@ export class ModelManager {
|
||||
})
|
||||
.flat()
|
||||
.filter(it => {
|
||||
return it !== $close;
|
||||
return it !== $close && it !== $refresh && it !== $stop;
|
||||
});
|
||||
|
||||
list.forEach($elem => {
|
||||
@@ -874,6 +978,18 @@ export class ModelManager {
|
||||
|
||||
}
|
||||
|
||||
showRefresh() {
|
||||
this.element.querySelector(".cmm-manager-refresh").style.display = "block";
|
||||
}
|
||||
|
||||
showStop() {
|
||||
this.element.querySelector(".cmm-manager-stop").style.display = "block";
|
||||
}
|
||||
|
||||
hideStop() {
|
||||
this.element.querySelector(".cmm-manager-stop").style.display = "none";
|
||||
}
|
||||
|
||||
setKeywords(keywords = "") {
|
||||
this.keywords = keywords;
|
||||
this.element.querySelector(".cmm-manager-keywords").value = keywords;
|
||||
|
||||
@@ -1,16 +1,6 @@
|
||||
import { app } from "../../scripts/app.js";
|
||||
import { api } from "../../scripts/api.js";
|
||||
|
||||
let double_click_policy = "copy-all";
|
||||
|
||||
api.fetchApi('/manager/dbl_click/policy')
|
||||
.then(response => response.text())
|
||||
.then(data => set_double_click_policy(data));
|
||||
|
||||
export function set_double_click_policy(mode) {
|
||||
double_click_policy = mode;
|
||||
}
|
||||
|
||||
function addMenuHandler(nodeType, cb) {
|
||||
const getOpts = nodeType.prototype.getExtraMenuOptions;
|
||||
nodeType.prototype.getExtraMenuOptions = function () {
|
||||
@@ -153,62 +143,6 @@ function node_info_copy(src, dest, connect_both, copy_shape) {
|
||||
|
||||
app.registerExtension({
|
||||
name: "Comfy.Manager.NodeFixer",
|
||||
|
||||
async nodeCreated(node, app) {
|
||||
let orig_dblClick = node.onDblClick;
|
||||
node.onDblClick = function (e, pos, self) {
|
||||
orig_dblClick?.apply?.(this, arguments);
|
||||
|
||||
if((!node.inputs && !node.outputs) || pos[1] > 0)
|
||||
return;
|
||||
|
||||
switch(double_click_policy) {
|
||||
case "copy-all":
|
||||
case "copy-full":
|
||||
case "copy-input":
|
||||
{
|
||||
if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
|
||||
return;
|
||||
|
||||
let src_node = lookup_nearest_nodes(node);
|
||||
if(src_node)
|
||||
{
|
||||
let both_connection = double_click_policy != "copy-input";
|
||||
let copy_shape = double_click_policy == "copy-full";
|
||||
node_info_copy(src_node, node, both_connection, copy_shape);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "possible-input":
|
||||
{
|
||||
let nearest_inputs = lookup_nearest_inputs(node);
|
||||
if(nearest_inputs)
|
||||
connect_inputs(nearest_inputs, node);
|
||||
}
|
||||
break;
|
||||
case "dual":
|
||||
{
|
||||
if(pos[0] < node.size[0]/2) {
|
||||
// left: possible-input
|
||||
let nearest_inputs = lookup_nearest_inputs(node);
|
||||
if(nearest_inputs)
|
||||
connect_inputs(nearest_inputs, node);
|
||||
}
|
||||
else {
|
||||
// right: copy-all
|
||||
if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
|
||||
return;
|
||||
|
||||
let src_node = lookup_nearest_nodes(node);
|
||||
if(src_node)
|
||||
node_info_copy(src_node, node, true);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
beforeRegisterNodeDef(nodeType, nodeData, app) {
|
||||
addMenuHandler(nodeType, function (_, options) {
|
||||
options.push({
|
||||
|
||||
@@ -11,6 +11,46 @@
|
||||
|
||||
|
||||
|
||||
{
|
||||
"author": "molbal",
|
||||
"title": "comfy-url-fetcher [WIP]",
|
||||
"reference": "https://github.com/molbal/comfy-url-fetcher",
|
||||
"files": [
|
||||
"https://github.com/molbal/comfy-url-fetcher"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Fetches URLs"
|
||||
},
|
||||
{
|
||||
"author": "myAiLemon",
|
||||
"title": "MagicAutomaticPicture [WIP]",
|
||||
"reference": "https://github.com/myAiLemon/MagicAutomaticPicture",
|
||||
"files": [
|
||||
"https://github.com/myAiLemon/MagicAutomaticPicture"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "A comfyui node package that can generate pictures and automatically save positive prompts and eliminate unwanted prompts"
|
||||
},
|
||||
{
|
||||
"author": "neverbiasu",
|
||||
"title": "ComfyUI_Output_as_Input",
|
||||
"reference": "https://github.com/a-und-b/ComfyUI_Output_as_Input",
|
||||
"files": [
|
||||
"https://github.com/a-und-b/ComfyUI_Output_as_Input"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This is a simple custom ComfyUI node that allows you to easily use recent output images as input in your workflows. It does not allow image uploads on purpose and does not require any additional dependencies.\nNOTE: The files in the repo are not organized."
|
||||
},
|
||||
{
|
||||
"author": "neverbiasu",
|
||||
"title": "ComfyUI-DeepSeek",
|
||||
"reference": "https://github.com/neverbiasu/ComfyUI-DeepSeek",
|
||||
"files": [
|
||||
"https://github.com/neverbiasu/ComfyUI-DeepSeek"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "NODES: DeepSeek Caller"
|
||||
},
|
||||
{
|
||||
"author": "Krish-701",
|
||||
"title": "RK_Comfyui",
|
||||
|
||||
@@ -924,6 +924,7 @@
|
||||
"DeepSeekImageGeneration",
|
||||
"DeepSeekImageUnderstanding",
|
||||
"DeepSeekModelLoader",
|
||||
"LLM_Loader",
|
||||
"OpenAICompatibleLoader"
|
||||
],
|
||||
{
|
||||
@@ -1628,6 +1629,10 @@
|
||||
"FrameBlend",
|
||||
"ImageReferenceUpdate",
|
||||
"ImageSelector",
|
||||
"KeypointsInput",
|
||||
"KeypointsInputNode",
|
||||
"KeypointsToPose",
|
||||
"KeypointsToPoseNode",
|
||||
"SimHashCompare",
|
||||
"TemporalConsistency"
|
||||
],
|
||||
@@ -1759,6 +1764,14 @@
|
||||
"title_aux": "ComfyUI-Blenderesque-Nodes [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/a-und-b/ComfyUI_Output_as_Input": [
|
||||
[
|
||||
"OutputAsInput"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI_Output_as_Input"
|
||||
}
|
||||
],
|
||||
"https://github.com/aiden1020/ComfyUI_Artcoder": [
|
||||
[
|
||||
"ArtCoder"
|
||||
@@ -2438,6 +2451,7 @@
|
||||
"PolyexponentialScheduler",
|
||||
"PorterDuffImageComposite",
|
||||
"Preview3D",
|
||||
"Preview3DAnimation",
|
||||
"PreviewAudio",
|
||||
"PreviewImage",
|
||||
"RandomNoise",
|
||||
@@ -3317,12 +3331,15 @@
|
||||
[
|
||||
"ForceMinimumBatchSize",
|
||||
"ImageCompositeChained",
|
||||
"LineDetection",
|
||||
"MangaPanelSegmentationNode",
|
||||
"Mask_Fill_Region",
|
||||
"MatchImageCountToMaskCount",
|
||||
"ParallaxGPUTest",
|
||||
"ParallaxTest",
|
||||
"RandomCharacterPrompts",
|
||||
"TargetLocationCrop",
|
||||
"TargetLocationPaste",
|
||||
"Yolov8Detection",
|
||||
"easy_parallax",
|
||||
"string_list_to_prompt_schedule"
|
||||
],
|
||||
@@ -4074,6 +4091,14 @@
|
||||
"title_aux": "ComfyUI-FramerComfy [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/molbal/comfy-url-fetcher": [
|
||||
[
|
||||
"URL Fetcher"
|
||||
],
|
||||
{
|
||||
"title_aux": "comfy-url-fetcher [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/monate0615/ComfyUI-Affine-Transform": [
|
||||
[
|
||||
"AffineTransform"
|
||||
@@ -4107,6 +4132,17 @@
|
||||
"title_aux": "ComfyUI-Claude-I2T"
|
||||
}
|
||||
],
|
||||
"https://github.com/myAiLemon/MagicAutomaticPicture": [
|
||||
[
|
||||
"EditableStringNode",
|
||||
"IntegratedCLIPTextEncodeWithExtract",
|
||||
"ProcessAndSave",
|
||||
"StringConcat"
|
||||
],
|
||||
{
|
||||
"title_aux": "MagicAutomaticPicture [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/naderzare/comfyui-inodes": [
|
||||
[
|
||||
"IAzureAiApi",
|
||||
@@ -4169,6 +4205,14 @@
|
||||
"title_aux": "ComfyUI-ControlNeXt [WIP]"
|
||||
}
|
||||
],
|
||||
"https://github.com/neverbiasu/ComfyUI-DeepSeek": [
|
||||
[
|
||||
"DeepSeekCaller"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-DeepSeek"
|
||||
}
|
||||
],
|
||||
"https://github.com/neverbiasu/ComfyUI-StereoCrafter": [
|
||||
[
|
||||
"DepthSplattingModelLoader",
|
||||
@@ -4237,7 +4281,8 @@
|
||||
],
|
||||
"https://github.com/nomcycle/ComfyUI_Cluster": [
|
||||
[
|
||||
"FenceClusteredWorkflow"
|
||||
"ClusterFanInTensorsToBatch",
|
||||
"ClusterInstanceIndex"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI_Cluster [WIP]"
|
||||
@@ -4958,6 +5003,7 @@
|
||||
"FixUTF8StringNode",
|
||||
"ImageResizeNode",
|
||||
"ImagesToVideoNode",
|
||||
"LoadImageFormURLNode",
|
||||
"LoadImageFromFolderNode",
|
||||
"SaveImageToFolderNode",
|
||||
"SaveImagesToFolderNode",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,15 @@
|
||||
{
|
||||
"custom_nodes": [
|
||||
{
|
||||
"author": "PramaLLC",
|
||||
"title": "ComfyUI BEN - Background Erase Network",
|
||||
"reference": "https://github.com/PramaLLC/BEN2_ComfyUI",
|
||||
"files": [
|
||||
"https://github.com/PramaLLC/BEN2_ComfyUI"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Remove backgrounds from images with [a/BEN2](https://huggingface.co/PramaLLC/BEN2) in ComfyUI\nOriginal repo: [a/https://github.com/DoctorDiffusion/ComfyUI-BEN](https://github.com/DoctorDiffusion/ComfyUI-BEN)"
|
||||
},
|
||||
{
|
||||
"author": "BlenderNeko",
|
||||
"title": "ltdrdata/ComfyUI_TiledKSampler",
|
||||
|
||||
@@ -11,6 +11,16 @@
|
||||
|
||||
|
||||
|
||||
{
|
||||
"author": "myAiLemon",
|
||||
"title": "MagicGetPromptAutomatically",
|
||||
"reference": "https://github.com/myAiLemon/MagicGetPromptAutomatically",
|
||||
"files": [
|
||||
"https://github.com/myAiLemon/MagicGetPromptAutomatically"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "A plug-in that can automatically generate pictures and save txt files in comfyui"
|
||||
},
|
||||
{
|
||||
"author": "ryanontheinside",
|
||||
"title": "ComfyUI_ScavengerHunt [REMOVED]",
|
||||
|
||||
@@ -8,7 +8,72 @@
|
||||
"description": "If you see this message, your ComfyUI-Manager is outdated.\nRecent channel provides only the list of the latest nodes. If you want to find the complete node list, please go to the Default channel.\nMaking LoRA has never been easier!"
|
||||
},
|
||||
|
||||
|
||||
|
||||
{
|
||||
"title": "A2V Multi Image Composite",
|
||||
"author": "AiartvnTeam",
|
||||
"id": "Aiartvn",
|
||||
"description": "Node for compositing multiple images with interactive preview and layer management",
|
||||
"repository": "https://github.com/aiartvn/A2V_Multi_Image_Composite",
|
||||
"install_type": "git-clone",
|
||||
"files": [
|
||||
"https://github.com/aiartvn/A2V_Multi_Image_Composite"
|
||||
],
|
||||
"tags": ["image", "composite", "layer", "blend", "transform"]
|
||||
},
|
||||
{
|
||||
"author": "ProGamerGov",
|
||||
"title": "Preview 360 Panorama for ComfyUI",
|
||||
"id": "comfyui-preview360panorama",
|
||||
"reference": "https://github.com/ProGamerGov/ComfyUI_preview360panorama",
|
||||
"files": [
|
||||
"https://github.com/ProGamerGov/ComfyUI_preview360panorama"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "A custom ComfyUI node for interactive 360° panorama image previews. Panoramic 360 images are also sometimes known as VR photography (virtual reality), HDRI environments (ex: skyboxes), image spheres, spherical images, 360 pano, and 360 degree photos."
|
||||
},
|
||||
{
|
||||
"author": "amorano",
|
||||
"title": "Jovi_MIDI",
|
||||
"id": "jovi_midi",
|
||||
"reference": "https://github.com/Amorano/Jovi_MIDI",
|
||||
"files": [
|
||||
"https://github.com/Amorano/Jovi_MIDI"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "Read and Process data from MIDI devices inside of ComfyUI."
|
||||
},
|
||||
{
|
||||
"author": "nkchocoai",
|
||||
"title": "ComfyUI-DanbooruPromptQuiz",
|
||||
"reference": "https://github.com/nkchocoai/ComfyUI-DanbooruPromptQuiz",
|
||||
"files": [
|
||||
"https://github.com/nkchocoai/ComfyUI-DanbooruPromptQuiz"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This node is for playing the game of guessing prompts by looking at images generated from prompts output by TIPO, Tagger, etc.."
|
||||
},
|
||||
{
|
||||
"author": "agilly1989",
|
||||
"title": "ComfyUI_agilly1989_motorway",
|
||||
"reference": "https://github.com/agilly1989/ComfyUI_agilly1989_motorway",
|
||||
"files": [
|
||||
"https://github.com/agilly1989/ComfyUI_agilly1989_motorway"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This my implemenation of a `pipe` in ComfyUI. Is it better or worse than others? No idea."
|
||||
},
|
||||
{
|
||||
"author": "da2el-ai",
|
||||
"title": "D2-PromptSelector-comfyUI",
|
||||
"reference": "https://github.com/da2el-ai/D2-PromptSelector-comfyUI",
|
||||
"files": [
|
||||
"https://github.com/da2el-ai/D2-PromptSelector-comfyUI"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This is a version of [a/sd-d2-prompt-selector](https://github.com/da2el-ai/sd-d2-prompt-selector) reworked for ComfyUI. It's just a prototype that I've put together for now. The random syntax of sd-d2-prompt-selector cannot be used; instead, the DynamicPrompt syntax is used"
|
||||
},
|
||||
{
|
||||
"author": "kijai",
|
||||
"title": "ComfyUI-StableXWrapper",
|
||||
@@ -667,26 +732,6 @@
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "A Text To Speech node using Kokoro TTS in ComfyUI."
|
||||
},
|
||||
{
|
||||
"author": "WangPengxing",
|
||||
"title": "ComfyUI WPX Nodes",
|
||||
"reference": "https://github.com/WangPengxing/ComfyUI_WPX_Node",
|
||||
"files": [
|
||||
"https://github.com/WangPengxing/ComfyUI_WPX_Node"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "A custom node collection for ComfyUI, offering enhanced image processing features."
|
||||
},
|
||||
{
|
||||
"author": "PixelFunAI",
|
||||
"title": "Hunyuan LoRA Loader Nodes",
|
||||
"reference": "https://github.com/PixelFunAI/ComfyUI_PixelFun",
|
||||
"files": [
|
||||
"https://github.com/PixelFunAI/ComfyUI_PixelFun"
|
||||
],
|
||||
"install_type": "git-clone",
|
||||
"description": "This collection provides four additional nodes for loading and managing Hunyuan Video LoRAs in ComfyUI"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -493,6 +493,7 @@
|
||||
"https://github.com/852wa/ComfyUI-ColorshiftColor": [
|
||||
[
|
||||
"ColorshiftColor",
|
||||
"CsCFill",
|
||||
"CsCPaletteEditor"
|
||||
],
|
||||
{
|
||||
@@ -1427,6 +1428,18 @@
|
||||
"title_aux": "Jovi_GLSL"
|
||||
}
|
||||
],
|
||||
"https://github.com/Amorano/Jovi_MIDI": [
|
||||
[
|
||||
"MIDI FILTER (JOV_MIDI)",
|
||||
"MIDI FILTER EZ (JOV_MIDI)",
|
||||
"MIDI LOADER (JOV_MIDI)",
|
||||
"MIDI MESSAGE (JOV_MIDI)",
|
||||
"MIDI READER (JOV_MIDI)"
|
||||
],
|
||||
{
|
||||
"title_aux": "Jovi_MIDI"
|
||||
}
|
||||
],
|
||||
"https://github.com/Amorano/Jovi_Measure": [
|
||||
[
|
||||
"BLUR EFFECT (JOV_MEASURE)",
|
||||
@@ -2379,7 +2392,9 @@
|
||||
"ClownsharKSamplerAutomation",
|
||||
"ClownsharKSamplerAutomation_Beta",
|
||||
"ClownsharKSamplerGuide",
|
||||
"ClownsharKSamplerGuide_Beta",
|
||||
"ClownsharKSamplerGuides",
|
||||
"ClownsharKSamplerGuides_Beta",
|
||||
"ClownsharKSamplerOptions",
|
||||
"ClownsharKSamplerOptions_SDE_Noise",
|
||||
"ClownsharkSamplerOptions_FrameWeights",
|
||||
@@ -2816,11 +2831,17 @@
|
||||
],
|
||||
"https://github.com/DesertPixelAi/ComfyUI-Desert-Pixel-Nodes": [
|
||||
[
|
||||
"DP 10 String Switch",
|
||||
"DP 10 Images Switch Or Batch",
|
||||
"DP 10 String Switch Or Connect",
|
||||
"DP 2 String Switch",
|
||||
"DP 3 Images Switch Or Batch",
|
||||
"DP 3 String Switch Or Connect",
|
||||
"DP 5 Find And Replace",
|
||||
"DP 5 String Switch",
|
||||
"DP 5 Images Switch Or Batch",
|
||||
"DP 5 String Switch Or Connect",
|
||||
"DP Add Background To Png",
|
||||
"DP Add Weight To String Sdxl",
|
||||
"DP Advanced Sampler",
|
||||
"DP Advanced Weight String Sdxl",
|
||||
"DP Animation Calculator 10 Inputs",
|
||||
"DP Animation Calculator 5 Inputs",
|
||||
@@ -2830,8 +2851,7 @@
|
||||
"DP Broken Token",
|
||||
"DP Clean Prompt",
|
||||
"DP Clean Prompt Travel",
|
||||
"DP Combo Controller",
|
||||
"DP Condition Mixer",
|
||||
"DP Condition Switch",
|
||||
"DP ControlNet Apply Advanced",
|
||||
"DP Crazy Prompt Mixer",
|
||||
"DP Create Json File",
|
||||
@@ -2843,6 +2863,7 @@
|
||||
"DP Fast Slow Motion",
|
||||
"DP Five Lora",
|
||||
"DP Five Lora Random",
|
||||
"DP Float Stepper",
|
||||
"DP Image And String Pairs Switch",
|
||||
"DP Image Color Analyzer",
|
||||
"DP Image Color Analyzer Small",
|
||||
@@ -2853,12 +2874,10 @@
|
||||
"DP Image Empty Latent Switch SDXL",
|
||||
"DP Image Slide Show",
|
||||
"DP Image Strip",
|
||||
"DP Image Switch 10",
|
||||
"DP Image Switch 3",
|
||||
"DP Image Switch 5",
|
||||
"DP Int 0-1000",
|
||||
"DP Int 0-1000 4 Step",
|
||||
"DP Int 0-1000 8 Step",
|
||||
"DP Latent Split",
|
||||
"DP Line Cycler",
|
||||
"DP Load Checkpoint With Info",
|
||||
"DP Load Controlnet Model With Name",
|
||||
@@ -2868,13 +2887,10 @@
|
||||
"DP Load Image Minimal",
|
||||
"DP Load UNET With Info",
|
||||
"DP Logo Animator",
|
||||
"DP Logo Animator Advanced",
|
||||
"DP Lora Random Strength Controller",
|
||||
"DP Lora Strength Controller",
|
||||
"DP Lora Strength Stepper",
|
||||
"DP Mask Settings",
|
||||
"DP Prompt Inverter",
|
||||
"DP Prompt Manager",
|
||||
"DP Prompt Manager Small",
|
||||
"DP Prompt Mode Controller",
|
||||
"DP Prompt Styler",
|
||||
@@ -2892,9 +2908,7 @@
|
||||
"DP Save Preview Image",
|
||||
"DP Set New Model Folder Link",
|
||||
"DP String Text",
|
||||
"DP String Text With Weight",
|
||||
"DP String With Switch",
|
||||
"DP Strings Connector",
|
||||
"DP String Text With Sdxl Weight",
|
||||
"DP Strip Edge Masks",
|
||||
"DP Switch Controller",
|
||||
"DP Text Preview",
|
||||
@@ -2905,10 +2919,8 @@
|
||||
"DP Video Looper",
|
||||
"DP Video Transition",
|
||||
"DP_Crazy_Prompt_Mixer",
|
||||
"DP_Logo_Animator_Advanced",
|
||||
"DP_Lora_Strength_Stepper",
|
||||
"DP_Prompt_Inverter",
|
||||
"DP_Strings_Connector"
|
||||
"DP_Float_Stepper",
|
||||
"DP_Prompt_Inverter"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-Desert-Pixel-Nodes"
|
||||
@@ -4712,6 +4724,8 @@
|
||||
],
|
||||
"https://github.com/JTriggerFish/ComfyLatentTools": [
|
||||
[
|
||||
"DownsampledAttentionGuidance",
|
||||
"DownsampledLatentGuidance",
|
||||
"LatentNormalizedLanczosResize",
|
||||
"RescaledPAG",
|
||||
"RescaledSEG"
|
||||
@@ -5016,6 +5030,7 @@
|
||||
[
|
||||
"Simple Extract Lora From Text",
|
||||
"Simple Image Saver (as Forge)",
|
||||
"Simple Load Image With Metadata",
|
||||
"Simple Load Line From Text File",
|
||||
"Simple Lora Loader"
|
||||
],
|
||||
@@ -5988,7 +6003,8 @@
|
||||
],
|
||||
"https://github.com/Mattabyte/ComfyUI-SecureApiCall": [
|
||||
[
|
||||
"SecureAPI-SecureAPI"
|
||||
"SecureAPI-SecureAPI",
|
||||
"SecureAPI-SecureAPI-AWS"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI Secure API Call"
|
||||
@@ -6431,10 +6447,13 @@
|
||||
],
|
||||
"https://github.com/MzMaXaM/ComfyUi-MzMaXaM": [
|
||||
[
|
||||
"ImageToText",
|
||||
"KSamplerWithVAE",
|
||||
"SelectLatentSize1MP",
|
||||
"SelectLatentSize2MP",
|
||||
"TextEncode3in1",
|
||||
"TextToText",
|
||||
"UpscaleImageBy1_5x",
|
||||
"UpscaleLatentBy1_5x"
|
||||
],
|
||||
{
|
||||
@@ -7058,6 +7077,14 @@
|
||||
"title_aux": "ComfyUI-StringsAndThings"
|
||||
}
|
||||
],
|
||||
"https://github.com/ProGamerGov/ComfyUI_preview360panorama": [
|
||||
[
|
||||
"PanoramaViewerNode"
|
||||
],
|
||||
{
|
||||
"title_aux": "Preview 360 Panorama for ComfyUI"
|
||||
}
|
||||
],
|
||||
"https://github.com/ProGamerGov/ComfyUI_pytorch360convert": [
|
||||
[
|
||||
"Crop Image with Coords",
|
||||
@@ -7348,6 +7375,7 @@
|
||||
"AspectRatioAdvanced",
|
||||
"DisplayEverything",
|
||||
"ImageComparer",
|
||||
"LensFlare",
|
||||
"MultiFloat",
|
||||
"MultiTextNode",
|
||||
"SKB_AnySwitch",
|
||||
@@ -8447,8 +8475,10 @@
|
||||
"SD35StartSettings",
|
||||
"SDXLStartSettings",
|
||||
"SDstarsampler",
|
||||
"Star Face Loader",
|
||||
"StarFiveWildcards",
|
||||
"StarImageSwitch",
|
||||
"StarLatentSwitch",
|
||||
"StarTextFilter",
|
||||
"StarTextInput",
|
||||
"Starupscale"
|
||||
@@ -10643,6 +10673,18 @@
|
||||
"title_aux": "ComfyUI-styles-all"
|
||||
}
|
||||
],
|
||||
"https://github.com/agilly1989/ComfyUI_agilly1989_motorway": [
|
||||
[
|
||||
"MotorwayFloat",
|
||||
"MotorwayInt",
|
||||
"MotorwaySeed",
|
||||
"MotorwayStr",
|
||||
"MotorwayStrMulti"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI_agilly1989_motorway"
|
||||
}
|
||||
],
|
||||
"https://github.com/ahernandezmiro/ComfyUI-GCP_Storage_tools": [
|
||||
[
|
||||
"GCPReadImageNode",
|
||||
@@ -10718,8 +10760,17 @@
|
||||
"title_aux": "Comfy UI FatLabels"
|
||||
}
|
||||
],
|
||||
"https://github.com/aiartvn/A2V_Multi_Image_Composite": [
|
||||
[
|
||||
"A2V_Multi_Image_Composite"
|
||||
],
|
||||
{
|
||||
"title_aux": "A2V Multi Image Composite"
|
||||
}
|
||||
],
|
||||
"https://github.com/aidec/Comfyui_TextBatch_aidec": [
|
||||
[
|
||||
"ImageQueueProcessor",
|
||||
"TextBatch",
|
||||
"TextQueueProcessor",
|
||||
"TextSplitCounter"
|
||||
@@ -11877,18 +11928,22 @@
|
||||
"SamplerSonarEuler",
|
||||
"SamplerSonarEulerA",
|
||||
"SonarAdvanced1fNoise",
|
||||
"SonarAdvancedDistroNoise",
|
||||
"SonarAdvancedPowerLawNoise",
|
||||
"SonarAdvancedPyramidNoise",
|
||||
"SonarBlendedNoise",
|
||||
"SonarChannelNoise",
|
||||
"SonarCompositeNoise",
|
||||
"SonarCustomNoise",
|
||||
"SonarCustomNoiseAdv",
|
||||
"SonarGuidanceConfig",
|
||||
"SonarGuidedNoise",
|
||||
"SonarModulatedNoise",
|
||||
"SonarRandomNoise",
|
||||
"SonarRepeatedNoise",
|
||||
"SonarScheduledNoise"
|
||||
"SonarResizedNoise",
|
||||
"SonarScheduledNoise",
|
||||
"SonarWaveletFilteredNoise"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-sonar"
|
||||
@@ -12939,6 +12994,7 @@
|
||||
"chaosaiart_controlnet_weidgth",
|
||||
"chaosaiart_convert",
|
||||
"chaosaiart_convert_Prompt",
|
||||
"chaosaiart_deepseek_fix",
|
||||
"chaosaiart_forPreview",
|
||||
"chaosaiart_image_loop",
|
||||
"chaosaiart_img2gif",
|
||||
@@ -13892,6 +13948,7 @@
|
||||
"PolyexponentialScheduler",
|
||||
"PorterDuffImageComposite",
|
||||
"Preview3D",
|
||||
"Preview3DAnimation",
|
||||
"PreviewAudio",
|
||||
"PreviewImage",
|
||||
"RandomNoise",
|
||||
@@ -15447,7 +15504,8 @@
|
||||
"SelOutModel",
|
||||
"SelOutPolar",
|
||||
"Selector",
|
||||
"Selector Advanced"
|
||||
"Selector Advanced",
|
||||
"Selector Hub"
|
||||
],
|
||||
{
|
||||
"author": "\"\u02f6\ud835\udfa2\u292c\u2ad2\u2d56s\u143c\u02f6\"",
|
||||
@@ -15705,6 +15763,7 @@
|
||||
[
|
||||
"FL_API_Base64_ImageLoader",
|
||||
"FL_API_ImageSaver",
|
||||
"FL_AnimeLineExtractor",
|
||||
"FL_ApplyMask",
|
||||
"FL_Ascii",
|
||||
"FL_BatchAlign",
|
||||
@@ -16632,8 +16691,10 @@
|
||||
"Griptape Replace: Rulesets on Agent",
|
||||
"Griptape Replace: Tools on Agent",
|
||||
"Griptape Rerank Driver: Cohere",
|
||||
"Griptape Retrieve: Cloud Ruleset",
|
||||
"Griptape Run: Agent",
|
||||
"Griptape Run: Audio Transcription",
|
||||
"Griptape Run: Cloud Assistant",
|
||||
"Griptape Run: Image Description",
|
||||
"Griptape Run: Parallel Image Description",
|
||||
"Griptape Run: Prompt Task",
|
||||
@@ -19300,6 +19361,7 @@
|
||||
"GetImageRangeFromBatch",
|
||||
"GetImageSizeAndCount",
|
||||
"GetImagesFromBatchIndexed",
|
||||
"GetLatentRangeFromBatch",
|
||||
"GetLatentsFromBatchIndexed",
|
||||
"GetMaskSizeAndCount",
|
||||
"GradientToFloat",
|
||||
@@ -19318,6 +19380,7 @@
|
||||
"ImageGridComposite2x2",
|
||||
"ImageGridComposite3x3",
|
||||
"ImageGridtoBatch",
|
||||
"ImageNoiseAugmentation",
|
||||
"ImageNormalize_Neg1_To_1",
|
||||
"ImagePadForOutpaintMasked",
|
||||
"ImagePadForOutpaintTargetSize",
|
||||
@@ -19333,6 +19396,7 @@
|
||||
"Intrinsic_lora_sampling",
|
||||
"JoinStringMulti",
|
||||
"JoinStrings",
|
||||
"LeapfusionHunyuanI2VPatcher",
|
||||
"LoadAndResizeImage",
|
||||
"LoadImagesFromFolderKJ",
|
||||
"LoadResAdapterNormalization",
|
||||
@@ -20727,6 +20791,7 @@
|
||||
"Enhanced Random Light Source",
|
||||
"Float Relay",
|
||||
"HLFrequencyDetailRestore",
|
||||
"Hex to Color",
|
||||
"Image Add Alpha",
|
||||
"Image Frequency Analyzer",
|
||||
"Image Relay",
|
||||
@@ -22568,6 +22633,15 @@
|
||||
"title_aux": "ComfyUI OpenAI Prompter"
|
||||
}
|
||||
],
|
||||
"https://github.com/nkchocoai/ComfyUI-DanbooruPromptQuiz": [
|
||||
[
|
||||
"DanbooruPromptComparison",
|
||||
"DanbooruPromptQuiz"
|
||||
],
|
||||
{
|
||||
"title_aux": "ComfyUI-DanbooruPromptQuiz"
|
||||
}
|
||||
],
|
||||
"https://github.com/nkchocoai/ComfyUI-Dart": [
|
||||
[
|
||||
"DanbooruTagsTransformerBanTagsFromRegex",
|
||||
@@ -22673,6 +22747,7 @@
|
||||
],
|
||||
"https://github.com/nofunstudio/Node_Fun_ComfyUI": [
|
||||
[
|
||||
"IframeView",
|
||||
"LayeredInfiniteZoom",
|
||||
"Replicate flux 1.1 pro ultra",
|
||||
"ReplicateAPI_flux_1_1_pro_ultra",
|
||||
@@ -26156,6 +26231,7 @@
|
||||
"quadmoonChangeBackground",
|
||||
"quadmoonConvertBoolToString",
|
||||
"quadmoonConvertFloatToString",
|
||||
"quadmoonConvertImageToPrompt",
|
||||
"quadmoonConvertIntToString",
|
||||
"quadmoonConvertNormalizeHW",
|
||||
"quadmoonConvertNumberToString",
|
||||
@@ -27132,6 +27208,7 @@
|
||||
],
|
||||
"https://github.com/xlinx/ComfyUI-decadetw-auto-prompt-llm": [
|
||||
[
|
||||
"Auto-LLM-Chat",
|
||||
"Auto-LLM-Text",
|
||||
"Auto-LLM-Text-Vision",
|
||||
"Auto-LLM-Vision"
|
||||
|
||||
@@ -20,13 +20,13 @@ import cm_global
|
||||
import manager_downloader
|
||||
import folder_paths
|
||||
|
||||
try:
|
||||
from datetime import datetime
|
||||
import datetime
|
||||
if hasattr(datetime, 'datetime'):
|
||||
def current_timestamp():
|
||||
return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
|
||||
except:
|
||||
return datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
|
||||
else:
|
||||
# NOTE: Occurs in some Mac environments.
|
||||
import time
|
||||
import datetime
|
||||
logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n datetime module is invalid: '{datetime.__file__}'")
|
||||
def current_timestamp():
|
||||
return str(time.time()).split('.')[0]
|
||||
@@ -103,6 +103,24 @@ manager_config_path = os.path.join(manager_files_path, 'config.ini')
|
||||
cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
|
||||
|
||||
|
||||
default_conf = {}
|
||||
|
||||
def read_config():
|
||||
global default_conf
|
||||
import configparser
|
||||
config = configparser.ConfigParser()
|
||||
config.read(manager_config_path)
|
||||
default_conf = config['default']
|
||||
|
||||
def read_uv_mode():
|
||||
if 'use_uv' in default_conf:
|
||||
manager_util.use_uv = default_conf['use_uv']
|
||||
|
||||
|
||||
read_config()
|
||||
read_uv_mode()
|
||||
|
||||
|
||||
cm_global.pip_overrides = {'numpy': 'numpy<2', 'ultralytics': 'ultralytics==8.3.40'}
|
||||
if os.path.exists(manager_pip_overrides_path):
|
||||
with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
|
||||
@@ -411,19 +429,20 @@ except Exception as e:
|
||||
|
||||
|
||||
try:
|
||||
import git # noqa: F401
|
||||
import git # noqa: F401
|
||||
import toml # noqa: F401
|
||||
import rich # noqa: F401
|
||||
except ModuleNotFoundError:
|
||||
my_path = os.path.dirname(__file__)
|
||||
requirements_path = os.path.join(my_path, "requirements.txt")
|
||||
|
||||
print("## ComfyUI-Manager: installing dependencies. (GitPython)")
|
||||
try:
|
||||
result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '-r', requirements_path])
|
||||
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
|
||||
except subprocess.CalledProcessError:
|
||||
print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
|
||||
try:
|
||||
result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '--user', '-r', requirements_path])
|
||||
result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
|
||||
except subprocess.CalledProcessError:
|
||||
print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
|
||||
|
||||
@@ -452,11 +471,6 @@ else:
|
||||
|
||||
def read_downgrade_blacklist():
|
||||
try:
|
||||
import configparser
|
||||
config = configparser.ConfigParser()
|
||||
config.read(manager_config_path)
|
||||
default_conf = config['default']
|
||||
|
||||
if 'downgrade_blacklist' in default_conf:
|
||||
items = default_conf['downgrade_blacklist'].split(',')
|
||||
items = [x.strip() for x in items if x != '']
|
||||
@@ -471,19 +485,13 @@ read_downgrade_blacklist()
|
||||
|
||||
def check_bypass_ssl():
|
||||
try:
|
||||
import configparser
|
||||
import ssl
|
||||
config = configparser.ConfigParser()
|
||||
config.read(manager_config_path)
|
||||
default_conf = config['default']
|
||||
|
||||
if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true':
|
||||
print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see {manager_config_path})")
|
||||
ssl._create_default_https_context = ssl._create_unverified_context # SSL certificate error fix.
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
check_bypass_ssl()
|
||||
|
||||
|
||||
@@ -603,9 +611,9 @@ def execute_lazy_install_script(repo_path, executable):
|
||||
if package_name and not is_installed(package_name):
|
||||
if '--index-url' in package_name:
|
||||
s = package_name.split('--index-url')
|
||||
install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
|
||||
install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
|
||||
else:
|
||||
install_cmd = [sys.executable, "-m", "pip", "install", package_name]
|
||||
install_cmd = manager_util.make_pip_cmd(["install", package_name])
|
||||
|
||||
process_wrap(install_cmd, repo_path)
|
||||
|
||||
|
||||
@@ -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.11.2"
|
||||
version = "3.17.3"
|
||||
license = { file = "LICENSE.txt" }
|
||||
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user