From d03097d513e641865b6343f7f23a1dd70cdca164 Mon Sep 17 00:00:00 2001 From: Codex Date: Mon, 20 Jul 2026 22:54:31 +0800 Subject: [PATCH] fix: support AstrBot package plugin imports --- download_service.py | 8 ++++++-- main.py | 23 ++++++++++++++++------- media_service.py | 8 ++++++-- notification_service.py | 8 ++++++-- platform_compat.py | 5 ++++- subscription_service.py | 8 ++++++-- 6 files changed, 44 insertions(+), 16 deletions(-) diff --git a/download_service.py b/download_service.py index 0d935cf..a92a465 100644 --- a/download_service.py +++ b/download_service.py @@ -5,8 +5,12 @@ from __future__ import annotations from collections.abc import Mapping from typing import Any -from media_service import MediaService -from moviepilot_client import MoviePilotClient +try: + from .media_service import MediaService + from .moviepilot_client import MoviePilotClient +except ImportError: + from media_service import MediaService + from moviepilot_client import MoviePilotClient class DownloadService: diff --git a/main.py b/main.py index 278f5a3..703de02 100644 --- a/main.py +++ b/main.py @@ -3,13 +3,22 @@ from astrbot.api import AstrBotConfig, logger, star from astrbot.api.event import AstrMessageEvent, filter -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 +try: + 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 +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 diff --git a/media_service.py b/media_service.py index f1300e8..e2b300f 100644 --- a/media_service.py +++ b/media_service.py @@ -5,8 +5,12 @@ from __future__ import annotations from collections.abc import Mapping from typing import Any -from moviepilot_client import MoviePilotClient -from session_context import SessionContextStore +try: + from .moviepilot_client import MoviePilotClient + from .session_context import SessionContextStore +except ImportError: + from moviepilot_client import MoviePilotClient + from session_context import SessionContextStore class MediaService: diff --git a/notification_service.py b/notification_service.py index 8b8da62..290a662 100644 --- a/notification_service.py +++ b/notification_service.py @@ -10,8 +10,12 @@ from collections.abc import Awaitable, Callable, Mapping from pathlib import Path from typing import Any -from moviepilot_client import MoviePilotClient -from platform_compat import target_from_config +try: + 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]] diff --git a/platform_compat.py b/platform_compat.py index be9c8d7..428e7d6 100644 --- a/platform_compat.py +++ b/platform_compat.py @@ -4,7 +4,10 @@ from __future__ import annotations 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) diff --git a/subscription_service.py b/subscription_service.py index b7bed41..fb0ed19 100644 --- a/subscription_service.py +++ b/subscription_service.py @@ -5,8 +5,12 @@ from __future__ import annotations from collections.abc import Mapping from typing import Any -from media_service import MediaService -from moviepilot_client import MoviePilotClient +try: + from .media_service import MediaService + from .moviepilot_client import MoviePilotClient +except ImportError: + from media_service import MediaService + from moviepilot_client import MoviePilotClient class SubscriptionService: