add the VolcanoImageEditNode.

Author: zhangp365

README.md

@@ -41,13 +41,14 @@ This node is designed to concatenate the input one batch images to a grid. It ca
 
 ## VolcanoOutpainting
 This node is designed to outpaint the input image using the Volcano engine. 
-
 use this node, must get your free API key from Volcano engine:
    - Visit [Volcano engine](https://console.volcengine.com/)
    - Log in with your Volcano engine account
    - Click on "访问控制" or go to [settings](https://console.volcengine.com/iam/keymanage)
    - Create a new API key
    - Copy the API key for use in the node's input
+## VolcanoImageEdit
+This node is designed to edit the input image using the Volcano engine.
 
 ## ModifyTextGender
 This node adjusts the text to describe the gender based on the input. If the gender input is 'M', the text will be adjusted to describe as male; if the gender input is 'F', it will be adjusted to describe as female.

py/node_volcano.py

@@ -17,46 +17,37 @@
 
 logger = logging.getLogger(__name__)
 
-class VolcanoOutpaintingNode:
-    @classmethod
-    def INPUT_TYPES(s):
-        return {
-            "required": {
-                "image": ("IMAGE",),
-                "mask": ("MASK",),
-                "ak": ("STRING", {"default": ""}),
-                "sk": ("STRING", {"default": ""}),
-                "seed": ("INT", {"default": 42, "min": 0, "max": 999999})
-            }
-        }
-
-    RETURN_TYPES = ("IMAGE",)
-    RETURN_NAMES = ("result_image",)
-    FUNCTION = "process_outpainting"
-    CATEGORY = "image/volcano"
-
+class VolcanoBaseNode:
+    """火山引擎视觉服务基类"""
+    
+    def __init__(self):
+        self.visual_service = VisualService()
+    
     def save_config(self, config):
+        """保存配置到文件"""
         config_path = os.path.join(config_dir, 'volcano_config.yml')
         with open(config_path, 'w', encoding='utf-8') as f:
             yaml.dump(config, f, indent=4)
 
     def load_config(self):
+        """从文件加载配置"""
         config_path = os.path.join(config_dir, 'volcano_config.yml')
-        with open(config_path, 'r', encoding='utf-8') as f:
-            config = yaml.load(f, Loader=yaml.FullLoader)
-        return config
+        try:
+            with open(config_path, 'r', encoding='utf-8') as f:
+                config = yaml.load(f, Loader=yaml.FullLoader)
+            return config
+        except FileNotFoundError:
+            return {}
 
     def pil_to_base64(self, pil_image):
         """将PIL图像转换为base64字符串"""
         buffer = io.BytesIO()
         pil_image.save(buffer, format='PNG')
         img_data = buffer.getvalue()
         return base64.b64encode(img_data).decode('utf-8')
-
-    def request_valcanic_outpainting(self, req_key, ak, sk, image_base64s, seed=42, top=0, left=0, bottom=0, right=0):
-        """调用火山引擎图像扩展API"""
-        visual_service = VisualService()
-        
+    
+    def setup_credentials(self, ak, sk):
+        """设置API凭证"""
         if ak and sk:          
             self.save_config({"ak": ak, "sk": sk})
         else:
@@ -65,34 +56,49 @@ def request_valcanic_outpainting(self, req_key, ak, sk, image_base64s, seed=42,
             sk = config.get("sk")
             if not ak or not sk:
                 raise Exception("volcano engine ak or sk not found")
-
-        visual_service.set_ak(ak)
-        visual_service.set_sk(sk)   
-
-        # 请求参数
-        form = {
-            "req_key": req_key,
-            "binary_data_base64": image_base64s,
-            "top": top,
-            "left": left,
-            "bottom": bottom,
-            "right": right,
-            "seed": seed
-        }
-
-        resp = visual_service.cv_process(form)
+        
+        self.visual_service.set_ak(ak)
+        self.visual_service.set_sk(sk)
+        return ak, sk
+    
+    def request_volcano_api(self, ak, sk, form_data):
+        """通用的火山引擎API请求方法"""
+        # 设置凭证
+        self.setup_credentials(ak, sk)
+        
+        # 发送请求
+        resp = self.visual_service.cv_process(form_data)
 
         # 解码返回的图像
         img_base64 = resp['data']['binary_data_base64'][0]
         img_data = base64.b64decode(img_base64)
-        # 转换为PIL图像
         result_image = Image.open(io.BytesIO(img_data))
+        
+        # 删除图片base64，方便print
+        resp['data']['binary_data_base64'][0] = ""
+        logger.debug(f"volcano api response: {resp}")
+        
+        return result_image, resp
 
-        # 删除图片base64， 方便print
-        resp['data']['binary_data_base64'][0] =""
+class VolcanoOutpaintingNode(VolcanoBaseNode):
+    """火山引擎图像扩展节点"""
+    
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "image": ("IMAGE",),
+                "mask": ("MASK",),
+                "ak": ("STRING", {"default": ""}),
+                "sk": ("STRING", {"default": ""}),
+                "seed": ("INT", {"default": 42, "min": 0, "max": 999999})
+            }
+        }
 
-        logger.debug(f"volcano outpainting response: {resp}")
-        return result_image, resp
+    RETURN_TYPES = ("IMAGE",)
+    RETURN_NAMES = ("result_image",)
+    FUNCTION = "process_outpainting"
+    CATEGORY = "image/volcano"
 
     def process_outpainting(self, image, mask, ak, sk, seed):
         try:
@@ -104,18 +110,23 @@ def process_outpainting(self, image, mask, ak, sk, seed):
             if pil_mask.mode != 'L':
                 pil_mask = pil_mask.convert('L')
 
-            # 直接转换为base64
+            # 转换为base64
             image_base64 = self.pil_to_base64(pil_image)
             mask_base64 = self.pil_to_base64(pil_mask)
 
-            # 调用API
-            result_image, _ = self.request_valcanic_outpainting(
-                req_key="i2i_outpainting",
-                ak=ak,
-                sk=sk,
-                image_base64s=[image_base64, mask_base64],
-                seed=seed
-            )
+            # 构建请求参数
+            form_data = {
+                "req_key": "i2i_outpainting",
+                "binary_data_base64": [image_base64, mask_base64],
+                "top": 0,
+                "left": 0,
+                "bottom": 0,
+                "right": 0,
+                "seed": seed
+            }
+            
+            # 调用基类的通用API请求方法
+            result_image, _ = self.request_volcano_api(ak, sk, form_data)
 
             # 使用节点库的转换函数转换结果为tensor
             result_tensor = pil2tensor(result_image)
@@ -127,11 +138,66 @@ def process_outpainting(self, image, mask, ak, sk, seed):
             # 返回原图作为fallback
             return (image,)
 
+class VolcanoImageEditNode(VolcanoBaseNode):
+    """火山引擎图像编辑节点"""
+    
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "image": ("IMAGE",),
+                "prompt": ("STRING", {"multiline": True, "default": ""}),
+                "ak": ("STRING", {"default": ""}),
+                "sk": ("STRING", {"default": ""}),
+                "seed": ("INT", {"default": 42, "min": 0, "max": 0xffffffffffffffff}),
+                "scale": ("FLOAT", {"default": 0.5, "min": 0.1, "max": 1.0, "step": 0.01})
+            },
+            "optional": {
+            }
+        }
+
+    RETURN_TYPES = ("IMAGE",)
+    RETURN_NAMES = ("edited_image",)
+    FUNCTION = "process_image_edit"
+    CATEGORY = "image/volcano"
+
+    def process_image_edit(self, image, prompt, ak, sk, seed, scale=0.5):
+        try:
+            # 使用节点库的转换函数
+            pil_image = tensor2pil(image)
+            
+            # 转换为base64
+            image_base64 = self.pil_to_base64(pil_image)
+            binary_data = [image_base64]
+            # 构建请求参数
+            form_data = {
+                "req_key": "byteedit_v2.0",
+                "binary_data_base64": binary_data,
+                "prompt": prompt,
+                "seed": seed,
+                "scale": scale
+            }
+            
+            # 调用基类的通用API请求方法
+            result_image, _ = self.request_volcano_api(ak, sk, form_data)
+            
+            # 使用节点库的转换函数转换结果为tensor
+            result_tensor = pil2tensor(result_image)
+            
+            return (result_tensor,)
+                
+        except Exception as e:
+            logger.exception(f"图像编辑处理失败: {e}")
+            # 返回原图作为fallback
+            return (image,)
+
 # 节点映射
 NODE_CLASS_MAPPINGS = {
-    "VolcanoOutpaintingNode": VolcanoOutpaintingNode
+    "VolcanoOutpaintingNode": VolcanoOutpaintingNode,
+    "VolcanoImageEditNode": VolcanoImageEditNode
 }
 
 NODE_DISPLAY_NAME_MAPPINGS = {
-    "VolcanoOutpaintingNode": "volcano outpainting"
+    "VolcanoOutpaintingNode": "volcano outpainting",
+    "VolcanoImageEditNode": "volcano image edit"
 }

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-utils-nodes"
-description = "Nodes:LoadImageWithSwitch, ImageBatchOneOrMore, ModifyTextGender, GenderControlOutput, ImageCompositeMaskedWithSwitch, ImageCompositeMaskedOneByOne, ColorCorrectOfUtils, SplitMask, MaskFastGrow, CheckpointLoaderSimpleWithSwitch, ImageResizeTo8x, MatchImageRatioToPreset, UpscaleImageWithModelIfNeed, MaskFromFaceModel, MaskCoverFourCorners, DetectorForNSFW, DeepfaceAnalyzeFaceAttributes etc."
-version = "1.3.1"
+description = "Nodes:LoadImageWithSwitch, ImageBatchOneOrMore, ModifyTextGender, GenderControlOutput, ImageCompositeMaskedWithSwitch, ImageCompositeMaskedOneByOne, ColorCorrectOfUtils, SplitMask, MaskFastGrow, CheckpointLoaderSimpleWithSwitch, ImageResizeTo8x, MatchImageRatioToPreset, MaskFromFaceModel, MaskCoverFourCorners, DetectorForNSFW, DeepfaceAnalyzeFaceAttributes, VolcanoOutpainting, VolcanoImageEdit, etc."
+version = "1.3.2"
 license = { file = "LICENSE" }
 dependencies = []