Commit 9d78d317 authored by AUTOMATIC1111's avatar AUTOMATIC1111
Browse files

add VAE to infotext

parent b13806c1
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ infotext_to_setting_name_mapping = [
    ('RNG', 'randn_source'),
    ('NGMS', 's_min_uncond'),
    ('Pad conds', 'pad_cond_uncond'),
    ('VAE', 'sd_vae'),
    ('VAE Encoder', 'sd_vae_encode_method'),
    ('VAE Decoder', 'sd_vae_decode_method'),
    ('Tiling', 'tiling'),
+2 −0
Original line number Diff line number Diff line
@@ -576,6 +576,8 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
        "Size": f"{p.width}x{p.height}",
        "Model hash": getattr(p, 'sd_model_hash', None if not opts.add_model_hash_to_info or not shared.sd_model.sd_model_hash else shared.sd_model.sd_model_hash),
        "Model": (None if not opts.add_model_name_to_info else shared.sd_model.sd_checkpoint_info.name_for_extra),
        "VAE hash": sd_vae.get_loaded_vae_hash() if opts.add_model_hash_to_info else None,
        "VAE": sd_vae.get_loaded_vae_name() if opts.add_model_name_to_info else None,
        "Variation seed": (None if p.subseed_strength == 0 else (p.all_subseeds[0] if use_main_prompt else all_subseeds[index])),
        "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}"),
+15 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import os
import collections
from dataclasses import dataclass

from modules import paths, shared, devices, script_callbacks, sd_models, extra_networks, lowvram, sd_hijack
from modules import paths, shared, devices, script_callbacks, sd_models, extra_networks, lowvram, sd_hijack, hashes

import glob
from copy import deepcopy
@@ -20,6 +20,20 @@ checkpoint_info = None
checkpoints_loaded = collections.OrderedDict()


def get_loaded_vae_name():
    if loaded_vae_file is None:
        return None

    return os.path.basename(loaded_vae_file)


def get_loaded_vae_hash():
    if loaded_vae_file is None:
        return None

    return hashes.sha256(loaded_vae_file, 'vae')[0:10]


def get_base_vae(model):
    if base_vae is not None and checkpoint_info == model.sd_checkpoint_info and model:
        return base_vae