Merge ad1102fc1d into 98bdca4cb2

* Deprecate InputTypeOptions.defaultInput

* nit

* nit

comfy/comfy_types/node_typing.py

@@ -102,9 +102,13 @@ class InputTypeOptions(TypedDict):
     default: bool | str | float | int | list | tuple
     """The default value of the widget"""
     defaultInput: bool
-    """Defaults to an input slot rather than a widget"""
+    """@deprecated in v1.16 frontend. v1.16 frontend allows input socket and widget to co-exist.
+    - defaultInput on required inputs should be dropped.
+    - defaultInput on optional inputs should be replaced with forceInput.
+    Ref: https://github.com/Comfy-Org/ComfyUI_frontend/pull/3364
+    """
     forceInput: bool
-    """`defaultInput` and also don't allow converting to a widget"""
+    """Forces the input to be an input slot rather than a widget even a widget is available for the input type."""
     lazy: bool
     """Declares that this input uses lazy evaluation"""
     rawLink: bool

nodes.py

@@ -1653,7 +1653,8 @@ class LoadImage:
     @classmethod
     def INPUT_TYPES(s):
         input_dir = folder_paths.get_input_directory()
-        files = [f for f in os.listdir(input_dir) if os.path.isfile(os.path.join(input_dir, f))]
+        strip_inputdir = lambda path: path[len(input_dir)+1:]
+        files = [strip_inputdir(os.path.join(dir,f)) for (dir, subdirs, files) in os.walk(input_dir, followlinks=True) for f in files]
         return {"required":
                     {"image": (sorted(files), {"image_upload": True})},
                 }
@@ -2136,7 +2137,7 @@ def load_custom_node(module_path: str, ignore=set(), module_parent="custom_nodes
         module_name = sp[0]
         sys_module_name = module_name
     elif os.path.isdir(module_path):
-        sys_module_name = module_path
+        sys_module_name = module_path.replace(".", "_x_")
 
     try:
         logging.debug("Trying to load custom node {}".format(module_path))