fix: support AstrBot package plugin imports

这个提交存在于:
Codex 2026-07-20 22:54:31 +08:00
父节点 5f9a5ae35a
当前提交 d03097d513
共有 6 个文件被更改,包括 44 次插入 和 16 次删除

查看文件

@ -5,8 +5,12 @@ from __future__ import annotations
from collections.abc import Mapping from collections.abc import Mapping
from typing import Any from typing import Any
from media_service import MediaService try:
from moviepilot_client import MoviePilotClient from .media_service import MediaService
from .moviepilot_client import MoviePilotClient
except ImportError:
from media_service import MediaService
from moviepilot_client import MoviePilotClient
class DownloadService: class DownloadService:

23
main.py
查看文件

@ -3,13 +3,22 @@
from astrbot.api import AstrBotConfig, logger, star from astrbot.api import AstrBotConfig, logger, star
from astrbot.api.event import AstrMessageEvent, filter from astrbot.api.event import AstrMessageEvent, filter
from access_policy import AccessPolicy try:
from media_service import MediaService, format_media_results, format_resource_results from .access_policy import AccessPolicy
from session_context import SessionContextStore from .media_service import MediaService, format_media_results, format_resource_results
from confirmation import ConfirmationStore from .session_context import SessionContextStore
from subscription_service import SubscriptionService, format_subscriptions from .confirmation import ConfirmationStore
from download_service import DownloadService, format_download_tasks from .subscription_service import SubscriptionService, format_subscriptions
from notification_service import NotificationPoller from .download_service import DownloadService, format_download_tasks
from .notification_service import NotificationPoller
except ImportError:
from access_policy import AccessPolicy
from media_service import MediaService, format_media_results, format_resource_results
from session_context import SessionContextStore
from confirmation import ConfirmationStore
from subscription_service import SubscriptionService, format_subscriptions
from download_service import DownloadService, format_download_tasks
from notification_service import NotificationPoller
from astrbot.api.event import MessageChain from astrbot.api.event import MessageChain

查看文件

@ -5,8 +5,12 @@ from __future__ import annotations
from collections.abc import Mapping from collections.abc import Mapping
from typing import Any from typing import Any
from moviepilot_client import MoviePilotClient try:
from session_context import SessionContextStore from .moviepilot_client import MoviePilotClient
from .session_context import SessionContextStore
except ImportError:
from moviepilot_client import MoviePilotClient
from session_context import SessionContextStore
class MediaService: class MediaService:

查看文件

@ -10,8 +10,12 @@ from collections.abc import Awaitable, Callable, Mapping
from pathlib import Path from pathlib import Path
from typing import Any from typing import Any
from moviepilot_client import MoviePilotClient try:
from platform_compat import target_from_config from .moviepilot_client import MoviePilotClient
from .platform_compat import target_from_config
except ImportError:
from moviepilot_client import MoviePilotClient
from platform_compat import target_from_config
NotificationSender = Callable[[str, str], Awaitable[None]] NotificationSender = Callable[[str, str], Awaitable[None]]

查看文件

@ -4,7 +4,10 @@ from __future__ import annotations
from dataclasses import dataclass from dataclasses import dataclass
from access_policy import PlatformIdentity try:
from .access_policy import PlatformIdentity
except ImportError:
from access_policy import PlatformIdentity
@dataclass(frozen=True, slots=True) @dataclass(frozen=True, slots=True)

查看文件

@ -5,8 +5,12 @@ from __future__ import annotations
from collections.abc import Mapping from collections.abc import Mapping
from typing import Any from typing import Any
from media_service import MediaService try:
from moviepilot_client import MoviePilotClient from .media_service import MediaService
from .moviepilot_client import MoviePilotClient
except ImportError:
from media_service import MediaService
from moviepilot_client import MoviePilotClient
class SubscriptionService: class SubscriptionService: