From bccfe8b3ccdd457759544de3528495e155102ecb Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sun, 8 Oct 2023 19:30:04 -0400 Subject: [PATCH] fix some type mismatches introduces by reorg --- invokeai/backend/install/install_helper.py | 3 +++ invokeai/backend/model_manager/install.py | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/invokeai/backend/install/install_helper.py b/invokeai/backend/install/install_helper.py index ffac1d8b7d..0d2e1d81fb 100644 --- a/invokeai/backend/install/install_helper.py +++ b/invokeai/backend/install/install_helper.py @@ -13,6 +13,7 @@ from tqdm import tqdm import invokeai.configs as configs from invokeai.app.services.config import InvokeAIAppConfig from invokeai.backend.model_manager import BaseModelType, ModelType +from invokeai.backend.model_manager.download.queue import DownloadJobRemoteSource from invokeai.backend.model_manager.install import ModelInstall, ModelInstallJob, ModelSourceMetadata # name of the starter models file @@ -48,6 +49,8 @@ class TqdmProgress(object): self._last = dict() def job_update(self, job: ModelInstallJob): + if not isinstance(job, DownloadJobRemoteSource): + return job_id = job.id if job.status == "running": if job_id not in self._bars: diff --git a/invokeai/backend/model_manager/install.py b/invokeai/backend/model_manager/install.py index e8ae798802..bc157482a4 100644 --- a/invokeai/backend/model_manager/install.py +++ b/invokeai/backend/model_manager/install.py @@ -122,7 +122,7 @@ ModelInstallEventHandler = Callable[["ModelInstallJob"], None] class ModelInstallBase(ABC): - """Abstract base class for InvokeAI model installation""" + """Abstract base class for InvokeAI model installation.""" @abstractmethod def __init__( @@ -558,7 +558,7 @@ class ModelInstall(ModelInstallBase): ) if isinstance(job, ModelInstallJob): job.probe_override = probe_override - if metadata: + if metadata and isinstance(job, DownloadJobWithMetadata): job.metadata = metadata job.add_event_handler(handler) @@ -573,13 +573,14 @@ class ModelInstall(ModelInstallBase): model_id = self.install_path(job.destination, job.probe_override) info = self._store.get_model(model_id) info.source = str(job.source) - metadata: ModelSourceMetadata = job.metadata - info.description = metadata.description or f"Imported model {info.name}" - info.name = metadata.name or info.name - info.author = metadata.author - info.tags = metadata.tags - info.license = metadata.license - info.thumbnail_url = metadata.thumbnail_url + if isinstance(job, DownloadJobWithMetadata): + metadata: ModelSourceMetadata = job.metadata + info.description = metadata.description or f"Imported model {info.name}" + info.name = metadata.name or info.name + info.author = metadata.author + info.tags = metadata.tags + info.license = metadata.license + info.thumbnail_url = metadata.thumbnail_url self._store.update_model(model_id, info) self._async_installs[job.source] = model_id job.model_key = model_id