fix some type mismatches introduces by reorg

This commit is contained in:
Lincoln Stein
2023-10-08 19:30:04 -04:00
parent e5b2bc8532
commit bccfe8b3cc
2 changed files with 13 additions and 9 deletions

View File

@ -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:

View File

@ -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