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
6585cba2
Unverified
Commit
6585cba2
authored
Nov 11, 2022
by
AUTOMATIC1111
Committed by
GitHub
Nov 11, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4395 from snowmeow2/master
Add DeepDanbooru to the interrogate API
parents
ac085628
67c8e11b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
api.py
modules/api/api.py
+14
-2
models.py
modules/api/models.py
+1
-0
No files found.
modules/api/api.py
View file @
6585cba2
...
@@ -15,6 +15,9 @@ from modules.sd_models import checkpoints_list
...
@@ -15,6 +15,9 @@ from modules.sd_models import checkpoints_list
from
modules.realesrgan_model
import
get_realesrgan_models
from
modules.realesrgan_model
import
get_realesrgan_models
from
typing
import
List
from
typing
import
List
if
shared
.
cmd_opts
.
deepdanbooru
:
from
modules.deepbooru
import
get_deepbooru_tags
def
upscaler_to_index
(
name
:
str
):
def
upscaler_to_index
(
name
:
str
):
try
:
try
:
return
[
x
.
name
.
lower
()
for
x
in
shared
.
sd_upscalers
]
.
index
(
name
.
lower
())
return
[
x
.
name
.
lower
()
for
x
in
shared
.
sd_upscalers
]
.
index
(
name
.
lower
())
...
@@ -220,11 +223,20 @@ class Api:
...
@@ -220,11 +223,20 @@ class Api:
if
image_b64
is
None
:
if
image_b64
is
None
:
raise
HTTPException
(
status_code
=
404
,
detail
=
"Image not found"
)
raise
HTTPException
(
status_code
=
404
,
detail
=
"Image not found"
)
img
=
self
.
__base64_to_image
(
image_b64
)
img
=
decode_base64_to_image
(
image_b64
)
img
=
img
.
convert
(
'RGB'
)
# Override object param
# Override object param
with
self
.
queue_lock
:
with
self
.
queue_lock
:
processed
=
shared
.
interrogator
.
interrogate
(
img
)
if
interrogatereq
.
model
==
"clip"
:
processed
=
shared
.
interrogator
.
interrogate
(
img
)
elif
interrogatereq
.
model
==
"deepdanbooru"
:
if
shared
.
cmd_opts
.
deepdanbooru
:
processed
=
get_deepbooru_tags
(
img
)
else
:
raise
HTTPException
(
status_code
=
404
,
detail
=
"Model not found. Add --deepdanbooru when launching for using the model."
)
else
:
raise
HTTPException
(
status_code
=
404
,
detail
=
"Model not found"
)
return
InterrogateResponse
(
caption
=
processed
)
return
InterrogateResponse
(
caption
=
processed
)
...
...
modules/api/models.py
View file @
6585cba2
...
@@ -170,6 +170,7 @@ class ProgressResponse(BaseModel):
...
@@ -170,6 +170,7 @@ class ProgressResponse(BaseModel):
class
InterrogateRequest
(
BaseModel
):
class
InterrogateRequest
(
BaseModel
):
image
:
str
=
Field
(
default
=
""
,
title
=
"Image"
,
description
=
"Image to work on, must be a Base64 string containing the image's data."
)
image
:
str
=
Field
(
default
=
""
,
title
=
"Image"
,
description
=
"Image to work on, must be a Base64 string containing the image's data."
)
model
:
str
=
Field
(
default
=
"clip"
,
title
=
"Model"
,
description
=
"The interrogate model used."
)
class
InterrogateResponse
(
BaseModel
):
class
InterrogateResponse
(
BaseModel
):
caption
:
str
=
Field
(
default
=
None
,
title
=
"Caption"
,
description
=
"The generated caption for the image."
)
caption
:
str
=
Field
(
default
=
None
,
title
=
"Caption"
,
description
=
"The generated caption for the image."
)
...
...
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