Merge branch 'master' into stable

1 files changed, 10 insertions, 7 deletions

diff --git a/modules/processing.py b/modules/processing.py
index a838ebb3..2f5a2967 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -56,7 +56,7 @@ class StableDiffusionProcessing:
         self.prompt: str = prompt

         self.prompt_for_display: str = None

         self.negative_prompt: str = (negative_prompt or "")

-        self.styles: str = styles

+        self.styles: list = styles or []

         self.seed: int = seed

         self.subseed: int = subseed

         self.subseed_strength: float = subseed_strength

@@ -79,7 +79,7 @@ class StableDiffusionProcessing:
         self.paste_to = None

         self.color_corrections = None

         self.denoising_strength: float = 0

-

+        self.sampler_noise_scheduler_override = None

         self.ddim_discretize = opts.ddim_discretize

         self.s_churn = opts.s_churn

         self.s_tmin = opts.s_tmin

@@ -130,7 +130,7 @@ class Processed:
         self.s_tmin = p.s_tmin

         self.s_tmax = p.s_tmax

         self.s_noise = p.s_noise

-        

+        self.sampler_noise_scheduler_override = p.sampler_noise_scheduler_override

         self.prompt = self.prompt if type(self.prompt) != list else self.prompt[0]

         self.negative_prompt = self.negative_prompt if type(self.negative_prompt) != list else self.negative_prompt[0]

         self.seed = int(self.seed if type(self.seed) != list else self.seed[0])

@@ -271,7 +271,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration
         "Variation seed strength": (None if p.subseed_strength == 0 else p.subseed_strength),

         "Seed resize from": (None if p.seed_resize_from_w == 0 or p.seed_resize_from_h == 0 else f"{p.seed_resize_from_w}x{p.seed_resize_from_h}"),

         "Denoising strength": getattr(p, 'denoising_strength', None),

-        "Eta": (None if p.sampler.eta == p.sampler.default_eta else p.sampler.eta),

+        "Eta": (None if p.sampler is None or p.sampler.eta == p.sampler.default_eta else p.sampler.eta),

     }

 

     generation_params.update(p.extra_generation_params)

@@ -295,8 +295,11 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
 

     fix_seed(p)

 

-    os.makedirs(p.outpath_samples, exist_ok=True)

-    os.makedirs(p.outpath_grids, exist_ok=True)

+    if p.outpath_samples is not None:

+        os.makedirs(p.outpath_samples, exist_ok=True)

+

+    if p.outpath_grids is not None:

+        os.makedirs(p.outpath_grids, exist_ok=True)

 

     modules.sd_hijack.model_hijack.apply_circular(p.tiling)

 

@@ -323,7 +326,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
         return create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration, position_in_batch)

 

     if os.path.exists(cmd_opts.embeddings_dir):

-        model_hijack.load_textual_inversion_embeddings(cmd_opts.embeddings_dir, p.sd_model)

+        model_hijack.embedding_db.load_textual_inversion_embeddings()

 

     infotexts = []

     output_images = []