diff --git a/invokeai/backend/model_management/model_probe.py b/invokeai/backend/model_management/model_probe.py index 44d2682911..1da0b59101 100644 --- a/invokeai/backend/model_management/model_probe.py +++ b/invokeai/backend/model_management/model_probe.py @@ -59,7 +59,7 @@ class ModelProbe(object): elif isinstance(model,(dict,ModelMixin,ConfigMixin)): return cls.probe(model_path=None, model=model, prediction_type_helper=prediction_type_helper) else: - raise Exception("model parameter {model} is neither a Path, nor a model") + raise ValueError("model parameter {model} is neither a Path, nor a model") @classmethod def probe(cls, @@ -237,7 +237,7 @@ class CheckpointProbeBase(ProbeBase): elif in_channels == 4: return ModelVariantType.Normal else: - raise Exception("Cannot determine variant type") + raise ValueError(f"Cannot determine variant type (in_channels={in_channels}) at {self.checkpoint_path}") class PipelineCheckpointProbe(CheckpointProbeBase): def get_base_type(self)->BaseModelType: @@ -248,7 +248,7 @@ class PipelineCheckpointProbe(CheckpointProbeBase): return BaseModelType.StableDiffusion1 if key_name in state_dict and state_dict[key_name].shape[-1] == 1024: return BaseModelType.StableDiffusion2 - raise Exception("Cannot determine base type") + raise ValueError("Cannot determine base type") def get_scheduler_prediction_type(self)->SchedulerPredictionType: type = self.get_base_type() @@ -329,7 +329,7 @@ class ControlNetCheckpointProbe(CheckpointProbeBase): return BaseModelType.StableDiffusion2 elif self.checkpoint_path and self.helper: return self.helper(self.checkpoint_path) - raise Exception("Unable to determine base type for {self.checkpoint_path}") + raise ValueError("Unable to determine base type for {self.checkpoint_path}") ######################################################## # classes for probing folders @@ -418,7 +418,7 @@ class ControlNetFolderProbe(FolderProbeBase): def get_base_type(self)->BaseModelType: config_file = self.folder_path / 'config.json' if not config_file.exists(): - raise Exception(f"Cannot determine base type for {self.folder_path}") + raise ValueError(f"Cannot determine base type for {self.folder_path}") with open(config_file,'r') as file: config = json.load(file) # no obvious way to distinguish between sd2-base and sd2-768 @@ -435,7 +435,7 @@ class LoRAFolderProbe(FolderProbeBase): model_file = base_file break if not model_file: - raise Exception('Unknown LoRA format encountered') + raise ValueError('Unknown LoRA format encountered') return LoRACheckpointProbe(model_file,None).get_base_type() ############## register probe classes ######