InvokeAI 3.7.0__tar.gz → 4.0.0rc2__tar.gz

{InvokeAI-3.7.0 → InvokeAI-4.0.0rc2}/InvokeAI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: InvokeAI
-Version: 3.7.0
+Version: 4.0.0rc2
 Summary: An implementation of Stable Diffusion which provides various new features and options to aid the image generation process
 Author-email: The InvokeAI Project <lincoln.stein@gmail.com>
 License:                                  Apache License

{InvokeAI-3.7.0 → InvokeAI-4.0.0rc2}/InvokeAI.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ InvokeAI.egg-info/dependency_links.txt
 InvokeAI.egg-info/entry_points.txt
 InvokeAI.egg-info/requires.txt
 InvokeAI.egg-info/top_level.txt
+invokeai/app/__init__.py
 invokeai/app/api_app.py
 invokeai/app/api/dependencies.py
 invokeai/app/api/events.py
@@ -19,10 +20,8 @@ invokeai/app/api/routers/board_images.py
 invokeai/app/api/routers/boards.py
 invokeai/app/api/routers/download_queue.py
 invokeai/app/api/routers/images.py
-invokeai/app/api/routers/model_records.py
-invokeai/app/api/routers/models.py
+invokeai/app/api/routers/model_manager.py
 invokeai/app/api/routers/session_queue.py
-invokeai/app/api/routers/sessions.py
 invokeai/app/api/routers/utilities.py
 invokeai/app/api/routers/workflows.py
 invokeai/app/assets/images/caution.png
@@ -30,9 +29,11 @@ invokeai/app/invocations/__init__.py
 invokeai/app/invocations/baseinvocation.py
 invokeai/app/invocations/collections.py
 invokeai/app/invocations/compel.py
+invokeai/app/invocations/constants.py
 invokeai/app/invocations/controlnet_image_processors.py
 invokeai/app/invocations/cv.py
 invokeai/app/invocations/facetools.py
+invokeai/app/invocations/fields.py
 invokeai/app/invocations/image.py
 invokeai/app/invocations/infill.py
 invokeai/app/invocations/ip_adapter.py
@@ -41,7 +42,6 @@ invokeai/app/invocations/math.py
 invokeai/app/invocations/metadata.py
 invokeai/app/invocations/model.py
 invokeai/app/invocations/noise.py
-invokeai/app/invocations/onnx.py
 invokeai/app/invocations/param_easing.py
 invokeai/app/invocations/primitives.py
 invokeai/app/invocations/prompt.py
@@ -70,6 +70,10 @@ invokeai/app/services/boards/__init__.py
 invokeai/app/services/boards/boards_base.py
 invokeai/app/services/boards/boards_common.py
 invokeai/app/services/boards/boards_default.py
+invokeai/app/services/bulk_download/__init__.py
+invokeai/app/services/bulk_download/bulk_download_base.py
+invokeai/app/services/bulk_download/bulk_download_common.py
+invokeai/app/services/bulk_download/bulk_download_default.py
 invokeai/app/services/config/__init__.py
 invokeai/app/services/config/config_base.py
 invokeai/app/services/config/config_common.py
@@ -95,14 +99,6 @@ invokeai/app/services/invocation_cache/__init__.py
 invokeai/app/services/invocation_cache/invocation_cache_base.py
 invokeai/app/services/invocation_cache/invocation_cache_common.py
 invokeai/app/services/invocation_cache/invocation_cache_memory.py
-invokeai/app/services/invocation_processor/__init__.py
-invokeai/app/services/invocation_processor/invocation_processor_base.py
-invokeai/app/services/invocation_processor/invocation_processor_common.py
-invokeai/app/services/invocation_processor/invocation_processor_default.py
-invokeai/app/services/invocation_queue/__init__.py
-invokeai/app/services/invocation_queue/invocation_queue_base.py
-invokeai/app/services/invocation_queue/invocation_queue_common.py
-invokeai/app/services/invocation_queue/invocation_queue_memory.py
 invokeai/app/services/invocation_stats/__init__.py
 invokeai/app/services/invocation_stats/invocation_stats_base.py
 invokeai/app/services/invocation_stats/invocation_stats_common.py
@@ -111,15 +107,18 @@ invokeai/app/services/item_storage/__init__.py
 invokeai/app/services/item_storage/item_storage_base.py
 invokeai/app/services/item_storage/item_storage_common.py
 invokeai/app/services/item_storage/item_storage_memory.py
-invokeai/app/services/latents_storage/__init__.py
-invokeai/app/services/latents_storage/latents_storage_base.py
-invokeai/app/services/latents_storage/latents_storage_disk.py
-invokeai/app/services/latents_storage/latents_storage_forward_cache.py
+invokeai/app/services/model_images/model_images_base.py
+invokeai/app/services/model_images/model_images_common.py
+invokeai/app/services/model_images/model_images_default.py
 invokeai/app/services/model_install/__init__.py
 invokeai/app/services/model_install/model_install_base.py
 invokeai/app/services/model_install/model_install_default.py
+invokeai/app/services/model_load/__init__.py
+invokeai/app/services/model_load/model_load_base.py
+invokeai/app/services/model_load/model_load_default.py
 invokeai/app/services/model_manager/__init__.py
 invokeai/app/services/model_manager/model_manager_base.py
+invokeai/app/services/model_manager/model_manager_common.py
 invokeai/app/services/model_manager/model_manager_default.py
 invokeai/app/services/model_records/__init__.py
 invokeai/app/services/model_records/model_records_base.py
@@ -128,6 +127,10 @@ invokeai/app/services/names/__init__.py
 invokeai/app/services/names/names_base.py
 invokeai/app/services/names/names_common.py
 invokeai/app/services/names/names_default.py
+invokeai/app/services/object_serializer/object_serializer_base.py
+invokeai/app/services/object_serializer/object_serializer_common.py
+invokeai/app/services/object_serializer/object_serializer_disk.py
+invokeai/app/services/object_serializer/object_serializer_forward_cache.py
 invokeai/app/services/session_processor/__init__.py
 invokeai/app/services/session_processor/session_processor_base.py
 invokeai/app/services/session_processor/session_processor_common.py
@@ -137,8 +140,8 @@ invokeai/app/services/session_queue/session_queue_base.py
 invokeai/app/services/session_queue/session_queue_common.py
 invokeai/app/services/session_queue/session_queue_sqlite.py
 invokeai/app/services/shared/__init__.py
-invokeai/app/services/shared/default_graphs.py
 invokeai/app/services/shared/graph.py
+invokeai/app/services/shared/invocation_context.py
 invokeai/app/services/shared/pagination.py
 invokeai/app/services/shared/sqlite/__init__.py
 invokeai/app/services/shared/sqlite/sqlite_common.py
@@ -153,7 +156,8 @@ invokeai/app/services/shared/sqlite_migrator/migrations/migration_2.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_3.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_4.py
 invokeai/app/services/shared/sqlite_migrator/migrations/migration_5.py
-invokeai/app/services/shared/sqlite_migrator/migrations/util/migrate_yaml_config_1.py
+invokeai/app/services/shared/sqlite_migrator/migrations/migration_6.py
+invokeai/app/services/shared/sqlite_migrator/migrations/migration_7.py
 invokeai/app/services/urls/__init__.py
 invokeai/app/services/urls/urls_base.py
 invokeai/app/services/urls/urls_default.py
@@ -170,11 +174,9 @@ invokeai/app/services/workflow_records/default_workflows/Text to Image - SD1.5.j
 invokeai/app/services/workflow_records/default_workflows/Text to Image with LoRA.json
 invokeai/app/services/workflow_records/default_workflows/Tiled Upscaling (Beta).json
 invokeai/app/shared/__init__.py
-invokeai/app/shared/fields.py
 invokeai/app/shared/models.py
 invokeai/app/util/__init__.py
 invokeai/app/util/controlnet_utils.py
-invokeai/app/util/metadata.py
 invokeai/app/util/metaenum.py
 invokeai/app/util/misc.py
 invokeai/app/util/model_exclude_null.py
@@ -184,6 +186,12 @@ invokeai/app/util/thumbnails.py
 invokeai/app/util/ti_utils.py
 invokeai/assets/fonts/inter/Inter-Regular.ttf
 invokeai/backend/__init__.py
+invokeai/backend/lora.py
+invokeai/backend/model_patcher.py
+invokeai/backend/raw_model.py
+invokeai/backend/textual_inversion.py
+invokeai/backend/embeddings/__init__.py
+invokeai/backend/embeddings/embedding_base.py
 invokeai/backend/image_util/__init__.py
 invokeai/backend/image_util/cv2_inpaint.py
 invokeai/backend/image_util/invisible_watermark.py
@@ -214,60 +222,58 @@ invokeai/backend/install/check_root.py
 invokeai/backend/install/install_helper.py
 invokeai/backend/install/invokeai_configure.py
 invokeai/backend/install/legacy_arg_parsing.py
-invokeai/backend/install/migrate_to_3.py
-invokeai/backend/install/model_install_backend.py
 invokeai/backend/ip_adapter/__init__.py
 invokeai/backend/ip_adapter/attention_processor.py
 invokeai/backend/ip_adapter/ip_adapter.py
 invokeai/backend/ip_adapter/ip_attention_weights.py
 invokeai/backend/ip_adapter/resampler.py
 invokeai/backend/ip_adapter/unet_patcher.py
-invokeai/backend/model_management/__init__.py
-invokeai/backend/model_management/convert_ckpt_to_diffusers.py
-invokeai/backend/model_management/detect_baked_in_vae.py
-invokeai/backend/model_management/libc_util.py
-invokeai/backend/model_management/lora.py
-invokeai/backend/model_management/memory_snapshot.py
-invokeai/backend/model_management/model_cache.py
-invokeai/backend/model_management/model_load_optimizations.py
-invokeai/backend/model_management/model_manager.py
-invokeai/backend/model_management/model_merge.py
-invokeai/backend/model_management/model_probe.py
-invokeai/backend/model_management/model_search.py
-invokeai/backend/model_management/seamless.py
-invokeai/backend/model_management/util.py
-invokeai/backend/model_management/models/__init__.py
-invokeai/backend/model_management/models/base.py
-invokeai/backend/model_management/models/clip_vision.py
-invokeai/backend/model_management/models/controlnet.py
-invokeai/backend/model_management/models/ip_adapter.py
-invokeai/backend/model_management/models/lora.py
-invokeai/backend/model_management/models/sdxl.py
-invokeai/backend/model_management/models/stable_diffusion.py
-invokeai/backend/model_management/models/stable_diffusion_onnx.py
-invokeai/backend/model_management/models/t2i_adapter.py
-invokeai/backend/model_management/models/textual_inversion.py
-invokeai/backend/model_management/models/vae.py
+invokeai/backend/model_hash/model_hash.py
 invokeai/backend/model_manager/__init__.py
 invokeai/backend/model_manager/config.py
-invokeai/backend/model_manager/hash.py
+invokeai/backend/model_manager/convert_ckpt_to_diffusers.py
+invokeai/backend/model_manager/libc_util.py
 invokeai/backend/model_manager/merge.py
 invokeai/backend/model_manager/probe.py
 invokeai/backend/model_manager/search.py
+invokeai/backend/model_manager/load/__init__.py
+invokeai/backend/model_manager/load/load_base.py
+invokeai/backend/model_manager/load/load_default.py
+invokeai/backend/model_manager/load/memory_snapshot.py
+invokeai/backend/model_manager/load/model_loader_registry.py
+invokeai/backend/model_manager/load/model_util.py
+invokeai/backend/model_manager/load/optimizations.py
+invokeai/backend/model_manager/load/convert_cache/__init__.py
+invokeai/backend/model_manager/load/convert_cache/convert_cache_base.py
+invokeai/backend/model_manager/load/convert_cache/convert_cache_default.py
+invokeai/backend/model_manager/load/model_cache/__init__.py
+invokeai/backend/model_manager/load/model_cache/model_cache_base.py
+invokeai/backend/model_manager/load/model_cache/model_cache_default.py
+invokeai/backend/model_manager/load/model_cache/model_locker.py
+invokeai/backend/model_manager/load/model_loaders/__init__.py
+invokeai/backend/model_manager/load/model_loaders/controlnet.py
+invokeai/backend/model_manager/load/model_loaders/generic_diffusers.py
+invokeai/backend/model_manager/load/model_loaders/ip_adapter.py
+invokeai/backend/model_manager/load/model_loaders/lora.py
+invokeai/backend/model_manager/load/model_loaders/onnx.py
+invokeai/backend/model_manager/load/model_loaders/stable_diffusion.py
+invokeai/backend/model_manager/load/model_loaders/textual_inversion.py
+invokeai/backend/model_manager/load/model_loaders/vae.py
 invokeai/backend/model_manager/metadata/__init__.py
 invokeai/backend/model_manager/metadata/metadata_base.py
-invokeai/backend/model_manager/metadata/metadata_store.py
 invokeai/backend/model_manager/metadata/fetch/__init__.py
-invokeai/backend/model_manager/metadata/fetch/civitai.py
 invokeai/backend/model_manager/metadata/fetch/fetch_base.py
 invokeai/backend/model_manager/metadata/fetch/huggingface.py
+invokeai/backend/model_manager/util/libc_util.py
+invokeai/backend/model_manager/util/model_util.py
 invokeai/backend/model_manager/util/select_hf_files.py
+invokeai/backend/onnx/onnx_runtime.py
 invokeai/backend/stable_diffusion/__init__.py
 invokeai/backend/stable_diffusion/diffusers_pipeline.py
+invokeai/backend/stable_diffusion/seamless.py
 invokeai/backend/stable_diffusion/diffusion/__init__.py
 invokeai/backend/stable_diffusion/diffusion/conditioning_data.py
 invokeai/backend/stable_diffusion/diffusion/cross_attention_control.py
-invokeai/backend/stable_diffusion/diffusion/cross_attention_map_saving.py
 invokeai/backend/stable_diffusion/diffusion/shared_invokeai_diffusion.py
 invokeai/backend/stable_diffusion/schedulers/__init__.py
 invokeai/backend/stable_diffusion/schedulers/schedulers.py
@@ -284,11 +290,10 @@ invokeai/backend/util/hotfixes.py
 invokeai/backend/util/log.py
 invokeai/backend/util/logging.py
 invokeai/backend/util/mps_fixes.py
+invokeai/backend/util/silence_warnings.py
 invokeai/backend/util/test_utils.py
 invokeai/backend/util/util.py
 invokeai/configs/INITIAL_MODELS.yaml
-invokeai/configs/INITIAL_MODELS2.yaml
-invokeai/configs/models.yaml.example
 invokeai/configs/controlnet/cldm_v15.yaml
 invokeai/configs/controlnet/cldm_v21.yaml
 invokeai/configs/stable-diffusion/sd_xl_base.yaml
@@ -311,28 +316,25 @@ invokeai/frontend/install/import_images.py
 invokeai/frontend/install/invokeai_configure.py
 invokeai/frontend/install/invokeai_update.py
 invokeai/frontend/install/model_install.py
-invokeai/frontend/install/model_install2.py
 invokeai/frontend/install/widgets.py
 invokeai/frontend/merge/__init__.py
 invokeai/frontend/merge/merge_diffusers.py
-invokeai/frontend/merge/merge_diffusers2.py
 invokeai/frontend/training/__init__.py
 invokeai/frontend/training/textual_inversion.py
-invokeai/frontend/training/textual_inversion2.py
 invokeai/frontend/web/__init__.py
 invokeai/frontend/web/dist/index.html
-invokeai/frontend/web/dist/assets/App-bX_N2fq4.js
-invokeai/frontend/web/dist/assets/App-yOqAlINK.css
-invokeai/frontend/web/dist/assets/ThemeLocaleProvider-LDFeQ-Xr.css
-invokeai/frontend/web/dist/assets/ThemeLocaleProvider-zQsWeS5D.js
-invokeai/frontend/web/dist/assets/index-5973AuZK.js
-invokeai/frontend/web/dist/assets/inter-cyrillic-ext-wght-normal-yBM_KeYt.woff2
-invokeai/frontend/web/dist/assets/inter-cyrillic-wght-normal-ZiSV2vHp.woff2
-invokeai/frontend/web/dist/assets/inter-greek-ext-wght-normal--QGCzYqo.woff2
-invokeai/frontend/web/dist/assets/inter-greek-wght-normal-8iAzSMjZ.woff2
-invokeai/frontend/web/dist/assets/inter-latin-ext-wght-normal-jdaSF5G5.woff2
-invokeai/frontend/web/dist/assets/inter-latin-wght-normal-YFatk6uG.woff2
-invokeai/frontend/web/dist/assets/inter-vietnamese-wght-normal-PxkLsD1V.woff2
+invokeai/frontend/web/dist/assets/App-DI6oCUg0.css
+invokeai/frontend/web/dist/assets/App-DvDxXs2J.js
+invokeai/frontend/web/dist/assets/ThemeLocaleProvider-D652FVM6.css
+invokeai/frontend/web/dist/assets/ThemeLocaleProvider-DHi38vMA.js
+invokeai/frontend/web/dist/assets/index-DALs_7tf.js
+invokeai/frontend/web/dist/assets/inter-cyrillic-ext-wght-normal-DIEz8p5i.woff2
+invokeai/frontend/web/dist/assets/inter-cyrillic-wght-normal-BmJJXa8e.woff2
+invokeai/frontend/web/dist/assets/inter-greek-ext-wght-normal-D5AYLNiq.woff2
+invokeai/frontend/web/dist/assets/inter-greek-wght-normal-DyIDNIyN.woff2
+invokeai/frontend/web/dist/assets/inter-latin-ext-wght-normal-CN1pIXkb.woff2
+invokeai/frontend/web/dist/assets/inter-latin-wght-normal-BgVq2Tq4.woff2
+invokeai/frontend/web/dist/assets/inter-vietnamese-wght-normal-_GQuwPVU.woff2
 invokeai/frontend/web/dist/assets/images/invoke-avatar-circle.svg
 invokeai/frontend/web/dist/assets/images/invoke-avatar-square.svg
 invokeai/frontend/web/dist/assets/images/invoke-favicon.png
@@ -378,6 +380,8 @@ invokeai/frontend/web/dist/locales/uk.json
 invokeai/frontend/web/dist/locales/vi.json
 invokeai/frontend/web/dist/locales/zh_CN.json
 invokeai/frontend/web/dist/locales/zh_Hant.json
+invokeai/frontend/web/scripts/clean_translations.py
 invokeai/frontend/web/static/docs/invoke-favicon-docs.svg
+invokeai/invocation_api/__init__.py
 invokeai/version/__init__.py
 invokeai/version/invokeai_version.py

{InvokeAI-3.7.0 → InvokeAI-4.0.0rc2}/InvokeAI.egg-info/entry_points.txt

@@ -3,8 +3,7 @@ configure_invokeai.py = invokeai.frontend.install.invokeai_configure:invokeai_co
 invokeai-configure = invokeai.frontend.install.invokeai_configure:invokeai_configure
 invokeai-db-maintenance = invokeai.backend.util.db_maintenance:main
 invokeai-import-images = invokeai.frontend.install.import_images:main
-invokeai-merge = invokeai.frontend.merge:invokeai_merge_diffusers
-invokeai-merge2 = invokeai.frontend.merge.merge_diffusers2:main
+invokeai-merge = invokeai.frontend.merge.merge_diffusers:main
 invokeai-metadata = invokeai.backend.image_util.invoke_metadata:main
 invokeai-migrate3 = invokeai.backend.install.migrate_to_3:main
 invokeai-model-install = invokeai.frontend.install.model_install:main

{InvokeAI-3.7.0 → InvokeAI-4.0.0rc2}/InvokeAI.egg-info/requires.txt

@@ -16,23 +16,24 @@ torch==2.1.2
 torchmetrics==0.11.4
 torchsde==0.2.6
 torchvision==0.16.2
-transformers==4.37.2
-fastapi-events==0.10.1
-fastapi==0.109.2
-huggingface-hub==0.20.3
-pydantic-settings==2.1.0
-pydantic==2.6.1
+transformers==4.38.2
+fastapi-events==0.11.0
+fastapi==0.110.0
+huggingface-hub==0.21.3
+pydantic-settings==2.2.1
+pydantic==2.6.3
 python-socketio==5.11.1
-uvicorn[standard]==0.27.1
+uvicorn[standard]==0.28.0
 albumentations
+blake3
 click
 datasets
+Deprecated
 dnspython~=2.4.0
 dynamicprompts
 easing-functions
 einops
 facexlib
-imohash
 matplotlib
 npyscreen
 omegaconf
@@ -66,9 +67,10 @@ pipdeptree
 twine
 
 [docs]
-mkdocs-material<9.0
+mkdocs-material>=9.5.13
 mkdocs-git-revision-date-localized-plugin
-mkdocs-redirects==1.2.0
+mkdocs-redirects
+mkdocstrings[python]>=0.24.1
 
 [onnx]
 onnxruntime
@@ -80,14 +82,16 @@ onnxruntime-gpu
 onnxruntime-directml
 
 [test]
-ruff==0.2.1
+ruff
 ruff-lsp
 mypy
 pre-commit
 pytest>6.0.0
 pytest-cov
+pytest-timeout
 pytest-datadir
 requests_testadapter
+httpx
 
 [xformers]
 

{InvokeAI-3.7.0 → InvokeAI-4.0.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: InvokeAI
-Version: 3.7.0
+Version: 4.0.0rc2
 Summary: An implementation of Stable Diffusion which provides various new features and options to aid the image generation process
 Author-email: The InvokeAI Project <lincoln.stein@gmail.com>
 License:                                  Apache License

{InvokeAI-3.7.0 → InvokeAI-4.0.0rc2}/invokeai/app/api/dependencies.py

@@ -2,9 +2,12 @@
 
 from logging import Logger
 
-from invokeai.app.services.item_storage.item_storage_memory import ItemStorageMemory
+import torch
+
+from invokeai.app.services.object_serializer.object_serializer_disk import ObjectSerializerDisk
+from invokeai.app.services.object_serializer.object_serializer_forward_cache import ObjectSerializerForwardCache
 from invokeai.app.services.shared.sqlite.sqlite_util import init_db
-from invokeai.backend.model_manager.metadata import ModelMetadataStore
+from invokeai.backend.stable_diffusion.diffusion.conditioning_data import ConditioningFieldData
 from invokeai.backend.util.logging import InvokeAILogger
 from invokeai.version.invokeai_version import __version__
 
@@ -12,26 +15,22 @@ from ..services.board_image_records.board_image_records_sqlite import SqliteBoar
 from ..services.board_images.board_images_default import BoardImagesService
 from ..services.board_records.board_records_sqlite import SqliteBoardRecordStorage
 from ..services.boards.boards_default import BoardService
+from ..services.bulk_download.bulk_download_default import BulkDownloadService
 from ..services.config import InvokeAIAppConfig
 from ..services.download import DownloadQueueService
 from ..services.image_files.image_files_disk import DiskImageFileStorage
 from ..services.image_records.image_records_sqlite import SqliteImageRecordStorage
 from ..services.images.images_default import ImageService
 from ..services.invocation_cache.invocation_cache_memory import MemoryInvocationCache
-from ..services.invocation_processor.invocation_processor_default import DefaultInvocationProcessor
-from ..services.invocation_queue.invocation_queue_memory import MemoryInvocationQueue
 from ..services.invocation_services import InvocationServices
 from ..services.invocation_stats.invocation_stats_default import InvocationStatsService
 from ..services.invoker import Invoker
-from ..services.latents_storage.latents_storage_disk import DiskLatentsStorage
-from ..services.latents_storage.latents_storage_forward_cache import ForwardCacheLatentsStorage
-from ..services.model_install import ModelInstallService
+from ..services.model_images.model_images_default import ModelImageFileStorageDisk
 from ..services.model_manager.model_manager_default import ModelManagerService
 from ..services.model_records import ModelRecordServiceSQL
 from ..services.names.names_default import SimpleNameService
 from ..services.session_processor.session_processor_default import DefaultSessionProcessor
 from ..services.session_queue.session_queue_sqlite import SqliteSessionQueue
-from ..services.shared.graph import GraphExecutionState
 from ..services.urls.urls_default import LocalUrlService
 from ..services.workflow_records.workflow_records_sqlite import SqliteWorkflowRecordsStorage
 from .events import FastAPIEventService
@@ -68,8 +67,13 @@ class ApiDependencies:
         logger.debug(f"Internet connectivity is {config.internet_available}")
 
         output_folder = config.output_path
+        if output_folder is None:
+            raise ValueError("Output folder is not set")
+
         image_files = DiskImageFileStorage(f"{output_folder}/images")
 
+        model_images_folder = config.models_path
+
         db = init_db(config=config, logger=logger, image_files=image_files)
 
         configuration = config
@@ -80,26 +84,26 @@ class ApiDependencies:
         board_records = SqliteBoardRecordStorage(db=db)
         boards = BoardService()
         events = FastAPIEventService(event_handler_id)
-        graph_execution_manager = ItemStorageMemory[GraphExecutionState]()
+        bulk_download = BulkDownloadService()
         image_records = SqliteImageRecordStorage(db=db)
         images = ImageService()
         invocation_cache = MemoryInvocationCache(max_cache_size=config.node_cache_size)
-        latents = ForwardCacheLatentsStorage(DiskLatentsStorage(f"{output_folder}/latents"))
-        model_manager = ModelManagerService(config, logger)
-        model_record_service = ModelRecordServiceSQL(db=db)
+        tensors = ObjectSerializerForwardCache(
+            ObjectSerializerDisk[torch.Tensor](output_folder / "tensors", ephemeral=True)
+        )
+        conditioning = ObjectSerializerForwardCache(
+            ObjectSerializerDisk[ConditioningFieldData](output_folder / "conditioning", ephemeral=True)
+        )
         download_queue_service = DownloadQueueService(event_bus=events)
-        metadata_store = ModelMetadataStore(db=db)
-        model_install_service = ModelInstallService(
-            app_config=config,
-            record_store=model_record_service,
+        model_images_service = ModelImageFileStorageDisk(model_images_folder / "model_images")
+        model_manager = ModelManagerService.build_model_manager(
+            app_config=configuration,
+            model_record_service=ModelRecordServiceSQL(db=db),
             download_queue=download_queue_service,
-            metadata_store=metadata_store,
-            event_bus=events,
+            events=events,
         )
         names = SimpleNameService()
         performance_statistics = InvocationStatsService()
-        processor = DefaultInvocationProcessor()
-        queue = MemoryInvocationQueue()
         session_processor = DefaultSessionProcessor()
         session_queue = SqliteSessionQueue(db=db)
         urls = LocalUrlService()
@@ -110,27 +114,25 @@ class ApiDependencies:
             board_images=board_images,
             board_records=board_records,
             boards=boards,
+            bulk_download=bulk_download,
             configuration=configuration,
             events=events,
-            graph_execution_manager=graph_execution_manager,
             image_files=image_files,
             image_records=image_records,
             images=images,
             invocation_cache=invocation_cache,
-            latents=latents,
             logger=logger,
+            model_images=model_images_service,
             model_manager=model_manager,
-            model_records=model_record_service,
             download_queue=download_queue_service,
-            model_install=model_install_service,
             names=names,
             performance_statistics=performance_statistics,
-            processor=processor,
-            queue=queue,
             session_processor=session_processor,
             session_queue=session_queue,
             urls=urls,
             workflow_records=workflow_records,
+            tensors=tensors,
+            conditioning=conditioning,
         )
 
         ApiDependencies.invoker = Invoker(services)

{InvokeAI-3.7.0 → InvokeAI-4.0.0rc2}/invokeai/app/api/routers/download_queue.py

@@ -36,7 +36,7 @@ async def list_downloads() -> List[DownloadJob]:
         400: {"description": "Bad request"},
     },
 )
-async def prune_downloads():
+async def prune_downloads() -> Response:
     """Prune completed and errored jobs."""
     queue = ApiDependencies.invoker.services.download_queue
     queue.prune_jobs()
@@ -55,7 +55,7 @@ async def download(
 ) -> DownloadJob:
     """Download the source URL to the file or directory indicted in dest."""
     queue = ApiDependencies.invoker.services.download_queue
-    return queue.download(source, dest, priority, access_token)
+    return queue.download(source, Path(dest), priority, access_token)
 
 
 @download_queue_router.get(
@@ -87,7 +87,7 @@ async def get_download_job(
 )
 async def cancel_download_job(
     id: int = Path(description="ID of the download job to cancel."),
-):
+) -> Response:
     """Cancel a download job using its ID."""
     try:
         queue = ApiDependencies.invoker.services.download_queue
@@ -105,7 +105,7 @@ async def cancel_download_job(
         204: {"description": "Download jobs have been cancelled"},
     },
 )
-async def cancel_all_download_jobs():
+async def cancel_all_download_jobs() -> Response:
     """Cancel all download jobs."""
     ApiDependencies.invoker.services.download_queue.cancel_all_jobs()
     return Response(status_code=204)

{InvokeAI-3.7.0 → InvokeAI-4.0.0rc2}/invokeai/app/api/routers/images.py

@@ -2,13 +2,13 @@ import io
 import traceback
 from typing import Optional
 
-from fastapi import Body, HTTPException, Path, Query, Request, Response, UploadFile
+from fastapi import BackgroundTasks, Body, HTTPException, Path, Query, Request, Response, UploadFile
 from fastapi.responses import FileResponse
 from fastapi.routing import APIRouter
 from PIL import Image
 from pydantic import BaseModel, Field, ValidationError
 
-from invokeai.app.invocations.baseinvocation import MetadataField, MetadataFieldValidator
+from invokeai.app.invocations.fields import MetadataField, MetadataFieldValidator
 from invokeai.app.services.image_records.image_records_common import ImageCategory, ImageRecordChanges, ResourceOrigin
 from invokeai.app.services.images.images_common import ImageDTO, ImageUrlsDTO
 from invokeai.app.services.shared.pagination import OffsetPaginatedResults
@@ -375,16 +375,67 @@ async def unstar_images_in_list(
 
 class ImagesDownloaded(BaseModel):
     response: Optional[str] = Field(
-        description="If defined, the message to display to the user when images begin downloading"
+        default=None, description="The message to display to the user when images begin downloading"
+    )
+    bulk_download_item_name: Optional[str] = Field(
+        default=None, description="The name of the bulk download item for which events will be emitted"
     )
 
 
-@images_router.post("/download", operation_id="download_images_from_list", response_model=ImagesDownloaded)
+@images_router.post(
+    "/download", operation_id="download_images_from_list", response_model=ImagesDownloaded, status_code=202
+)
 async def download_images_from_list(
-    image_names: list[str] = Body(description="The list of names of images to download", embed=True),
+    background_tasks: BackgroundTasks,
+    image_names: Optional[list[str]] = Body(
+        default=None, description="The list of names of images to download", embed=True
+    ),
     board_id: Optional[str] = Body(
-        default=None, description="The board from which image should be downloaded from", embed=True
+        default=None, description="The board from which image should be downloaded", embed=True
     ),
 ) -> ImagesDownloaded:
-    # return ImagesDownloaded(response="Your images are downloading")
-    raise HTTPException(status_code=501, detail="Endpoint is not yet implemented")
+    if (image_names is None or len(image_names) == 0) and board_id is None:
+        raise HTTPException(status_code=400, detail="No images or board id specified.")
+    bulk_download_item_id: str = ApiDependencies.invoker.services.bulk_download.generate_item_id(board_id)
+
+    background_tasks.add_task(
+        ApiDependencies.invoker.services.bulk_download.handler,
+        image_names,
+        board_id,
+        bulk_download_item_id,
+    )
+    return ImagesDownloaded(bulk_download_item_name=bulk_download_item_id + ".zip")
+
+
+@images_router.api_route(
+    "/download/{bulk_download_item_name}",
+    methods=["GET"],
+    operation_id="get_bulk_download_item",
+    response_class=Response,
+    responses={
+        200: {
+            "description": "Return the complete bulk download item",
+            "content": {"application/zip": {}},
+        },
+        404: {"description": "Image not found"},
+    },
+)
+async def get_bulk_download_item(
+    background_tasks: BackgroundTasks,
+    bulk_download_item_name: str = Path(description="The bulk_download_item_name of the bulk download item to get"),
+) -> FileResponse:
+    """Gets a bulk download zip file"""
+    try:
+        path = ApiDependencies.invoker.services.bulk_download.get_path(bulk_download_item_name)
+
+        response = FileResponse(
+            path,
+            media_type="application/zip",
+            filename=bulk_download_item_name,
+            content_disposition_type="inline",
+        )
+        response.headers["Cache-Control"] = f"max-age={IMAGE_MAX_AGE}"
+        background_tasks.add_task(ApiDependencies.invoker.services.bulk_download.delete, bulk_download_item_name)
+        return response
+    except Exception:
+        raise HTTPException(status_code=404)