From b98e1c0f01af569082134370c42f244fb7f953cb Mon Sep 17 00:00:00 2001
From: Benjamin Berman <benjamin.s.berman@gmail.com>
Date: Tue, 22 Aug 2023 18:00:18 -0700
Subject: [PATCH] move this back since the issue is resolved

---
 comfy/api/__init__.py                          | 16 ++++++++--------
 comfy/api/openapi.yaml                         |  4 ++--
 comfy/cmd/openapi_gen.py                       | 18 +++++++++++++-----
 .../comfy_extras => comfy_extras}/__init__.py  |  0
 .../chainner_models/__init__.py                |  0
 .../chainner_models/architecture/HAT.py        |  0
 .../architecture/LICENSE-ESRGAN                |  0
 .../chainner_models/architecture/LICENSE-HAT   |  0
 .../architecture/LICENSE-RealESRGAN            |  0
 .../chainner_models/architecture/LICENSE-SPSR  |  0
 .../architecture/LICENSE-SwiftSRGAN            |  0
 .../architecture/LICENSE-Swin2SR               |  0
 .../architecture/LICENSE-SwinIR                |  0
 .../chainner_models/architecture/LICENSE-lama  |  0
 .../chainner_models/architecture/LICENSE-mat   |  0
 .../chainner_models/architecture/LaMa.py       |  0
 .../chainner_models/architecture/MAT.py        |  0
 .../architecture/OmniSR/ChannelAttention.py    |  0
 .../architecture/OmniSR/LICENSE                |  0
 .../chainner_models/architecture/OmniSR/OSA.py |  0
 .../architecture/OmniSR/OSAG.py                |  0
 .../architecture/OmniSR/OmniSR.py              |  0
 .../chainner_models/architecture/OmniSR/esa.py |  0
 .../architecture/OmniSR/layernorm.py           |  0
 .../architecture/OmniSR/pixelshuffle.py        |  0
 .../chainner_models/architecture/RRDB.py       |  0
 .../chainner_models/architecture/SPSR.py       |  0
 .../chainner_models/architecture/SRVGG.py      |  0
 .../chainner_models/architecture/SwiftSRGAN.py |  0
 .../chainner_models/architecture/Swin2SR.py    |  0
 .../chainner_models/architecture/SwinIR.py     |  0
 .../chainner_models/architecture/__init__.py   |  0
 .../chainner_models/architecture/block.py      |  0
 .../architecture/face/LICENSE-GFPGAN           |  0
 .../architecture/face/LICENSE-RestoreFormer    |  0
 .../architecture/face/LICENSE-codeformer       |  0
 .../architecture/face/arcface_arch.py          |  0
 .../architecture/face/codeformer.py            |  0
 .../architecture/face/fused_act.py             |  0
 .../architecture/face/gfpgan_bilinear_arch.py  |  0
 .../architecture/face/gfpganv1_arch.py         |  0
 .../architecture/face/gfpganv1_clean_arch.py   |  0
 .../architecture/face/restoreformer_arch.py    |  0
 .../architecture/face/stylegan2_arch.py        |  0
 .../face/stylegan2_bilinear_arch.py            |  0
 .../architecture/face/stylegan2_clean_arch.py  |  0
 .../architecture/face/upfirdn2d.py             |  0
 .../chainner_models/architecture/mat/utils.py  |  0
 .../chainner_models/architecture/timm/LICENSE  |  0
 .../chainner_models/architecture/timm/drop.py  |  0
 .../architecture/timm/helpers.py               |  0
 .../architecture/timm/weight_init.py           |  0
 .../chainner_models/model_loading.py           |  0
 .../chainner_models/types.py                   |  0
 .../nodes/__init__.py                          |  0
 .../nodes/nodes_canny.py                       |  0
 .../nodes/nodes_clip_sdxl.py                   |  2 +-
 .../nodes/nodes_hypernetwork.py                |  4 ++--
 .../nodes/nodes_mask.py                        |  2 +-
 .../nodes/nodes_model_merging.py               |  8 ++++----
 .../nodes/nodes_post_processing.py             |  2 +-
 .../nodes/nodes_rebatch.py                     |  0
 .../nodes/nodes_tomesd.py                      |  0
 .../nodes/nodes_upscale_model.py               |  6 +++---
 64 files changed, 35 insertions(+), 27 deletions(-)
 rename {comfy/comfy_extras => comfy_extras}/__init__.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/__init__.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/HAT.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LICENSE-ESRGAN (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LICENSE-HAT (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LICENSE-RealESRGAN (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LICENSE-SPSR (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LICENSE-SwiftSRGAN (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LICENSE-Swin2SR (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LICENSE-SwinIR (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LICENSE-lama (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LICENSE-mat (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/LaMa.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/MAT.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/OmniSR/ChannelAttention.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/OmniSR/LICENSE (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/OmniSR/OSA.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/OmniSR/OSAG.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/OmniSR/OmniSR.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/OmniSR/esa.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/OmniSR/layernorm.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/OmniSR/pixelshuffle.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/RRDB.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/SPSR.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/SRVGG.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/SwiftSRGAN.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/Swin2SR.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/SwinIR.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/__init__.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/block.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/LICENSE-GFPGAN (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/LICENSE-RestoreFormer (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/LICENSE-codeformer (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/arcface_arch.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/codeformer.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/fused_act.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/gfpgan_bilinear_arch.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/gfpganv1_arch.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/gfpganv1_clean_arch.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/restoreformer_arch.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/stylegan2_arch.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/stylegan2_bilinear_arch.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/stylegan2_clean_arch.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/face/upfirdn2d.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/mat/utils.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/timm/LICENSE (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/timm/drop.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/timm/helpers.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/architecture/timm/weight_init.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/model_loading.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/chainner_models/types.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/__init__.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/nodes_canny.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/nodes_clip_sdxl.py (98%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/nodes_hypernetwork.py (98%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/nodes_mask.py (99%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/nodes_model_merging.py (97%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/nodes_post_processing.py (99%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/nodes_rebatch.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/nodes_tomesd.py (100%)
 rename {comfy/comfy_extras => comfy_extras}/nodes/nodes_upscale_model.py (95%)

diff --git a/comfy/api/__init__.py b/comfy/api/__init__.py
index 8143dbf9a..b647128f5 100644
--- a/comfy/api/__init__.py
+++ b/comfy/api/__init__.py
@@ -14,15 +14,15 @@
 __version__ = "1.0.0"
 
 # import ApiClient
-from api_client import ApiClient
+from .api_client import ApiClient
 
 # import Configuration
-from configuration import Configuration
+from .configuration import Configuration
 
 # import exceptions
-from exceptions import OpenApiException
-from exceptions import ApiAttributeError
-from exceptions import ApiTypeError
-from exceptions import ApiValueError
-from exceptions import ApiKeyError
-from exceptions import ApiException
+from .exceptions import OpenApiException
+from .exceptions import ApiAttributeError
+from .exceptions import ApiTypeError
+from .exceptions import ApiValueError
+from .exceptions import ApiKeyError
+from .exceptions import ApiException
diff --git a/comfy/api/openapi.yaml b/comfy/api/openapi.yaml
index 69b1bb706..e429ce82e 100644
--- a/comfy/api/openapi.yaml
+++ b/comfy/api/openapi.yaml
@@ -263,7 +263,7 @@ paths:
         - name: digest
           in: path
           required: true
-          description: A digest of the request used to generate the imaeg
+          description: A digest of the request used to generate the image
           schema:
             type: string
           example: e5187160a7b2c496773c1c5a45bfd3ffbf25eaa5969328e6469d36f31cf240a3
@@ -394,7 +394,7 @@ paths:
                     items:
                       type: string
                 example:
-                  uris: [ "/api/v1/images/e5187160a7b2c496773c1c5a45bfd3ffbf25eaa5969328e6469d36f31cf240a3", "http://127.0.0.1:8188/view?filename=ComfyUI_00001_.png&type=output" ]
+                  urls: [ "/api/v1/images/e5187160a7b2c496773c1c5a45bfd3ffbf25eaa5969328e6469d36f31cf240a3", "http://127.0.0.1:8188/view?filename=ComfyUI_00001_.png&type=output" ]
         204:
           description: |
             The prompt was run but did not contain any SaveImage outputs, so nothing will be returned.
diff --git a/comfy/cmd/openapi_gen.py b/comfy/cmd/openapi_gen.py
index d0a9a136f..795262cc6 100644
--- a/comfy/cmd/openapi_gen.py
+++ b/comfy/cmd/openapi_gen.py
@@ -8,8 +8,8 @@ from importlib_resources import files, as_file
 
 from ..vendor.appdirs import user_cache_dir
 
-_openapi_jar_basename = "openapi-generator-cli-6.4.0.jar"
-_openapi_jar_url = f"https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.4.0/{_openapi_jar_basename}"
+_openapi_jar_basename = "openapi-generator-cli-6.6.0.jar"
+_openapi_jar_url = f"https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.6.0/{_openapi_jar_basename}"
 
 
 def is_java_installed():
@@ -36,9 +36,17 @@ def main():
 
     with as_file(files('comfy.api').joinpath('openapi.yaml')) as openapi_schema:
         with as_file(files('comfy.api').joinpath('openapi_python_config.yaml')) as python_config:
-            cmds = ["java", "--add-opens", "java.base/java.io=ALL-UNNAMED", "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens",
-                    "java.base/java.lang=ALL-UNNAMED", "-jar", jar, "generate", "--input-spec", openapi_schema, "-g", "python", "--global-property", "models",
-                    "--config", python_config]
+            cmds = [
+                "java",
+                "--add-opens", "java.base/java.io=ALL-UNNAMED",
+                "--add-opens", "java.base/java.util=ALL-UNNAMED",
+                "--add-opens", "java.base/java.lang=ALL-UNNAMED",
+                "-jar", jar,
+                "generate",
+                "--input-spec", openapi_schema,
+                "--global-property", "models",
+                "--config", python_config
+            ]
             subprocess.check_output(cmds)
 
 
diff --git a/comfy/comfy_extras/__init__.py b/comfy_extras/__init__.py
similarity index 100%
rename from comfy/comfy_extras/__init__.py
rename to comfy_extras/__init__.py
diff --git a/comfy/comfy_extras/chainner_models/__init__.py b/comfy_extras/chainner_models/__init__.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/__init__.py
rename to comfy_extras/chainner_models/__init__.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/HAT.py b/comfy_extras/chainner_models/architecture/HAT.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/HAT.py
rename to comfy_extras/chainner_models/architecture/HAT.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/LICENSE-ESRGAN b/comfy_extras/chainner_models/architecture/LICENSE-ESRGAN
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LICENSE-ESRGAN
rename to comfy_extras/chainner_models/architecture/LICENSE-ESRGAN
diff --git a/comfy/comfy_extras/chainner_models/architecture/LICENSE-HAT b/comfy_extras/chainner_models/architecture/LICENSE-HAT
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LICENSE-HAT
rename to comfy_extras/chainner_models/architecture/LICENSE-HAT
diff --git a/comfy/comfy_extras/chainner_models/architecture/LICENSE-RealESRGAN b/comfy_extras/chainner_models/architecture/LICENSE-RealESRGAN
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LICENSE-RealESRGAN
rename to comfy_extras/chainner_models/architecture/LICENSE-RealESRGAN
diff --git a/comfy/comfy_extras/chainner_models/architecture/LICENSE-SPSR b/comfy_extras/chainner_models/architecture/LICENSE-SPSR
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LICENSE-SPSR
rename to comfy_extras/chainner_models/architecture/LICENSE-SPSR
diff --git a/comfy/comfy_extras/chainner_models/architecture/LICENSE-SwiftSRGAN b/comfy_extras/chainner_models/architecture/LICENSE-SwiftSRGAN
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LICENSE-SwiftSRGAN
rename to comfy_extras/chainner_models/architecture/LICENSE-SwiftSRGAN
diff --git a/comfy/comfy_extras/chainner_models/architecture/LICENSE-Swin2SR b/comfy_extras/chainner_models/architecture/LICENSE-Swin2SR
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LICENSE-Swin2SR
rename to comfy_extras/chainner_models/architecture/LICENSE-Swin2SR
diff --git a/comfy/comfy_extras/chainner_models/architecture/LICENSE-SwinIR b/comfy_extras/chainner_models/architecture/LICENSE-SwinIR
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LICENSE-SwinIR
rename to comfy_extras/chainner_models/architecture/LICENSE-SwinIR
diff --git a/comfy/comfy_extras/chainner_models/architecture/LICENSE-lama b/comfy_extras/chainner_models/architecture/LICENSE-lama
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LICENSE-lama
rename to comfy_extras/chainner_models/architecture/LICENSE-lama
diff --git a/comfy/comfy_extras/chainner_models/architecture/LICENSE-mat b/comfy_extras/chainner_models/architecture/LICENSE-mat
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LICENSE-mat
rename to comfy_extras/chainner_models/architecture/LICENSE-mat
diff --git a/comfy/comfy_extras/chainner_models/architecture/LaMa.py b/comfy_extras/chainner_models/architecture/LaMa.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/LaMa.py
rename to comfy_extras/chainner_models/architecture/LaMa.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/MAT.py b/comfy_extras/chainner_models/architecture/MAT.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/MAT.py
rename to comfy_extras/chainner_models/architecture/MAT.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/OmniSR/ChannelAttention.py b/comfy_extras/chainner_models/architecture/OmniSR/ChannelAttention.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/OmniSR/ChannelAttention.py
rename to comfy_extras/chainner_models/architecture/OmniSR/ChannelAttention.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/OmniSR/LICENSE b/comfy_extras/chainner_models/architecture/OmniSR/LICENSE
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/OmniSR/LICENSE
rename to comfy_extras/chainner_models/architecture/OmniSR/LICENSE
diff --git a/comfy/comfy_extras/chainner_models/architecture/OmniSR/OSA.py b/comfy_extras/chainner_models/architecture/OmniSR/OSA.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/OmniSR/OSA.py
rename to comfy_extras/chainner_models/architecture/OmniSR/OSA.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/OmniSR/OSAG.py b/comfy_extras/chainner_models/architecture/OmniSR/OSAG.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/OmniSR/OSAG.py
rename to comfy_extras/chainner_models/architecture/OmniSR/OSAG.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/OmniSR/OmniSR.py b/comfy_extras/chainner_models/architecture/OmniSR/OmniSR.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/OmniSR/OmniSR.py
rename to comfy_extras/chainner_models/architecture/OmniSR/OmniSR.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/OmniSR/esa.py b/comfy_extras/chainner_models/architecture/OmniSR/esa.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/OmniSR/esa.py
rename to comfy_extras/chainner_models/architecture/OmniSR/esa.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/OmniSR/layernorm.py b/comfy_extras/chainner_models/architecture/OmniSR/layernorm.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/OmniSR/layernorm.py
rename to comfy_extras/chainner_models/architecture/OmniSR/layernorm.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/OmniSR/pixelshuffle.py b/comfy_extras/chainner_models/architecture/OmniSR/pixelshuffle.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/OmniSR/pixelshuffle.py
rename to comfy_extras/chainner_models/architecture/OmniSR/pixelshuffle.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/RRDB.py b/comfy_extras/chainner_models/architecture/RRDB.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/RRDB.py
rename to comfy_extras/chainner_models/architecture/RRDB.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/SPSR.py b/comfy_extras/chainner_models/architecture/SPSR.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/SPSR.py
rename to comfy_extras/chainner_models/architecture/SPSR.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/SRVGG.py b/comfy_extras/chainner_models/architecture/SRVGG.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/SRVGG.py
rename to comfy_extras/chainner_models/architecture/SRVGG.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/SwiftSRGAN.py b/comfy_extras/chainner_models/architecture/SwiftSRGAN.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/SwiftSRGAN.py
rename to comfy_extras/chainner_models/architecture/SwiftSRGAN.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/Swin2SR.py b/comfy_extras/chainner_models/architecture/Swin2SR.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/Swin2SR.py
rename to comfy_extras/chainner_models/architecture/Swin2SR.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/SwinIR.py b/comfy_extras/chainner_models/architecture/SwinIR.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/SwinIR.py
rename to comfy_extras/chainner_models/architecture/SwinIR.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/__init__.py b/comfy_extras/chainner_models/architecture/__init__.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/__init__.py
rename to comfy_extras/chainner_models/architecture/__init__.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/block.py b/comfy_extras/chainner_models/architecture/block.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/block.py
rename to comfy_extras/chainner_models/architecture/block.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/LICENSE-GFPGAN b/comfy_extras/chainner_models/architecture/face/LICENSE-GFPGAN
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/LICENSE-GFPGAN
rename to comfy_extras/chainner_models/architecture/face/LICENSE-GFPGAN
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/LICENSE-RestoreFormer b/comfy_extras/chainner_models/architecture/face/LICENSE-RestoreFormer
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/LICENSE-RestoreFormer
rename to comfy_extras/chainner_models/architecture/face/LICENSE-RestoreFormer
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/LICENSE-codeformer b/comfy_extras/chainner_models/architecture/face/LICENSE-codeformer
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/LICENSE-codeformer
rename to comfy_extras/chainner_models/architecture/face/LICENSE-codeformer
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/arcface_arch.py b/comfy_extras/chainner_models/architecture/face/arcface_arch.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/arcface_arch.py
rename to comfy_extras/chainner_models/architecture/face/arcface_arch.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/codeformer.py b/comfy_extras/chainner_models/architecture/face/codeformer.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/codeformer.py
rename to comfy_extras/chainner_models/architecture/face/codeformer.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/fused_act.py b/comfy_extras/chainner_models/architecture/face/fused_act.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/fused_act.py
rename to comfy_extras/chainner_models/architecture/face/fused_act.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/gfpgan_bilinear_arch.py b/comfy_extras/chainner_models/architecture/face/gfpgan_bilinear_arch.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/gfpgan_bilinear_arch.py
rename to comfy_extras/chainner_models/architecture/face/gfpgan_bilinear_arch.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_arch.py b/comfy_extras/chainner_models/architecture/face/gfpganv1_arch.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_arch.py
rename to comfy_extras/chainner_models/architecture/face/gfpganv1_arch.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_clean_arch.py b/comfy_extras/chainner_models/architecture/face/gfpganv1_clean_arch.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/gfpganv1_clean_arch.py
rename to comfy_extras/chainner_models/architecture/face/gfpganv1_clean_arch.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/restoreformer_arch.py b/comfy_extras/chainner_models/architecture/face/restoreformer_arch.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/restoreformer_arch.py
rename to comfy_extras/chainner_models/architecture/face/restoreformer_arch.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/stylegan2_arch.py b/comfy_extras/chainner_models/architecture/face/stylegan2_arch.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/stylegan2_arch.py
rename to comfy_extras/chainner_models/architecture/face/stylegan2_arch.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/stylegan2_bilinear_arch.py b/comfy_extras/chainner_models/architecture/face/stylegan2_bilinear_arch.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/stylegan2_bilinear_arch.py
rename to comfy_extras/chainner_models/architecture/face/stylegan2_bilinear_arch.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/stylegan2_clean_arch.py b/comfy_extras/chainner_models/architecture/face/stylegan2_clean_arch.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/stylegan2_clean_arch.py
rename to comfy_extras/chainner_models/architecture/face/stylegan2_clean_arch.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/face/upfirdn2d.py b/comfy_extras/chainner_models/architecture/face/upfirdn2d.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/face/upfirdn2d.py
rename to comfy_extras/chainner_models/architecture/face/upfirdn2d.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/mat/utils.py b/comfy_extras/chainner_models/architecture/mat/utils.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/mat/utils.py
rename to comfy_extras/chainner_models/architecture/mat/utils.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/timm/LICENSE b/comfy_extras/chainner_models/architecture/timm/LICENSE
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/timm/LICENSE
rename to comfy_extras/chainner_models/architecture/timm/LICENSE
diff --git a/comfy/comfy_extras/chainner_models/architecture/timm/drop.py b/comfy_extras/chainner_models/architecture/timm/drop.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/timm/drop.py
rename to comfy_extras/chainner_models/architecture/timm/drop.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/timm/helpers.py b/comfy_extras/chainner_models/architecture/timm/helpers.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/timm/helpers.py
rename to comfy_extras/chainner_models/architecture/timm/helpers.py
diff --git a/comfy/comfy_extras/chainner_models/architecture/timm/weight_init.py b/comfy_extras/chainner_models/architecture/timm/weight_init.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/architecture/timm/weight_init.py
rename to comfy_extras/chainner_models/architecture/timm/weight_init.py
diff --git a/comfy/comfy_extras/chainner_models/model_loading.py b/comfy_extras/chainner_models/model_loading.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/model_loading.py
rename to comfy_extras/chainner_models/model_loading.py
diff --git a/comfy/comfy_extras/chainner_models/types.py b/comfy_extras/chainner_models/types.py
similarity index 100%
rename from comfy/comfy_extras/chainner_models/types.py
rename to comfy_extras/chainner_models/types.py
diff --git a/comfy/comfy_extras/nodes/__init__.py b/comfy_extras/nodes/__init__.py
similarity index 100%
rename from comfy/comfy_extras/nodes/__init__.py
rename to comfy_extras/nodes/__init__.py
diff --git a/comfy/comfy_extras/nodes/nodes_canny.py b/comfy_extras/nodes/nodes_canny.py
similarity index 100%
rename from comfy/comfy_extras/nodes/nodes_canny.py
rename to comfy_extras/nodes/nodes_canny.py
diff --git a/comfy/comfy_extras/nodes/nodes_clip_sdxl.py b/comfy_extras/nodes/nodes_clip_sdxl.py
similarity index 98%
rename from comfy/comfy_extras/nodes/nodes_clip_sdxl.py
rename to comfy_extras/nodes/nodes_clip_sdxl.py
index 9d294089d..94308edef 100644
--- a/comfy/comfy_extras/nodes/nodes_clip_sdxl.py
+++ b/comfy_extras/nodes/nodes_clip_sdxl.py
@@ -1,5 +1,5 @@
 import torch
-from ...nodes.common import MAX_RESOLUTION
+from comfy.nodes.common import MAX_RESOLUTION
 
 
 class CLIPTextEncodeSDXLRefiner:
diff --git a/comfy/comfy_extras/nodes/nodes_hypernetwork.py b/comfy_extras/nodes/nodes_hypernetwork.py
similarity index 98%
rename from comfy/comfy_extras/nodes/nodes_hypernetwork.py
rename to comfy_extras/nodes/nodes_hypernetwork.py
index 4a315397b..03eda4906 100644
--- a/comfy/comfy_extras/nodes/nodes_hypernetwork.py
+++ b/comfy_extras/nodes/nodes_hypernetwork.py
@@ -1,5 +1,5 @@
-from ... import utils
-from ...cmd import folder_paths
+from comfy import utils
+from comfy.cmd import folder_paths
 import torch
 
 def load_hypernetwork_patch(path, strength):
diff --git a/comfy/comfy_extras/nodes/nodes_mask.py b/comfy_extras/nodes/nodes_mask.py
similarity index 99%
rename from comfy/comfy_extras/nodes/nodes_mask.py
rename to comfy_extras/nodes/nodes_mask.py
index 6b0daf174..acdc0d96b 100644
--- a/comfy/comfy_extras/nodes/nodes_mask.py
+++ b/comfy_extras/nodes/nodes_mask.py
@@ -2,7 +2,7 @@ import numpy as np
 from scipy.ndimage import grey_dilation
 import torch
 
-from ...nodes.common import MAX_RESOLUTION
+from comfy.nodes.common import MAX_RESOLUTION
 
 
 def composite(destination, source, x, y, mask = None, multiplier = 8, resize_source = False):
diff --git a/comfy/comfy_extras/nodes/nodes_model_merging.py b/comfy_extras/nodes/nodes_model_merging.py
similarity index 97%
rename from comfy/comfy_extras/nodes/nodes_model_merging.py
rename to comfy_extras/nodes/nodes_model_merging.py
index 556f1a844..901d3a7db 100644
--- a/comfy/comfy_extras/nodes/nodes_model_merging.py
+++ b/comfy_extras/nodes/nodes_model_merging.py
@@ -1,11 +1,11 @@
-from ... import sd
-from ... import model_base
+from comfy import sd
+from comfy import model_base
 
-from ...cmd import folder_paths
+from comfy.cmd import folder_paths
 import json
 import os
 
-from ...cli_args import args
+from comfy.cli_args import args
 
 class ModelMergeSimple:
     @classmethod
diff --git a/comfy/comfy_extras/nodes/nodes_post_processing.py b/comfy_extras/nodes/nodes_post_processing.py
similarity index 99%
rename from comfy/comfy_extras/nodes/nodes_post_processing.py
rename to comfy_extras/nodes/nodes_post_processing.py
index 6a3387f06..ee73da0b7 100644
--- a/comfy/comfy_extras/nodes/nodes_post_processing.py
+++ b/comfy_extras/nodes/nodes_post_processing.py
@@ -4,7 +4,7 @@ import torch.nn.functional as F
 from PIL import Image
 import math
 
-from ... import utils
+from comfy import utils
 
 
 class Blend:
diff --git a/comfy/comfy_extras/nodes/nodes_rebatch.py b/comfy_extras/nodes/nodes_rebatch.py
similarity index 100%
rename from comfy/comfy_extras/nodes/nodes_rebatch.py
rename to comfy_extras/nodes/nodes_rebatch.py
diff --git a/comfy/comfy_extras/nodes/nodes_tomesd.py b/comfy_extras/nodes/nodes_tomesd.py
similarity index 100%
rename from comfy/comfy_extras/nodes/nodes_tomesd.py
rename to comfy_extras/nodes/nodes_tomesd.py
diff --git a/comfy/comfy_extras/nodes/nodes_upscale_model.py b/comfy_extras/nodes/nodes_upscale_model.py
similarity index 95%
rename from comfy/comfy_extras/nodes/nodes_upscale_model.py
rename to comfy_extras/nodes/nodes_upscale_model.py
index 36b1522dd..7705f292e 100644
--- a/comfy/comfy_extras/nodes/nodes_upscale_model.py
+++ b/comfy_extras/nodes/nodes_upscale_model.py
@@ -1,8 +1,8 @@
 from ..chainner_models import model_loading
-from ... import model_management
+from comfy import model_management
 import torch
-from ... import utils
-from ...cmd import folder_paths
+from comfy import utils
+from comfy.cmd import folder_paths
 
 
 class UpscaleModelLoader: