From 0a9d20a4b5165838525221b40d8acad873452edf Mon Sep 17 00:00:00 2001
From: aszc-dev <kontakt@aszczepanski.pl>
Date: Sun, 29 Oct 2023 14:35:35 +0100
Subject: [PATCH] Restructure

---
 __init__.py                           | 7 ++++++-
 coreml_suite/__init__.py              | 3 +++
 loaders.py => coreml_suite/loaders.py | 4 ++--
 logger.py => coreml_suite/logger.py   | 0
 model.py => coreml_suite/model.py     | 2 +-
 utils.py => coreml_suite/utils.py     | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 coreml_suite/__init__.py
 rename loaders.py => coreml_suite/loaders.py (97%)
 rename logger.py => coreml_suite/logger.py (100%)
 rename model.py => coreml_suite/model.py (95%)
 rename utils.py => coreml_suite/utils.py (98%)

diff --git a/__init__.py b/__init__.py
index 051e9f4..781d955 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,9 @@
-from .loaders import CoreMLLoaderUNet
+import os
+import sys
+
+sys.path.append(os.path.dirname(__file__))
+
+from coreml_suite import CoreMLLoaderUNet
 
 NODE_CLASS_MAPPINGS = {
     "CoreMLUNetLoader": CoreMLLoaderUNet,
diff --git a/coreml_suite/__init__.py b/coreml_suite/__init__.py
new file mode 100644
index 0000000..ba3ef0b
--- /dev/null
+++ b/coreml_suite/__init__.py
@@ -0,0 +1,3 @@
+from .loaders import CoreMLLoaderUNet
+
+__all__ = ["CoreMLLoaderUNet"]
diff --git a/loaders.py b/coreml_suite/loaders.py
similarity index 97%
rename from loaders.py
rename to coreml_suite/loaders.py
index 720d684..90ec623 100644
--- a/loaders.py
+++ b/coreml_suite/loaders.py
@@ -5,9 +5,9 @@ import folder_paths
 from comfy import supported_models_base, model_management
 from comfy.latent_formats import SD15
 from comfy.model_patcher import ModelPatcher
-from .logger import logger
-from .model import CoreMLModelWrapper
 
+from coreml_suite.logger import logger
+from coreml_suite.model import CoreMLModelWrapper
 
 class CoreMLLoader:
     PACKAGE_DIRNAME = ""
diff --git a/logger.py b/coreml_suite/logger.py
similarity index 100%
rename from logger.py
rename to coreml_suite/logger.py
diff --git a/model.py b/coreml_suite/model.py
similarity index 95%
rename from model.py
rename to coreml_suite/model.py
index b3af7ff..43fb246 100644
--- a/model.py
+++ b/coreml_suite/model.py
@@ -5,7 +5,7 @@ from python_coreml_stable_diffusion.coreml_model import CoreMLModel
 
 from comfy.model_base import BaseModel
 
-from .utils import expand_inputs, extract_residual_kwargs
+from coreml_suite.utils import expand_inputs, extract_residual_kwargs
 
 
 class CoreMLModelWrapper(BaseModel):
diff --git a/utils.py b/coreml_suite/utils.py
similarity index 98%
rename from utils.py
rename to coreml_suite/utils.py
index c78e48b..ada96f6 100644
--- a/utils.py
+++ b/coreml_suite/utils.py
@@ -3,7 +3,7 @@ from itertools import chain
 import numpy as np
 import torch
 
-from .logger import logger
+from coreml_suite.logger import logger
 
 
 def expand_inputs(inputs):