diff --git a/tests/app/services/download/test_download_queue.py b/tests/app/services/download/test_download_queue.py index 93a3832b51..34408ac5ae 100644 --- a/tests/app/services/download/test_download_queue.py +++ b/tests/app/services/download/test_download_queue.py @@ -2,19 +2,17 @@ import re import time from pathlib import Path -from typing import Any, Dict, List import pytest -from pydantic import BaseModel from pydantic.networks import AnyHttpUrl from requests.sessions import Session from requests_testadapter import TestAdapter, TestSession from invokeai.app.services.download import DownloadJob, DownloadJobStatus, DownloadQueueService -from invokeai.app.services.events.events_base import EventServiceBase +from tests.fixtures.event_service import DummyEventService # Prevent pytest deprecation warnings -TestAdapter.__test__ = False +TestAdapter.__test__ = False # type: ignore @pytest.fixture @@ -52,28 +50,6 @@ def session() -> Session: return sess -class DummyEvent(BaseModel): - """Dummy Event to use with Dummy Event service.""" - - event_name: str - payload: Dict[str, Any] - - -# A dummy event service for testing event issuing -class DummyEventService(EventServiceBase): - """Dummy event service for testing.""" - - events: List[DummyEvent] - - def __init__(self) -> None: - super().__init__() - self.events = [] - - def dispatch(self, event_name: str, payload: Any) -> None: - """Dispatch an event by appending it to self.events.""" - self.events.append(DummyEvent(event_name=payload["event"], payload=payload["data"])) - - def test_basic_queue_download(tmp_path: Path, session: Session) -> None: events = set() diff --git a/tests/app/services/model_install/test_model_install.py b/tests/app/services/model_install/test_model_install.py index 55f7e86541..14c8ed5c84 100644 --- a/tests/app/services/model_install/test_model_install.py +++ b/tests/app/services/model_install/test_model_install.py @@ -10,7 +10,6 @@ from pydantic import ValidationError from pydantic.networks import Url from invokeai.app.services.config import InvokeAIAppConfig -from invokeai.app.services.events.events_base import EventServiceBase from invokeai.app.services.model_install import ( InstallStatus, LocalModelSource, diff --git a/tests/fixtures/event_service.py b/tests/fixtures/event_service.py new file mode 100644 index 0000000000..71262be3f9 --- /dev/null +++ b/tests/fixtures/event_service.py @@ -0,0 +1,34 @@ +from typing import Any, Dict, List + +import pytest +from pydantic import BaseModel + +from invokeai.app.services.events.events_base import EventServiceBase + + +class DummyEvent(BaseModel): + """Dummy Event to use with Dummy Event service.""" + + event_name: str + payload: Dict[str, Any] + + +# A dummy event service for testing event issuing +class DummyEventService(EventServiceBase): + """Dummy event service for testing.""" + + events: List[DummyEvent] + + def __init__(self) -> None: + super().__init__() + self.events = [] + + def dispatch(self, event_name: str, payload: Any) -> None: + """Dispatch an event by appending it to self.events.""" + self.events.append(DummyEvent(event_name=payload["event"], payload=payload["data"])) + + +@pytest.fixture +def mock_event_service() -> EventServiceBase: + """Create a dummy event service.""" + return DummyEventService() diff --git a/tests/test_graph_execution_state.py b/tests/test_graph_execution_state.py index 2e88178424..9a35037431 100644 --- a/tests/test_graph_execution_state.py +++ b/tests/test_graph_execution_state.py @@ -50,6 +50,7 @@ def mock_services() -> InvocationServices: board_images=None, # type: ignore board_records=None, # type: ignore boards=None, # type: ignore + bulk_download=None, # type: ignore configuration=configuration, events=TestEventService(), image_files=None, # type: ignore