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
595dca85
Commit
595dca85
authored
Oct 24, 2022
by
Bruno Seoane
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reverse run_extras change
Update serialization on the batch images endpoint
parent
90f02c75
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
modules/api/api.py
modules/api/api.py
+6
-1
modules/api/models.py
modules/api/models.py
+4
-4
modules/extras.py
modules/extras.py
+1
-1
No files found.
modules/api/api.py
View file @
595dca85
...
@@ -109,7 +109,12 @@ class Api:
...
@@ -109,7 +109,12 @@ class Api:
def
extras_batch_images_api
(
self
,
req
:
ExtrasBatchImagesRequest
):
def
extras_batch_images_api
(
self
,
req
:
ExtrasBatchImagesRequest
):
reqDict
=
setUpscalers
(
req
)
reqDict
=
setUpscalers
(
req
)
reqDict
[
'image_folder'
]
=
list
(
map
(
decode_base64_to_file
,
reqDict
[
'imageList'
]))
def
prepareFiles
(
file
):
file
=
decode_base64_to_file
(
file
.
data
,
file_path
=
file
.
name
)
file
.
orig_name
=
file
.
name
return
file
reqDict
[
'image_folder'
]
=
list
(
map
(
prepareFiles
,
reqDict
[
'imageList'
]))
reqDict
.
pop
(
'imageList'
)
reqDict
.
pop
(
'imageList'
)
with
self
.
queue_lock
:
with
self
.
queue_lock
:
...
...
modules/api/models.py
View file @
595dca85
...
@@ -138,12 +138,12 @@ class ExtrasSingleImageRequest(ExtrasBaseRequest):
...
@@ -138,12 +138,12 @@ class ExtrasSingleImageRequest(ExtrasBaseRequest):
class
ExtrasSingleImageResponse
(
ExtraBaseResponse
):
class
ExtrasSingleImageResponse
(
ExtraBaseResponse
):
image
:
str
=
Field
(
default
=
None
,
title
=
"Image"
,
description
=
"The generated image in base64 format."
)
image
:
str
=
Field
(
default
=
None
,
title
=
"Image"
,
description
=
"The generated image in base64 format."
)
class
ImageItem
(
BaseModel
):
class
FileData
(
BaseModel
):
data
:
str
=
Field
(
title
=
"
image data
"
)
data
:
str
=
Field
(
title
=
"
File data"
,
description
=
"Base64 representation of the file
"
)
name
:
str
=
Field
(
title
=
"
file
name"
)
name
:
str
=
Field
(
title
=
"
File
name"
)
class
ExtrasBatchImagesRequest
(
ExtrasBaseRequest
):
class
ExtrasBatchImagesRequest
(
ExtrasBaseRequest
):
imageList
:
list
[
str
]
=
Field
(
title
=
"Images"
,
description
=
"List of images to work on. Must be Base64 strings"
)
imageList
:
list
[
FileData
]
=
Field
(
title
=
"Images"
,
description
=
"List of images to work on. Must be Base64 strings"
)
class
ExtrasBatchImagesResponse
(
ExtraBaseResponse
):
class
ExtrasBatchImagesResponse
(
ExtraBaseResponse
):
images
:
list
[
str
]
=
Field
(
title
=
"Images"
,
description
=
"The generated images in base64 format."
)
images
:
list
[
str
]
=
Field
(
title
=
"Images"
,
description
=
"The generated images in base64 format."
)
...
...
modules/extras.py
View file @
595dca85
...
@@ -33,7 +33,7 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_
...
@@ -33,7 +33,7 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_
for
img
in
image_folder
:
for
img
in
image_folder
:
image
=
Image
.
open
(
img
)
image
=
Image
.
open
(
img
)
imageArr
.
append
(
image
)
imageArr
.
append
(
image
)
imageNameArr
.
append
(
os
.
path
.
splitext
(
img
.
name
)[
0
])
imageNameArr
.
append
(
os
.
path
.
splitext
(
img
.
orig_
name
)[
0
])
elif
extras_mode
==
2
:
elif
extras_mode
==
2
:
assert
not
shared
.
cmd_opts
.
hide_ui_dir_config
,
'--hide-ui-dir-config option must be disabled'
assert
not
shared
.
cmd_opts
.
hide_ui_dir_config
,
'--hide-ui-dir-config option must be disabled'
...
...
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