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
579f1ef2
Commit
579f1ef2
authored
Apr 28, 2024
by
missionfloyd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow old sampler names in API
parent
1c0a0c4c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
2 deletions
+19
-2
modules/api/api.py
modules/api/api.py
+19
-2
No files found.
modules/api/api.py
View file @
579f1ef2
...
...
@@ -48,6 +48,15 @@ def validate_sampler_name(name):
return
name
def
parse_old_sampler_name
(
name
):
for
scheduler
in
sd_schedulers
.
schedulers
:
for
scheduler_name
in
[
scheduler
.
label
,
scheduler
.
name
,
*
(
scheduler
.
aliases
or
[])]:
if
name
.
endswith
(
" "
+
scheduler_name
):
return
name
[
0
:
-
(
len
(
scheduler_name
)
+
1
)],
scheduler_name
return
name
,
"Automatic"
def
setUpscalers
(
req
:
dict
):
reqDict
=
vars
(
req
)
reqDict
[
'extras_upscaler_1'
]
=
reqDict
.
pop
(
'upscaler_1'
,
None
)
...
...
@@ -438,15 +447,19 @@ class Api:
self
.
apply_infotext
(
txt2imgreq
,
"txt2img"
,
script_runner
=
script_runner
,
mentioned_script_args
=
infotext_script_args
)
selectable_scripts
,
selectable_script_idx
=
self
.
get_selectable_script
(
txt2imgreq
.
script_name
,
script_runner
)
sampler
,
scheduler
=
parse_old_sampler_name
(
txt2imgreq
.
sampler_name
or
txt2imgreq
.
sampler_index
)
populate
=
txt2imgreq
.
copy
(
update
=
{
# Override __init__ params
"sampler_name"
:
validate_sampler_name
(
txt2imgreq
.
sampler_name
or
txt2imgreq
.
sampler_index
),
"sampler_name"
:
validate_sampler_name
(
sampler
),
"do_not_save_samples"
:
not
txt2imgreq
.
save_images
,
"do_not_save_grid"
:
not
txt2imgreq
.
save_images
,
})
if
populate
.
sampler_name
:
populate
.
sampler_index
=
None
# prevent a warning later on
if
not
populate
.
scheduler
:
populate
.
scheduler
=
scheduler
args
=
vars
(
populate
)
args
.
pop
(
'script_name'
,
None
)
args
.
pop
(
'script_args'
,
None
)
# will refeed them to the pipeline directly after initializing them
...
...
@@ -502,9 +515,10 @@ class Api:
self
.
apply_infotext
(
img2imgreq
,
"img2img"
,
script_runner
=
script_runner
,
mentioned_script_args
=
infotext_script_args
)
selectable_scripts
,
selectable_script_idx
=
self
.
get_selectable_script
(
img2imgreq
.
script_name
,
script_runner
)
sampler
,
scheduler
=
parse_old_sampler_name
(
img2imgreq
.
sampler_name
or
img2imgreq
.
sampler_index
)
populate
=
img2imgreq
.
copy
(
update
=
{
# Override __init__ params
"sampler_name"
:
validate_sampler_name
(
img2imgreq
.
sampler_name
or
img2imgreq
.
sampler_index
),
"sampler_name"
:
validate_sampler_name
(
sampler
),
"do_not_save_samples"
:
not
img2imgreq
.
save_images
,
"do_not_save_grid"
:
not
img2imgreq
.
save_images
,
"mask"
:
mask
,
...
...
@@ -512,6 +526,9 @@ class Api:
if
populate
.
sampler_name
:
populate
.
sampler_index
=
None
# prevent a warning later on
if
not
populate
.
scheduler
:
populate
.
scheduler
=
scheduler
args
=
vars
(
populate
)
args
.
pop
(
'include_init_images'
,
None
)
# this is meant to be done by "exclude": True in model, but it's for a reason that I cannot determine.
args
.
pop
(
'script_name'
,
None
)
...
...
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