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
76ebf750
Commit
76ebf750
authored
May 17, 2023
by
AUTOMATIC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use a local variable instead of dictionary entry for sd_merge_models in merge model metadata code
parent
36c14831
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
modules/extras.py
modules/extras.py
+7
-4
No files found.
modules/extras.py
View file @
76ebf750
...
...
@@ -245,7 +245,8 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
metadata
=
None
if
save_metadata
:
metadata
=
{
"format"
:
"pt"
,
"sd_merge_models"
:
{}}
metadata
=
{
"format"
:
"pt"
}
merge_recipe
=
{
"type"
:
"webui"
,
# indicate this model was merged with webui's built-in merger
"primary_model_hash"
:
primary_model_info
.
sha256
,
...
...
@@ -263,15 +264,17 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
}
metadata
[
"sd_merge_recipe"
]
=
json
.
dumps
(
merge_recipe
)
sd_merge_models
=
{}
def
add_model_metadata
(
checkpoint_info
):
checkpoint_info
.
calculate_shorthash
()
metadata
[
"sd_merge_models"
]
[
checkpoint_info
.
sha256
]
=
{
sd_merge_models
[
checkpoint_info
.
sha256
]
=
{
"name"
:
checkpoint_info
.
name
,
"legacy_hash"
:
checkpoint_info
.
hash
,
"sd_merge_recipe"
:
checkpoint_info
.
metadata
.
get
(
"sd_merge_recipe"
,
None
)
}
metadata
[
"sd_merge_models"
]
.
update
(
checkpoint_info
.
metadata
.
get
(
"sd_merge_models"
,
{}))
sd_merge_models
.
update
(
checkpoint_info
.
metadata
.
get
(
"sd_merge_models"
,
{}))
add_model_metadata
(
primary_model_info
)
if
secondary_model_info
:
...
...
@@ -279,7 +282,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
if
tertiary_model_info
:
add_model_metadata
(
tertiary_model_info
)
metadata
[
"sd_merge_models"
]
=
json
.
dumps
(
metadata
[
"sd_merge_models"
]
)
metadata
[
"sd_merge_models"
]
=
json
.
dumps
(
sd_merge_models
)
_
,
extension
=
os
.
path
.
splitext
(
output_modelname
)
if
extension
.
lower
()
==
".safetensors"
:
...
...
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