1
0
Fork 0

feat: add API parameter for upscale checkbox

This commit is contained in:
Sean Sube 2023-12-30 19:34:40 -06:00
parent a5ecb59cd9
commit 71fbc871a6
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
4 changed files with 36 additions and 25 deletions

View File

@ -67,7 +67,9 @@ def stage_upscale_correction(
**kwargs, **kwargs,
"upscale": upscale, "upscale": upscale,
} }
upscale_stage: Optional[PipelineStage] = None upscale_stage: Optional[PipelineStage] = None
if upscale.upscale:
if "bsrgan" in upscale.upscale_model: if "bsrgan" in upscale.upscale_model:
bsrgan_params = StageParams( bsrgan_params = StageParams(
tile_size=stage.tile_size, tile_size=stage.tile_size,

View File

@ -391,6 +391,7 @@ class UpscaleParams:
upscale_model: str, upscale_model: str,
correction_model: Optional[str] = None, correction_model: Optional[str] = None,
denoise: float = 0.5, denoise: float = 0.5,
upscale=True,
faces=True, faces=True,
face_outscale: int = 1, face_outscale: int = 1,
face_strength: float = 0.5, face_strength: float = 0.5,
@ -406,6 +407,7 @@ class UpscaleParams:
self.upscale_model = upscale_model self.upscale_model = upscale_model
self.correction_model = correction_model self.correction_model = correction_model
self.denoise = denoise self.denoise = denoise
self.upscale = upscale
self.faces = faces self.faces = faces
self.face_outscale = face_outscale self.face_outscale = face_outscale
self.face_strength = face_strength self.face_strength = face_strength
@ -421,6 +423,7 @@ class UpscaleParams:
self.upscale_model, self.upscale_model,
correction_model=self.correction_model, correction_model=self.correction_model,
denoise=self.denoise, denoise=self.denoise,
upscale=self.upscale,
faces=self.faces, faces=self.faces,
face_outscale=self.face_outscale, face_outscale=self.face_outscale,
face_strength=self.face_strength, face_strength=self.face_strength,
@ -447,6 +450,7 @@ class UpscaleParams:
"upscale_model": self.upscale_model, "upscale_model": self.upscale_model,
"correction_model": self.correction_model, "correction_model": self.correction_model,
"denoise": self.denoise, "denoise": self.denoise,
"upscale": self.upscale,
"faces": self.faces, "faces": self.faces,
"face_outscale": self.face_outscale, "face_outscale": self.face_outscale,
"face_strength": self.face_strength, "face_strength": self.face_strength,
@ -463,6 +467,7 @@ class UpscaleParams:
kwargs.get("upscale_model", self.upscale_model), kwargs.get("upscale_model", self.upscale_model),
kwargs.get("correction_model", self.correction_model), kwargs.get("correction_model", self.correction_model),
kwargs.get("denoise", self.denoise), kwargs.get("denoise", self.denoise),
kwargs.get("upscale", self.upscale),
kwargs.get("faces", self.faces), kwargs.get("faces", self.faces),
kwargs.get("face_outscale", self.face_outscale), kwargs.get("face_outscale", self.face_outscale),
kwargs.get("face_strength", self.face_strength), kwargs.get("face_strength", self.face_strength),

View File

@ -239,6 +239,7 @@ def build_upscale(
if data is None: if data is None:
data = request.args data = request.args
upscale = get_boolean(data, "upscale", False)
denoise = get_and_clamp_float( denoise = get_and_clamp_float(
data, data,
"denoise", "denoise",
@ -262,7 +263,8 @@ def build_upscale(
) )
upscaling = get_from_list(data, "upscaling", get_upscaling_models()) upscaling = get_from_list(data, "upscaling", get_upscaling_models())
correction = get_from_list(data, "correction", get_correction_models()) correction = get_from_list(data, "correction", get_correction_models())
faces = get_not_empty(data, "faces", "false") == "true"
faces = get_boolean(data, "faces", False)
face_outscale = get_and_clamp_int( face_outscale = get_and_clamp_int(
data, data,
"faceOutscale", "faceOutscale",
@ -283,6 +285,7 @@ def build_upscale(
upscaling, upscaling,
correction_model=correction, correction_model=correction,
denoise=denoise, denoise=denoise,
upscale=upscale,
faces=faces, faces=faces,
face_outscale=face_outscale, face_outscale=face_outscale,
face_strength=face_strength, face_strength=face_strength,

View File

@ -110,6 +110,7 @@ export function appendModelToURL(url: URL, params: ModelParams) {
* Append the upscale parameters to an existing URL. * Append the upscale parameters to an existing URL.
*/ */
export function appendUpscaleToURL(url: URL, upscale: UpscaleParams) { export function appendUpscaleToURL(url: URL, upscale: UpscaleParams) {
url.searchParams.append('upscale', String(upscale.enabled));
url.searchParams.append('upscaleOrder', upscale.upscaleOrder); url.searchParams.append('upscaleOrder', upscale.upscaleOrder);
if (upscale.enabled) { if (upscale.enabled) {