diff --git a/app/startup/composition/chain.py b/app/startup/composition/chain.py index 5e39a5a7b..8895232d4 100644 --- a/app/startup/composition/chain.py +++ b/app/startup/composition/chain.py @@ -16,23 +16,23 @@ from app.application.image import ( configure_wallpaper_providers, reset_wallpaper_providers, ) -from app.chain.mediaserver import MediaServerChain from app.chain._recognition import ( RecognitionSharePort, configure_recognition_share_port, reset_recognition_share_port, ) +from app.chain.mediaserver import MediaServerChain from app.chain.subscribe.notify import ( SubscriptionSharePort, configure_subscription_share_port, reset_subscription_share_port, ) +from app.chain.tmdb import TmdbChain from app.chain.transfer.filter import ( NetworkFilesystemPort, configure_network_filesystem_port, reset_network_filesystem_port, ) -from app.chain.tmdb import TmdbChain from app.db.adapters.chain import TransactionalChainDurableEventWriter from app.db.adapters.download import TransactionalDownloadFailureRepository from app.db.adapters.mediaserver import TransactionalMediaServerRepository diff --git a/app/startup/composition/network.py b/app/startup/composition/network.py index e20492c9c..f246cfa55 100644 --- a/app/startup/composition/network.py +++ b/app/startup/composition/network.py @@ -4,9 +4,9 @@ from collections.abc import Mapping from pathlib import Path from typing import Any, Callable, Optional, Union, cast +from app.adapters.network.doh import DohHelper from app.adapters.network.http import AsyncRequestUtils, RequestUtils from app.adapters.network.ip import IpUtils -from app.adapters.network.doh import DohHelper from app.adapters.system.host import SystemUtils from app.application.configuration import get_runtime_settings from app.application.image import ( diff --git a/app/startup/initializers/modules.py b/app/startup/initializers/modules.py index a96dab78a..267793e70 100644 --- a/app/startup/initializers/modules.py +++ b/app/startup/initializers/modules.py @@ -79,10 +79,10 @@ from app.startup.composition.context import HostRuntime from app.startup.composition.database import ( compose_database_services, configure_database, + configure_workflow_execution_composition, database_runtime_active, publish_database_services, reset_database_services, - configure_workflow_execution_composition, reset_workflow_execution_composition, start_database_runtime, stop_database_runtime, @@ -94,6 +94,10 @@ from app.startup.composition.network import ( stop_doh_composition, ) from app.startup.composition.outbox import build_outbox_dispatcher, reset_outbox_services +from app.startup.composition.resource import ( + install_site_resources, + reset_site_resource_composition, +) from app.startup.composition.runtime import ( RuntimeInputs, compose_runtime, @@ -101,10 +105,6 @@ from app.startup.composition.runtime import ( publish_runtime, reset_runtime, ) -from app.startup.composition.resource import ( - install_site_resources, - reset_site_resource_composition, -) from app.startup.composition.security import ( configure_security_access, configure_security_services, diff --git a/tests/fixtures/architecture/ruff-baseline.json b/tests/fixtures/architecture/ruff-baseline.json index 52ebd0772..83ac1f24e 100644 --- a/tests/fixtures/architecture/ruff-baseline.json +++ b/tests/fixtures/architecture/ruff-baseline.json @@ -1146,9 +1146,6 @@ "tests/test_resource_token_cookie_secure_flag.py": { "I001": 1 }, - "tests/test_resource_v3.py": { - "I001": 1 - }, "tests/test_rust_accel_toggle.py": { "I001": 1 }, diff --git a/tests/test_managed_resources.py b/tests/test_managed_resources.py index d7d5324b9..0fabc3c43 100644 --- a/tests/test_managed_resources.py +++ b/tests/test_managed_resources.py @@ -417,8 +417,8 @@ assert "pyvirtualdisplay" not in sys.modules def test_startup_shutdown_without_init_does_not_build_registry(monkeypatch) -> None: """未执行启动装配时,关闭入口不得通过发现声明反向初始化 Runtime。""" - from app.startup.initializers import resources as managed_resources_initializer from app.startup.composition import resource as resource_composition + from app.startup.initializers import resources as managed_resources_initializer build_registry = MagicMock(side_effect=AssertionError("must not discover")) monkeypatch.setattr( diff --git a/tests/test_plugin_backup_restore.py b/tests/test_plugin_backup_restore.py index 2e36f9b86..716efb170 100644 --- a/tests/test_plugin_backup_restore.py +++ b/tests/test_plugin_backup_restore.py @@ -4,11 +4,11 @@ import errno from dataclasses import replace from pathlib import Path +from app.adapters.system.host import SystemUtils from app.adapters.system.plugin import package as package_module from app.adapters.system.plugin.package import PluginPackageManager from app.chain import system as system_module from app.chain.system import SystemChain -from app.adapters.system.host import SystemUtils def _patch_docker_paths(monkeypatch, tmp_path: Path, *, reset: bool) -> Path: