Merge branch 'beta' into refactor

This commit is contained in:
cmdr2 2022-12-13 11:45:43 +05:30
commit 47a39569bc
2 changed files with 3 additions and 1 deletions

View File

@ -822,7 +822,7 @@ def _txt2img(opt_W, opt_H, opt_n_samples, opt_ddim_steps, opt_scale, start_code,
move_to_cpu(thread_data.modelCS)
if thread_data.test_sd2 and sampler_name not in ('plms', 'ddim', 'dpm2'):
raise Exception('Only plms and ddim samplers are supported right now, in SD 2.0')
raise Exception('Only plms, ddim and dpm2 samplers are supported right now, in SD 2.0')
# samples, _ = sampler.sample(S=opt.steps,

View File

@ -290,6 +290,8 @@ def thread_render(device):
session_cache.keep(task.task_data.session_id, TASK_TTL)
except Exception as e:
task.error = e
task.response = {"status": 'failed', "detail": str(task.error)}
task.buffer_queue.put(json.dumps(task.response))
log.error(traceback.format_exc())
continue
finally: