some fixes

Author: divamgupta

backends/stable_diffusion/diffusionbee_backend.py

@@ -131,6 +131,10 @@ def process_opt(d, generator):
  print("sdbk mdvr 1.4")
 
  if d['do_controlnet'] == True:
+
+ if "sd_1x_controlnet" not in generator.model.avail_models:
+ raise ValueError("ControlNet is not supported. Please upgrade to macOS13.0+")
+
  if d['control_name'] == "body_pose":
  second_tdict_path = ProgressBarDownloader(title="Downloading ControlNet Body Model 1/2").download(
  url="https://huggingface.co/divamgupta/controlnet_tensorflow/resolve/main/just_control_sd15_openpose_fp16.tdict",

backends/stable_diffusion/tests.py

@@ -158,6 +158,27 @@ def test_7():
 
 
 
+def test_ctrl_1():
+ inp = "./test_assets/scribble_turtle.png"
+
+ img = sd.generate(
+ prompt="a turtle" , 
+ img_height=512, 
+ img_width=512, 
+ seed=6378, 
+ tdict_path=None,
+ second_tdict_path="/Users/divamgupta/Downloads/just_control_sd15_scribble_fp16.tdict",
+ batch_size=1,
+ dtype="float32",
+ scheduler='ddim',
+ num_steps=10,
+ input_image=inp,
+ mode="controlnet" )
+
+ Image.fromarray(img['img'][0]).show()
+
+
+
 
 # inp = "./test_assets/yoga1.jpg"
 
@@ -183,23 +204,6 @@ def test_7():
 
 
 
-# inp = "./test_assets/scribble_turtle.png"
-
-
-# img = sd.generate(
-# prompt="a turtle" , 
-# img_height=512, 
-# img_width=512, 
-# seed=6378, 
-# tdict_path=None,
-# second_tdict_path="/Users/divamgupta/Downloads/just_control_sd15_scribble_fp16.tdict",
-# batch_size=1,
-# dtype=ModelInterface.default_float_type,
-# scheduler='ddim',
-# num_steps=25,
-# input_image=inp,
-# mode="controlnet" )
-
 
 # Image.fromarray(img['img'][0]).show()
 
@@ -219,7 +223,7 @@ def test_7():
 
 # Image.fromarray(img[0]).show()
 
-test_7()
+test_ctrl_1()
 
 
 exit()

backends/stable_diffusion_tf_models/interface.py

@@ -99,6 +99,7 @@ class ModelInterface:
 
  default_float_type = 'float32'
  avail_float_types = ['float32']
+ avail_models = ["sd_1x" , "sd_1x_inpaint" , "sd_1x_controlnet"]
 
  def __init__(self, tdict, dtype='float16', model_name="sd_1x", second_tdict=None ):
 

electron_app/package.json

@@ -1,7 +1,7 @@
 {
  "name": "DiffusionBee",
- "version": "1.7.1",
- "build_number": "0019",
+ "version": "1.7.2",
+ "build_number": "0021",
  "website": "https://diffusionbee.com",
  "description": "Diffusion Bee - Stable Diffusion App.",
  "is_dev": false,