Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
9d78d317
Commit
9d78d317
authored
Aug 10, 2023
by
AUTOMATIC1111
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add VAE to infotext
parent
b13806c1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
modules/generation_parameters_copypaste.py
modules/generation_parameters_copypaste.py
+1
-0
modules/processing.py
modules/processing.py
+2
-0
modules/sd_vae.py
modules/sd_vae.py
+15
-1
No files found.
modules/generation_parameters_copypaste.py
View file @
9d78d317
...
@@ -341,6 +341,7 @@ infotext_to_setting_name_mapping = [
...
@@ -341,6 +341,7 @@ infotext_to_setting_name_mapping = [
(
'RNG'
,
'randn_source'
),
(
'RNG'
,
'randn_source'
),
(
'NGMS'
,
's_min_uncond'
),
(
'NGMS'
,
's_min_uncond'
),
(
'Pad conds'
,
'pad_cond_uncond'
),
(
'Pad conds'
,
'pad_cond_uncond'
),
(
'VAE'
,
'sd_vae'
),
(
'VAE Encoder'
,
'sd_vae_encode_method'
),
(
'VAE Encoder'
,
'sd_vae_encode_method'
),
(
'VAE Decoder'
,
'sd_vae_decode_method'
),
(
'VAE Decoder'
,
'sd_vae_decode_method'
),
(
'Tiling'
,
'tiling'
),
(
'Tiling'
,
'tiling'
),
...
...
modules/processing.py
View file @
9d78d317
...
@@ -576,6 +576,8 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
...
@@ -576,6 +576,8 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
"Size"
:
f
"{p.width}x{p.height}"
,
"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 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
),
"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"
:
(
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
),
"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}"
),
"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}"
),
...
...
modules/sd_vae.py
View file @
9d78d317
...
@@ -2,7 +2,7 @@ import os
...
@@ -2,7 +2,7 @@ import os
import
collections
import
collections
from
dataclasses
import
dataclass
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
import
glob
from
copy
import
deepcopy
from
copy
import
deepcopy
...
@@ -20,6 +20,20 @@ checkpoint_info = None
...
@@ -20,6 +20,20 @@ checkpoint_info = None
checkpoints_loaded
=
collections
.
OrderedDict
()
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
):
def
get_base_vae
(
model
):
if
base_vae
is
not
None
and
checkpoint_info
==
model
.
sd_checkpoint_info
and
model
:
if
base_vae
is
not
None
and
checkpoint_info
==
model
.
sd_checkpoint_info
and
model
:
return
base_vae
return
base_vae
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment