mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
fix: other recursive imports
This commit is contained in:
committed by
Kent Keirsey
parent
b1e56e2485
commit
568a4844f7
@ -8,7 +8,7 @@ import time
|
|||||||
import traceback
|
import traceback
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from queue import Empty, PriorityQueue
|
from queue import Empty, PriorityQueue
|
||||||
from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Set
|
from typing import Any, Dict, List, Literal, Optional, Set
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
from pydantic.networks import AnyHttpUrl
|
from pydantic.networks import AnyHttpUrl
|
||||||
@ -34,9 +34,6 @@ from .download_base import (
|
|||||||
UnknownJobIDException,
|
UnknownJobIDException,
|
||||||
)
|
)
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from invokeai.app.services.events.events_base import EventServiceBase
|
|
||||||
|
|
||||||
# Maximum number of bytes to download during each call to requests.iter_content()
|
# Maximum number of bytes to download during each call to requests.iter_content()
|
||||||
DOWNLOAD_CHUNK_SIZE = 100000
|
DOWNLOAD_CHUNK_SIZE = 100000
|
||||||
|
|
||||||
|
@ -34,7 +34,6 @@ from invokeai.backend.stable_diffusion.diffusers_pipeline import PipelineInterme
|
|||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from invokeai.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput
|
from invokeai.app.invocations.baseinvocation import BaseInvocation, BaseInvocationOutput
|
||||||
from invokeai.app.services.download.download_base import DownloadJob
|
from invokeai.app.services.download.download_base import DownloadJob
|
||||||
from invokeai.app.services.events.events_common import EventBase
|
|
||||||
from invokeai.app.services.model_install.model_install_common import ModelInstallJob
|
from invokeai.app.services.model_install.model_install_common import ModelInstallJob
|
||||||
from invokeai.app.services.session_processor.session_processor_common import ProgressImage
|
from invokeai.app.services.session_processor.session_processor_common import ProgressImage
|
||||||
from invokeai.app.services.session_queue.session_queue_common import (
|
from invokeai.app.services.session_queue.session_queue_common import (
|
||||||
|
@ -9,7 +9,7 @@ from pathlib import Path
|
|||||||
from queue import Empty, Queue
|
from queue import Empty, Queue
|
||||||
from shutil import copyfile, copytree, move, rmtree
|
from shutil import copyfile, copytree, move, rmtree
|
||||||
from tempfile import mkdtemp
|
from tempfile import mkdtemp
|
||||||
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Type, Union
|
from typing import Any, Dict, List, Optional, Tuple, Type, Union
|
||||||
|
|
||||||
import torch
|
import torch
|
||||||
import yaml
|
import yaml
|
||||||
@ -60,9 +60,6 @@ from .model_install_common import (
|
|||||||
|
|
||||||
TMPDIR_PREFIX = "tmpinstall_"
|
TMPDIR_PREFIX = "tmpinstall_"
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
|
||||||
from invokeai.app.services.events.events_base import EventServiceBase
|
|
||||||
|
|
||||||
|
|
||||||
class ModelInstallService(ModelInstallServiceBase):
|
class ModelInstallService(ModelInstallServiceBase):
|
||||||
"""class for InvokeAI model installation."""
|
"""class for InvokeAI model installation."""
|
||||||
@ -412,11 +409,14 @@ class ModelInstallService(ModelInstallServiceBase):
|
|||||||
if isinstance(source, HFModelSource):
|
if isinstance(source, HFModelSource):
|
||||||
metadata = HuggingFaceMetadataFetch(self._session).from_id(source.repo_id, source.variant)
|
metadata = HuggingFaceMetadataFetch(self._session).from_id(source.repo_id, source.variant)
|
||||||
assert isinstance(metadata, ModelMetadataWithFiles)
|
assert isinstance(metadata, ModelMetadataWithFiles)
|
||||||
return metadata.download_urls(
|
return (
|
||||||
variant=source.variant or self._guess_variant(),
|
metadata.download_urls(
|
||||||
subfolder=source.subfolder,
|
variant=source.variant or self._guess_variant(),
|
||||||
session=self._session,
|
subfolder=source.subfolder,
|
||||||
), metadata
|
session=self._session,
|
||||||
|
),
|
||||||
|
metadata,
|
||||||
|
)
|
||||||
|
|
||||||
if isinstance(source, URLModelSource):
|
if isinstance(source, URLModelSource):
|
||||||
try:
|
try:
|
||||||
|
Reference in New Issue
Block a user