apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

make all params compatible with JSON structure

This commit is contained in:
Sean Sube 2024-02-17 15:18:00 -06:00
parent bf1a88fac2
commit b00de64c38
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
api/onnx_web/server/api.py
View File

@ -52,7 +52,13 @@ from .load import (
get_upscaling_models, get_upscaling_models,
get_wildcard_data, get_wildcard_data,
) )
from .params import build_border, build_upscale, get_request_params, pipeline_from_json from .params import (
build_border,
build_upscale,
get_request_data,
get_request_params,
pipeline_from_json,
)
from .utils import wrap_route from .utils import wrap_route
logger = getLogger(__name__) logger = getLogger(__name__)
@ -256,14 +262,13 @@ def img2img(server: ServerContext, pool: DevicePoolExecutor):
source = Image.open(BytesIO(source_file.read())).convert("RGB") source = Image.open(BytesIO(source_file.read())).convert("RGB")
# TODO: look up the correct request field data = get_request_data()
source_filter = get_from_list( source_filter = get_from_list(
request.args, "sourceFilter", list(get_source_filters().keys()) data["params"], "sourceFilter", list(get_source_filters().keys())
) )
# TODO: look up the correct request field
strength = get_and_clamp_float( strength = get_and_clamp_float(
request.args, data["params"],
"strength", "strength",
get_config_value("strength"), get_config_value("strength"),
get_config_value("strength", "max"), get_config_value("strength", "max"),
@ -330,12 +335,12 @@ def inpaint(server: ServerContext, pool: DevicePoolExecutor):
mask.alpha_composite(mask_top_layer) mask.alpha_composite(mask_top_layer)
mask.convert(mode="L") mask.convert(mode="L")
# TODO: look up the correct request field data = get_request_data()
full_res_inpaint = get_boolean( full_res_inpaint = get_boolean(
request.args, "fullresInpaint", get_config_value("fullresInpaint") data["params"], "fullresInpaint", get_config_value("fullresInpaint")
) )
full_res_inpaint_padding = get_and_clamp_float( full_res_inpaint_padding = get_and_clamp_float(
request.args, data["params"],
"fullresInpaintPadding", "fullresInpaintPadding",
get_config_value("fullresInpaintPadding"), get_config_value("fullresInpaintPadding"),
get_config_value("fullresInpaintPadding", "max"), get_config_value("fullresInpaintPadding", "max"),
@ -345,13 +350,16 @@ def inpaint(server: ServerContext, pool: DevicePoolExecutor):
params = get_request_params(server, JobType.INPAINT.value) params = get_request_params(server, JobType.INPAINT.value)
replace_wildcards(params.image, get_wildcard_data()) replace_wildcards(params.image, get_wildcard_data())
fill_color = get_not_empty(request.args, "fillColor", "white") fill_color = get_not_empty(data["params"], "fillColor", "white")
mask_filter = get_from_map(request.args, "filter", get_mask_filters(), "none") mask_filter = get_from_map(data["params"], "filter", get_mask_filters(), "none")
noise_source = get_from_map(request.args, "noise", get_noise_sources(), "histogram") noise_source = get_from_map(
tile_order = get_from_list( data["params"], "noise", get_noise_sources(), "histogram"
request.args, "tileOrder", [TileOrder.grid, TileOrder.kernel, TileOrder.spiral] )
tile_order = get_from_list(
data["params"],
"tileOrder",
[TileOrder.grid, TileOrder.kernel, TileOrder.spiral],
) )
tile_order = TileOrder.spiral
job_name = make_job_name( job_name = make_job_name(
JobType.INPAINT.value, JobType.INPAINT.value,

2
gui/src/client/api.ts
View File

@ -97,7 +97,7 @@ export function makeImageJSON(params: ImageJSON): string {
body.params = { body.params = {
...body.params, ...body.params,
loopback: img2img.loopback, loopback: img2img.loopback,
source_filter: img2img.sourceFilter, sourceFilter: img2img.sourceFilter,
strength: img2img.strength, strength: img2img.strength,
}; };
} }