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
29d7e31d
Commit
29d7e31d
authored
Jul 31, 2023
by
AUTOMATIC1111
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
repair AttributeError: 'NoneType' object has no attribute 'conditioning_key'
parent
dca121e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
modules/processing.py
modules/processing.py
+7
-7
No files found.
modules/processing.py
View file @
29d7e31d
...
...
@@ -1104,6 +1104,13 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
info
=
create_infotext
(
self
,
self
.
all_prompts
,
self
.
all_seeds
,
self
.
all_subseeds
,
[],
iteration
=
self
.
iteration
,
position_in_batch
=
index
)
images
.
save_image
(
image
,
self
.
outpath_samples
,
""
,
seeds
[
index
],
prompts
[
index
],
opts
.
samples_format
,
info
=
info
,
p
=
self
,
suffix
=
"-before-highres-fix"
)
img2img_sampler_name
=
self
.
hr_sampler_name
or
self
.
sampler_name
if
self
.
sampler_name
in
[
'PLMS'
,
'UniPC'
]:
# PLMS/UniPC do not support img2img so we just silently switch to DDIM
img2img_sampler_name
=
'DDIM'
self
.
sampler
=
sd_samplers
.
create_sampler
(
img2img_sampler_name
,
self
.
sd_model
)
if
self
.
latent_scale_mode
is
not
None
:
for
i
in
range
(
samples
.
shape
[
0
]):
save_intermediate
(
samples
,
i
)
...
...
@@ -1143,13 +1150,6 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
shared
.
state
.
nextjob
()
img2img_sampler_name
=
self
.
hr_sampler_name
or
self
.
sampler_name
if
self
.
sampler_name
in
[
'PLMS'
,
'UniPC'
]:
# PLMS/UniPC do not support img2img so we just silently switch to DDIM
img2img_sampler_name
=
'DDIM'
self
.
sampler
=
sd_samplers
.
create_sampler
(
img2img_sampler_name
,
self
.
sd_model
)
samples
=
samples
[:,
:,
self
.
truncate_y
//
2
:
samples
.
shape
[
2
]
-
(
self
.
truncate_y
+
1
)
//
2
,
self
.
truncate_x
//
2
:
samples
.
shape
[
3
]
-
(
self
.
truncate_x
+
1
)
//
2
]
noise
=
create_random_tensors
(
samples
.
shape
[
1
:],
seeds
=
seeds
,
subseeds
=
subseeds
,
subseed_strength
=
subseed_strength
,
p
=
self
)
...
...
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