From 7e6588685f819467fb849b077a91e331ae6d8a50 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sun, 12 May 2024 08:39:11 -0400 Subject: [PATCH] fix prompt cropping --- extensions-builtin/sdnext-modernui | 2 +- modules/generation_parameters_copypaste.py | 10 ++++++++-- wiki | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index 9763f69ae..2ab24c63b 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit 9763f69ae0175fe05a9d1781c7775325d6070987 +Subproject commit 2ab24c63bd879006b014b83624f1c7ba6218e341 diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py index 5688be7fd..2afc4b3e9 100644 --- a/modules/generation_parameters_copypaste.py +++ b/modules/generation_parameters_copypaste.py @@ -218,8 +218,14 @@ def parse_generation_parameters(infotext, no_prompt=False): params_idx = sanitized.find(f'{first_param}:') if first_param else -1 negative_idx = infotext.find("Negative prompt:") - prompt = infotext[:params_idx] if negative_idx == -1 else infotext[:negative_idx] # prompt can be with or without negative prompt - negative = infotext[negative_idx:params_idx] if negative_idx >= 0 else '' + if negative_idx == -1: # prompt can be without negative prompt + prompt = infotext[:params_idx] if params_idx > 0 else infotext + else: + prompt = infotext[:negative_idx] + if negative_idx >= 0: + negative = infotext[negative_idx:params_idx] if params_idx > 0 else infotext[negative_idx:] + else: + negative = '' negative = negative.strip().strip(',') for k, v in params.copy().items(): # avoid dict-has-changed diff --git a/wiki b/wiki index 6b939596a..7d0d151d4 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 6b939596acb827c8403d9a0eab4d87a4118226ce +Subproject commit 7d0d151d44803b9e86b9c53f5e3c53f8edd08c7f