tweak name of folder containing model base config files

invoke-ai · Sep 4, 2024 · 471dbf8 · 471dbf8
1 parent 9e097b6
commit 471dbf8
Show file tree

Hide file tree

Showing 63 changed files with 2 additions and 2 deletions.
diff --git a/...se_conf_files/controlnet_sd15/config.json → ...se_conf_files/controlnet_sd15/config.json b/...se_conf_files/controlnet_sd15/config.json → ...se_conf_files/controlnet_sd15/config.json
diff --git a/...se_conf_files/controlnet_sdxl/config.json → ...se_conf_files/controlnet_sdxl/config.json b/...se_conf_files/controlnet_sdxl/config.json → ...se_conf_files/controlnet_sdxl/config.json
diff --git a/...eature_extractor/preprocessor_config.json → ...eature_extractor/preprocessor_config.json b/...eature_extractor/preprocessor_config.json → ...eature_extractor/preprocessor_config.json
diff --git a/...le-diffusion-1.5-epsilon/model_index.json → ...le-diffusion-1.5-epsilon/model_index.json b/...le-diffusion-1.5-epsilon/model_index.json → ...le-diffusion-1.5-epsilon/model_index.json
diff --git a/...on-1.5-epsilon/safety_checker/config.json → ...on-1.5-epsilon/safety_checker/config.json b/...on-1.5-epsilon/safety_checker/config.json → ...on-1.5-epsilon/safety_checker/config.json
diff --git a/...5-epsilon/scheduler/scheduler_config.json → ...5-epsilon/scheduler/scheduler_config.json b/...5-epsilon/scheduler/scheduler_config.json → ...5-epsilon/scheduler/scheduler_config.json
diff --git a/...sion-1.5-epsilon/text_encoder/config.json → ...sion-1.5-epsilon/text_encoder/config.json b/...sion-1.5-epsilon/text_encoder/config.json → ...sion-1.5-epsilon/text_encoder/config.json
diff --git a/...iffusion-1.5-epsilon/tokenizer/merges.txt → ...iffusion-1.5-epsilon/tokenizer/merges.txt b/...iffusion-1.5-epsilon/tokenizer/merges.txt → ...iffusion-1.5-epsilon/tokenizer/merges.txt
diff --git a/...epsilon/tokenizer/special_tokens_map.json → ...epsilon/tokenizer/special_tokens_map.json b/...epsilon/tokenizer/special_tokens_map.json → ...epsilon/tokenizer/special_tokens_map.json
diff --git a/...5-epsilon/tokenizer/tokenizer_config.json → ...5-epsilon/tokenizer/tokenizer_config.json b/...5-epsilon/tokenizer/tokenizer_config.json → ...5-epsilon/tokenizer/tokenizer_config.json
diff --git a/...iffusion-1.5-epsilon/tokenizer/vocab.json → ...iffusion-1.5-epsilon/tokenizer/vocab.json b/...iffusion-1.5-epsilon/tokenizer/vocab.json → ...iffusion-1.5-epsilon/tokenizer/vocab.json
diff --git a/...le-diffusion-1.5-epsilon/unet/config.json → ...le-diffusion-1.5-epsilon/unet/config.json b/...le-diffusion-1.5-epsilon/unet/config.json → ...le-diffusion-1.5-epsilon/unet/config.json
diff --git a/...ble-diffusion-1.5-epsilon/vae/config.json → ...ble-diffusion-1.5-epsilon/vae/config.json b/...ble-diffusion-1.5-epsilon/vae/config.json → ...ble-diffusion-1.5-epsilon/vae/config.json
diff --git a/...eature_extractor/preprocessor_config.json → ...eature_extractor/preprocessor_config.json b/...eature_extractor/preprocessor_config.json → ...eature_extractor/preprocessor_config.json
diff --git a/...ffusion-1.5-v_prediction/model_index.json → ...ffusion-1.5-v_prediction/model_index.json b/...ffusion-1.5-v_prediction/model_index.json → ...ffusion-1.5-v_prediction/model_index.json
diff --git a/...5-v_prediction/safety_checker/config.json → ...5-v_prediction/safety_checker/config.json b/...5-v_prediction/safety_checker/config.json → ...5-v_prediction/safety_checker/config.json
diff --git a/...rediction/scheduler/scheduler_config.json → ...rediction/scheduler/scheduler_config.json b/...rediction/scheduler/scheduler_config.json → ...rediction/scheduler/scheduler_config.json
diff --git a/...1.5-v_prediction/text_encoder/config.json → ...1.5-v_prediction/text_encoder/config.json b/...1.5-v_prediction/text_encoder/config.json → ...1.5-v_prediction/text_encoder/config.json
diff --git a/...ion-1.5-v_prediction/tokenizer/merges.txt → ...ion-1.5-v_prediction/tokenizer/merges.txt b/...ion-1.5-v_prediction/tokenizer/merges.txt → ...ion-1.5-v_prediction/tokenizer/merges.txt
diff --git a/...diction/tokenizer/special_tokens_map.json → ...diction/tokenizer/special_tokens_map.json b/...diction/tokenizer/special_tokens_map.json → ...diction/tokenizer/special_tokens_map.json
diff --git a/...rediction/tokenizer/tokenizer_config.json → ...rediction/tokenizer/tokenizer_config.json b/...rediction/tokenizer/tokenizer_config.json → ...rediction/tokenizer/tokenizer_config.json
diff --git a/...ion-1.5-v_prediction/tokenizer/vocab.json → ...ion-1.5-v_prediction/tokenizer/vocab.json b/...ion-1.5-v_prediction/tokenizer/vocab.json → ...ion-1.5-v_prediction/tokenizer/vocab.json
diff --git a/...ffusion-1.5-v_prediction/unet/config.json → ...ffusion-1.5-v_prediction/unet/config.json b/...ffusion-1.5-v_prediction/unet/config.json → ...ffusion-1.5-v_prediction/unet/config.json
diff --git a/...iffusion-1.5-v_prediction/vae/config.json → ...iffusion-1.5-v_prediction/vae/config.json b/...iffusion-1.5-v_prediction/vae/config.json → ...iffusion-1.5-v_prediction/vae/config.json
diff --git a/...eature_extractor/preprocessor_config.json → ...eature_extractor/preprocessor_config.json b/...eature_extractor/preprocessor_config.json → ...eature_extractor/preprocessor_config.json
diff --git a/...ffusion-2.0-v_prediction/model_index.json → ...ffusion-2.0-v_prediction/model_index.json b/...ffusion-2.0-v_prediction/model_index.json → ...ffusion-2.0-v_prediction/model_index.json
diff --git a/...rediction/scheduler/scheduler_config.json → ...rediction/scheduler/scheduler_config.json b/...rediction/scheduler/scheduler_config.json → ...rediction/scheduler/scheduler_config.json
diff --git a/...2.0-v_prediction/text_encoder/config.json → ...2.0-v_prediction/text_encoder/config.json b/...2.0-v_prediction/text_encoder/config.json → ...2.0-v_prediction/text_encoder/config.json
diff --git a/...ion-2.0-v_prediction/tokenizer/merges.txt → ...ion-2.0-v_prediction/tokenizer/merges.txt b/...ion-2.0-v_prediction/tokenizer/merges.txt → ...ion-2.0-v_prediction/tokenizer/merges.txt
diff --git a/...diction/tokenizer/special_tokens_map.json → ...diction/tokenizer/special_tokens_map.json b/...diction/tokenizer/special_tokens_map.json → ...diction/tokenizer/special_tokens_map.json
diff --git a/...rediction/tokenizer/tokenizer_config.json → ...rediction/tokenizer/tokenizer_config.json b/...rediction/tokenizer/tokenizer_config.json → ...rediction/tokenizer/tokenizer_config.json
diff --git a/...ion-2.0-v_prediction/tokenizer/vocab.json → ...ion-2.0-v_prediction/tokenizer/vocab.json b/...ion-2.0-v_prediction/tokenizer/vocab.json → ...ion-2.0-v_prediction/tokenizer/vocab.json
diff --git a/...ffusion-2.0-v_prediction/unet/config.json → ...ffusion-2.0-v_prediction/unet/config.json b/...ffusion-2.0-v_prediction/unet/config.json → ...ffusion-2.0-v_prediction/unet/config.json
diff --git a/...iffusion-2.0-v_prediction/vae/config.json → ...iffusion-2.0-v_prediction/vae/config.json b/...iffusion-2.0-v_prediction/vae/config.json → ...iffusion-2.0-v_prediction/vae/config.json
diff --git a/...le-diffusion-xl-base-1.0/model_index.json → ...le-diffusion-xl-base-1.0/model_index.json b/...le-diffusion-xl-base-1.0/model_index.json → ...le-diffusion-xl-base-1.0/model_index.json
diff --git a/...-base-1.0/scheduler/scheduler_config.json → ...-base-1.0/scheduler/scheduler_config.json b/...-base-1.0/scheduler/scheduler_config.json → ...-base-1.0/scheduler/scheduler_config.json
diff --git a/...sion-xl-base-1.0/text_encoder/config.json → ...sion-xl-base-1.0/text_encoder/config.json b/...sion-xl-base-1.0/text_encoder/config.json → ...sion-xl-base-1.0/text_encoder/config.json
diff --git a/...on-xl-base-1.0/text_encoder_2/config.json → ...on-xl-base-1.0/text_encoder_2/config.json b/...on-xl-base-1.0/text_encoder_2/config.json → ...on-xl-base-1.0/text_encoder_2/config.json
diff --git a/...iffusion-xl-base-1.0/tokenizer/merges.txt → ...iffusion-xl-base-1.0/tokenizer/merges.txt b/...iffusion-xl-base-1.0/tokenizer/merges.txt → ...iffusion-xl-base-1.0/tokenizer/merges.txt
diff --git a/...ase-1.0/tokenizer/special_tokens_map.json → ...ase-1.0/tokenizer/special_tokens_map.json b/...ase-1.0/tokenizer/special_tokens_map.json → ...ase-1.0/tokenizer/special_tokens_map.json
diff --git a/...-base-1.0/tokenizer/tokenizer_config.json → ...-base-1.0/tokenizer/tokenizer_config.json b/...-base-1.0/tokenizer/tokenizer_config.json → ...-base-1.0/tokenizer/tokenizer_config.json
diff --git a/...iffusion-xl-base-1.0/tokenizer/vocab.json → ...iffusion-xl-base-1.0/tokenizer/vocab.json b/...iffusion-xl-base-1.0/tokenizer/vocab.json → ...iffusion-xl-base-1.0/tokenizer/vocab.json
diff --git a/...fusion-xl-base-1.0/tokenizer_2/merges.txt → ...fusion-xl-base-1.0/tokenizer_2/merges.txt b/...fusion-xl-base-1.0/tokenizer_2/merges.txt → ...fusion-xl-base-1.0/tokenizer_2/merges.txt
diff --git a/...e-1.0/tokenizer_2/special_tokens_map.json → ...e-1.0/tokenizer_2/special_tokens_map.json b/...e-1.0/tokenizer_2/special_tokens_map.json → ...e-1.0/tokenizer_2/special_tokens_map.json
diff --git a/...ase-1.0/tokenizer_2/tokenizer_config.json → ...ase-1.0/tokenizer_2/tokenizer_config.json b/...ase-1.0/tokenizer_2/tokenizer_config.json → ...ase-1.0/tokenizer_2/tokenizer_config.json
diff --git a/...fusion-xl-base-1.0/tokenizer_2/vocab.json → ...fusion-xl-base-1.0/tokenizer_2/vocab.json b/...fusion-xl-base-1.0/tokenizer_2/vocab.json → ...fusion-xl-base-1.0/tokenizer_2/vocab.json
diff --git a/...le-diffusion-xl-base-1.0/unet/config.json → ...le-diffusion-xl-base-1.0/unet/config.json b/...le-diffusion-xl-base-1.0/unet/config.json → ...le-diffusion-xl-base-1.0/unet/config.json
diff --git a/...ble-diffusion-xl-base-1.0/vae/config.json → ...ble-diffusion-xl-base-1.0/vae/config.json b/...ble-diffusion-xl-base-1.0/vae/config.json → ...ble-diffusion-xl-base-1.0/vae/config.json
diff --git a/...diffusion-xl-base-1.0/vae_1_0/config.json → ...diffusion-xl-base-1.0/vae_1_0/config.json b/...diffusion-xl-base-1.0/vae_1_0/config.json → ...diffusion-xl-base-1.0/vae_1_0/config.json
diff --git a/...usion-xl-base-1.0/vae_decoder/config.json → ...usion-xl-base-1.0/vae_decoder/config.json b/...usion-xl-base-1.0/vae_decoder/config.json → ...usion-xl-base-1.0/vae_decoder/config.json
diff --git a/...usion-xl-base-1.0/vae_encoder/config.json → ...usion-xl-base-1.0/vae_encoder/config.json b/...usion-xl-base-1.0/vae_encoder/config.json → ...usion-xl-base-1.0/vae_encoder/config.json
diff --git a/...diffusion-xl-refiner-1.0/model_index.json → ...diffusion-xl-refiner-1.0/model_index.json b/...diffusion-xl-refiner-1.0/model_index.json → ...diffusion-xl-refiner-1.0/model_index.json
diff --git a/...finer-1.0/scheduler/scheduler_config.json → ...finer-1.0/scheduler/scheduler_config.json b/...finer-1.0/scheduler/scheduler_config.json → ...finer-1.0/scheduler/scheduler_config.json
diff --git a/...xl-refiner-1.0/text_encoder_2/config.json → ...xl-refiner-1.0/text_encoder_2/config.json b/...xl-refiner-1.0/text_encoder_2/config.json → ...xl-refiner-1.0/text_encoder_2/config.json
diff --git a/...ion-xl-refiner-1.0/tokenizer_2/merges.txt → ...ion-xl-refiner-1.0/tokenizer_2/merges.txt b/...ion-xl-refiner-1.0/tokenizer_2/merges.txt → ...ion-xl-refiner-1.0/tokenizer_2/merges.txt
diff --git a/...r-1.0/tokenizer_2/special_tokens_map.json → ...r-1.0/tokenizer_2/special_tokens_map.json b/...r-1.0/tokenizer_2/special_tokens_map.json → ...r-1.0/tokenizer_2/special_tokens_map.json
diff --git a/...ner-1.0/tokenizer_2/tokenizer_config.json → ...ner-1.0/tokenizer_2/tokenizer_config.json b/...ner-1.0/tokenizer_2/tokenizer_config.json → ...ner-1.0/tokenizer_2/tokenizer_config.json
diff --git a/...ion-xl-refiner-1.0/tokenizer_2/vocab.json → ...ion-xl-refiner-1.0/tokenizer_2/vocab.json b/...ion-xl-refiner-1.0/tokenizer_2/vocab.json → ...ion-xl-refiner-1.0/tokenizer_2/vocab.json
diff --git a/...diffusion-xl-refiner-1.0/unet/config.json → ...diffusion-xl-refiner-1.0/unet/config.json b/...diffusion-xl-refiner-1.0/unet/config.json → ...diffusion-xl-refiner-1.0/unet/config.json
diff --git a/...-diffusion-xl-refiner-1.0/vae/config.json → ...-diffusion-xl-refiner-1.0/vae/config.json b/...-diffusion-xl-refiner-1.0/vae/config.json → ...-diffusion-xl-refiner-1.0/vae/config.json
diff --git a/...fusion-xl-refiner-1.0/vae_1_0/config.json → ...fusion-xl-refiner-1.0/vae_1_0/config.json b/...fusion-xl-refiner-1.0/vae_1_0/config.json → ...fusion-xl-refiner-1.0/vae_1_0/config.json
diff --git a/invokeai/backend/model_manager/load/model_loaders/controlnet.py b/invokeai/backend/model_manager/load/model_loaders/controlnet.py
@@ -6,7 +6,7 @@
 
 from diffusers import ControlNetModel
 
-import invokeai.backend.assets.sd_base_conf_files as conf_file_cache
+import invokeai.backend.assets.model_base_conf_files as conf_file_cache
 from invokeai.backend.model_manager import (
     AnyModel,
     AnyModelConfig,

diff --git a/invokeai/backend/model_manager/load/model_loaders/stable_diffusion.py b/invokeai/backend/model_manager/load/model_loaders/stable_diffusion.py
@@ -11,7 +11,7 @@
     StableDiffusionXLPipeline,
 )
 
-import invokeai.backend.assets.sd_base_conf_files as conf_file_cache
+import invokeai.backend.assets.model_base_conf_files as conf_file_cache
 from invokeai.backend.model_manager import (
     AnyModel,
     AnyModelConfig,