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
61c1261e
Commit
61c1261e
authored
Aug 18, 2023
by
XDOneDude
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more grammar fixes
parent
956e1d8d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
modules/processing.py
modules/processing.py
+12
-12
modules/prompt_parser.py
modules/prompt_parser.py
+1
-1
No files found.
modules/processing.py
View file @
61c1261e
...
...
@@ -386,14 +386,14 @@ class StableDiffusionProcessing:
return
self
.
token_merging_ratio
or
opts
.
token_merging_ratio
def
setup_prompts
(
self
):
if
type
(
self
.
prompt
)
==
list
:
if
isinstance
(
self
.
prompt
,
list
)
:
self
.
all_prompts
=
self
.
prompt
elif
type
(
self
.
negative_prompt
)
==
list
:
elif
isinstance
(
self
.
negative_prompt
,
list
)
:
self
.
all_prompts
=
[
self
.
prompt
]
*
len
(
self
.
negative_prompt
)
else
:
self
.
all_prompts
=
self
.
batch_size
*
self
.
n_iter
*
[
self
.
prompt
]
if
type
(
self
.
negative_prompt
)
==
list
:
if
isinstance
(
self
.
negative_prompt
,
list
)
:
self
.
all_negative_prompts
=
self
.
negative_prompt
else
:
self
.
all_negative_prompts
=
[
self
.
negative_prompt
]
*
len
(
self
.
all_prompts
)
...
...
@@ -512,10 +512,10 @@ class Processed:
self
.
s_noise
=
p
.
s_noise
self
.
s_min_uncond
=
p
.
s_min_uncond
self
.
sampler_noise_scheduler_override
=
p
.
sampler_noise_scheduler_override
self
.
prompt
=
self
.
prompt
if
type
(
self
.
prompt
)
!=
list
else
self
.
prompt
[
0
]
self
.
negative_prompt
=
self
.
negative_prompt
if
type
(
self
.
negative_prompt
)
!=
list
else
self
.
negative_prompt
[
0
]
self
.
seed
=
int
(
self
.
seed
if
type
(
self
.
seed
)
!=
list
else
self
.
seed
[
0
])
if
self
.
seed
is
not
None
else
-
1
self
.
subseed
=
int
(
self
.
subseed
if
type
(
self
.
subseed
)
!=
list
else
self
.
subseed
[
0
])
if
self
.
subseed
is
not
None
else
-
1
self
.
prompt
=
self
.
prompt
if
not
isinstance
(
self
.
prompt
,
list
)
else
self
.
prompt
[
0
]
self
.
negative_prompt
=
self
.
negative_prompt
if
not
isinstance
(
self
.
negative_prompt
,
list
)
else
self
.
negative_prompt
[
0
]
self
.
seed
=
int
(
self
.
seed
if
not
isinstance
(
self
.
seed
,
list
)
else
self
.
seed
[
0
])
if
self
.
seed
is
not
None
else
-
1
self
.
subseed
=
int
(
self
.
subseed
if
not
isinstance
(
self
.
subseed
,
list
)
else
self
.
subseed
[
0
])
if
self
.
subseed
is
not
None
else
-
1
self
.
is_using_inpainting_conditioning
=
p
.
is_using_inpainting_conditioning
self
.
all_prompts
=
all_prompts
or
p
.
all_prompts
or
[
self
.
prompt
]
...
...
@@ -741,7 +741,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
def
process_images_inner
(
p
:
StableDiffusionProcessing
)
->
Processed
:
"""this is the main loop that both txt2img and img2img use; it calls func_init once inside all the scopes and func_sample once per batch"""
if
type
(
p
.
prompt
)
==
list
:
if
isinstance
(
p
.
prompt
,
list
)
:
assert
(
len
(
p
.
prompt
)
>
0
)
else
:
assert
p
.
prompt
is
not
None
...
...
@@ -772,12 +772,12 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
p
.
setup_prompts
()
if
type
(
seed
)
==
list
:
if
isinstance
(
seed
,
list
)
:
p
.
all_seeds
=
seed
else
:
p
.
all_seeds
=
[
int
(
seed
)
+
(
x
if
p
.
subseed_strength
==
0
else
0
)
for
x
in
range
(
len
(
p
.
all_prompts
))]
if
type
(
subseed
)
==
list
:
if
isinstance
(
subseed
,
list
)
:
p
.
all_subseeds
=
subseed
else
:
p
.
all_subseeds
=
[
int
(
subseed
)
+
x
for
x
in
range
(
len
(
p
.
all_prompts
))]
...
...
@@ -1268,12 +1268,12 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
if
self
.
hr_negative_prompt
==
''
:
self
.
hr_negative_prompt
=
self
.
negative_prompt
if
type
(
self
.
hr_prompt
)
==
list
:
if
isinstance
(
self
.
hr_prompt
,
list
)
:
self
.
all_hr_prompts
=
self
.
hr_prompt
else
:
self
.
all_hr_prompts
=
self
.
batch_size
*
self
.
n_iter
*
[
self
.
hr_prompt
]
if
type
(
self
.
hr_negative_prompt
)
==
list
:
if
isinstance
(
self
.
hr_negative_prompt
,
list
)
:
self
.
all_hr_negative_prompts
=
self
.
hr_negative_prompt
else
:
self
.
all_hr_negative_prompts
=
self
.
batch_size
*
self
.
n_iter
*
[
self
.
hr_negative_prompt
]
...
...
modules/prompt_parser.py
View file @
61c1261e
...
...
@@ -86,7 +86,7 @@ def get_learned_conditioning_prompt_schedules(prompts, steps):
yield
args
[(
step
-
1
)
%
len
(
args
)]
def
start
(
self
,
args
):
def
flatten
(
x
):
if
type
(
x
)
==
str
:
if
isinstance
(
x
,
str
)
:
yield
x
else
:
for
gen
in
x
:
...
...
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