diff --git a/invokeai/backend/args.py b/invokeai/backend/args.py index 952b799d70..b6c2608b20 100644 --- a/invokeai/backend/args.py +++ b/invokeai/backend/args.py @@ -561,7 +561,7 @@ class Args(object): "--autoimport", default=None, type=str, - help="Check the indicated directory for .ckpt/.safetensors weights files at startup and import directly", + help="(DEPRECATED - NONFUNCTIONAL). Check the indicated directory for .ckpt/.safetensors weights files at startup and import directly", ) model_group.add_argument( "--autoconvert", diff --git a/invokeai/backend/config/model_install_backend.py b/invokeai/backend/config/model_install_backend.py index b5110c53ea..2018cd42af 100644 --- a/invokeai/backend/config/model_install_backend.py +++ b/invokeai/backend/config/model_install_backend.py @@ -67,7 +67,6 @@ def install_requested_models( scan_directory: Path = None, external_models: List[str] = None, scan_at_startup: bool = False, - convert_to_diffusers: bool = False, precision: str = "float16", purge_deleted: bool = False, config_file_path: Path = None, @@ -113,7 +112,6 @@ def install_requested_models( try: model_manager.heuristic_import( path_url_or_repo, - convert=convert_to_diffusers, commit_to_conf=config_file_path, ) except KeyboardInterrupt: @@ -122,7 +120,7 @@ def install_requested_models( pass if scan_at_startup and scan_directory.is_dir(): - argument = "--autoconvert" if convert_to_diffusers else "--autoimport" + argument = "--autoconvert" initfile = Path(Globals.root, Globals.initfile) replacement = Path(Globals.root, f"{Globals.initfile}.new") directory = str(scan_directory).replace("\\", "/") diff --git a/invokeai/frontend/CLI/CLI.py b/invokeai/frontend/CLI/CLI.py index cebfe54391..352ee83812 100644 --- a/invokeai/frontend/CLI/CLI.py +++ b/invokeai/frontend/CLI/CLI.py @@ -158,14 +158,9 @@ def main(): report_model_error(opt, e) # try to autoconvert new models - if path := opt.autoimport: - gen.model_manager.heuristic_import( - str(path), convert=False, commit_to_conf=opt.conf - ) - if path := opt.autoconvert: gen.model_manager.heuristic_import( - str(path), convert=True, commit_to_conf=opt.conf + str(path), commit_to_conf=opt.conf ) # web server loops forever diff --git a/invokeai/frontend/install/model_install.py b/invokeai/frontend/install/model_install.py index e7b10c34e1..18ec6d55df 100644 --- a/invokeai/frontend/install/model_install.py +++ b/invokeai/frontend/install/model_install.py @@ -199,17 +199,6 @@ class addModelsForm(npyscreen.FormMultiPage): relx=4, scroll_exit=True, ) - self.nextrely += 1 - self.convert_models = self.add_widget_intelligent( - npyscreen.TitleSelectOne, - name="== CONVERT IMPORTED MODELS INTO DIFFUSERS==", - values=["Keep original format", "Convert to diffusers"], - value=0, - begin_entry_at=4, - max_height=4, - hidden=True, # will appear when imported models box is edited - scroll_exit=True, - ) self.cancel = self.add_widget_intelligent( npyscreen.ButtonPress, name="CANCEL", @@ -244,8 +233,6 @@ class addModelsForm(npyscreen.FormMultiPage): self.show_directory_fields.addVisibleWhenSelected(i) self.show_directory_fields.when_value_edited = self._clear_scan_directory - self.import_model_paths.when_value_edited = self._show_hide_convert - self.autoload_directory.when_value_edited = self._show_hide_convert def resize(self): super().resize() @@ -256,13 +243,6 @@ class addModelsForm(npyscreen.FormMultiPage): if not self.show_directory_fields.value: self.autoload_directory.value = "" - def _show_hide_convert(self): - model_paths = self.import_model_paths.value or "" - autoload_directory = self.autoload_directory.value or "" - self.convert_models.hidden = ( - len(model_paths) == 0 and len(autoload_directory) == 0 - ) - def _get_starter_model_labels(self) -> List[str]: window_width, window_height = get_terminal_size() label_width = 25 @@ -322,7 +302,6 @@ class addModelsForm(npyscreen.FormMultiPage): .scan_directory: Path to a directory of models to scan and import .autoscan_on_startup: True if invokeai should scan and import at startup time .import_model_paths: list of URLs, repo_ids and file paths to import - .convert_to_diffusers: if True, convert legacy checkpoints into diffusers """ # we're using a global here rather than storing the result in the parentapp # due to some bug in npyscreen that is causing attributes to be lost @@ -359,7 +338,6 @@ class addModelsForm(npyscreen.FormMultiPage): # URLs and the like selections.import_model_paths = self.import_model_paths.value.split() - selections.convert_to_diffusers = self.convert_models.value[0] == 1 class AddModelApplication(npyscreen.NPSAppManaged): @@ -372,7 +350,6 @@ class AddModelApplication(npyscreen.NPSAppManaged): scan_directory=None, autoscan_on_startup=None, import_model_paths=None, - convert_to_diffusers=None, ) def onStart(self): @@ -393,7 +370,6 @@ def process_and_execute(opt: Namespace, selections: Namespace): directory_to_scan = selections.scan_directory scan_at_startup = selections.autoscan_on_startup potential_models_to_install = selections.import_model_paths - convert_to_diffusers = selections.convert_to_diffusers install_requested_models( install_initial_models=models_to_install, @@ -401,7 +377,6 @@ def process_and_execute(opt: Namespace, selections: Namespace): scan_directory=Path(directory_to_scan) if directory_to_scan else None, external_models=potential_models_to_install, scan_at_startup=scan_at_startup, - convert_to_diffusers=convert_to_diffusers, precision="float32" if opt.full_precision else choose_precision(torch.device(choose_torch_device())),