mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2024-11-27 06:40:10 +08:00
show image history
This commit is contained in:
parent
2995107fa2
commit
8a7c07a214
66
javascript/images_history.js
Normal file
66
javascript/images_history.js
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
function init_images_history(){
|
||||||
|
if (gradioApp().getElementById('txt2img_images_history_first_page') == null) {
|
||||||
|
setTimeout(init_images_history, 1000)
|
||||||
|
} else {
|
||||||
|
tab_list = ["txt2img", "img2img"]
|
||||||
|
for (i in tab_list){
|
||||||
|
tab = tab_list[i]
|
||||||
|
gradioApp().getElementById(tab + "_images_history_first_page").click()
|
||||||
|
$(gradioApp().getElementById(tab + '_images_history')).addClass("images_history_gallery")
|
||||||
|
item = $(gradioApp().getElementById(tab + '_images_history_set_index'))
|
||||||
|
item.addClass("images_history_set_index")
|
||||||
|
item.hide()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
setTimeout(init_images_history, 1000)
|
||||||
|
onUiUpdate(function(){
|
||||||
|
fullImg_preview = gradioApp().querySelectorAll('#txt2img_images_history img.w-full')
|
||||||
|
if(fullImg_preview.length > 0){
|
||||||
|
fullImg_preview.forEach(set_history_index_from_img);
|
||||||
|
}
|
||||||
|
fullImg_preview = gradioApp().querySelectorAll('#img2img_images_history img.w-full')
|
||||||
|
if(fullImg_preview.length > 0){
|
||||||
|
fullImg_preview.forEach(set_history_index_from_img);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
function set_history_gallery_index(item){
|
||||||
|
buttons = item.find(".gallery-item")
|
||||||
|
// alert(item.attr("id") + " " + buttons.length)
|
||||||
|
index = -1
|
||||||
|
i = 0
|
||||||
|
buttons.each(function(){
|
||||||
|
if($(this).hasClass("!ring-2")){ index = i }
|
||||||
|
i += 1
|
||||||
|
})
|
||||||
|
if (index == -1){
|
||||||
|
setTimeout(set_history_gallery_index, 10, item)
|
||||||
|
} else {
|
||||||
|
item = item.find(".images_history_set_index").first()
|
||||||
|
item.attr("img_index", index)
|
||||||
|
item.click()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function set_history_index_from_img(e){
|
||||||
|
if(e && e.parentElement.tagName == 'BUTTON'){
|
||||||
|
bnt = $(e).parent()
|
||||||
|
if (bnt.hasClass("transform")){
|
||||||
|
bnt.off("click").on("click",function(){
|
||||||
|
set_history_gallery_index($(this).parents(".images_history_gallery").first())
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
bnt.off("mousedown").on("mousedown", function(){
|
||||||
|
set_history_gallery_index($(this).parents(".images_history_gallery").first())
|
||||||
|
})
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function images_history_get_current_img(is_image2image){
|
||||||
|
head = is_image2image?"img2img":"txt2img"
|
||||||
|
s = $(gradioApp().getElementById(head + '_images_history_set_index')).attr("img_index")
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
2
javascript/jquery-3.6.0.min.js
vendored
Normal file
2
javascript/jquery-3.6.0.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
90
modules/images_history.py
Normal file
90
modules/images_history.py
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
import os
|
||||||
|
def get_recent_images(is_img2img, dir_name, page_index, step):
|
||||||
|
page_index = int(page_index)
|
||||||
|
f_list = os.listdir(dir_name)
|
||||||
|
file_list = []
|
||||||
|
for file in f_list:
|
||||||
|
if file[-4:] == ".txt":
|
||||||
|
continue
|
||||||
|
file_list.append(file)
|
||||||
|
file_list = sorted(file_list, key=lambda file: -os.path.getctime(os.path.join(dir_name, file)))
|
||||||
|
num = 24
|
||||||
|
max_page_index = len(file_list) // num + 1
|
||||||
|
page_index = max_page_index if page_index == -1 else page_index + step
|
||||||
|
page_index = 1 if page_index < 1 else page_index
|
||||||
|
page_index = max_page_index if page_index > max_page_index else page_index
|
||||||
|
idx_frm = (page_index - 1) * num
|
||||||
|
file_list = file_list[idx_frm:idx_frm + num]
|
||||||
|
print(f"Loading history page {page_index}")
|
||||||
|
return [os.path.join(dir_name, file) for file in file_list], page_index, file_list
|
||||||
|
def first_page_click(is_img2img, dir_name):
|
||||||
|
return get_recent_images(is_img2img, dir_name, 1, 0)
|
||||||
|
def end_page_click(is_img2img, dir_name):
|
||||||
|
return get_recent_images(is_img2img, dir_name, -1, 0)
|
||||||
|
def prev_page_click(is_img2img, dir_name, page_index):
|
||||||
|
return get_recent_images(is_img2img, dir_name, page_index, -1)
|
||||||
|
def next_page_click(is_img2img, dir_name, page_index):
|
||||||
|
return get_recent_images(is_img2img, dir_name, page_index, 1)
|
||||||
|
def page_index_change(is_img2img, dir_name, page_index):
|
||||||
|
return get_recent_images(is_img2img, dir_name, page_index, 0)
|
||||||
|
def show_image_info(num, filenames):
|
||||||
|
return filenames[int(num)]
|
||||||
|
def delete_image(is_img2img, dir_name, name, page_index, filenames):
|
||||||
|
path = os.path.join(dir_name, name)
|
||||||
|
if os.path.exists(path):
|
||||||
|
print(f"Delete file {path}")
|
||||||
|
os.remove(path)
|
||||||
|
i = 0
|
||||||
|
for f in filenames:
|
||||||
|
if f == name:
|
||||||
|
break
|
||||||
|
i += 1
|
||||||
|
images, page_index, file_list = get_recent_images(is_img2img, dir_name, page_index, 0)
|
||||||
|
current_file = file_list[i] if i < len(file_list) else None
|
||||||
|
return images, page_index, file_list, current_file
|
||||||
|
|
||||||
|
|
||||||
|
def show_images_history(gr, opts, is_img2img):
|
||||||
|
def id_name(is_img2img, name):
|
||||||
|
return ("img2img" if is_img2img else "txt2img") + "_" + name
|
||||||
|
with gr.Row():
|
||||||
|
if is_img2img:
|
||||||
|
dir_name = opts.outdir_img2img_samples
|
||||||
|
else:
|
||||||
|
dir_name = opts.outdir_txt2img_samples
|
||||||
|
first_page = gr.Button('First Page', elem_id=id_name(is_img2img,"images_history_first_page"))
|
||||||
|
prev_page = gr.Button('Prev Page')
|
||||||
|
page_index = gr.Number(value=1)
|
||||||
|
next_page = gr.Button('Next Page')
|
||||||
|
end_page = gr.Button('End Page')
|
||||||
|
with gr.Row():
|
||||||
|
delete = gr.Button('Delete')
|
||||||
|
Send = gr.Button('Send')
|
||||||
|
with gr.Row():
|
||||||
|
with gr.Column(elem_id=id_name(is_img2img,"images_history")):
|
||||||
|
history_gallery = gr.Gallery(label="Images history").style(grid=6)
|
||||||
|
img_file_name = gr.Textbox()
|
||||||
|
img_file_info = gr.Textbox(dir_name)
|
||||||
|
img_path = gr.Textbox(dir_name, visible=False)
|
||||||
|
set_index = gr.Button('set_index', elem_id=id_name(is_img2img,"images_history_set_index"))
|
||||||
|
is_img2img_flag = gr.Checkbox(is_img2img, visible=False)
|
||||||
|
filenames = gr.State()
|
||||||
|
first_page.click(first_page_click, inputs=[is_img2img_flag, img_path], outputs=[history_gallery, page_index, filenames])
|
||||||
|
next_page.click(next_page_click, inputs=[is_img2img_flag, img_path, page_index], outputs=[history_gallery, page_index, filenames])
|
||||||
|
prev_page.click(prev_page_click, inputs=[is_img2img_flag, img_path, page_index], outputs=[history_gallery, page_index, filenames])
|
||||||
|
end_page.click(end_page_click, inputs=[is_img2img_flag, img_path], outputs=[history_gallery, page_index, filenames])
|
||||||
|
page_index.submit(page_index_change, inputs=[is_img2img_flag, img_path, page_index], outputs=[history_gallery, page_index, filenames])
|
||||||
|
set_index.click(show_image_info, _js="images_history_get_current_img",inputs=[is_img2img_flag, filenames], outputs=img_file_name)
|
||||||
|
delete.click(delete_image, inputs=[is_img2img_flag, img_path, img_file_name, page_index, filenames], outputs=[history_gallery, page_index, filenames,img_file_name])
|
||||||
|
#page_index.change(page_index_change, inputs=[is_img2img_flag, img_path, page_index], outputs=[history_gallery, page_index])
|
||||||
|
|
||||||
|
def create_history_tabs(gr, opts):
|
||||||
|
with gr.Blocks(analytics_enabled=False) as images_history:
|
||||||
|
with gr.Tabs() as tabs:
|
||||||
|
with gr.Tab("txt2img history", id="images_history_txt2img"):
|
||||||
|
with gr.Blocks(analytics_enabled=False) as images_history_txt2img:
|
||||||
|
show_images_history(gr, opts, is_img2img=False)
|
||||||
|
with gr.Tab("img2img history", id="images_history_img2img"):
|
||||||
|
with gr.Blocks(analytics_enabled=False) as images_history_img2img:
|
||||||
|
show_images_history(gr, opts, is_img2img=True)
|
||||||
|
return images_history
|
@ -37,6 +37,7 @@ import modules.generation_parameters_copypaste
|
|||||||
from modules import prompt_parser
|
from modules import prompt_parser
|
||||||
from modules.images import save_image
|
from modules.images import save_image
|
||||||
import modules.textual_inversion.ui
|
import modules.textual_inversion.ui
|
||||||
|
import modules.images_history as img_his
|
||||||
|
|
||||||
# this is a fix for Windows users. Without it, javascript files will be served with text/html content-type and the bowser will not show any UI
|
# this is a fix for Windows users. Without it, javascript files will be served with text/html content-type and the bowser will not show any UI
|
||||||
mimetypes.init()
|
mimetypes.init()
|
||||||
@ -499,7 +500,6 @@ def create_ui(wrap_gradio_gpu_call):
|
|||||||
custom_inputs = modules.scripts.scripts_txt2img.setup_ui(is_img2img=False)
|
custom_inputs = modules.scripts.scripts_txt2img.setup_ui(is_img2img=False)
|
||||||
|
|
||||||
with gr.Column(variant='panel'):
|
with gr.Column(variant='panel'):
|
||||||
|
|
||||||
with gr.Group():
|
with gr.Group():
|
||||||
txt2img_preview = gr.Image(elem_id='txt2img_preview', visible=False)
|
txt2img_preview = gr.Image(elem_id='txt2img_preview', visible=False)
|
||||||
txt2img_gallery = gr.Gallery(label='Output', show_label=False, elem_id='txt2img_gallery').style(grid=4)
|
txt2img_gallery = gr.Gallery(label='Output', show_label=False, elem_id='txt2img_gallery').style(grid=4)
|
||||||
@ -517,6 +517,7 @@ def create_ui(wrap_gradio_gpu_call):
|
|||||||
html_info = gr.HTML()
|
html_info = gr.HTML()
|
||||||
generation_info = gr.Textbox(visible=False)
|
generation_info = gr.Textbox(visible=False)
|
||||||
|
|
||||||
|
|
||||||
connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)
|
connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)
|
||||||
connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)
|
connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)
|
||||||
|
|
||||||
@ -608,6 +609,7 @@ def create_ui(wrap_gradio_gpu_call):
|
|||||||
modules.generation_parameters_copypaste.connect_paste(paste, txt2img_paste_fields, txt2img_prompt)
|
modules.generation_parameters_copypaste.connect_paste(paste, txt2img_paste_fields, txt2img_prompt)
|
||||||
token_button.click(fn=update_token_counter, inputs=[txt2img_prompt, steps], outputs=[token_counter])
|
token_button.click(fn=update_token_counter, inputs=[txt2img_prompt, steps], outputs=[token_counter])
|
||||||
|
|
||||||
|
|
||||||
with gr.Blocks(analytics_enabled=False) as img2img_interface:
|
with gr.Blocks(analytics_enabled=False) as img2img_interface:
|
||||||
img2img_prompt, roll, img2img_prompt_style, img2img_negative_prompt, img2img_prompt_style2, submit, img2img_interrogate, img2img_prompt_style_apply, img2img_save_style, paste, token_counter, token_button = create_toprow(is_img2img=True)
|
img2img_prompt, roll, img2img_prompt_style, img2img_negative_prompt, img2img_prompt_style2, submit, img2img_interrogate, img2img_prompt_style_apply, img2img_save_style, paste, token_counter, token_button = create_toprow(is_img2img=True)
|
||||||
|
|
||||||
@ -697,6 +699,7 @@ def create_ui(wrap_gradio_gpu_call):
|
|||||||
html_info = gr.HTML()
|
html_info = gr.HTML()
|
||||||
generation_info = gr.Textbox(visible=False)
|
generation_info = gr.Textbox(visible=False)
|
||||||
|
|
||||||
|
|
||||||
connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)
|
connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)
|
||||||
connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)
|
connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)
|
||||||
|
|
||||||
@ -1128,6 +1131,8 @@ def create_ui(wrap_gradio_gpu_call):
|
|||||||
|
|
||||||
return f'{changed} settings changed.', opts.dumpjson()
|
return f'{changed} settings changed.', opts.dumpjson()
|
||||||
|
|
||||||
|
|
||||||
|
images_history = img_his.create_history_tabs(gr, opts)
|
||||||
with gr.Blocks(analytics_enabled=False) as settings_interface:
|
with gr.Blocks(analytics_enabled=False) as settings_interface:
|
||||||
settings_submit = gr.Button(value="Apply settings", variant='primary')
|
settings_submit = gr.Button(value="Apply settings", variant='primary')
|
||||||
result = gr.HTML()
|
result = gr.HTML()
|
||||||
@ -1206,7 +1211,9 @@ def create_ui(wrap_gradio_gpu_call):
|
|||||||
(pnginfo_interface, "PNG Info", "pnginfo"),
|
(pnginfo_interface, "PNG Info", "pnginfo"),
|
||||||
(modelmerger_interface, "Checkpoint Merger", "modelmerger"),
|
(modelmerger_interface, "Checkpoint Merger", "modelmerger"),
|
||||||
(textual_inversion_interface, "Textual inversion", "ti"),
|
(textual_inversion_interface, "Textual inversion", "ti"),
|
||||||
|
(images_history, "History", "images_history"),
|
||||||
(settings_interface, "Settings", "settings"),
|
(settings_interface, "Settings", "settings"),
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
||||||
with open(os.path.join(script_path, "style.css"), "r", encoding="utf8") as file:
|
with open(os.path.join(script_path, "style.css"), "r", encoding="utf8") as file:
|
||||||
|
1
repositorieslatent-diffusion
Submodule
1
repositorieslatent-diffusion
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit abf33e7002d59d9085081bce93ec798dcabd49af
|
124
testui.py
Normal file
124
testui.py
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
import os
|
||||||
|
import threading
|
||||||
|
import time
|
||||||
|
import importlib
|
||||||
|
import signal
|
||||||
|
import threading
|
||||||
|
|
||||||
|
from modules.paths import script_path
|
||||||
|
|
||||||
|
from modules import devices, sd_samplers
|
||||||
|
import modules.codeformer_model as codeformer
|
||||||
|
import modules.extras
|
||||||
|
import modules.face_restoration
|
||||||
|
import modules.gfpgan_model as gfpgan
|
||||||
|
import modules.img2img
|
||||||
|
|
||||||
|
import modules.lowvram
|
||||||
|
import modules.paths
|
||||||
|
import modules.scripts
|
||||||
|
import modules.sd_hijack
|
||||||
|
import modules.sd_models
|
||||||
|
import modules.shared as shared
|
||||||
|
import modules.txt2img
|
||||||
|
|
||||||
|
import modules.ui
|
||||||
|
from modules import devices
|
||||||
|
from modules import modelloader
|
||||||
|
from modules.paths import script_path
|
||||||
|
from modules.shared import cmd_opts
|
||||||
|
|
||||||
|
modelloader.cleanup_models()
|
||||||
|
modules.sd_models.setup_model()
|
||||||
|
codeformer.setup_model(cmd_opts.codeformer_models_path)
|
||||||
|
gfpgan.setup_model(cmd_opts.gfpgan_models_path)
|
||||||
|
shared.face_restorers.append(modules.face_restoration.FaceRestoration())
|
||||||
|
modelloader.load_upscalers()
|
||||||
|
queue_lock = threading.Lock()
|
||||||
|
|
||||||
|
|
||||||
|
def wrap_queued_call(func):
|
||||||
|
def f(*args, **kwargs):
|
||||||
|
with queue_lock:
|
||||||
|
res = func(*args, **kwargs)
|
||||||
|
|
||||||
|
return res
|
||||||
|
|
||||||
|
return f
|
||||||
|
|
||||||
|
|
||||||
|
def wrap_gradio_gpu_call(func, extra_outputs=None):
|
||||||
|
def f(*args, **kwargs):
|
||||||
|
devices.torch_gc()
|
||||||
|
|
||||||
|
shared.state.sampling_step = 0
|
||||||
|
shared.state.job_count = -1
|
||||||
|
shared.state.job_no = 0
|
||||||
|
shared.state.job_timestamp = shared.state.get_job_timestamp()
|
||||||
|
shared.state.current_latent = None
|
||||||
|
shared.state.current_image = None
|
||||||
|
shared.state.current_image_sampling_step = 0
|
||||||
|
shared.state.interrupted = False
|
||||||
|
shared.state.textinfo = None
|
||||||
|
|
||||||
|
with queue_lock:
|
||||||
|
res = func(*args, **kwargs)
|
||||||
|
|
||||||
|
shared.state.job = ""
|
||||||
|
shared.state.job_count = 0
|
||||||
|
|
||||||
|
devices.torch_gc()
|
||||||
|
|
||||||
|
return res
|
||||||
|
|
||||||
|
return modules.ui.wrap_gradio_call(f, extra_outputs=extra_outputs)
|
||||||
|
|
||||||
|
|
||||||
|
modules.scripts.load_scripts(os.path.join(script_path, "scripts"))
|
||||||
|
|
||||||
|
shared.sd_model = None #modules.sd_models.load_model()
|
||||||
|
#shared.opts.onchange("sd_model_checkpoint", wrap_queued_call(lambda: modules.sd_models.reload_model_weights(shared.sd_model)))
|
||||||
|
|
||||||
|
|
||||||
|
def webui():
|
||||||
|
# make the program just exit at ctrl+c without waiting for anything
|
||||||
|
def sigint_handler(sig, frame):
|
||||||
|
print(f'Interrupted with signal {sig} in {frame}')
|
||||||
|
os._exit(0)
|
||||||
|
|
||||||
|
signal.signal(signal.SIGINT, sigint_handler)
|
||||||
|
|
||||||
|
while 1:
|
||||||
|
|
||||||
|
demo = modules.ui.create_ui(wrap_gradio_gpu_call=wrap_gradio_gpu_call)
|
||||||
|
|
||||||
|
demo.launch(
|
||||||
|
share=cmd_opts.share,
|
||||||
|
server_name="0.0.0.0" if cmd_opts.listen else None,
|
||||||
|
server_port=cmd_opts.port,
|
||||||
|
debug=cmd_opts.gradio_debug,
|
||||||
|
auth=[tuple(cred.split(':')) for cred in cmd_opts.gradio_auth.strip('"').split(',')] if cmd_opts.gradio_auth else None,
|
||||||
|
inbrowser=cmd_opts.autolaunch,
|
||||||
|
prevent_thread_lock=True
|
||||||
|
)
|
||||||
|
|
||||||
|
while 1:
|
||||||
|
time.sleep(0.5)
|
||||||
|
if getattr(demo, 'do_restart', False):
|
||||||
|
time.sleep(0.5)
|
||||||
|
demo.close()
|
||||||
|
time.sleep(0.5)
|
||||||
|
break
|
||||||
|
|
||||||
|
sd_samplers.set_samplers()
|
||||||
|
|
||||||
|
print('Reloading Custom Scripts')
|
||||||
|
modules.scripts.reload_scripts(os.path.join(script_path, "scripts"))
|
||||||
|
print('Reloading modules: modules.ui')
|
||||||
|
importlib.reload(modules.ui)
|
||||||
|
print('Restarting Gradio')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
webui()
|
Loading…
Reference in New Issue
Block a user