apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

Merge branch 'main' into main

This commit is contained in:
HoopyFreud 2023-07-12 21:55:44 -04:00 committed by GitHub
parent 7d9f93c7ea 00fc584c99
commit 6fee7f418d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -54,6 +54,9 @@ stages:
.build-python: .build-python:
extends: extends:
- .build-base - .build-base
tags:
- platform:k8s
- runner:large
variables: variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
interruptible: true interruptible: true

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

@ -20,7 +20,7 @@ MAX_TOKENS_PER_GROUP = 77
CLIP_TOKEN = compile(r"\<clip:([-\w]+):(\d+)\>") CLIP_TOKEN = compile(r"\<clip:([-\w]+):(\d+)\>")
INVERSION_TOKEN = compile(r"\<inversion:([^:\>]+):(-?[\.|\d]+)\>") INVERSION_TOKEN = compile(r"\<inversion:([^:\>]+):(-?[\.|\d]+)\>")
LORA_TOKEN = compile(r"\<lora:([^:\>]+):(-?[\.|\d]+)\>") LORA_TOKEN = compile(r"\<lora:([^:\>]+):(-?[\.|\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"\(([^\)]+)\)")

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

@ -255,17 +255,24 @@ IGNORE_EXTENSIONS = [".crdownload", ".lock", ".tmp"]
def list_model_globs( def list_model_globs(
server: ServerContext, globs: List[str], base_path: Optional[str] = None server: ServerContext,
globs: List[str],
base_path: Optional[str] = None,
recursive=False,
filename_only=True,
) -> List[str]: ) -> List[str]:
if base_path is None:
base_path = server.model_path
models = [] models = []
for pattern in globs: for pattern in globs:
pattern_path = path.join(base_path or server.model_path, pattern) pattern_path = path.join(base_path, pattern)
logger.debug("loading models from %s", pattern_path) logger.debug("loading models from %s", pattern_path)
for name in glob(pattern_path): for name in glob(pattern_path, recursive=recursive):
base = path.basename(name) base = path.basename(name)
(file, ext) = path.splitext(base) (file, ext) = path.splitext(base)
if ext not in IGNORE_EXTENSIONS: if ext not in IGNORE_EXTENSIONS:
models.append(file) models.append(file if filename_only else path.relpath(name, base_path))
unique_models = list(set(models)) unique_models = list(set(models))
unique_models.sort() unique_models.sort()
@ -456,7 +463,11 @@ def load_wildcards(server: ServerContext) -> None:
# simple wildcards # simple wildcards
wildcard_files = list_model_globs( wildcard_files = list_model_globs(
server, ["*.txt"], base_path=path.join(server.model_path, "wildcard") server,
["**/*.txt"],
base_path=path.join(server.model_path, "wildcard"),
filename_only=False,
recursive=True,
) )
for file in wildcard_files: for file in wildcard_files:
@ -465,6 +476,6 @@ def load_wildcards(server: ServerContext) -> None:
lines = [line.strip() for line in lines if not line.startswith("#")] lines = [line.strip() for line in lines if not line.startswith("#")]
lines = [line for line in lines if len(line) > 0] lines = [line for line in lines if len(line) > 0]
logger.debug("loading wildcards from %s: %s", file, lines) logger.debug("loading wildcards from %s: %s", file, lines)
wildcard_data[file] = lines wildcard_data[path.splitext(file)[0]] = lines
# TODO: structured wildcards # TODO: structured wildcards