Seem comfyui LiteGraph may not exist STRING

6 add more convert

README.md

@@ -17,6 +17,7 @@ To install, either:
 - Input Image
 - Input Float
 - Input Integer
+- Input Video
 
 Each input node supports setting a default value and additional configuration options.
 
@@ -25,6 +26,9 @@ Each input node supports setting a default value and additional configuration op
 - Save Image
 - Save Images
 - Save Video - VHS
+- Output Text
+- Output Float
+- Output Integer
 
 ### Convert Widgets to ShellAgent Inputs
 

comfy-nodes/input_image.py

@@ -1,5 +1,7 @@
 import folder_paths
-from PIL import Image, ImageOps
+import node_helpers
+
+from PIL import Image, ImageOps, ImageSequence, ImageFile
 import numpy as np
 import torch
 import os
@@ -32,8 +34,8 @@ class ShellAgentPluginInputImage:
             }
         }
 
-    RETURN_TYPES = ("IMAGE",)
-    RETURN_NAMES = ("image",)
+    RETURN_TYPES = ("IMAGE", "MASK")
+    # RETURN_NAMES = ("image",)
 
     FUNCTION = "run"
 
@@ -45,7 +47,7 @@ class ShellAgentPluginInputImage:
             "title": kwargs["input_name"],
             "type": "string",
             "default": kwargs["default_value"],
-            "description": kwargs["description"],
+            "description": kwargs.get("description", ""),
             "url_type": "image"
         }
         return schema
@@ -60,6 +62,46 @@ class ShellAgentPluginInputImage:
             return "Invalid image file: {}".format(image)
 
         return True
+    
+    def convert_image_mask(self, img):
+        output_images = []
+        output_masks = []
+        w, h = None, None
+
+        excluded_formats = ['MPO']
+        
+        for i in ImageSequence.Iterator(img):
+            i = node_helpers.pillow(ImageOps.exif_transpose, i)
+
+            if i.mode == 'I':
+                i = i.point(lambda i: i * (1 / 255))
+            image = i.convert("RGB")
+
+            if len(output_images) == 0:
+                w = image.size[0]
+                h = image.size[1]
+            
+            if image.size[0] != w or image.size[1] != h:
+                continue
+            
+            image = np.array(image).astype(np.float32) / 255.0
+            image = torch.from_numpy(image)[None,]
+            if 'A' in i.getbands():
+                mask = np.array(i.getchannel('A')).astype(np.float32) / 255.0
+                mask = 1. - torch.from_numpy(mask)
+            else:
+                mask = torch.zeros((64,64), dtype=torch.float32, device="cpu")
+            output_images.append(image)
+            output_masks.append(mask.unsqueeze(0))
+
+        if len(output_images) > 1 and img.format not in excluded_formats:
+            output_image = torch.cat(output_images, dim=0)
+            output_mask = torch.cat(output_masks, dim=0)
+        else:
+            output_image = output_images[0]
+            output_mask = output_masks[0]
+
+        return (output_image, output_mask)
 
     def run(self, input_name, default_value=None, display_name=None, description=None):
         input_dir = folder_paths.get_input_directory()
@@ -84,11 +126,12 @@ class ShellAgentPluginInputImage:
                     image_path = os.path.join(input_dir, image_path)
                 image = Image.open(image_path).convert("RGB")
 
-            image = ImageOps.exif_transpose(image)
-            image = image.convert("RGB")
-            image = np.array(image).astype(np.float32) / 255.0
-            image = torch.from_numpy(image)[None,]
-            return [image]
+            return self.convert_image_mask(image)
+            # image = ImageOps.exif_transpose(image)
+            # image = image.convert("RGB")
+            # image = np.array(image).astype(np.float32) / 255.0
+            # image = torch.from_numpy(image)[None,]
+            # return [image]
         except Exception as e:
             raise e
 

comfy-nodes/input_text.py

@@ -42,7 +42,7 @@ class ShellAgentPluginInputText:
             "title": kwargs["input_name"],
             "type": "string",
             "default": kwargs["default_value"],
-            "description": kwargs["description"],
+            "description": kwargs.get("description", ""),
         }
         if kwargs.get("choices", "") != "":
             schema["enums"] = eval(kwargs["choices"])
@@ -101,7 +101,7 @@ class ShellAgentPluginInputFloat:
             "title": kwargs["input_name"],
             "type": "number",
             "default": kwargs["default_value"],
-            "description": kwargs["description"],
+            "description": kwargs.get("description", ""),
         }
         if kwargs.get("choices", "") != "":
             schema["enums"] = eval(kwargs["choices"])
@@ -184,14 +184,58 @@ class ShellAgentPluginInputInteger:
     def run(self, input_name, default_value=None, display_name=None, description=None, **kwargs):
         return [default_value]
 
+class ShellAgentPluginInputBoolean:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "input_name": (
+                    "STRING",
+                    {"multiline": False, "default": "input_bool"},
+                ),
+            },
+            "optional": {
+                "default_value": (
+                    "BOOLEAN",
+                    {"default": False},
+                ),
+                "description": (
+                    "STRING",
+                    {"multiline": True, "default": ""},
+                ),
+            }
+        }
+
+    RETURN_TYPES = ("BOOLEAN",)
+    RETURN_NAMES = ("boolean",)
+
+    FUNCTION = "run"
+
+    CATEGORY = "shellagent"
+    
+    @classmethod
+    def validate(cls, **kwargs):
+        schema = {
+            "title": kwargs["input_name"],
+            "type": "boolean",
+            "default": kwargs["default_value"],
+            "description": kwargs.get("description", ""),
+        }
+        return schema
+
+    def run(self, input_name, default_value=None, display_name=None, description=None, **kwargs):
+        return [default_value]
+
 
 NODE_CLASS_MAPPINGS = {
     "ShellAgentPluginInputText": ShellAgentPluginInputText,
     "ShellAgentPluginInputFloat": ShellAgentPluginInputFloat,
-    "ShellAgentPluginInputInteger": ShellAgentPluginInputInteger
+    "ShellAgentPluginInputInteger": ShellAgentPluginInputInteger,
+    "ShellAgentPluginInputBoolean": ShellAgentPluginInputBoolean,
 }
 NODE_DISPLAY_NAME_MAPPINGS = {
     "ShellAgentPluginInputText": "Input Text (ShellAgent Plugin)",
     "ShellAgentPluginInputFloat": "Input Float (ShellAgent Plugin)",
     "ShellAgentPluginInputInteger": "Input Integer (ShellAgent Plugin)",
+    "ShellAgentPluginInputBoolean": "Input Boolean (ShellAgent Plugin)",
 }

comfy-nodes/input_video.py

@@ -4,7 +4,7 @@ import numpy as np
 import torch
 import os
 import uuid
-import tqdm
+from tqdm import tqdm
 
 
 # class ShellAgentPluginInputImage:
@@ -120,6 +120,15 @@ class ShellAgentPluginInputVideo:
             "url_type": "video"
         }
         return schema
+    
+    @classmethod
+    def VALIDATE_INPUTS(s, input_name, default_value, description=""):
+        video = default_value
+        if video.startswith("http"):
+            return True
+        if not folder_paths.exists_annotated_filepath(video):
+            return "Invalid video file: {}".format(video)
+        return True
 
     def run(self, input_name, default_value=None, description=None):
         input_dir = folder_paths.get_input_directory()
@@ -166,4 +175,4 @@ NODE_CLASS_MAPPINGS = {
 NODE_DISPLAY_NAME_MAPPINGS = {
     # "ShellAgentPluginInputImage": "Input Image (ShellAgent Plugin)",
     "ShellAgentPluginInputVideo": "Input Video (ShellAgent Plugin)"
-}
+}

comfy-nodes/output_image.py

@@ -75,12 +75,15 @@ class ShellAgentSaveVideoVHS:
         return schema
         
     def save_video(self, filenames, **kwargs):
-        status, (preview_image, video_path) = filenames
+        status, output_files = filenames
+        if len(output_files) == 0:
+            raise ValueError("the filenames are empty")
+        print("output_files", output_files)
+        video_path = output_files[-1]
         cwd = os.getcwd()
-        preview_image = os.path.relpath(preview_image)
-        video_path = os.path.relpath(video_path)
-        results = {"ui": {"image": [preview_image], "video": [video_path]}}
-        print(results)
+        # preview_image = os.path.relpath(preview_image)
+        video_path = os.path.relpath(video_path, folder_paths.base_path)
+        results = {"ui": {"video": [video_path]}}
         return results
     
     

comfy-nodes/output_text.py

@@ -0,0 +1,88 @@
+
+json_type_mapipng = {
+    "text": "string",
+    "float": "number",
+    "integer": "integer",
+    "boolean": "boolean",
+}
+
+class ShellAgentOutputText:
+    TYPE_STR = "text"
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                s.TYPE_STR: ("STRING", {"tooltip": f"The {s.TYPE_STR} to output."}),
+                "output_name": ("STRING", {"multiline": False, "default": f"output_{s.TYPE_STR}"},),
+            },
+        }
+        
+    RETURN_TYPES = ()
+    FUNCTION = "output_var"
+
+    OUTPUT_NODE = True
+
+    CATEGORY = "shellagent"
+    DESCRIPTION = "output the text"
+    
+    @classmethod
+    def validate(cls, **kwargs):
+        schema = {
+            "title": kwargs["output_name"],
+            "type": json_type_mapipng[cls.TYPE_STR]
+        }
+        return schema
+    
+    def output_var(self, **kwargs):
+        results = {"ui": {"output": [kwargs[self.TYPE_STR]]}}
+        return results
+    
+class ShellAgentOutputFloat(ShellAgentOutputText):
+    TYPE_STR = "float"
+    DESCRIPTION = "output the float"
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                s.TYPE_STR: ("FLOAT", {"tooltip": f"The {s.TYPE_STR} to output."}),
+                "output_name": ("STRING", {"multiline": False, "default": f"output_{s.TYPE_STR}"},),
+            },
+        }
+    
+    
+class ShellAgentOutputInteger(ShellAgentOutputText):
+    TYPE_STR = "integer"
+    DESCRIPTION = "output the integer"
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                s.TYPE_STR: ("INT", {"tooltip": f"The {s.TYPE_STR} to output."}),
+                "output_name": ("STRING", {"multiline": False, "default": f"output_{s.TYPE_STR}"},),
+            },
+        }
+    
+class ShellAgentOutputBoolean(ShellAgentOutputText):
+    TYPE_STR = "boolean"
+    DESCRIPTION = "output the integer"
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                s.TYPE_STR: ("BOOLEAN", {"tooltip": f"The {s.TYPE_STR} to output."}),
+                "output_name": ("STRING", {"multiline": False, "default": f"output_{s.TYPE_STR}"},),
+            },
+        }
+    
+    
+NODE_CLASS_MAPPINGS = {
+    "ShellAgentPluginOutputText": ShellAgentOutputText,
+    "ShellAgentPluginOutputFloat": ShellAgentOutputFloat,
+    "ShellAgentPluginOutputInteger": ShellAgentOutputInteger,
+    "ShellAgentPluginOutputBoolean": ShellAgentOutputBoolean,
+}
+NODE_DISPLAY_NAME_MAPPINGS = {
+    "ShellAgentPluginOutputText": "Output Text (ShellAgent Plugin)",
+    "ShellAgentPluginOutputFloat": "Output Float (ShellAgent Plugin)",
+    "ShellAgentPluginOutputInteger": "Output Integer (ShellAgent Plugin)",
+}

custom_routes.py

@@ -29,6 +29,8 @@ import atexit
 from datetime import datetime
 import nodes
 import traceback
+import re
+import keyword
 
 from .dependency_checker import resolve_dependencies
 
@@ -45,6 +47,14 @@ CustomNodeTypeMap = {
     "ShellAgentPluginSaveVideoVHS": "video",
 }
 
+# Regular expression for a valid Python variable name
+variable_name_pattern = r'^[a-zA-Z_][a-zA-Z0-9_]*$'
+
+def is_valid_variable_name(name):
+    # Check if it matches the pattern and is not a keyword
+    if re.match(variable_name_pattern, name) and not keyword.iskeyword(name):
+        return True
+    return False
 
 def schema_validator(prompt):
     from nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
@@ -84,6 +94,9 @@ def schema_validator(prompt):
                 continue
             if hasattr(node_cls, "validate"):
                 schema = node_cls.validate(**node_info["inputs"])
+                # validate schema
+                if not is_valid_variable_name(schema["title"]):
+                    raise ValueError(f'`{schema["title"]}` is not a valid variable name!')
             else:
                 raise NotImplementedError("the validate is not implemented")
             schemas[mode][node_id] = schema
@@ -158,16 +171,26 @@ async def shellagent_export(request):
         # for fname, dict_to_save in fname_mapping.items():
         #     with open(os.path.join(save_root, fname), "w") as f:
         #         json.dump(dict_to_save, f, indent=2)
+        warning_message = ""
+        if dependency_results.get("black_list_nodes", []):
+            warning_message = "The following nodes cannot be deployed to myshell:\n"
+            for item in dependency_results["black_list_nodes"]:
+                warning_message += f"  {item['name']}: {item['reason']}\n"
+                
+        if len(schemas["inputs"]) + len(schemas["outputs"]) == 0:
+            warning_message += f"The workflow contains neither inputs nor outputs!\n"
         
         return_dict = {
             "success": True,
-            "dependencies": dependency_results,
+            "dependencies": dependency_results["dependencies"],
+            "warning_message": warning_message,
             "schemas": schemas
         }
     except Exception as e:
         status = 400
         return_dict = {
             "success": False,
-            "message": str(traceback.format_exc()),
+            "message_detail": str(traceback.format_exc()),
+            "message": str(e),
         }
     return web.json_response(return_dict, status=status)

dependency_checker.py

@@ -5,25 +5,36 @@ import logging
 from functools import partial
 import re
 import glob
+import sys
 from folder_paths import models_dir as MODELS_DIR
 from folder_paths import base_path as BASE_PATH
+from folder_paths import get_full_path
 
-from .utils import compute_sha256, windows_to_linux_path
+
+from .utils.utils import compute_sha256, windows_to_linux_path
+from .utils.pytree import tree_map
 from .file_upload import collect_local_file, process_local_file_path_async
 
 
 model_list_json = json.load(open(os.path.join(os.path.dirname(__file__), "model_info.json")))
 model_loaders_info = json.load(open(os.path.join(os.path.dirname(__file__), "model_loader_info.json")))
 node_deps_info = json.load(open(os.path.join(os.path.dirname(__file__), "node_deps_info.json")))
+node_blacklist = json.load(open(os.path.join(os.path.dirname(__file__), "node_blacklist.json")))
+node_remote_skip_models = json.load(open(os.path.join(os.path.dirname(__file__), "node_remote.json")))
+
+model_suffix = [".ckpt", ".safetensors", ".bin", ".pth", ".pt", ".onnx", ".gguf", ".sft"]
+extra_packages = ["transformers", "timm", "diffusers", "accelerate"]
 
 
-model_suffix = [".ckpt", ".safetensors", ".bin", ".pth", ".pt", ".onnx"]
+def get_full_path_or_raise(folder_name: str, filename: str) -> str:
+    full_path = get_full_path(folder_name, filename)
+    if full_path is None:
+        raise FileNotFoundError(f"Model in folder '{folder_name}' with filename '{filename}' not found.")
+    return full_path
 
-def handle_model_info(ckpt_path):
+
+def handle_model_info(ckpt_path, filename, rel_save_path):
     ckpt_path = windows_to_linux_path(ckpt_path)
-    filename = os.path.basename(ckpt_path)
-    dirname = os.path.dirname(ckpt_path)
-    save_path = os.path.dirname(os.path.relpath(ckpt_path, MODELS_DIR))
     metadata_path = ckpt_path + ".json"
     if os.path.isfile(metadata_path):
         metadata = json.load(open(metadata_path))
@@ -35,7 +46,7 @@ def handle_model_info(ckpt_path):
         model_id = compute_sha256(ckpt_path)
         data = {
             "id": model_id,
-            "save_path": save_path,
+            "save_path": rel_save_path,
             "filename": filename,
         }
         json.dump(data, open(metadata_path, "w"))
@@ -45,8 +56,8 @@ def handle_model_info(ckpt_path):
         urls = []
         
     item = {
-        "filename": filename,
-        "save_path": windows_to_linux_path(save_path),
+        "filename": windows_to_linux_path(filename),
+        "save_path": windows_to_linux_path(rel_save_path),
         "urls": urls,
     }
     return model_id, item
@@ -59,6 +70,10 @@ def inspect_repo_version(module_path):
         "repo": "",
         "commit": ""
     }
+    
+    if not os.path.isdir(os.path.join(module_path, ".git")):
+        return result
+    
     # Get the remote repository URL
     try:
         remote_url = subprocess.check_output(
@@ -87,7 +102,7 @@ def inspect_repo_version(module_path):
 
 def fetch_model_searcher_results(model_ids):
     import requests
-    url = "https://shellagent.myshell.ai/models_searcher/search_urls"
+    url = "https://models-searcher.myshell.life/search_urls"
     headers = {
         "Content-Type": "application/json"
     }
@@ -96,59 +111,164 @@ def fetch_model_searcher_results(model_ids):
     }
 
     response = requests.post(url, headers=headers, json=data)
-    results = [item[:10] for item in response.json()]
+    if response.status_code == 200:
+        results = [item[:10] for item in response.json()]
+    else:
+        results = None
     return results
 
+def split_package_version(require_line):
+    require_line = require_line.strip()
+    
+    pattern = r"^([a-zA-Z0-9_\-\[\]]+)(.*)$"
+    match = re.match(pattern, require_line.strip())
+    
+    if match:
+        package_name = match.group(1)  # First capturing group is the package name
+        version_specifier = match.group(2) if match.group(2) else ""  # Second group is the version, if present
+        return package_name, version_specifier
+    else:
+        assert len(require_line) == 0 or require_line.strip()[0] == "#", require_line
+        return None, None
+
+def get_package_version(package_name):
+    try:
+        if sys.version_info >= (3, 8):
+            from importlib.metadata import version, PackageNotFoundError
+            return version(package_name)
+        else:
+            from pkg_resources import get_distribution, DistributionNotFound
+            return get_distribution(package_name).version
+    except Exception:
+        return None
+    
 def resolve_dependencies(prompt, custom_dependencies): # resolve custom nodes and models at the same time
     from nodes import NODE_CLASS_MAPPINGS
+    import folder_paths
+    
     custom_nodes = []
-    ckpt_paths = []
+    ckpt_paths = {}
     
     file_mapping_dict = {}
+    
+    SKIP_FOLDER_NAMES = ["configs", "custom_nodes"]
+    def collect_unknown_models(filename, node_id, node_info, custom_node_path):
+        if type(filename) != str:
+            return
+        is_model = False
+        for possible_suffix in model_suffix:
+            if filename.endswith(possible_suffix):
+                is_model = True
+        if is_model:
+            print(f"find {filename}, is_model=True")
+            # find possible paths
+            matching_files = {}
+            # Walk through all subdirectories and files in the directory
+            rel_save_path = None
+            for possible_folder_name in folder_paths.folder_names_and_paths:
+                if possible_folder_name in SKIP_FOLDER_NAMES:
+                    print(f"skip {possible_folder_name}")
+                    continue
+                full_path = folder_paths.get_full_path(possible_folder_name, filename)
+                if full_path is None:
+                    continue
+                rel_save_path = os.path.relpath(folder_paths.folder_names_and_paths[possible_folder_name][0][0], folder_paths.models_dir)
+                matching_files[full_path] = {
+                    "rel_save_path": rel_save_path
+                }
+
+            print(f"matched files: {matching_files}")
+            
+            # step 2: search for all the files under "models"
+            
+            for full_path in glob.glob(f"{folder_paths.models_dir}/**/*", recursive=True):
+                if os.path.isfile(full_path) and full_path.endswith(filename) and full_path not in matching_files:
+                    folder_path = full_path[:-len(filename)]
+                    rel_save_path = os.path.relpath(folder_path, folder_paths.models_dir)
+                    matching_files[full_path] = {
+                        "rel_save_path": rel_save_path
+                    }
+                    
+            print(f"matched files: {matching_files}")
+            
+            # step 3: search inside the custom nodes
+            if custom_node_path is not None:
+                for full_path in glob.glob(f"{custom_node_path}/**/*", recursive=True):
+                    if os.path.isfile(full_path) and full_path.endswith(filename) and full_path not in matching_files:
+                        folder_path = full_path[:-len(filename)]
+                        rel_save_path = os.path.relpath(folder_path, folder_paths.models_dir)
+                        matching_files[full_path] = {
+                            "rel_save_path": rel_save_path
+                        }
+            
+            if len(matching_files) == 0:
+                raise ValueError(f"Cannot find model: `{filename}`, Node ID: `{node_id}`, Node Info: `{node_info}`")
+            
+            elif len(matching_files) <= 3:
+                for full_path, info in matching_files.items():
+                    ckpt_paths[full_path] = {
+                        "filename": filename,
+                        "rel_save_path": info["rel_save_path"]
+                    }
+                    return
+            else:
+                raise ValueError(f"Multiple models of `{filename}` founded, Node ID: `{node_id}`, Node Info: `{node_info}`, Possible paths: `{list(matching_files.keys())}`")
+            
+    
     for node_id, node_info in prompt.items():
         node_class_type = node_info.get("class_type")
         if node_class_type is None:
             raise NotImplementedError(f"Missing nodes founded, please first install the missing nodes using ComfyUI Manager")
         node_cls = NODE_CLASS_MAPPINGS[node_class_type]
-        if hasattr(node_cls, "RELATIVE_PYTHON_MODULE"):
+        
+        skip_model_check = False
+        
+        custom_node_path = None
+        if hasattr(node_cls, "RELATIVE_PYTHON_MODULE") and node_cls.RELATIVE_PYTHON_MODULE.startswith("custom_nodes."):
+            print(node_cls.RELATIVE_PYTHON_MODULE)
             custom_nodes.append(node_cls.RELATIVE_PYTHON_MODULE)
+            custom_node_path = os.path.join(BASE_PATH, node_cls.RELATIVE_PYTHON_MODULE.replace(".", "/"))
+            if node_cls.RELATIVE_PYTHON_MODULE[len("custom_nodes."):] in node_remote_skip_models:
+                skip_model_check = True
+                print(f"skip model check for {node_class_type}")
+                
         if node_class_type in model_loaders_info:
-            for field_name, filename in node_info["inputs"].items():
-                for item in model_loaders_info[node_class_type]:
-                    pattern = item["field_name"]
-                    if re.match(f"^{pattern}$", field_name):
-                        ckpt_path = os.path.join(MODELS_DIR, item["save_path"], filename)
-                        ckpt_paths.append(ckpt_path)
-        else:
             for field_name, filename in node_info["inputs"].items():
                 if type(filename) != str:
                     continue
-                is_model = False
-                for possible_suffix in model_suffix:
-                    if filename.endswith(possible_suffix):
-                        is_model = True
-                if is_model:
-                    print(f"find {filename}, is_model=True")
-                    # find possible paths
-                    matching_files = []
-                    # Walk through all subdirectories and files in the directory
-                    for possible_filename in glob.glob(os.path.join(MODELS_DIR, "**", "*"), recursive=True):
-                        if os.path.isfile(possible_filename) and possible_filename.endswith(filename):
-                            matching_files.append(possible_filename)
-                    print(f"matched files: {matching_files}")
-                    if len(matching_files) == 1:
-                        ckpt_paths.append(matching_files[0])
+                for item in model_loaders_info[node_class_type]:
+                    pattern = item["field_name"]
+                    if re.match(f"^{pattern}$", field_name) and any([filename.endswith(possible_suffix) for possible_suffix in model_suffix]):
+                        ckpt_path = get_full_path_or_raise(item["save_path"], filename)
+                        if hasattr(folder_paths, "map_legacy"):
+                            save_folder = folder_paths.map_legacy(item["save_path"])
+                        else:
+                            save_folder = item["save_path"]
+                        rel_save_path = os.path.relpath(folder_paths.folder_names_and_paths[save_folder][0][0], folder_paths.models_dir)
+                        ckpt_paths[ckpt_path] = {
+                            "filename": filename,
+                            "rel_save_path": rel_save_path
+                        }
+        elif not skip_model_check:
+            tree_map(lambda x: collect_unknown_models(x, node_id, node_info, custom_node_path), node_info["inputs"])
+
         list(map(partial(collect_local_file, mapping_dict=file_mapping_dict), node_info["inputs"].values()))
             
-    ckpt_paths = list(set(ckpt_paths))
     print("ckpt_paths:", ckpt_paths)
     custom_nodes = list(set(custom_nodes))
     # step 0: comfyui version
-    comfyui_version = inspect_repo_version(BASE_PATH)
-    
+    repo_info = inspect_repo_version(BASE_PATH)
+    if repo_info["repo"] == "":
+        repo_info["require_recheck"] = True
+        if repo_info["name"] in custom_dependencies["custom_nodes"]:
+            repo_info["repo"] = custom_dependencies["custom_nodes"][repo_info["name"]].get("repo", "")
+            repo_info["commit"] = custom_dependencies["custom_nodes"][repo_info["name"]].get("commit", "")
+    comfyui_version = repo_info
+
     # step 1: custom nodes
     custom_nodes_list = []
     custom_nodes_names = []
+    requirements_lines = []
     for custom_node in custom_nodes:
         try:
             repo_info = inspect_repo_version(os.path.join(BASE_PATH, custom_node.replace(".", "/")))
@@ -161,20 +281,36 @@ def resolve_dependencies(prompt, custom_dependencies): # resolve custom nodes an
             custom_nodes_names.append(repo_info["name"])
         except:
             print(f"failed to resolve repo info of {custom_node}")
+        requirement_file = os.path.join(BASE_PATH, custom_node.replace(".", "/"), "requirements.txt")
+        if os.path.isfile(requirement_file):
+            requirements_lines += open(requirement_file).readlines()
+    requirements_lines = list(set(requirements_lines))
+    requirements_packages = [package_name for package_name, version_specifier in map(split_package_version, requirements_lines) if package_name is not None]
+    package_names = set(requirements_packages + extra_packages)
+    pypi_deps = {
+        package_name: get_package_version(package_name)
+        for package_name in package_names
+    }
     
     for repo_name in custom_nodes_names:
         if repo_name in node_deps_info:
             for deps_node in node_deps_info[repo_name]:
                 if deps_node["name"] not in custom_nodes_names:
-                    repo_info = inspect_repo_version(os.path.join("custom_nodes", deps_node["name"]))
+                    repo_info = inspect_repo_version(os.path.join(BASE_PATH, "custom_nodes", deps_node["name"]))
                     deps_node["commit"] = repo_info["commit"]
                     custom_nodes_list.append(deps_node)
+                    custom_nodes_names.append(deps_node["name"])
+                    
+    black_list_nodes = []
+    for repo_name in custom_nodes_names:
+        if repo_name in node_blacklist:
+            black_list_nodes.append({"name": repo_name, "reason": node_blacklist[repo_name]["reason"]})
     
     # step 2: models
     models_dict = {}
     missing_model_ids = []
-    for ckpt_path in ckpt_paths:
-        model_id, item = handle_model_info(ckpt_path)
+    for ckpt_path, ckpt_info in ckpt_paths.items():
+        model_id, item = handle_model_info(ckpt_path, ckpt_info["filename"], ckpt_info["rel_save_path"])
         models_dict[model_id] = item
         if len(item["urls"]) == 0:
             item["require_recheck"] = True
@@ -184,20 +320,30 @@ def resolve_dependencies(prompt, custom_dependencies): # resolve custom nodes an
             
     # try to fetch from myshell model searcher
     missing_model_results_myshell = fetch_model_searcher_results(missing_model_ids)
-    for missing_model_id, missing_model_urls in zip(missing_model_ids, missing_model_results_myshell):
-        if len(missing_model_urls) > 0:
-            models_dict[missing_model_id]["require_recheck"] = False
-            models_dict[missing_model_id]["urls"] = missing_model_urls
-            print("successfully fetch results from myshell", models_dict[missing_model_id])
+    if missing_model_results_myshell is not None:
+        for missing_model_id, missing_model_urls in zip(missing_model_ids, missing_model_results_myshell):
+            if len(missing_model_urls) > 0:
+                models_dict[missing_model_id]["require_recheck"] = False
+                models_dict[missing_model_id]["urls"] = missing_model_urls
+                print("successfully fetch results from myshell", models_dict[missing_model_id])
 
     # step 3: handle local files
     process_local_file_path_async(file_mapping_dict, max_workers=20)
-    files_dict = {v[0]: {"filename": windows_to_linux_path(os.path.relpath(v[2], BASE_PATH)), "urls": [v[1]]} for v in file_mapping_dict.values()}
+    files_dict = {
+        v[0]: {
+            "filename": windows_to_linux_path(os.path.relpath(v[2], BASE_PATH)) if not v[3] else v[2], 
+            "urls": [v[1]]} for v in file_mapping_dict.values()}
     
-    results = {
+    depencencies = {
         "comfyui_version": comfyui_version,
         "custom_nodes": custom_nodes_list,
         "models": models_dict,
         "files": files_dict,
+        "pypi": pypi_deps
     }
-    return results
+    
+    return_dict = {
+        "dependencies": depencencies,
+        "black_list_nodes": black_list_nodes,
+    }
+    return return_dict

file_upload.py

@@ -5,7 +5,7 @@ import time
 from concurrent.futures import ThreadPoolExecutor, as_completed
 import folder_paths
 
-from .utils import compute_sha256
+from .utils.utils import compute_sha256, get_alphanumeric_hash
 
 ext_to_type = {
     # image
@@ -27,7 +27,7 @@ ext_to_type = {
     '.m4a': 'audio/mp4',
 }
 
-def upload_file_to_myshell(local_file: str) -> str:
+def upload_file_to_myshell(local_file: str, target_path: str, is_abs) -> str:
     ''' Now we only support upload file one-by-one
     '''
     MYSHELL_KEY = os.environ.get('MYSHELL_KEY', "OPENSOURCE_FIXED")
@@ -51,8 +51,8 @@ def upload_file_to_myshell(local_file: str) -> str:
     response = requests.request("POST", server_url, headers=headers, files=files)
     if response.status_code == 200:
         end_time = time.time()
-        logging.info(f"{local_file} uploaded, time elapsed: {end_time - start_time}")
-        return [sha256sum, response.json()['url'], local_file]
+        logging.info(f"{local_file} uploaded, time elapsed: {end_time - start_time}, will be saved to {target_path}")
+        return [sha256sum, response.json()['url'], target_path, is_abs]
     else:
         raise Exception(
             f"[HTTP ERROR] {response.status_code} - {response.text} \n"
@@ -66,8 +66,11 @@ def collect_local_file(item, mapping_dict={}):
     abspath = os.path.abspath(item)
     input_abspath = os.path.join(input_dir, item)
     # required file type
+    is_abs = False
     if os.path.isfile(abspath):
         fpath = abspath
+        is_abs = True
+        
     elif os.path.isfile(input_abspath):
         fpath = input_abspath
     else:
@@ -75,7 +78,13 @@ def collect_local_file(item, mapping_dict={}):
     if fpath is not None:
         ext = os.path.splitext(fpath)[1]
         if ext.lower() in ext_to_type.keys():
-            mapping_dict[item] = fpath
+            if is_abs: # if use abs path, replace it
+                filename_hash = get_alphanumeric_hash(abspath)[:16]
+                count = len(mapping_dict)
+                target_path = f"/ShellAgentDeploy/ComfyUI/input/{filename_hash}_{count:06d}{ext}"
+                mapping_dict[item] = (fpath, target_path, is_abs)
+            else:
+                mapping_dict[item] = (fpath, fpath, is_abs)
             return
         else:
             return
@@ -86,7 +95,7 @@ def process_local_file_path_async(mapping_dict, max_workers=10):
     start_time = time.time()
     with ThreadPoolExecutor(max_workers=max_workers) as executor:
         # Submit tasks to the executor
-        futures = {executor.submit(upload_file_to_myshell, full_path): filename for filename, full_path in mapping_dict.items()}
+        futures = {executor.submit(upload_file_to_myshell, source_path, target_path, is_abs): filename for filename, (source_path, target_path, is_abs) in mapping_dict.items()}
         logging.info("submit done")
         # Collect the results as they complete
         for future in as_completed(futures):
@@ -95,7 +104,8 @@ def process_local_file_path_async(mapping_dict, max_workers=10):
                 result = future.result()
                 mapping_dict[filename] = result
             except Exception as e:
-                print(f"Error processing {filename}: {e}")
+                del mapping_dict[filename]
+                raise NotImplementedError(f"Error processing {filename}: {e}")
     end_time = time.time()
     logging.info(f"upload end, elapsed time: {end_time - start_time}")
     return

node_blacklist.json

@@ -0,0 +1,5 @@
+{
+    "comfyui-ollama": {
+        "reason": "this node requires installing an extra software on linux, which is currently unsupported"
+    }
+}

node_deps_info.json

@@ -15,5 +15,19 @@
         "repo": "https://github.com/shiimizu/ComfyUI_smZNodes.git",
         "commit": ""
       }
+  ],
+  "efficiency-nodes-comfyui": [
+    {
+      "name": "comfyui_controlnet_aux",
+      "repo": "https://github.com/Fannovel16/comfyui_controlnet_aux.git",
+      "commit": ""
+    }
+  ],
+  "ComfyUI-Anyline": [
+    {
+      "name": "comfyui_controlnet_aux",
+      "repo": "https://github.com/Fannovel16/comfyui_controlnet_aux.git",
+      "commit": ""
+    }
   ]
 }

node_remote.json

@@ -0,0 +1,3 @@
+[
+    "BizyAir"
+]

utils/utils.py

@@ -1,6 +1,8 @@
 import hashlib
 import time
 from pathlib import PurePosixPath, Path, PureWindowsPath
+import base64
+import re
 
 def windows_to_linux_path(windows_path):
     return PureWindowsPath(windows_path).as_posix()
@@ -17,4 +19,17 @@ def compute_sha256(file_path, chunk_size=1024 ** 2):
             sha256.update(chunk)
     print("finish compute sha256 for", file_path, f"time: {time.time() - start}")
     # Return the hexadecimal digest of the hash
-    return sha256.hexdigest()
+    return sha256.hexdigest()
+
+
+def get_alphanumeric_hash(input_string: str) -> str:
+    # Generate a SHA-256 hash of the input string
+    sha256_hash = hashlib.sha256(input_string.encode()).digest()
+    
+    # Encode the hash in base64 to get a string with [A-Za-z0-9+/=]
+    base64_hash = base64.b64encode(sha256_hash).decode('ascii')
+    
+    # Remove any non-alphanumeric characters (+, /, =)
+    alphanumeric_hash = re.sub(r'[^a-zA-Z0-9]', '', base64_hash)
+    
+    return alphanumeric_hash

web/shellagent.js

@@ -37,11 +37,15 @@ app.registerExtension({
     });
   },
   async beforeRegisterNodeDef(nodeType, nodeData, app) {
+    if (["ShellAgentPluginOutputText", "ShellAgentPluginOutputFloat", "ShellAgentPluginOutputInteger"].indexOf(nodeData.name) > -1) {
+      chainCallback(nodeType.prototype, "onNodeCreated", function () {
+        this.convertWidgetToInput(this.widgets[0])
+      })
+    }
 
     if (["ShellAgentPluginInputText", "ShellAgentPluginInputFloat", "ShellAgentPluginInputInteger"].indexOf(nodeData.name) > -1) {
       chainCallback(nodeType.prototype, "onNodeCreated", function () {
         const widget = this.widgets.find(w => w.name === 'choices')
-
         this.addWidget('button', 'manage choices', null, () => {
           const container = document.createElement("div");
           Object.assign(container.style, {
@@ -93,7 +97,7 @@ app.registerExtension({
             try {
               arr = JSON.parse(widget.value)
             } catch { }
-          } else if(Array.isArray(widget.value)) {
+          } else if (Array.isArray(widget.value)) {
             arr = widget.value
           }
 
@@ -137,6 +141,27 @@ app.registerExtension({
       })
     }
 
+    if (['LoadImage', 'LoadImageMask'].indexOf(nodeData.name) > -1) {
+      addMenuHandler(nodeType, function (_, options) {
+        options.unshift({
+          content: "Replace with ShellAgent Input Image",
+          callback: () => {
+            const node = addNode("ShellAgentPluginInputImage", this, { before: true });
+
+            const dvn = node.widgets.find(w => w.name === 'default_value')
+            dvn.value = this.widgets.find(w => w.name === 'image')?.value
+
+            app.graph.links.filter(l => l != null)
+              .forEach(l => {
+                const tn = app.graph._nodes_by_id[l.target_id]
+                node.connect(0, tn, 0)
+              })
+            app.graph.remove(this);
+          }
+        })
+      })
+    }
+
     if (nodeData.name === "ShellAgentPluginInputImage") {
       if (
         nodeData?.input?.required?.default_value?.[1]?.image_upload === true
@@ -151,7 +176,6 @@ app.registerExtension({
     if (nodeData.name === "ShellAgentPluginInputVideo") {
       addUploadWidget(nodeType, nodeData, "default_value");
       chainCallback(nodeType.prototype, "onNodeCreated", function () {
-        // const pathWidget = this.widgets.find((w) => w.name === "video");
         const pathWidget = this.widgets.find((w) => w.name === "default_value");
         chainCallback(pathWidget, "callback", (value) => {
           if (!value) {
@@ -174,59 +198,180 @@ app.registerExtension({
 
     if (nodeData.name.indexOf('ShellAgentPlugin') === -1) {
       addMenuHandler(nodeType, function (_, options) {
+
         if (this.widgets) {
           let toInput = [];
-
           for (const w of this.widgets) {
             if (["customtext"].indexOf(w.type) > -1) {
               toInput.push({
-                content: `${w.name} <- Input Text`,
-                callback: () => {
-                  this.convertWidgetToInput(w);
-                  const node = addNode("ShellAgentPluginInputText", this, { before: true });
-                  const dvn = node.widgets.find(w => w.name === 'default_value')
-                  dvn.value = w.value;
-                  node.connect(0, this, this.inputs.length - 1);
-                }
+                content: w.name,
+                submenu: {
+                  options: [
+                    {
+                      content: 'Input Text',
+                      callback: () => {
+                        this.convertWidgetToInput(w);
+                        const node = addNode("ShellAgentPluginInputText", this, { before: true });
+                        const dvn = node.widgets.find(w => w.name === 'default_value')
+                        dvn.value = w.value;
+                        node.connect(0, this, this.inputs.length - 1);
+                      }
+                    }
+                  ]
+                },
               })
             }
             if (["number"].indexOf(w.type) > -1) {
               toInput.push({
-                content: `${w.name} <- Input Interger`,
-                callback: () => {
-                  this.convertWidgetToInput(w);
-                  const node = addNode("ShellAgentPluginInputInteger", this, { before: true });
-                  const dvn = node.widgets.find(w => w.name === 'default_value')
-                  dvn.value = w.value;
-                  node.connect(0, this, this.inputs.length - 1);
-                }
-              })
-
-              toInput.push({
-                content: `${w.name} <- Input Float`,
-                callback: () => {
-                  this.convertWidgetToInput(w);
-                  const node = addNode("ShellAgentPluginInputFloat", this, { before: true });
-                  const dvn = node.widgets.find(w => w.name === 'default_value')
-                  dvn.value = w.value;
-                  node.connect(0, this, this.inputs.length - 1);
+                content: w.name,
+                submenu: {
+                  options: [
+                    {
+                      content: 'Input Interger',
+                      callback: () => {
+                        this.convertWidgetToInput(w);
+                        const node = addNode("ShellAgentPluginInputInteger", this, { before: true });
+                        const dvn = node.widgets.find(w => w.name === 'default_value')
+                        dvn.value = w.value;
+                        node.connect(0, this, this.inputs.length - 1);
+                      }
+                    },
+                    {
+                      content: 'Input Float',
+                      callback: () => {
+                        this.convertWidgetToInput(w);
+                        const node = addNode("ShellAgentPluginInputFloat", this, { before: true });
+                        const dvn = node.widgets.find(w => w.name === 'default_value')
+                        dvn.value = w.value;
+                        node.connect(0, this, this.inputs.length - 1);
+                      }
+                    }
+                  ]
                 }
               })
             }
           }
-
           if (toInput.length) {
             options.unshift({
-              content: "Convert to ShellAgent",
+              content: "Convert to ShellAgent (Input)",
               submenu: {
                 options: toInput
               }
             })
           }
         }
+
+        if (this.outputs) {
+          let toOutput = [];
+          for (const o of this.outputs) {
+            if (o.type === 'IMAGE') {
+              toOutput.push({
+                content: o.name,
+                submenu: {
+                  options: [
+                    {
+                      content: 'Save Image',
+                      callback: () => {
+                        const node = addNode("ShellAgentPluginSaveImage", this);
+                        this.connect(0, node, 0);
+                      }
+                    },
+                    {
+                      content: 'Save Images',
+                      callback: () => {
+                        const node = addNode("ShellAgentPluginSaveImages", this);
+                        this.connect(0, node, 0);
+                      }
+                    }
+                  ]
+                }
+
+              })
+            }
+
+            if (o.type === 'STRING') {
+              toOutput.push({
+                content: o.name,
+                submenu: {
+                  options: [
+                    {
+                      content: `Output Text`,
+                      callback: () => {
+                        const node = addNode("ShellAgentPluginOutputText", this);
+                        this.connect(0, node, 0);
+                      }
+                    },
+                    {
+                      content: `Output Float`,
+                      callback: () => {
+                        const node = addNode("ShellAgentPluginOutputFloat", this);
+                        this.connect(0, node, 0);
+                      }
+                    },
+                    {
+                      content: `Output Integer`,
+                      callback: () => {
+                        const node = addNode("ShellAgentPluginOutputInteger", this);
+                        this.connect(0, node, 0);
+                      }
+                    }
+                  ]
+                }
+              })
+            }
+
+            if (o.type === "VHS_FILENAMES") {
+              toOutput.push({
+                content: o.name,
+                submenu: {
+                  options: [
+                    {
+                      content: `Save Video - VHS`,
+                      callback: () => {
+                        const node = addNode("ShellAgentPluginSaveVideoVHS", this);
+                        this.connect(0, node, 0);
+                      }
+                    }
+                  ]
+                }
+              })
+            }
+          }
+
+          if (toOutput.length) {
+            options.unshift({
+              content: "Connect to ShellAgent (Output)",
+              submenu: {
+                options: toOutput
+              }
+            })
+          }
+
+        }
       })
     }
   },
+
+  afterConfigureGraph(missingNodeTypes, app) {
+    function addIn(type, nodeId) {
+      if (LiteGraph.slot_types_default_in[type].indexOf(nodeId) === -1) {
+        LiteGraph.slot_types_default_in[type].unshift(nodeId)
+      }
+    }
+
+    function addOut(type, nodeId) {
+      if (LiteGraph.slot_types_default_out[type].indexOf(nodeId) === -1) {
+        LiteGraph.slot_types_default_out[type].unshift(nodeId)
+      }
+    }
+
+    addIn('IMAGE', 'ShellAgentPluginInputImage')
+    addOut('IMAGE', 'ShellAgentPluginSaveImage')
+    addOut('IMAGE', 'ShellAgentPluginSaveImages')
+    // addOut('STRING', 'ShellAgentPluginOutputInteger')
+    // addOut('STRING', 'ShellAgentPluginOutputFloat')
+    // addOut('STRING', 'ShellAgentPluginOutputText')
+  }
 });
 
 function addMenuHandler(nodeType, cb) {