From dafe28c02599b6a363e9b9a5cb6f7ba903a1dc3d Mon Sep 17 00:00:00 2001
From: lllyasviel <lyuminzhang@outlook.com>
Date: Sun, 28 Jan 2024 09:08:33 -0800
Subject: [PATCH] i

---
 .../scripts/sd_forge_controlnet_example.py             |  7 +++----
 modules_forge/shared.py                                | 10 ++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/extensions-builtin/sd_forge_controlnet_example/scripts/sd_forge_controlnet_example.py b/extensions-builtin/sd_forge_controlnet_example/scripts/sd_forge_controlnet_example.py
index da8a28f2..8bd5f7fc 100644
--- a/extensions-builtin/sd_forge_controlnet_example/scripts/sd_forge_controlnet_example.py
+++ b/extensions-builtin/sd_forge_controlnet_example/scripts/sd_forge_controlnet_example.py
@@ -11,7 +11,8 @@ from modules.paths import models_path
 from modules.modelloader import load_file_from_url
 from ldm_patched.modules.controlnet import load_controlnet
 from modules_forge.controlnet import apply_controlnet_advanced
-from modules_forge.forge_util import pytorch_to_numpy, numpy_to_pytorch
+from modules_forge.forge_util import numpy_to_pytorch
+from modules_forge.shared import controlnet_dir
 
 
 class ControlNetExampleForge(scripts.Script):
@@ -43,8 +44,6 @@ class ControlNetExampleForge(scripts.Script):
         if input_image is None:
             return
 
-        model_dir = os.path.join(models_path, 'ControlNet')
-        os.makedirs(model_dir, exist_ok=True)
         # controlnet_canny_path = load_file_from_url(
         #     url='https://huggingface.co/lllyasviel/sd_control_collection/resolve/main/sai_xl_canny_256lora.safetensors',
         #     model_dir=model_dir,
@@ -52,7 +51,7 @@ class ControlNetExampleForge(scripts.Script):
         # )
         controlnet_canny_path = load_file_from_url(
             url='https://huggingface.co/lllyasviel/fav_models/resolve/main/fav/control_v11p_sd15_canny_fp16.safetensors',
-            model_dir=model_dir,
+            model_dir=controlnet_dir,
             file_name='control_v11p_sd15_canny_fp16.safetensors'
         )
         print('The model [control_v11p_sd15_canny_fp16.safetensors] download finished.')
diff --git a/modules_forge/shared.py b/modules_forge/shared.py
index 20eb7fcb..5d24444d 100644
--- a/modules_forge/shared.py
+++ b/modules_forge/shared.py
@@ -1,4 +1,14 @@
 import cv2
+import os
+
+from modules.paths import models_path
+
+
+controlnet_dir = os.path.join(models_path, 'ControlNet')
+os.makedirs(controlnet_dir, exist_ok=True)
+
+preprocessor_dir = os.path.join(models_path, 'ControlNetPreprocessor')
+os.makedirs(preprocessor_dir, exist_ok=True)
 
 shared_preprocessors = {}