Merge branch 'AUTOMATIC1111:master' into master

6 files changed, 44 insertions, 6 deletions

diff --git a/modules/images.py b/modules/images.py
index 7df2b08c..2da988ee 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -573,6 +573,11 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
         os.replace(temp_file_path, filename_without_extension + extension)

 

     fullfn_without_extension, extension = os.path.splitext(params.filename)

+    if hasattr(os, 'statvfs'):

+        max_name_len = os.statvfs(path).f_namemax

+        fullfn_without_extension = fullfn_without_extension[:max_name_len - max(4, len(extension))]

+        params.filename = fullfn_without_extension + extension

+        fullfn = params.filename

     _atomically_save_image(image, fullfn_without_extension, extension)

 

     image.already_saved_as = fullfn

diff --git a/modules/models/diffusion/uni_pc/sampler.py b/modules/models/diffusion/uni_pc/sampler.py
index bf346ff4..a241c8a7 100644
--- a/modules/models/diffusion/uni_pc/sampler.py
+++ b/modules/models/diffusion/uni_pc/sampler.py
@@ -71,7 +71,7 @@ class UniPCSampler(object):
         # sampling
         C, H, W = shape
         size = (batch_size, C, H, W)
-        print(f'Data shape for UniPC sampling is {size}')
+        # print(f'Data shape for UniPC sampling is {size}')
 
         device = self.model.betas.device
         if x_T is None:
diff --git a/modules/models/diffusion/uni_pc/uni_pc.py b/modules/models/diffusion/uni_pc/uni_pc.py
index e9a093a2..eb5f4e76 100644
--- a/modules/models/diffusion/uni_pc/uni_pc.py
+++ b/modules/models/diffusion/uni_pc/uni_pc.py
@@ -1,6 +1,7 @@
 import torch
 import torch.nn.functional as F
 import math
+from tqdm.auto import trange
 
 
 class NoiseScheduleVP:
@@ -750,7 +751,7 @@ class UniPC:
         if method == 'multistep':
             assert steps >= order, "UniPC order must be < sampling steps"
             timesteps = self.get_time_steps(skip_type=skip_type, t_T=t_T, t_0=t_0, N=steps, device=device)
-            print(f"Running UniPC Sampling with {timesteps.shape[0]} timesteps, order {order}")
+            #print(f"Running UniPC Sampling with {timesteps.shape[0]} timesteps, order {order}")
             assert timesteps.shape[0] - 1 == steps
             with torch.no_grad():
                 vec_t = timesteps[0].expand((x.shape[0]))
@@ -766,7 +767,7 @@ class UniPC:
                         self.after_update(x, model_x)
                     model_prev_list.append(model_x)
                     t_prev_list.append(vec_t)
-                for step in range(order, steps + 1):
+                for step in trange(order, steps + 1):
                     vec_t = timesteps[step].expand(x.shape[0])
                     if lower_order_final:
                         step_order = min(order, steps + 1 - step)
diff --git a/modules/processing.py b/modules/processing.py
index 06e7a440..59717b4c 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -583,6 +583,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
         if state.job_count == -1:

             state.job_count = p.n_iter

 

+        extra_network_data = None

         for n in range(p.n_iter):

             p.iteration = n

 

@@ -712,7 +713,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
             if opts.grid_save:

                 images.save_image(grid, p.outpath_grids, "grid", p.all_seeds[0], p.all_prompts[0], opts.grid_format, info=infotext(), short_filename=not opts.grid_extended_filename, p=p, grid=True)

 

-    if not p.disable_extra_networks:

+    if not p.disable_extra_networks and extra_network_data:

         extra_networks.deactivate(p, extra_network_data)

 

     devices.torch_gc()

diff --git a/modules/sd_models.py b/modules/sd_models.py
index 93959f55..f0cb1240 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -210,6 +210,30 @@ def get_state_dict_from_checkpoint(pl_sd):
     return pl_sd

 

 

+def read_metadata_from_safetensors(filename):

+    import json

+

+    with open(filename, mode="rb") as file:

+        metadata_len = file.read(8)

+        metadata_len = int.from_bytes(metadata_len, "little")

+        json_start = file.read(2)

+

+        assert metadata_len > 2 and json_start in (b'{"', b"{'"), f"{filename} is not a safetensors file"

+        json_data = json_start + file.read(metadata_len-2)

+        json_obj = json.loads(json_data)

+

+        res = {}

+        for k, v in json_obj.get("__metadata__", {}).items():

+            res[k] = v

+            if isinstance(v, str) and v[0:1] == '{':

+                try:

+                    res[k] = json.loads(v)

+                except Exception as e:

+                    pass

+

+        return res

+

+

 def read_state_dict(checkpoint_file, print_global_state=False, map_location=None):

     _, extension = os.path.splitext(checkpoint_file)

     if extension.lower() == ".safetensors":

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 01df5e90..cdfd6f2a 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -30,8 +30,8 @@ def add_pages_to_demo(app):
             raise ValueError(f"File cannot be fetched: {filename}. Must be in one of directories registered by extra pages.")

 

         ext = os.path.splitext(filename)[1].lower()

-        if ext not in (".png", ".jpg"):

-            raise ValueError(f"File cannot be fetched: {filename}. Only png and jpg.")

+        if ext not in (".png", ".jpg", ".webp"):

+            raise ValueError(f"File cannot be fetched: {filename}. Only png and jpg and webp.")

 

         # would profit from returning 304

         return FileResponse(filename, headers={"Accept-Ranges": "bytes"})

@@ -124,6 +124,12 @@ class ExtraNetworksPage:
         if onclick is None:

             onclick = '"' + html.escape(f"""return cardClicked({json.dumps(tabname)}, {item["prompt"]}, {"true" if self.allow_negative_prompt else "false"})""") + '"'

 

+        metadata_button = ""

+        metadata = item.get("metadata")

+        if metadata:

+            metadata_onclick = '"' + html.escape(f"""extraNetworksShowMetadata({json.dumps(metadata)}); return false;""") + '"'

+            metadata_button = f"<div class='metadata-button' title='Show metadata' onclick={metadata_onclick}></div>"

+

         args = {

             "preview_html": "style='background-image: url(\"" + html.escape(preview) + "\")'" if preview else '',

             "prompt": item.get("prompt", None),

@@ -134,6 +140,7 @@ class ExtraNetworksPage:
             "card_clicked": onclick,

             "save_card_preview": '"' + html.escape(f"""return saveCardPreview(event, {json.dumps(tabname)}, {json.dumps(item["local_preview"])})""") + '"',

             "search_term": item.get("search_term", ""),

+            "metadata_button": metadata_button,

         }

 

         return self.card_page.format(**args)