From 6f38d35c73d776c0e6533d5544771b76af1bc172 Mon Sep 17 00:00:00 2001 From: Sean Sube Date: Mon, 8 May 2023 21:56:05 -0500 Subject: [PATCH] default content type, use arg parser for override --- api/onnx_web/convert/__main__.py | 2 +- api/onnx_web/server/admin.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/api/onnx_web/convert/__main__.py b/api/onnx_web/convert/__main__.py index 272a1aac..9ecf3726 100644 --- a/api/onnx_web/convert/__main__.py +++ b/api/onnx_web/convert/__main__.py @@ -582,7 +582,7 @@ def main(args = None) -> int: help="HuggingFace token with read permissions for downloading models.", ) - args = args or parser.parse_args() + args = parser.parse_args(args=args) logger.info("CLI arguments: %s", args) server = ConversionContext.from_environ() diff --git a/api/onnx_web/server/admin.py b/api/onnx_web/server/admin.py index ac106e9d..24754b6c 100644 --- a/api/onnx_web/server/admin.py +++ b/api/onnx_web/server/admin.py @@ -48,7 +48,7 @@ def update_extra_models(server: ServerContext): return make_response(jsonify({})), 401 extra_schema = load_config("./schemas/extras.yaml") - data_str = request.data.decode(encoding=request.content_encoding) + data_str = request.data.decode(encoding=(request.content_encoding or "utf-8")) try: data = load_config_str(data_str) @@ -63,11 +63,10 @@ def update_extra_models(server: ServerContext): with open(server.extra_models[0], mode="w") as f: f.write(data_str) - from argparse import Namespace from onnx_web.convert.__main__ import main as convert logger.warning("downloading and converting models to ONNX") - convert(args=Namespace(correction=True, diffusion=True, upscalinng=True, extras=server.extra_models)) + convert(args=["--correction", "--diffusion", "--upscaling", "--extras", *server.extra_models]) return jsonify(data)