apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

adds support for dynamic wildcards in prompts

This commit is contained in:
BZLibby 2023-12-16 14:37:56 -06:00
parent 591a63edc8
commit 6a561173a7
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/onnx_web/diffusers/utils.py
View File

@ -24,7 +24,7 @@ REGION_TOKEN = compile(
r"\<region:(\d+):(\d+):(\d+):(\d+):(-?[\.|\d]+):(-?[\.|\d]+_?[TLBR]*):([^\>]+)\>" r"\<region:(\d+):(\d+):(\d+):(\d+):(-?[\.|\d]+):(-?[\.|\d]+_?[TLBR]*):([^\>]+)\>"
) )
RESEED_TOKEN = compile(r"\<reseed:(\d+):(\d+):(\d+):(\d+):(-?\d+)\>") RESEED_TOKEN = compile(r"\<reseed:(\d+):(\d+):(\d+):(\d+):(-?\d+)\>")
WILDCARD_TOKEN = compile(r"__([-/\\\w]+)__") WILDCARD_TOKEN = compile(r"__([-/\\\w\.]+)__")
INTERVAL_RANGE = compile(r"(\w+)-{(\d+),(\d+)(?:,(\d+))?}") INTERVAL_RANGE = compile(r"(\w+)-{(\d+),(\d+)(?:,(\d+))?}")
ALTERNATIVE_RANGE = compile(r"\(([^\)]+)\)") ALTERNATIVE_RANGE = compile(r"\(([^\)]+)\)")

20
api/onnx_web/server/load.py
View File

@ -2,7 +2,7 @@ from collections import defaultdict
from functools import cmp_to_key from functools import cmp_to_key
from glob import glob from glob import glob
from logging import getLogger from logging import getLogger
from os import path from os import path, sep
from typing import Any, Dict, List, Optional, Union from typing import Any, Dict, List, Optional, Union
import torch import torch
@ -516,7 +516,19 @@ def load_wildcards(server: ServerContext) -> None:
for file in structured_files: for file in structured_files:
data = load_config(path.join(wildcard_path, file)) data = load_config(path.join(wildcard_path, file))
logger.debug("loading structured wildcards from %s: %s", file, data) logger.debug("loading structured wildcards from %s: %s", file, data)
parse_wildcards(data, root_key=path.splitext(file)[0])
for key, values in data.items():
if isinstance(values, list): def parse_wildcards(data: Any, root_key: Optional[str]=None) -> None:
wildcard_data[key].extend(values) global wildcard_data
for key, values in data.items():
if root_key is not None:
key=f"{root_key}{sep}{key}"
if isinstance(values, dict):
parse_wildcards(values, root_key=key)
elif isinstance(values, list):
wildcard_data[key].extend(values)
else:
logger.warning("unable to parse key: %s from wildcard path: %s", key, root_key)