Merge branch 'main' into bugfix/heathen711/rocm-docker

Author: ebr

invokeai/app/services/model_install/model_install_default.py

@@ -7,7 +7,7 @@
 import time
 from pathlib import Path
 from queue import Empty, Queue
-from shutil import copyfile, copytree, move, rmtree
+from shutil import move, rmtree
 from tempfile import mkdtemp
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Type, Union
 
@@ -193,7 +193,7 @@ def install_path(
             self.app_config.models_path / info.base.value / info.type.value / (preferred_name or model_path.name)
         )
         try:
-            new_path = self._copy_model(model_path, dest_path)
+            new_path = self._move_model(model_path, dest_path)
         except FileExistsError as excp:
             raise DuplicateModelException(
                 f"A model named {model_path.name} is already installed at {dest_path.as_posix()}"
@@ -618,16 +618,6 @@ def sync_model_path(self, key: str) -> AnyModelConfig:
         self.record_store.update_model(key, ModelRecordChanges(path=model.path))
         return model
 
-    def _copy_model(self, old_path: Path, new_path: Path) -> Path:
-        if old_path == new_path:
-            return old_path
-        new_path.parent.mkdir(parents=True, exist_ok=True)
-        if old_path.is_dir():
-            copytree(old_path, new_path)
-        else:
-            copyfile(old_path, new_path)
-        return new_path
-
     def _move_model(self, old_path: Path, new_path: Path) -> Path:
         if old_path == new_path:
             return old_path

invokeai/frontend/web/src/features/gallery/store/types.ts

@@ -3,8 +3,9 @@ import z from 'zod';
 
 const zGalleryView = z.enum(['images', 'assets']);
 export type GalleryView = z.infer<typeof zGalleryView>;
-const zBoardId = z.union([z.literal('none'), z.intersection(z.string(), z.record(z.never(), z.never()))]);
-export type BoardId = z.infer<typeof zBoardId>;
+const zBoardId = z.string();
+// TS hack to get autocomplete for "none" but accept any string
+export type BoardId = 'none' | (string & {});
 const zComparisonMode = z.enum(['slider', 'side-by-side', 'hover']);
 export type ComparisonMode = z.infer<typeof zComparisonMode>;
 const zComparisonFit = z.enum(['contain', 'fill']);

invokeai/frontend/web/src/index.ts

@@ -32,6 +32,7 @@ export { default as InvokeAIUI } from './app/components/InvokeAIUI';
 export type { StudioInitAction } from './app/hooks/useStudioInitAction';
 export type { LoggingOverrides } from './app/logging/logger';
 export type { PartialAppConfig } from './app/types/invokeai';
+export { default as Loading } from './common/components/Loading/Loading';
 export { default as HotkeysModal } from './features/system/components/HotkeysModal/HotkeysModal';
 export { default as InvokeAiLogoComponent } from './features/system/components/InvokeAILogoComponent';
 export { default as SettingsModal } from './features/system/components/SettingsModal/SettingsModal';

tests/app/services/model_install/test_model_install.py

@@ -182,40 +182,48 @@ def test_background_install(
 def test_not_inplace_install(
     mm2_installer: ModelInstallServiceBase, embedding_file: Path, mm2_app_config: InvokeAIAppConfig
 ) -> None:
+    # An non in-place install will/should call `register_path()` internally
     source = LocalModelSource(path=embedding_file, inplace=False)
     job = mm2_installer.import_model(source)
     mm2_installer.wait_for_installs()
     assert job is not None
     assert job.config_out is not None
+    # Non in-place install should _move_ the model from the original location to the models path
+    # The model config's path should be different from the original file
     assert Path(job.config_out.path) != embedding_file
+    # Original file should _not_ exist after install
+    assert not embedding_file.exists()
     assert (mm2_app_config.models_path / job.config_out.path).exists()
 
 
 def test_inplace_install(
     mm2_installer: ModelInstallServiceBase, embedding_file: Path, mm2_app_config: InvokeAIAppConfig
 ) -> None:
+    # An in-place install will/should call `install_path()` internally
     source = LocalModelSource(path=embedding_file, inplace=True)
     job = mm2_installer.import_model(source)
     mm2_installer.wait_for_installs()
     assert job is not None
     assert job.config_out is not None
+    # In-place install should not touch the model file, just register it
+    # The model config's path should be the same as the original file
     assert Path(job.config_out.path) == embedding_file
+    # Model file should still exist after install
+    assert embedding_file.exists()
     assert Path(job.config_out.path).exists()
 
 
 def test_delete_install(
     mm2_installer: ModelInstallServiceBase, embedding_file: Path, mm2_app_config: InvokeAIAppConfig
 ) -> None:
     store = mm2_installer.record_store
-    key = mm2_installer.install_path(embedding_file)
+    key = mm2_installer.install_path(embedding_file)  # non in-place install
     model_record = store.get_model(key)
     assert (mm2_app_config.models_path / model_record.path).exists()
-    assert embedding_file.exists()  # original should still be there after installation
+    assert not embedding_file.exists()
     mm2_installer.delete(key)
-    assert not (
-        mm2_app_config.models_path / model_record.path
-    ).exists()  # after deletion, installed copy should not exist
-    assert embedding_file.exists()  # but original should still be there
+    # after deletion, installed copy should not exist
+    assert not (mm2_app_config.models_path / model_record.path).exists()
     with pytest.raises(UnknownModelException):
         store.get_model(key)
 
@@ -224,10 +232,10 @@ def test_delete_register(
     mm2_installer: ModelInstallServiceBase, embedding_file: Path, mm2_app_config: InvokeAIAppConfig
 ) -> None:
     store = mm2_installer.record_store
-    key = mm2_installer.register_path(embedding_file)
+    key = mm2_installer.register_path(embedding_file)  # in-place install
     model_record = store.get_model(key)
     assert Path(model_record.path).exists()
-    assert embedding_file.exists()  # original should still be there after installation
+    assert embedding_file.exists()
     mm2_installer.delete(key)
     assert Path(model_record.path).exists()
     with pytest.raises(UnknownModelException):