aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Fuller <gfuller23@gmail.com>2022-10-12 23:09:30 -0700
committerAUTOMATIC1111 <16777216c@gmail.com>2022-10-13 13:25:29 +0300
commitfed7f0e281a42ea962bbe422e018468bafa6f1e6 (patch)
tree5fe78ff716bf0d7b645e8c5ac7b7a5a429bcb5eb
parenta3f02e4690844715a510b7bc857a0971dd05c4d8 (diff)
Revert "fix prompt in log.csv"
This reverts commit e4b5d1696429ab78dae9779420ce6ec4cd9c5f67.
-rw-r--r--modules/ui.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/ui.py b/modules/ui.py
index edb4dab1..e07ee0e1 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -139,8 +139,6 @@ def save_files(js_data, images, do_make_zip, index):
if at_start:
writer.writerow(["prompt", "seed", "width", "height", "sampler", "cfgs", "steps", "filename", "negative_prompt"])
- log_prompt=data["prompt"]
- log_seed=data["seed"]
for image_index, filedata in enumerate(images, start_index):
if filedata.startswith("data:image/png;base64,"):
filedata = filedata[len("data:image/png;base64,"):]
@@ -150,9 +148,7 @@ def save_files(js_data, images, do_make_zip, index):
is_grid = image_index < p.index_of_first_image
i = 0 if is_grid else (image_index - p.index_of_first_image)
- log_seed=p.all_seeds[i]
- log_prompt=p.all_prompts[i]
- fullfn, txt_fullfn = save_image(image, path, "", seed=log_seed, prompt=log_prompt, extension=extension, info=p.infotexts[image_index], grid=is_grid, p=p, save_to_dirs=save_to_dirs)
+ fullfn, txt_fullfn = save_image(image, path, "", seed=p.all_seeds[i], prompt=p.all_prompts[i], extension=extension, info=p.infotexts[image_index], grid=is_grid, p=p, save_to_dirs=save_to_dirs)
filename = os.path.relpath(fullfn, path)
filenames.append(filename)
@@ -161,7 +157,7 @@ def save_files(js_data, images, do_make_zip, index):
filenames.append(os.path.basename(txt_fullfn))
fullfns.append(txt_fullfn)
- writer.writerow([log_prompt, log_seed, data["width"], data["height"], data["sampler"], data["cfg_scale"], data["steps"], filenames[0], data["negative_prompt"]])
+ writer.writerow([data["prompt"], data["seed"], data["width"], data["height"], data["sampler"], data["cfg_scale"], data["steps"], filenames[0], data["negative_prompt"]])
# Make Zip
if do_make_zip: