apextoaster
/
onnx-web
1
0
Fork 0
Code Actions

fix(api): assume inversion tokens are embeddings for now

This commit is contained in:
Sean Sube 2023-03-18 18:35:11 -05:00
parent 17a7cdae56
commit e5862d178c
Signed by: ssube
GPG Key ID: 3EED7B957D362AF1
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/onnx_web/diffusers/load.py
View File

@ -217,8 +217,8 @@ def load_pipeline(
text_encoder = None text_encoder = None
if inversions is not None and len(inversions) > 0: if inversions is not None and len(inversions) > 0:
logger.debug("blending Textual Inversions from %s", inversions)
inversion_names, inversion_weights = zip(*inversions) inversion_names, inversion_weights = zip(*inversions)
logger.debug("blending Textual Inversions from %s", inversion_names)
inversion_models = [ inversion_models = [
path.join(server.model_path, "inversion", f"{name}.ckpt") path.join(server.model_path, "inversion", f"{name}.ckpt")
@ -233,7 +233,14 @@ def load_pipeline(
server, server,
text_encoder, text_encoder,
tokenizer, tokenizer,
list(zip(inversion_models, inversion_weights, inversion_names)), list(
zip(
inversion_models,
inversion_weights,
inversion_names,
[None] * len(inversion_models),
)
),
) )
components["tokenizer"] = tokenizer components["tokenizer"] = tokenizer

11
api/onnx_web/worker/pool.py
View File

@ -202,7 +202,9 @@ class DevicePoolExecutor:
for job in self.pending_jobs: for job in self.pending_jobs:
if job.name == key: if job.name == key:
self.pending_jobs[:] = [job for job in self.pending_jobs if job.name != key] self.pending_jobs[:] = [
job for job in self.pending_jobs if job.name != key
]
logger.info("cancelled pending job: %s", key) logger.info("cancelled pending job: %s", key)
return True return True
@ -387,7 +389,8 @@ class DevicePoolExecutor:
False, False,
False, False,
False, False,
) for job in self.pending_jobs )
for job in self.pending_jobs
] ]
) )
history.extend( history.extend(
@ -420,7 +423,9 @@ class DevicePoolExecutor:
"progress update for job: %s to %s", progress.job, progress.progress "progress update for job: %s to %s", progress.job, progress.progress
) )
self.running_jobs[progress.job] = progress self.running_jobs[progress.job] = progress
self.pending_jobs[:] = [job for job in self.pending_jobs if job.name != progress.job] self.pending_jobs[:] = [
job for job in self.pending_jobs if job.name != progress.job
]
if progress.job in self.cancelled_jobs: if progress.job in self.cancelled_jobs:
logger.debug( logger.debug(