From 02f93037c83735782a97996355bec42448a1fe00 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sat, 1 Apr 2023 07:53:23 -0400 Subject: [PATCH] fix prompt parser --- extensions-builtin/sd-extension-system-info | 2 +- extensions-builtin/seed_travel | 2 +- .../stable-diffusion-webui-images-browser | 2 +- modules/lora | 2 +- modules/prompt_parser.py | 3 --- ui-config.json | 12 +++++++++++- wiki | 2 +- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index e76b05b00..5a0e803a7 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit e76b05b0024404582e28a9b7144451ff71620503 +Subproject commit 5a0e803a7e0ac05a576868db4e456b1e74ffcce6 diff --git a/extensions-builtin/seed_travel b/extensions-builtin/seed_travel index 3e217f28b..59973b8dd 160000 --- a/extensions-builtin/seed_travel +++ b/extensions-builtin/seed_travel @@ -1 +1 @@ -Subproject commit 3e217f28b801483d18af092208db3552f7b8ec42 +Subproject commit 59973b8dd532df46e62a014589b2574a5709deea diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index df3d54130..88388c78a 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit df3d541307ff59e06a9de982be25c5f12d5b6d9c +Subproject commit 88388c78aa6466bfb3654efee565cf4b5bf19be0 diff --git a/modules/lora b/modules/lora index ea1cf4ace..f037b09c2 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit ea1cf4aceea189e9c118b9ff190ca6be2de1adfb +Subproject commit f037b09c2de13df549290b7c8d4d4a22ab165c36 diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py index 987f5d891..7006f2822 100644 --- a/modules/prompt_parser.py +++ b/modules/prompt_parser.py @@ -2,7 +2,6 @@ import re from collections import namedtuple from typing import List import lark -import shared # a prompt like this: "fantasy landscape with a [mountain:lake:0.25] and [an oak:a christmas tree:0.75][ in foreground::0.6][ in background:0.25] [shoddy:masterful:0.5]" # will be represented with prompt_schedule like this (assuming steps=100): @@ -94,8 +93,6 @@ def get_learned_conditioning_prompt_schedules(prompts, steps): try: tree = schedule_parser.parse(prompt) except lark.exceptions.LarkError as e: - if 0: - shared.exception() return [[steps, prompt]] return [[t, at_step(t, tree)] for t in collect_steps(steps, tree)] diff --git a/ui-config.json b/ui-config.json index ff6f89528..1daf0edbd 100644 --- a/ui-config.json +++ b/ui-config.json @@ -1550,5 +1550,15 @@ "customscript/seed_travel.py/txt2img/Save extra status information/visible": true, "customscript/seed_travel.py/txt2img/Save extra status information/value": true, "customscript/seed_travel.py/img2img/Save extra status information/visible": true, - "customscript/seed_travel.py/img2img/Save extra status information/value": true + "customscript/seed_travel.py/img2img/Save extra status information/value": true, + "customscript/seed_travel.py/txt2img/Curve strength/visible": true, + "customscript/seed_travel.py/txt2img/Curve strength/value": 3, + "customscript/seed_travel.py/txt2img/Curve strength/minimum": 0.0, + "customscript/seed_travel.py/txt2img/Curve strength/maximum": 10.0, + "customscript/seed_travel.py/txt2img/Curve strength/step": 0.1, + "customscript/seed_travel.py/img2img/Curve strength/visible": true, + "customscript/seed_travel.py/img2img/Curve strength/value": 3, + "customscript/seed_travel.py/img2img/Curve strength/minimum": 0.0, + "customscript/seed_travel.py/img2img/Curve strength/maximum": 10.0, + "customscript/seed_travel.py/img2img/Curve strength/step": 0.1 } \ No newline at end of file diff --git a/wiki b/wiki index f79f85d11..61feae068 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit f79f85d11c1475440fb83920d748a6ceeb7b437d +Subproject commit 61feae068dd102d86a5dd92329ae10df9a314ef6