Separate Impact Pack and Impact Subpack

__init__.py

@@ -13,7 +13,6 @@ import traceback
 
 comfy_path = os.path.dirname(folder_paths.__file__)
 impact_path = os.path.join(os.path.dirname(__file__))
-subpack_path = os.path.join(os.path.dirname(__file__), "impact_subpack")
 modules_path = os.path.join(os.path.dirname(__file__), "modules")
 
 sys.path.append(modules_path)
@@ -22,14 +21,9 @@ import impact.config
 import impact.sample_error_enhancer
 print(f"### Loading: ComfyUI-Impact-Pack ({impact.config.version})")
 
-
-sys.path.append(subpack_path)
-
 # Core
 # recheck dependencies for colab
 try:
-    import impact.subpack_nodes  # This import must be done before cv2.
-
     import folder_paths
     import torch
     import cv2
@@ -463,19 +457,6 @@ if not impact.config.get_config()['mmdet_skip']:
         "SegmDetectorCombined": "SegmDetectorCombined (Legacy)",
     })
 
-try:
-    import impact.subpack_nodes
-
-    NODE_CLASS_MAPPINGS.update(impact.subpack_nodes.NODE_CLASS_MAPPINGS)
-    NODE_DISPLAY_NAME_MAPPINGS.update(impact.subpack_nodes.NODE_DISPLAY_NAME_MAPPINGS)
-except Exception as e:
-    print("### ComfyUI-Impact-Pack: (IMPORT FAILED) Subpack\n")
-    print("  The module at the `custom_nodes/ComfyUI-Impact-Pack/impact_subpack` path appears to be incomplete.")
-    print("  Recommended to delete the path and restart ComfyUI.")
-    print("  If the issue persists, please report it to https://github.com/ltdrdata/ComfyUI-Impact-Pack/issues.")
-    print("\n---------------------------------")
-    traceback.print_exc()
-    print("---------------------------------\n")
 
 # NOTE:  Inject directly into EXTENSION_WEB_DIRS instead of WEB_DIRECTORY
 #        Provide the js path fixed as ComfyUI-Impact-Pack instead of the path name, making it available for external use

modules/impact/impact_pack.py

@@ -225,6 +225,10 @@ class DetailerForEach:
 
     CATEGORY = "ImpactPack/Detailer"
 
+    @staticmethod
+    def get_core_module():
+        return core
+
     @staticmethod
     def do_detail(image, segs, model, clip, vae, guide_size, guide_size_for_bbox, max_size, seed, steps, cfg, sampler_name, scheduler,
                   positive, negative, denoise, feather, noise_mask, force_inpaint, wildcard_opt=None, detailer_hook=None,