From a23097029a40921771013a2c56e57bd635d28d02 Mon Sep 17 00:00:00 2001 From: tazlin Date: Mon, 1 Jul 2024 11:43:29 -0400 Subject: [PATCH] fix: `None` check for `job.payload.loras` --- horde_worker_regen/process_management/process_manager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/horde_worker_regen/process_management/process_manager.py b/horde_worker_regen/process_management/process_manager.py index 244f9676..319db370 100644 --- a/horde_worker_regen/process_management/process_manager.py +++ b/horde_worker_regen/process_management/process_manager.py @@ -1773,7 +1773,7 @@ def preload_models(self) -> bool: if job.model is None: raise ValueError(f"job.model is None ({job})") - if len(job.payload.loras) > 0: + if job.payload.loras is not None and len(job.payload.loras) > 0: for p in self._process_map.values(): if ( p.loaded_horde_model_name == job.model @@ -2833,7 +2833,9 @@ def get_single_job_effective_megapixelsteps(self, job: ImageGenerateJobPopRespon # Each extra batched image increases our difficulty by 20% batching_multiplier = 1 + ((job.payload.n_iter - 1) * 0.2) - lora_adjustment = 4 * 1_000_000 if len(job.payload.loras) > 0 else 0 + lora_adjustment = 0 + if job.payload.loras is not None: + lora_adjustment = 4 * 1_000_000 if len(job.payload.loras) > 0 else 0 hires_fix_adjustment = 0 @@ -3021,6 +3023,7 @@ async def _get_source_images(self, job_pop_response: ImageGenerateJobPopResponse _last_pop_no_jobs_available: bool = False + @logger.catch(reraise=True) async def api_job_pop(self) -> None: """If the job deque is not full, add any jobs that are available to the job deque.""" if self._shutting_down: