Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Overbill1683
Stable Diffusion Webui
提交
6585cba2
S
Stable Diffusion Webui
项目概览
Overbill1683
/
Stable Diffusion Webui
大约 1 年 前同步成功
通知
1784
Star
81
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
分析
仓库
DevOps
项目成员
Pages
S
Stable Diffusion Webui
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Pages
分析
分析
仓库分析
DevOps
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
提交
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6585cba2
编写于
11月 11, 2022
作者:
A
AUTOMATIC1111
提交者:
GitHub
11月 11, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4395 from snowmeow2/master
Add DeepDanbooru to the interrogate API
上级
ac085628
67c8e11b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
2 deletion
+15
-2
modules/api/api.py
modules/api/api.py
+14
-2
modules/api/models.py
modules/api/models.py
+1
-0
未找到文件。
modules/api/api.py
浏览文件 @
6585cba2
...
...
@@ -15,6 +15,9 @@ from modules.sd_models import checkpoints_list
from
modules.realesrgan_model
import
get_realesrgan_models
from
typing
import
List
if
shared
.
cmd_opts
.
deepdanbooru
:
from
modules.deepbooru
import
get_deepbooru_tags
def
upscaler_to_index
(
name
:
str
):
try
:
return
[
x
.
name
.
lower
()
for
x
in
shared
.
sd_upscalers
].
index
(
name
.
lower
())
...
...
@@ -220,11 +223,20 @@ class Api:
if
image_b64
is
None
:
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
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
)
...
...
modules/api/models.py
浏览文件 @
6585cba2
...
...
@@ -170,6 +170,7 @@ class ProgressResponse(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."
)
model
:
str
=
Field
(
default
=
"clip"
,
title
=
"Model"
,
description
=
"The interrogate model used."
)
class
InterrogateResponse
(
BaseModel
):
caption
:
str
=
Field
(
default
=
None
,
title
=
"Caption"
,
description
=
"The generated caption for the image."
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录