Merge pull request #441 from Creepybits/main

Fix: Correct scheduler input on StyleAligned Sample Reference Latents node

.github/workflows/publish.yml

@@ -7,15 +7,19 @@ on:
     paths:
       - "pyproject.toml"
 
+permissions:
+  issues: write
+
 jobs:
   publish-node:
     name: Publish Custom Node to registry
     runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'shadowcz007' }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Publish Custom Node
-        uses: Comfy-Org/publish-node-action@main
+        uses: Comfy-Org/publish-node-action@v1
         with:
           ## Add your own personal access token to your Github Repository secrets and reference it here.
-          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
+          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}

nodes/ImageNode.py

@@ -123,8 +123,13 @@ def composite_images(foreground, background, mask, is_multiply_blend=False, posi
         }
 
     # Resize the foreground image with antialiasing
-    layer_image = layer['image'].resize((layer['width'], layer['height']), Image.ANTIALIAS)
+    try:
-    layer_mask = layer['mask'].resize((layer['width'], layer['height']), Image.ANTIALIAS)
+        resampling_method = Image.Resampling.LANCZOS
+    except AttributeError:
+        resampling_method = Image.ANTIALIAS
+
+    layer_image = layer['image'].resize((layer['width'], layer['height']), resampling_method)
+    layer_mask = layer['mask'].resize((layer['width'], layer['height']), resampling_method)
 
     bg_image.paste(layer_image, (layer['x'], layer['y']), layer_mask)
 
@@ -1041,29 +1046,33 @@ def generate_text_image(text,
 
     if layout == "vertical":
         for line in lines:
-            max_char_width = max(font.getsize(char)[0] for char in line)
+            max_char_width = max(font.getbbox(char)[2] - font.getbbox(char)[0] for char in line)
             for char in line:
-                char_width, char_height = font.getsize(char)
+                left, top, right, bottom = font.getbbox(char)
+                char_width = right - left
+                char_height = bottom - top
                 char_coordinates.append((x, y))
                 y += char_height + spacing
                 max_height = max(max_height, y + padding)
             x += max_char_width + line_spacing
             y = padding
         max_width = x
-        total_line_width = sum(font.getsize(line)[1] for line in lines)
+        total_line_width = sum(font.getbbox(line)[2] - font.getbbox(line)[0] for line in lines)
         total_spacing = line_spacing * (len(lines) - 1)
         max_width = total_line_width + total_spacing + padding * 2
     else:
         for line in lines:
-            line_width, line_height = font.getsize(line)
+            line_width, line_height = font.getbbox(line)[2] - font.getbbox(line)[0], font.getbbox(line)[3] - font.getbbox(line)[1]
             for char in line:
-                char_width, char_height = font.getsize(char)
+                left, top, right, bottom = font.getbbox(char)
+                char_width = right - left
+                char_height = bottom - top
                 char_coordinates.append((x, y))
                 x += char_width + spacing
                 max_width = max(max_width, x + padding)
             y += line_height + line_spacing
             x = padding
-        total_line_heights = sum(font.getsize(line)[1] for line in lines)
+        total_line_heights = sum(font.getbbox(line)[3] - font.getbbox(line)[1] for line in lines)
         total_spacing = line_spacing * (len(lines) - 1)
         max_height = total_line_heights + total_spacing + padding * 2
 
@@ -2951,11 +2960,14 @@ class ResizeImage:
                     im=tensor2pil(im)
 
                     im=im.convert('RGB')
-                    a_im,hex=get_average_color_image(im)
 
+                    a_im,hex=get_average_color_image(im)
+                    
                     if average_color=='on':
                         fill_color=hex
-                        
+
+                    a_im=resize_image(a_im,scale_option,w,h,fill_color)
+
                     im=resize_image(im,scale_option,w,h,fill_color)
 
                     im=pil2tensor(im)

nodes/Style.py

@@ -234,7 +234,7 @@ class StyleAlignedSampleReferenceLatents:
                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
                     "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0, "step":0.1, "round": 0.01}),
 
-                    "scheduler": (comfy.samplers.KSampler.SCHEDULERS.reverse(), ), 
+                    "scheduler": (comfy.samplers.KSampler.SCHEDULERS, ), 
                     "denoise": ("FLOAT", {"default": 1, "min": 0.0, "max": 1.0, "step": 0.01}),
                     
                      }

nodes/edit_mask.py

@@ -7,6 +7,7 @@ import os
 import folder_paths 
 import node_helpers
 import hashlib
+from uuid import uuid4
 
 # Tensor to PIL
 def tensor2pil(image):
@@ -26,7 +27,7 @@ def tensor_to_hash(tensor):
     return hash_value
 
 
-def create_temp_file(image):
+def create_temp_file(image, uuid):
     output_dir = folder_paths.get_temp_directory()
 
     (
@@ -35,7 +36,7 @@ def create_temp_file(image):
             counter,
             subfolder,
             _,
-        ) = folder_paths.get_save_image_path('material', output_dir)
+        ) = folder_paths.get_save_image_path(f'material_{uuid}', output_dir)
 
     
     image=tensor2pil(image)
@@ -59,6 +60,7 @@ class EditMask:
 
     def __init__(self):
         self.image_id = None
+        self.uuid = str(uuid4())
 
     @classmethod
     def INPUT_TYPES(s):
@@ -117,13 +119,13 @@ class EditMask:
                 image_path = os.path.join(base_dir,subfolder, name)
         
         if image_path==None:
-            image_path,images=create_temp_file(image)
+            image_path,images=create_temp_file(image, self.uuid)
 
         print('#image_path',os.path.exists(image_path),image_path)
         # image_path = folder_paths.get_annotated_filepath(image) #文件名
         
         if not os.path.exists(image_path):
-            image_path,images=create_temp_file(image)
+            image_path,images=create_temp_file(image, self.uuid)
 
 
         img = node_helpers.pillow(Image.open, image_path)

web/javascript/app_mixlab.js

@@ -267,7 +267,13 @@ function downloadJsonFile (jsonData, fileName = 'mix_app.json') {
 }
 
 async function save (json, download = false, showInfo = true) {
-  let nodesAll = window._nodesAll || (await getObjectInfo())
+  if (!window._nodesAll) {
+    window._nodesAll = await getObjectInfo();
+  }
+
+  let nodesAll = window._nodesAll;
+  
+  // let nodesAll = window._nodesAll || (await getObjectInfo())
 
   console.log('####SAVE', nodesAll, json)
 
@@ -417,9 +423,9 @@ function getInputsAndOutputs () {
 app.registerExtension({
   name: 'Mixlab.utils.AppInfo',
   init () {
-    if (!window._nodesAll) {
+    // if (!window._nodesAll) {
-      getObjectInfo().then(r => (window._nodesAll = r))
+    //   getObjectInfo().then(r => (window._nodesAll = r))
-    }
+    // }
   },
   async beforeRegisterNodeDef (nodeType, nodeData, app) {
     if (nodeType.comfyClass == 'AppInfo') {

web/javascript/sound-lab.js

@@ -3,7 +3,7 @@ import { api } from '../../../scripts/api.js'
 import { ComfyWidgets } from '../../../scripts/widgets.js'
 import { $el } from '../../../scripts/ui.js'
 
-import WaveSurfer from 'https://cdn.jsdelivr.net/npm/wavesurfer.js@7/dist/wavesurfer.esm.js'
+import WaveSurfer from './wavesurfer.esm.js'
 
 function get_position_style (ctx, widget_width, y, node_height) {
   const MARGIN = 4 // the margin around the html element

web/javascript/ui_mixlab.js

@@ -1735,14 +1735,16 @@ app.registerExtension({
 
       // 把json往里 拖
       document.addEventListener('drop', async event => {
-        event.preventDefault()
+        // Only intercept the JSON files handled here. Calling preventDefault()
-        event.stopPropagation()
+        // unconditionally swallowed every drop, so ComfyUI's native drag&drop
-
+        // (guarded by event.defaultPrevented) never loaded dropped workflows
-        // Dragging from Chrome->Firefox there is a file but its a bmp, so ignore that
+        // (PNG / JSON / etc.). Keep preventDefault scoped to the handled case.
         if (
           event.dataTransfer.files.length &&
           event.dataTransfer.files[0].type == 'application/json'
         ) {
+          event.preventDefault()
+          event.stopPropagation()
           const reader = new FileReader()
           reader.onload = async () => {
             loadAppJson(reader.result)
@@ -2171,6 +2173,10 @@ app.registerExtension({
 
     fetch('manager/badge_mode').then(r => {
       if (r.status === 404) {
+        // 已有ComfyUI自带的badge
+        if(node.badges?.[0]?.()){
+          return
+        }
         // 右上角的badge是否已经绘制
         if (!node.badge_enabled) {
           if (!node.getNickname) {