diff --git a/comfy_extras/__init__.py b/comfy/comfy_extras/__init__.py similarity index 100% rename from comfy_extras/__init__.py rename to comfy/comfy_extras/__init__.py diff --git a/comfy_extras/chainner_models/__init__.py b/comfy/comfy_extras/chainner_models/__init__.py similarity index 100% rename from comfy_extras/chainner_models/__init__.py rename to comfy/comfy_extras/chainner_models/__init__.py diff --git a/comfy_extras/chainner_models/architecture/HAT.py b/comfy/comfy_extras/chainner_models/architecture/HAT.py similarity index 100% rename from comfy_extras/chainner_models/architecture/HAT.py rename to comfy/comfy_extras/chainner_models/architecture/HAT.py diff --git a/comfy_extras/chainner_models/architecture/LICENSE-ESRGAN b/comfy/comfy_extras/chainner_models/architecture/LICENSE-ESRGAN similarity index 100% rename from comfy_extras/chainner_models/architecture/LICENSE-ESRGAN rename to comfy/comfy_extras/chainner_models/architecture/LICENSE-ESRGAN diff --git a/comfy_extras/chainner_models/architecture/LICENSE-HAT b/comfy/comfy_extras/chainner_models/architecture/LICENSE-HAT similarity index 100% rename from comfy_extras/chainner_models/architecture/LICENSE-HAT rename to comfy/comfy_extras/chainner_models/architecture/LICENSE-HAT diff --git a/comfy_extras/chainner_models/architecture/LICENSE-RealESRGAN b/comfy/comfy_extras/chainner_models/architecture/LICENSE-RealESRGAN similarity index 100% rename from comfy_extras/chainner_models/architecture/LICENSE-RealESRGAN rename to comfy/comfy_extras/chainner_models/architecture/LICENSE-RealESRGAN diff --git a/comfy_extras/chainner_models/architecture/LICENSE-SPSR b/comfy/comfy_extras/chainner_models/architecture/LICENSE-SPSR similarity index 100% rename from comfy_extras/chainner_models/architecture/LICENSE-SPSR rename to comfy/comfy_extras/chainner_models/architecture/LICENSE-SPSR diff --git a/comfy_extras/chainner_models/architecture/LICENSE-SwiftSRGAN b/comfy/comfy_extras/chainner_models/architecture/LICENSE-SwiftSRGAN similarity index 100% rename from comfy_extras/chainner_models/architecture/LICENSE-SwiftSRGAN rename to comfy/comfy_extras/chainner_models/architecture/LICENSE-SwiftSRGAN diff --git a/comfy_extras/chainner_models/architecture/LICENSE-Swin2SR b/comfy/comfy_extras/chainner_models/architecture/LICENSE-Swin2SR similarity index 100% rename from comfy_extras/chainner_models/architecture/LICENSE-Swin2SR rename to comfy/comfy_extras/chainner_models/architecture/LICENSE-Swin2SR diff --git a/comfy_extras/chainner_models/architecture/LICENSE-SwinIR b/comfy/comfy_extras/chainner_models/architecture/LICENSE-SwinIR similarity index 100% rename from comfy_extras/chainner_models/architecture/LICENSE-SwinIR rename to comfy/comfy_extras/chainner_models/architecture/LICENSE-SwinIR diff --git a/comfy_extras/chainner_models/architecture/LICENSE-lama b/comfy/comfy_extras/chainner_models/architecture/LICENSE-lama similarity index 100% rename from comfy_extras/chainner_models/architecture/LICENSE-lama rename to comfy/comfy_extras/chainner_models/architecture/LICENSE-lama diff --git a/comfy_extras/chainner_models/architecture/LICENSE-mat b/comfy/comfy_extras/chainner_models/architecture/LICENSE-mat similarity index 100% rename from comfy_extras/chainner_models/architecture/LICENSE-mat rename to comfy/comfy_extras/chainner_models/architecture/LICENSE-mat diff --git a/comfy_extras/chainner_models/architecture/LaMa.py b/comfy/comfy_extras/chainner_models/architecture/LaMa.py similarity index 100% rename from comfy_extras/chainner_models/architecture/LaMa.py rename to comfy/comfy_extras/chainner_models/architecture/LaMa.py diff --git a/comfy_extras/chainner_models/architecture/MAT.py b/comfy/comfy_extras/chainner_models/architecture/MAT.py similarity index 100% rename from comfy_extras/chainner_models/architecture/MAT.py rename to comfy/comfy_extras/chainner_models/architecture/MAT.py diff --git a/comfy_extras/chainner_models/architecture/OmniSR/ChannelAttention.py b/comfy/comfy_extras/chainner_models/architecture/OmniSR/ChannelAttention.py similarity index 100% rename from comfy_extras/chainner_models/architecture/OmniSR/ChannelAttention.py rename to comfy/comfy_extras/chainner_models/architecture/OmniSR/ChannelAttention.py diff --git a/comfy_extras/chainner_models/architecture/OmniSR/LICENSE b/comfy/comfy_extras/chainner_models/architecture/OmniSR/LICENSE similarity index 100% rename from comfy_extras/chainner_models/architecture/OmniSR/LICENSE rename to comfy/comfy_extras/chainner_models/architecture/OmniSR/LICENSE diff --git a/comfy_extras/chainner_models/architecture/OmniSR/OSA.py b/comfy/comfy_extras/chainner_models/architecture/OmniSR/OSA.py similarity index 100% rename from comfy_extras/chainner_models/architecture/OmniSR/OSA.py rename to comfy/comfy_extras/chainner_models/architecture/OmniSR/OSA.py diff --git a/comfy_extras/chainner_models/architecture/OmniSR/OSAG.py b/comfy/comfy_extras/chainner_models/architecture/OmniSR/OSAG.py similarity index 100% rename from comfy_extras/chainner_models/architecture/OmniSR/OSAG.py rename to comfy/comfy_extras/chainner_models/architecture/OmniSR/OSAG.py diff --git a/comfy_extras/chainner_models/architecture/OmniSR/OmniSR.py b/comfy/comfy_extras/chainner_models/architecture/OmniSR/OmniSR.py similarity index 100% rename from comfy_extras/chainner_models/architecture/OmniSR/OmniSR.py rename to comfy/comfy_extras/chainner_models/architecture/OmniSR/OmniSR.py diff --git a/comfy_extras/chainner_models/architecture/OmniSR/esa.py b/comfy/comfy_extras/chainner_models/architecture/OmniSR/esa.py similarity index 100% rename from comfy_extras/chainner_models/architecture/OmniSR/esa.py rename to comfy/comfy_extras/chainner_models/architecture/OmniSR/esa.py diff --git a/comfy_extras/chainner_models/architecture/OmniSR/layernorm.py b/comfy/comfy_extras/chainner_models/architecture/OmniSR/layernorm.py similarity index 100% rename from comfy_extras/chainner_models/architecture/OmniSR/layernorm.py rename to comfy/comfy_extras/chainner_models/architecture/OmniSR/layernorm.py diff --git a/comfy_extras/chainner_models/architecture/OmniSR/pixelshuffle.py b/comfy/comfy_extras/chainner_models/architecture/OmniSR/pixelshuffle.py similarity index 100% rename from comfy_extras/chainner_models/architecture/OmniSR/pixelshuffle.py rename to comfy/comfy_extras/chainner_models/architecture/OmniSR/pixelshuffle.py diff --git a/comfy_extras/chainner_models/architecture/RRDB.py b/comfy/comfy_extras/chainner_models/architecture/RRDB.py similarity index 100% rename from comfy_extras/chainner_models/architecture/RRDB.py rename to comfy/comfy_extras/chainner_models/architecture/RRDB.py diff --git a/comfy_extras/chainner_models/architecture/SPSR.py b/comfy/comfy_extras/chainner_models/architecture/SPSR.py similarity index 100% rename from comfy_extras/chainner_models/architecture/SPSR.py rename to comfy/comfy_extras/chainner_models/architecture/SPSR.py diff --git a/comfy_extras/chainner_models/architecture/SRVGG.py b/comfy/comfy_extras/chainner_models/architecture/SRVGG.py similarity index 100% rename from comfy_extras/chainner_models/architecture/SRVGG.py rename to comfy/comfy_extras/chainner_models/architecture/SRVGG.py diff --git a/comfy_extras/chainner_models/architecture/SwiftSRGAN.py b/comfy/comfy_extras/chainner_models/architecture/SwiftSRGAN.py similarity index 100% rename from comfy_extras/chainner_models/architecture/SwiftSRGAN.py rename to comfy/comfy_extras/chainner_models/architecture/SwiftSRGAN.py diff --git a/comfy_extras/chainner_models/architecture/Swin2SR.py b/comfy/comfy_extras/chainner_models/architecture/Swin2SR.py similarity index 100% rename from comfy_extras/chainner_models/architecture/Swin2SR.py rename to comfy/comfy_extras/chainner_models/architecture/Swin2SR.py diff --git a/comfy_extras/chainner_models/architecture/SwinIR.py b/comfy/comfy_extras/chainner_models/architecture/SwinIR.py similarity index 100% rename from comfy_extras/chainner_models/architecture/SwinIR.py rename to comfy/comfy_extras/chainner_models/architecture/SwinIR.py diff --git a/comfy_extras/chainner_models/architecture/__init__.py b/comfy/comfy_extras/chainner_models/architecture/__init__.py similarity index 100% rename from comfy_extras/chainner_models/architecture/__init__.py rename to comfy/comfy_extras/chainner_models/architecture/__init__.py diff --git a/comfy_extras/chainner_models/architecture/block.py b/comfy/comfy_extras/chainner_models/architecture/block.py similarity index 100% rename from comfy_extras/chainner_models/architecture/block.py rename to comfy/comfy_extras/chainner_models/architecture/block.py diff --git a/comfy_extras/chainner_models/architecture/face/LICENSE-GFPGAN b/comfy/comfy_extras/chainner_models/architecture/face/LICENSE-GFPGAN similarity index 100% rename from comfy_extras/chainner_models/architecture/face/LICENSE-GFPGAN rename to comfy/comfy_extras/chainner_models/architecture/face/LICENSE-GFPGAN diff --git a/comfy_extras/chainner_models/architecture/face/LICENSE-RestoreFormer b/comfy/comfy_extras/chainner_models/architecture/face/LICENSE-RestoreFormer similarity index 100% rename from comfy_extras/chainner_models/architecture/face/LICENSE-RestoreFormer rename to comfy/comfy_extras/chainner_models/architecture/face/LICENSE-RestoreFormer diff --git a/comfy_extras/chainner_models/architecture/face/LICENSE-codeformer b/comfy/comfy_extras/chainner_models/architecture/face/LICENSE-codeformer similarity index 100% rename from comfy_extras/chainner_models/architecture/face/LICENSE-codeformer rename to comfy/comfy_extras/chainner_models/architecture/face/LICENSE-codeformer diff --git a/comfy_extras/chainner_models/architecture/face/arcface_arch.py b/comfy/comfy_extras/chainner_models/architecture/face/arcface_arch.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/arcface_arch.py rename to comfy/comfy_extras/chainner_models/architecture/face/arcface_arch.py diff --git a/comfy_extras/chainner_models/architecture/face/codeformer.py b/comfy/comfy_extras/chainner_models/architecture/face/codeformer.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/codeformer.py rename to comfy/comfy_extras/chainner_models/architecture/face/codeformer.py diff --git a/comfy_extras/chainner_models/architecture/face/fused_act.py b/comfy/comfy_extras/chainner_models/architecture/face/fused_act.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/fused_act.py rename to comfy/comfy_extras/chainner_models/architecture/face/fused_act.py diff --git a/comfy_extras/chainner_models/architecture/face/gfpgan_bilinear_arch.py b/comfy/comfy_extras/chainner_models/architecture/face/gfpgan_bilinear_arch.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/gfpgan_bilinear_arch.py rename to comfy/comfy_extras/chainner_models/architecture/face/gfpgan_bilinear_arch.py diff --git a/comfy_extras/chainner_models/architecture/face/gfpganv1_arch.py b/comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_arch.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/gfpganv1_arch.py rename to comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_arch.py diff --git a/comfy_extras/chainner_models/architecture/face/gfpganv1_clean_arch.py b/comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_clean_arch.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/gfpganv1_clean_arch.py rename to comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_clean_arch.py diff --git a/comfy_extras/chainner_models/architecture/face/restoreformer_arch.py b/comfy/comfy_extras/chainner_models/architecture/face/restoreformer_arch.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/restoreformer_arch.py rename to comfy/comfy_extras/chainner_models/architecture/face/restoreformer_arch.py diff --git a/comfy_extras/chainner_models/architecture/face/stylegan2_arch.py b/comfy/comfy_extras/chainner_models/architecture/face/stylegan2_arch.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/stylegan2_arch.py rename to comfy/comfy_extras/chainner_models/architecture/face/stylegan2_arch.py diff --git a/comfy_extras/chainner_models/architecture/face/stylegan2_bilinear_arch.py b/comfy/comfy_extras/chainner_models/architecture/face/stylegan2_bilinear_arch.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/stylegan2_bilinear_arch.py rename to comfy/comfy_extras/chainner_models/architecture/face/stylegan2_bilinear_arch.py diff --git a/comfy_extras/chainner_models/architecture/face/stylegan2_clean_arch.py b/comfy/comfy_extras/chainner_models/architecture/face/stylegan2_clean_arch.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/stylegan2_clean_arch.py rename to comfy/comfy_extras/chainner_models/architecture/face/stylegan2_clean_arch.py diff --git a/comfy_extras/chainner_models/architecture/face/upfirdn2d.py b/comfy/comfy_extras/chainner_models/architecture/face/upfirdn2d.py similarity index 100% rename from comfy_extras/chainner_models/architecture/face/upfirdn2d.py rename to comfy/comfy_extras/chainner_models/architecture/face/upfirdn2d.py diff --git a/comfy_extras/chainner_models/architecture/mat/utils.py b/comfy/comfy_extras/chainner_models/architecture/mat/utils.py similarity index 100% rename from comfy_extras/chainner_models/architecture/mat/utils.py rename to comfy/comfy_extras/chainner_models/architecture/mat/utils.py diff --git a/comfy_extras/chainner_models/architecture/timm/LICENSE b/comfy/comfy_extras/chainner_models/architecture/timm/LICENSE similarity index 100% rename from comfy_extras/chainner_models/architecture/timm/LICENSE rename to comfy/comfy_extras/chainner_models/architecture/timm/LICENSE diff --git a/comfy_extras/chainner_models/architecture/timm/drop.py b/comfy/comfy_extras/chainner_models/architecture/timm/drop.py similarity index 100% rename from comfy_extras/chainner_models/architecture/timm/drop.py rename to comfy/comfy_extras/chainner_models/architecture/timm/drop.py diff --git a/comfy_extras/chainner_models/architecture/timm/helpers.py b/comfy/comfy_extras/chainner_models/architecture/timm/helpers.py similarity index 100% rename from comfy_extras/chainner_models/architecture/timm/helpers.py rename to comfy/comfy_extras/chainner_models/architecture/timm/helpers.py diff --git a/comfy_extras/chainner_models/architecture/timm/weight_init.py b/comfy/comfy_extras/chainner_models/architecture/timm/weight_init.py similarity index 100% rename from comfy_extras/chainner_models/architecture/timm/weight_init.py rename to comfy/comfy_extras/chainner_models/architecture/timm/weight_init.py diff --git a/comfy_extras/chainner_models/model_loading.py b/comfy/comfy_extras/chainner_models/model_loading.py similarity index 100% rename from comfy_extras/chainner_models/model_loading.py rename to comfy/comfy_extras/chainner_models/model_loading.py diff --git a/comfy_extras/chainner_models/types.py b/comfy/comfy_extras/chainner_models/types.py similarity index 100% rename from comfy_extras/chainner_models/types.py rename to comfy/comfy_extras/chainner_models/types.py diff --git a/comfy_extras/nodes/__init__.py b/comfy/comfy_extras/nodes/__init__.py similarity index 100% rename from comfy_extras/nodes/__init__.py rename to comfy/comfy_extras/nodes/__init__.py diff --git a/comfy_extras/nodes/nodes_canny.py b/comfy/comfy_extras/nodes/nodes_canny.py similarity index 100% rename from comfy_extras/nodes/nodes_canny.py rename to comfy/comfy_extras/nodes/nodes_canny.py diff --git a/comfy_extras/nodes/nodes_clip_sdxl.py b/comfy/comfy_extras/nodes/nodes_clip_sdxl.py similarity index 98% rename from comfy_extras/nodes/nodes_clip_sdxl.py rename to comfy/comfy_extras/nodes/nodes_clip_sdxl.py index 6afa40315..9d294089d 100644 --- a/comfy_extras/nodes/nodes_clip_sdxl.py +++ b/comfy/comfy_extras/nodes/nodes_clip_sdxl.py @@ -1,5 +1,5 @@ import torch -from ...comfy.nodes.common import MAX_RESOLUTION +from ...nodes.common import MAX_RESOLUTION class CLIPTextEncodeSDXLRefiner: diff --git a/comfy_extras/nodes/nodes_hypernetwork.py b/comfy/comfy_extras/nodes/nodes_hypernetwork.py similarity index 98% rename from comfy_extras/nodes/nodes_hypernetwork.py rename to comfy/comfy_extras/nodes/nodes_hypernetwork.py index 95b527ac1..4a315397b 100644 --- a/comfy_extras/nodes/nodes_hypernetwork.py +++ b/comfy/comfy_extras/nodes/nodes_hypernetwork.py @@ -1,5 +1,5 @@ -from ...comfy import utils -from ...comfy.cmd import folder_paths +from ... import utils +from ...cmd import folder_paths import torch def load_hypernetwork_patch(path, strength): diff --git a/comfy_extras/nodes/nodes_mask.py b/comfy/comfy_extras/nodes/nodes_mask.py similarity index 99% rename from comfy_extras/nodes/nodes_mask.py rename to comfy/comfy_extras/nodes/nodes_mask.py index 7110016a3..6b0daf174 100644 --- a/comfy_extras/nodes/nodes_mask.py +++ b/comfy/comfy_extras/nodes/nodes_mask.py @@ -2,7 +2,7 @@ import numpy as np from scipy.ndimage import grey_dilation import torch -from ...comfy.nodes.common import MAX_RESOLUTION +from ...nodes.common import MAX_RESOLUTION def composite(destination, source, x, y, mask = None, multiplier = 8, resize_source = False): diff --git a/comfy_extras/nodes/nodes_model_merging.py b/comfy/comfy_extras/nodes/nodes_model_merging.py similarity index 97% rename from comfy_extras/nodes/nodes_model_merging.py rename to comfy/comfy_extras/nodes/nodes_model_merging.py index e2d7c0821..556f1a844 100644 --- a/comfy_extras/nodes/nodes_model_merging.py +++ b/comfy/comfy_extras/nodes/nodes_model_merging.py @@ -1,11 +1,11 @@ -from ...comfy import sd -from ...comfy import model_base +from ... import sd +from ... import model_base -from ...comfy.cmd import folder_paths +from ...cmd import folder_paths import json import os -from ...comfy.cli_args import args +from ...cli_args import args class ModelMergeSimple: @classmethod diff --git a/comfy_extras/nodes/nodes_post_processing.py b/comfy/comfy_extras/nodes/nodes_post_processing.py similarity index 99% rename from comfy_extras/nodes/nodes_post_processing.py rename to comfy/comfy_extras/nodes/nodes_post_processing.py index 0624900fc..6a3387f06 100644 --- a/comfy_extras/nodes/nodes_post_processing.py +++ b/comfy/comfy_extras/nodes/nodes_post_processing.py @@ -4,7 +4,7 @@ import torch.nn.functional as F from PIL import Image import math -from ...comfy import utils +from ... import utils class Blend: diff --git a/comfy_extras/nodes/nodes_rebatch.py b/comfy/comfy_extras/nodes/nodes_rebatch.py similarity index 100% rename from comfy_extras/nodes/nodes_rebatch.py rename to comfy/comfy_extras/nodes/nodes_rebatch.py diff --git a/comfy_extras/nodes/nodes_tomesd.py b/comfy/comfy_extras/nodes/nodes_tomesd.py similarity index 100% rename from comfy_extras/nodes/nodes_tomesd.py rename to comfy/comfy_extras/nodes/nodes_tomesd.py diff --git a/comfy_extras/nodes/nodes_upscale_model.py b/comfy/comfy_extras/nodes/nodes_upscale_model.py similarity index 95% rename from comfy_extras/nodes/nodes_upscale_model.py rename to comfy/comfy_extras/nodes/nodes_upscale_model.py index 3e7ba4349..36b1522dd 100644 --- a/comfy_extras/nodes/nodes_upscale_model.py +++ b/comfy/comfy_extras/nodes/nodes_upscale_model.py @@ -1,8 +1,8 @@ from ..chainner_models import model_loading -from ...comfy import model_management +from ... import model_management import torch -from ...comfy import utils -from ...comfy.cmd import folder_paths +from ... import utils +from ...cmd import folder_paths class UpscaleModelLoader: diff --git a/comfy/nodes/package.py b/comfy/nodes/package.py index 22d954e12..46ecbb558 100644 --- a/comfy/nodes/package.py +++ b/comfy/nodes/package.py @@ -7,7 +7,7 @@ import time import types from . import base_nodes -from ...comfy_extras import nodes as comfy_extras_nodes +from ..comfy_extras import nodes as comfy_extras_nodes try: import custom_nodes diff --git a/setup.py b/setup.py index a734a7f67..b42959be4 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ from setuptools import setup, find_packages """ The name of the package. """ -package_name = "comfyui" +package_name = "comfy" """ The current version. @@ -156,7 +156,7 @@ package_data = ['sd1_tokenizer/*', '**/*.json', '**/*.yaml'] if not is_editable: package_data.append('web/**/*') setup( - # "comfyui" + # "comfy" name=package_name, description="", author="",