extern/easydiffusion
1
0
Fork 1
mirror of https://github.com/easydiffusion/easydiffusion.git synced 2025-05-31 15:15:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed file path bugs introduced by mistake and made img_id sequential based on time for better sorting of renders.

Browse Source
This commit is contained in:
Marc-Andre Ferland 2022-10-17 21:27:15 -04:00
parent 87f93b34a3
commit 4d3358ba66
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/sd_internal/runtime.py
View File

@ -274,7 +274,7 @@ def load_model_real_esrgan():
thread_data.model_real_esrgan.model.name = thread_data.real_esrgan_file
print('loaded ', thread_data.real_esrgan_file, 'to', thread_data.model_real_esrgan.device, 'precision', thread_data.precision)
def get_base_path(disk_path, session_id, prompt, ext, suffix=None):
def get_base_path(disk_path, session_id, prompt, img_id, ext, suffix=None):
if disk_path is None: return None
if session_id is None: return None
if ext is None: raise Exception('Missing ext')
@ -283,7 +283,6 @@ def get_base_path(disk_path, session_id, prompt, ext, suffix=None):
os.makedirs(session_out_path, exist_ok=True)
prompt_flattened = filename_regex.sub('_', prompt)[:50]
img_id = str(uuid.uuid4())[-8:]
if suffix is not None:
return os.path.join(session_out_path, f"{prompt_flattened}_{img_id}_{suffix}.{ext}")
@ -391,6 +390,8 @@ def do_mk_img(req: Request):
opt_f = 8
opt_ddim_eta = 0.0
opt_init_img = req.init_image
img_id = base64.b64encode(int(time.time()).to_bytes(8, 'big')).decode() # Generate unique ID based on time.
img_id = img_id.translate({43:None, 47:None, 61:None})[-8:] # Remove + / = and keep last 8 chars.
print(req.to_string(), '\n device', thread_data.device)
print('\n\n Using precision:', thread_data.precision)
@ -548,9 +549,9 @@ def do_mk_img(req: Request):
if req.save_to_disk_path is not None:
if return_orig_img:
img_out_path = get_base_path(req.save_to_disk_path, req.session_id, prompts[0], req.output_format)
img_out_path = get_base_path(req.save_to_disk_path, req.session_id, prompts[0], img_id, req.output_format)
save_image(img, img_out_path)
meta_out_path = get_base_path(req.save_to_disk_path, req.session_id, prompts[0], 'txt')
meta_out_path = get_base_path(req.save_to_disk_path, req.session_id, prompts[0], img_id, 'txt')
save_metadata(meta_out_path, req, prompts[0], opt_seed)
if return_orig_img:
@ -577,7 +578,7 @@ def do_mk_img(req: Request):
response_image = ResponseImage(data=filtered_img_data, seed=req.seed)
res.images.append(response_image)
if req.save_to_disk_path is not None:
filtered_img_out_path = get_base_path(req.save_to_disk_path, req.session_id, prompts[0], req.output_format, "_".join(filters_applied))
filtered_img_out_path = get_base_path(req.save_to_disk_path, req.session_id, prompts[0], img_id, req.output_format, "_".join(filters_applied))
save_image(filtered_image, filtered_img_out_path)
response_image.path_abs = filtered_img_out_path
del filtered_image