diff options
| author | AUTOMATIC <16777216c@gmail.com> | 2022-10-20 08:18:19 +0300 |
|---|---|---|
| committer | AUTOMATIC <16777216c@gmail.com> | 2022-10-20 08:18:19 +0300 |
| commit | 7f8ab1ee8f304031b3404e25761dd0f4c7be7df8 (patch) | |
| tree | f6c64f5a6a8451ea64036aea882058101c3f29cc /modules | |
| parent | 930b4c64f7dbce6918894d53538003e5959fd022 (diff) | |
| parent | 604620a7f08d1126a8689f9f4bec8ade0801a69b (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/generation_parameters_copypaste.py | 7 | ||||
| -rw-r--r-- | modules/processing.py | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py index c27826b6..0f041449 100644 --- a/modules/generation_parameters_copypaste.py +++ b/modules/generation_parameters_copypaste.py @@ -45,11 +45,8 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model else:
prompt += ("" if prompt == "" else "\n") + line
- if len(prompt) > 0:
- res["Prompt"] = prompt
-
- if len(negative_prompt) > 0:
- res["Negative prompt"] = negative_prompt
+ res["Prompt"] = prompt
+ res["Negative prompt"] = negative_prompt
for k, v in re_param.findall(lastline):
m = re_imagesize.match(v)
diff --git a/modules/processing.py b/modules/processing.py index ea926fc3..bcb0c32c 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -304,7 +304,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration "Size": f"{p.width}x{p.height}",
"Model hash": getattr(p, 'sd_model_hash', None if not opts.add_model_hash_to_info or not shared.sd_model.sd_model_hash else shared.sd_model.sd_model_hash),
"Model": (None if not opts.add_model_name_to_info or not shared.sd_model.sd_checkpoint_info.model_name else shared.sd_model.sd_checkpoint_info.model_name.replace(',', '').replace(':', '')),
- "Hypernet": (None if shared.loaded_hypernetwork is None else shared.loaded_hypernetwork.name.replace(',', '').replace(':', '')),
+ "Hypernet": (None if shared.loaded_hypernetwork is None else shared.loaded_hypernetwork.filename.split('\\')[-1].split('.')[0]),
"Batch size": (None if p.batch_size < 2 else p.batch_size),
"Batch pos": (None if p.batch_size < 2 else position_in_batch),
"Variation seed": (None if p.subseed_strength == 0 else all_subseeds[index]),
|