Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
b11713ec
Unverified
Commit
b11713ec
authored
Nov 01, 2022
by
Billy Cao
Committed by
GitHub
Nov 01, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'AUTOMATIC1111:master' into enable-override-hypernet
parents
bc607686
fb393140
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
1 deletion
+29
-1
ko_KR.json
localizations/ko_KR.json
+22
-0
api.py
modules/api/api.py
+6
-0
extras.py
modules/extras.py
+1
-1
No files found.
localizations/ko_KR.json
View file @
b11713ec
This diff is collapsed.
Click to expand it.
modules/api/api.py
View file @
b11713ec
...
@@ -40,6 +40,7 @@ class Api:
...
@@ -40,6 +40,7 @@ class Api:
self
.
app
.
add_api_route
(
"/sdapi/v1/extra-batch-images"
,
self
.
extras_batch_images_api
,
methods
=
[
"POST"
],
response_model
=
ExtrasBatchImagesResponse
)
self
.
app
.
add_api_route
(
"/sdapi/v1/extra-batch-images"
,
self
.
extras_batch_images_api
,
methods
=
[
"POST"
],
response_model
=
ExtrasBatchImagesResponse
)
self
.
app
.
add_api_route
(
"/sdapi/v1/png-info"
,
self
.
pnginfoapi
,
methods
=
[
"POST"
],
response_model
=
PNGInfoResponse
)
self
.
app
.
add_api_route
(
"/sdapi/v1/png-info"
,
self
.
pnginfoapi
,
methods
=
[
"POST"
],
response_model
=
PNGInfoResponse
)
self
.
app
.
add_api_route
(
"/sdapi/v1/progress"
,
self
.
progressapi
,
methods
=
[
"GET"
],
response_model
=
ProgressResponse
)
self
.
app
.
add_api_route
(
"/sdapi/v1/progress"
,
self
.
progressapi
,
methods
=
[
"GET"
],
response_model
=
ProgressResponse
)
self
.
app
.
add_api_route
(
"/sdapi/v1/interrupt"
,
self
.
interruptapi
,
methods
=
[
"POST"
])
def
text2imgapi
(
self
,
txt2imgreq
:
StableDiffusionTxt2ImgProcessingAPI
):
def
text2imgapi
(
self
,
txt2imgreq
:
StableDiffusionTxt2ImgProcessingAPI
):
sampler_index
=
sampler_to_index
(
txt2imgreq
.
sampler_index
)
sampler_index
=
sampler_to_index
(
txt2imgreq
.
sampler_index
)
...
@@ -176,6 +177,11 @@ class Api:
...
@@ -176,6 +177,11 @@ class Api:
return
ProgressResponse
(
progress
=
progress
,
eta_relative
=
eta_relative
,
state
=
shared
.
state
.
dict
(),
current_image
=
current_image
)
return
ProgressResponse
(
progress
=
progress
,
eta_relative
=
eta_relative
,
state
=
shared
.
state
.
dict
(),
current_image
=
current_image
)
def
interruptapi
(
self
):
shared
.
state
.
interrupt
()
return
{}
def
launch
(
self
,
server_name
,
port
):
def
launch
(
self
,
server_name
,
port
):
self
.
app
.
include_router
(
self
.
router
)
self
.
app
.
include_router
(
self
.
router
)
uvicorn
.
run
(
self
.
app
,
host
=
server_name
,
port
=
port
)
uvicorn
.
run
(
self
.
app
,
host
=
server_name
,
port
=
port
)
modules/extras.py
View file @
b11713ec
...
@@ -141,7 +141,7 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_
...
@@ -141,7 +141,7 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_
upscaling_resize_w
,
upscaling_resize_h
,
upscaling_crop
)
upscaling_resize_w
,
upscaling_resize_h
,
upscaling_crop
)
cache_key
=
LruCache
.
Key
(
image_hash
=
hash
(
np
.
array
(
image
.
getdata
())
.
tobytes
()),
cache_key
=
LruCache
.
Key
(
image_hash
=
hash
(
np
.
array
(
image
.
getdata
())
.
tobytes
()),
info_hash
=
hash
(
info
),
info_hash
=
hash
(
info
),
args_hash
=
hash
(
upscale_args
))
args_hash
=
hash
(
(
upscale_args
,
upscale_first
)
))
cached_entry
=
cached_images
.
get
(
cache_key
)
cached_entry
=
cached_images
.
get
(
cache_key
)
if
cached_entry
is
None
:
if
cached_entry
is
None
:
res
=
upscale
(
image
,
*
upscale_args
)
res
=
upscale
(
image
,
*
upscale_args
)
...
...
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