From 5a7157e7e898dd87765bd999c0fb9f7966aa22ca Mon Sep 17 00:00:00 2001
From: filipstrand <strand.filip@gmail.com>
Date: Sat, 21 Sep 2024 10:23:05 +0200
Subject: [PATCH] Simplify import paths for controlnet file

---
 src/mflux/__init__.py            | 7 +++++--
 src/mflux/generate.py            | 2 --
 src/mflux/generate_controlnet.py | 9 +--------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/mflux/__init__.py b/src/mflux/__init__.py
index 3994351..9547ab8 100644
--- a/src/mflux/__init__.py
+++ b/src/mflux/__init__.py
@@ -1,5 +1,8 @@
-from mflux.flux.flux import Flux1
 from mflux.config.config import Config
+from mflux.config.config import ConfigControlnet
 from mflux.config.model_config import ModelConfig
+from mflux.controlnet.flux_controlnet import Flux1Controlnet
+from mflux.flux.flux import Flux1
+from mflux.post_processing.image_util import ImageUtil
 
-__all__ = ["Flux1", "Config", "ModelConfig"]
+__all__ = ["Flux1", "Flux1Controlnet", "Config", "ConfigControlnet", "ModelConfig", "ImageUtil"]
diff --git a/src/mflux/generate.py b/src/mflux/generate.py
index 6e3a4ae..fdcf8bd 100644
--- a/src/mflux/generate.py
+++ b/src/mflux/generate.py
@@ -1,6 +1,4 @@
 import argparse
-import os
-import sys
 import time
 
 from mflux import Flux1, Config, ModelConfig
diff --git a/src/mflux/generate_controlnet.py b/src/mflux/generate_controlnet.py
index 4c5bb1a..2e0784b 100644
--- a/src/mflux/generate_controlnet.py
+++ b/src/mflux/generate_controlnet.py
@@ -1,14 +1,7 @@
 import argparse
-import os
-import sys
 import time
 
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-
-from mflux.config.model_config import ModelConfig
-from mflux.config.config import ConfigControlnet
-from mflux.controlnet.flux_controlnet import Flux1Controlnet
-from mflux.post_processing.image_util import ImageUtil
+from mflux import Flux1Controlnet, ConfigControlnet, ModelConfig, ImageUtil
 
 
 def main():