apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

re-parse input prompt before saving metadata

This commit is contained in:
Sean Sube 2023-07-04 20:13:45 -05:00
parent 42e6f356a9
commit 0b5f554cf4
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/onnx_web/diffusers/run.py
View File

@ -82,7 +82,7 @@ def run_txt2img_pipeline(
progress = job.get_progress_callback()
images = chain(job, server, params, [], callback=progress)
_prompt_pairs, loras, inversions = parse_prompt(params)
_prompt_pairs, loras, inversions = parse_prompt(params, use_input=True)
for image, output in zip(images, outputs):
dest = save_image(
@ -177,7 +177,7 @@ def run_img2img_pipeline(
images.append(source)
# save with metadata
_prompt_pairs, loras, inversions = parse_prompt(params)
_prompt_pairs, loras, inversions = parse_prompt(params, use_input=True)
size = Size(*source.size)
for image, output in zip(images, outputs):
@ -263,7 +263,7 @@ def run_inpaint_pipeline(
progress = job.get_progress_callback()
images = chain(job, server, params, [source], callback=progress)
_prompt_pairs, loras, inversions = parse_prompt(params)
_prompt_pairs, loras, inversions = parse_prompt(params, use_input=True)
for image, output in zip(images, outputs):
dest = save_image(
server,
@ -331,7 +331,7 @@ def run_upscale_pipeline(
progress = job.get_progress_callback()
images = chain(job, server, params, [source], callback=progress)
_prompt_pairs, loras, inversions = parse_prompt(params)
_prompt_pairs, loras, inversions = parse_prompt(params, use_input=True)
for image, output in zip(images, outputs):
dest = save_image(
server,

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

@ -310,14 +310,15 @@ def get_scaled_latents(
def parse_prompt(
params: ImageParams,
use_input: bool = False,
) -> Tuple[List[Tuple[str, str]], List[Tuple[str, float]], List[Tuple[str, float]]]:
prompt, loras = get_loras_from_prompt(params.input_prompt)
prompt, loras = get_loras_from_prompt(params.input_prompt if use_input else params.prompt)
prompt, inversions = get_inversions_from_prompt(prompt)
params.prompt = prompt
neg_prompt = None
if params.input_negative_prompt is not None:
neg_prompt, neg_loras = get_loras_from_prompt(params.input_negative_prompt)
neg_prompt, neg_loras = get_loras_from_prompt(params.input_negative_prompt if use_input else params.negative_prompt)
neg_prompt, neg_inversions = get_inversions_from_prompt(neg_prompt)
params.negative_prompt = neg_prompt