From 542686eef8c1dab0ac47a5f74473e566f3172364 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Mon, 25 Dec 2023 07:58:43 -0500
Subject: [PATCH] detect sd2

---
 extensions-builtin/sd-webui-controlnet |  2 +-
 modules/sd_models.py                   | 18 +++++++++---------
 scripts/animatediff.py                 |  7 +------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet
index 4ceb6e8a4..b7a9bea23 160000
--- a/extensions-builtin/sd-webui-controlnet
+++ b/extensions-builtin/sd-webui-controlnet
@@ -1 +1 @@
-Subproject commit 4ceb6e8a4b86605cdeb6cd7087d1d7ef34452d85
+Subproject commit b7a9bea231c1eecdb2bf25ff7554e8b11d727fb6
diff --git a/modules/sd_models.py b/modules/sd_models.py
index 5d0dce124..aa97d922b 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -474,10 +474,10 @@ def load_model_weights(model: torch.nn.Module, checkpoint_info: CheckpointInfo,
     model.sd_model_checkpoint = checkpoint_info.filename
     model.sd_checkpoint_info = checkpoint_info
     model.is_sdxl = False # a1111 compatibility item
-    model.is_sd2 = False # a1111 compatibility item
-    model.is_sd1 = True # a1111 compatibility item
-    shared.opts.data["sd_checkpoint_hash"] = checkpoint_info.sha256
+    model.is_sd2 = hasattr(model.cond_stage_model, 'model') # a1111 compatibility item
+    model.is_sd1 = not hasattr(model.cond_stage_model, 'model') # a1111 compatibility item
     model.logvar = model.logvar.to(devices.device)  # fix for training
+    shared.opts.data["sd_checkpoint_hash"] = checkpoint_info.sha256
     sd_vae.delete_base_vae()
     sd_vae.clear_loaded_vae()
     vae_file, vae_source = sd_vae.resolve_vae(checkpoint_info.filename)
@@ -686,9 +686,9 @@ def copy_diffuser_options(new_pipe, orig_pipe):
     new_pipe.sd_model_hash = orig_pipe.sd_model_hash
     new_pipe.has_accelerate = orig_pipe.has_accelerate
     new_pipe.embedding_db = orig_pipe.embedding_db
-    new_pipe.is_sdxl = True # pylint: disable=attribute-defined-outside-init # a1111 compatibility item
-    new_pipe.is_sd2 = False # pylint: disable=attribute-defined-outside-init
-    new_pipe.is_sd1 = False # pylint: disable=attribute-defined-outside-init
+    new_pipe.is_sdxl = orig_pipe.is_sdxl # pylint: disable=attribute-defined-outside-init # a1111 compatibility item
+    new_pipe.is_sd2 = orig_pipe.is_sd2 # pylint: disable=attribute-defined-outside-init
+    new_pipe.is_sd1 = orig_pipe.is_sdv1 # pylint: disable=attribute-defined-outside-init
 
 
 
@@ -1069,9 +1069,9 @@ def set_diffuser_pipe(pipe, new_pipe_type):
     new_pipe.embedding_db = embedding_db
     new_pipe.image_encoder = image_encoder
     new_pipe.feature_extractor = feature_extractor
-    new_pipe.is_sdxl = True # pylint: disable=attribute-defined-outside-init # a1111 compatibility item
-    new_pipe.is_sd2 = False # pylint: disable=attribute-defined-outside-init
-    new_pipe.is_sd1 = False # pylint: disable=attribute-defined-outside-init
+    new_pipe.is_sdxl = pipe.is_sdxl
+    new_pipe.is_sd2 = pipe.is_sd2
+    new_pipe.is_sd1 = pipe.is_sd1
     shared.log.debug(f"Pipeline class change: original={pipe.__class__.__name__} target={new_pipe.__class__.__name__}")
     pipe = new_pipe
     return pipe
diff --git a/scripts/animatediff.py b/scripts/animatediff.py
index 650f43d6b..067e1b82d 100644
--- a/scripts/animatediff.py
+++ b/scripts/animatediff.py
@@ -87,15 +87,10 @@ def set_adapter(adapter_name: str = 'None'):
             motion_adapter=motion_adapter,
         )
         orig_pipe = shared.sd_model
-        new_pipe.sd_checkpoint_info = shared.sd_model.sd_checkpoint_info
-        new_pipe.sd_model_hash = shared.sd_model.sd_model_hash
-        new_pipe.sd_model_checkpoint = shared.sd_model.sd_checkpoint_info.filename
-        new_pipe.is_sdxl = False
-        new_pipe.is_sd2 = False
-        new_pipe.is_sd1 = True
         shared.sd_model = new_pipe
         if not ((shared.opts.diffusers_model_cpu_offload or shared.cmd_opts.medvram) or (shared.opts.diffusers_seq_cpu_offload or shared.cmd_opts.lowvram)):
             shared.sd_model.to(shared.device)
+        sd_models.copy_diffuser_options(new_pipe, orig_pipe)
         sd_models.set_diffuser_options(shared.sd_model, vae=None, op='model')
         shared.log.debug(f'AnimateDiff create pipeline: adapter="{loaded_adapter}"')
     except Exception as e: