Skip to content

feat: update parse_generation_parameters #15951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bluelovers wants to merge 2 commits into from
Closed

feat: update parse_generation_parameters #15951

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9af67ab
feat: update parse_generation_parameters
bluelovers Jun 5, 2024
d2d6ea2
fix: avoid error parse unknown value
bluelovers Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions modules/infotext_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

sys.modules['modules.generation_parameters_copypaste'] = sys.modules[__name__] # alias for old name

re_param_code = r'\s*(\w[\w \-/]+):\s*("(?:\\.|[^\\"])+"|[^,]*)(?:,|$)'
# Enhanced regular expression to support all JSON formats and plain text
re_param_code = r'\s*(\w[\w \-/]+):\s*({.*?}|\[.*?\]|"(?:\\.|[^\\"])*"|[^,]*)(?:,|$)'
re_param = re.compile(re_param_code)
re_imagesize = re.compile(r"^(\d+)x(\d+)$")
re_hypernet_hash = re.compile("\(([0-9a-f]+)\)$")
Expand Down Expand Up @@ -267,17 +268,25 @@ def parse_generation_parameters(x: str, skip_fields: list[str] | None = None):

for k, v in re_param.findall(lastline):
try:
if v[0] == '"' and v[-1] == '"':
v = unquote(v)
v = v.strip()

m = re_imagesize.match(v)
if m is not None:
res[f"{k}-1"] = m.group(1)
res[f"{k}-2"] = m.group(2)
if v.startswith('"') and v.endswith('"'):
v = unquote(v)
elif v.startswith('[') and v.endswith(']'):
v = json.loads(v)
elif v.startswith('{') and v.endswith('}'):
v = json.loads(v)
else:
res[k] = v
except Exception:
print(f"Error parsing \"{k}: {v}\"")
m = re_imagesize.match(v)
if m:
res[f"{k}-1"] = m.group(1)
res[f"{k}-2"] = m.group(2)
continue

except Exception as e:
print(f"Error parsing \"{k}: {v}\": {e}")

res[k] = v

# Extract styles from prompt
if shared.opts.infotext_styles != "Ignore":
Expand Down