apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

write extras as string, override conversion args from endpoint

This commit is contained in:
Sean Sube 2023-05-08 21:49:36 -05:00
parent a03f89a62c
commit c992c03584
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/onnx_web/convert/__main__.py
View File

@ -546,7 +546,7 @@ def convert_models(conversion: ConversionContext, args, models: Models):
logger.error("error while converting models: %s", model_errors) logger.error("error while converting models: %s", model_errors)
def main() -> int: def main(args = None) -> int:
parser = ArgumentParser( parser = ArgumentParser(
prog="onnx-web model converter", description="convert checkpoint models to ONNX" prog="onnx-web model converter", description="convert checkpoint models to ONNX"
) )
@ -582,7 +582,7 @@ def main() -> int:
help="HuggingFace token with read permissions for downloading models.", help="HuggingFace token with read permissions for downloading models.",
) )
args = parser.parse_args() args = args or parser.parse_args()
logger.info("CLI arguments: %s", args) logger.info("CLI arguments: %s", args)
server = ConversionContext.from_environ() server = ConversionContext.from_environ()

9
api/onnx_web/server/admin.py
View File

@ -48,9 +48,10 @@ def update_extra_models(server: ServerContext):
return make_response(jsonify({})), 401 return make_response(jsonify({})), 401
extra_schema = load_config("./schemas/extras.yaml") extra_schema = load_config("./schemas/extras.yaml")
data_str = request.data.decode(encoding=request.content_encoding)
try: try:
data = load_config_str(request.data) data = load_config_str(data_str)
try: try:
validate(data, extra_schema) validate(data, extra_schema)
except ValidationError: except ValidationError:
@ -60,11 +61,13 @@ def update_extra_models(server: ServerContext):
# TODO: make a backup # TODO: make a backup
with open(server.extra_models[0], mode="w") as f: with open(server.extra_models[0], mode="w") as f:
f.write(request.data) f.write(data_str)
from argparse import Namespace
from onnx_web.convert.__main__ import main as convert from onnx_web.convert.__main__ import main as convert
logger.warning("downloading and converting models to ONNX") logger.warning("downloading and converting models to ONNX")
convert() convert(args=Namespace(correction=True, diffusion=True, upscalinng=True, extras=server.extra_models))
return jsonify(data) return jsonify(data)