🚧 施工中，卡在platform的注册

Author: AzideCupric

bot.py

@@ -13,7 +13,8 @@
 
 # 加载插件
 nonebot.load_from_toml("pyproject.toml")
-nonebot.load_plugin(Path(__file__) / "for_test_plugin.py")
+# FIXME
+# nonebot.load_plugin(Path(__file__) / "for_test_plugin.py")
 
 if __name__ == "__main__":
     logger.warning("Always use `nb run` to start the bot instead of manually running!")

for_test_plugin.py

@@ -1,6 +1,17 @@
-from nonebot_bison import core, utils
+import anyio
+from nonebot import logger, require
+
+require("nonebot_plugin_saa")
+require("nonebot_bison")
+from nonebot_plugin_saa import TargetQQGroup
+
+from nonebot_bison import core
+from nonebot_bison.core.courier import Courier, Parcel, post_to_courier
 from nonebot_bison.core.platform import FetchMixin, FilterMixin, Platform, PlatformConfig
 from nonebot_bison.core.site import SiteConfig
+from nonebot_bison.typing import SubUnit, SubUnits, Target, UserSubInfo
+from nonebot_bison.utils.client_mgr import DefaultClientManager
+from nonebot_bison.utils.store import MemoryStore
 
 
 class TestPlatform(Platform, FetchMixin, FilterMixin):
@@ -16,16 +27,63 @@ class TestPlatform(Platform, FetchMixin, FilterMixin):
         schedule_setting={"seconds": 60},
         client_mgr=DefaultClientManager,
         require_browser=False,
+        store_cls=MemoryStore,
     )
 
     def parse(self, raw_post: str) -> core.post.Post:
         return core.post.Post(
-            platform=self,
+            platform=self.platform_config,
             content=raw_post,
         )
 
     async def fetch(self, sub_unit: core.platform.SubUnit) -> core.platform.TargetedPosts:
         # Simulate fetching posts
-        posts = [self.parse(f"Test post {i} from {sub_unit.target}") for i in range(3)]
-        return [(core.platform.PlatformTarget(self.platform_config.display_name, sub_unit.target), posts)]
+        posts = [self.parse(f"Test post {i} from {sub_unit.sub_target}") for i in range(3)]
+        return [(TargetQQGroup(group_id=114514), posts)]
+
+
+# ----
+
+
+def create_schedule_parcel(
+    sub_units: SubUnits,
+    platform_name: str,
+    cmgr,
+    store,
+) -> Parcel:
+    return Parcel(
+        tag="schedule",
+        payload=sub_units,
+        metadata={"platform_name": platform_name, "client_mgr": cmgr, "store": store},
+    )
+
+
+async def test_send_schedule_parcel():
+    cmgr = DefaultClientManager()
+    store = MemoryStore()
+
+
+    while True:
+        if Courier._instance is None:
+            logger.warning("courier not run")
+            await anyio.sleep(2)
+            continue
+        await post_to_courier(
+            create_schedule_parcel(
+                SubUnit(Target("111"), [UserSubInfo(TargetQQGroup(group_id=114514), [], [])]),
+                "TestPlatform",
+                cmgr,
+                store,
+            )
+        )
+        logger.success("send a parcel")
+        await anyio.sleep(5)
+
+
+from nonebot import get_driver
+
+d = get_driver()
 
+@d.on_startup
+async def a():
+    d.task_group.start_soon(test_send_schedule_parcel, name="test")

nonebot_bison/__init__.py

@@ -6,7 +6,9 @@
 
 import nonebot_plugin_saa
 
+from . import bootstrap as bootstrap
 from . import core as core
+from . import inbox as inbox
 from .setting import BisonConfig, plugin_config
 
 __help__version__ = "1.0.0"

nonebot_bison/bootstrap.py

@@ -58,7 +58,7 @@ async def post():
 
     driver = get_driver()
     courier = create_courier(driver.task_group)
-
+    logger.info("start courier...")
     driver.task_group.start_soon(courier.run)
     driver.on_shutdown(courier.close)
 

nonebot_bison/core/courier/courier.py

@@ -5,7 +5,7 @@
 
 import anyio
 from anyio import create_memory_object_stream
-from loguru import logger
+from nonebot import logger
 from nonebot.dependencies import Dependent, Param
 from nonebot.utils import flatten_exception_group
 
@@ -68,6 +68,7 @@ def __new__(cls, *args, **kwargs) -> Self:
     @classmethod
     def get_instance(cls) -> Self:
         if cls._instance is None:
+            logger.critical("Courier instance is not created yet, please call Courier() and .run() first")
             raise ValueError(
                 "Courier instance is not created yet, please call Courier() and .run() first"
             )
@@ -108,6 +109,7 @@ def wrapper[R](
                 receiver=dependentable,
             )
             cls.plan_channels.add(channel)
+            logger.success(f"register courier channel [{channel}]")
             return receiver
 
         return wrapper
@@ -174,7 +176,11 @@ async def _run_parcel_forwarding(channel: ChannelName):
                     continue
 
                 try:
-                    match await send_road.receiver(parcel=parcel):
+                    # courier common receiver dependency inject on here
+                    match await send_road.receiver(
+                        parcel=parcel,
+                        task_group=tg,
+                    ):
                         case None:
                             pass
                         case Parcel(tag) if tag == parcel.tag:
@@ -236,6 +242,7 @@ async def _run_dead_letter_receiver():
                 async with self.dead_letter_channel.outlet as rx:
                     async for dead_letter in rx:
                         exception = dead_letter.metadata.pop(__EXCEPTION_KEY__)
+                        # courier dead letter receiver dependency inject on here
                         await self.dead_letter_receiver(
                             parcel=dead_letter, exception=exception, task_group=self.task_group
                         )

nonebot_bison/core/platform/__init__.py

@@ -1,6 +1,6 @@
 from typing_extensions import TypeIs
 
-from nonebot_bison.core.schedule import SubUnit, SubUnits
+from nonebot_bison.typing import SubUnit, SubUnits
 
 from .config import PlatformConfig as PlatformConfig
 from .platform import BatchFetchMixin as BatchFetchMixin

nonebot_bison/core/platform/platform.py

@@ -5,9 +5,8 @@
 from nonebot_plugin_saa import PlatformTarget
 
 from nonebot_bison.core.post import Post
-from nonebot_bison.core.schedule import SubUnit
 from nonebot_bison.core.site import ProcessContext, SiteConfig
-from nonebot_bison.typing import Category, Tag, Target
+from nonebot_bison.typing import Category, SubUnit, Tag, Target
 from nonebot_bison.utils.classproperty import classproperty
 from nonebot_bison.utils.meta import RegistryMeta
 

nonebot_bison/core/post/post.py

@@ -4,6 +4,7 @@
 from dataclasses import dataclass
 from io import BytesIO
 from pathlib import Path
+from typing import override
 
 from nonebot_bison.core.platform import PlatformConfig
 
@@ -38,3 +39,7 @@ class Post(PlainContentSupport):
     """发布者个性签名等"""
     repost: "Post | None" = None
     """转发的Post"""
+
+    @override
+    async def get_plain_content(self) -> str:
+        return self.content

nonebot_bison/core/schedule/__init__.py

@@ -1,6 +1,3 @@
 from .manager import handle_delete_target as handle_delete_target
 from .manager import handle_insert_new_target as handle_insert_new_target
 from .manager import init_scheduler as init_scheduler
-from .model import SubUnit as SubUnit
-from .model import SubUnits as SubUnits
-from .model import UserSubInfo as UserSubInfo

nonebot_bison/core/schedule/manager.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING
 
 from nonebot.log import logger
@@ -13,31 +14,70 @@
 if TYPE_CHECKING:
     from nonebot_bison.db.db_model import Target
 
-scheduler_dict: dict[SiteConfig, Scheduler] = {}
+type SiteName = str
+
+
+@dataclass
+class SchedulerDict:
+    schedulers: dict[SiteName, Scheduler] = field(default_factory=dict)
+
+    def __getitem__(self, key: str | SiteConfig, /) -> Scheduler:
+        match key:
+            case str():
+                return self.schedulers[key]
+            case SiteConfig():
+                return self.schedulers[key.name]
+            case _:
+                raise TypeError(f"Unsupport SchedulerDict key type: {type(key)}")
+
+    def __setitem__(self, key: str | SiteConfig, value: Scheduler, /):
+        match key:
+            case str():
+                self.schedulers[key] = value
+            case SiteConfig():
+                self.schedulers[key.name] = value
+            case _:
+                raise TypeError(f"Unsupport SchedulerDict key type: {type(key)}")
+
+    def __contains__(self, key: str | SiteConfig) -> bool:
+        match key:
+            case str():
+                return key in self.schedulers
+            case SiteConfig():
+                return key.name in self.schedulers
+            case _:
+                raise TypeError(f"Unsupport SchedulerDict key type: {type(key)}")
+
+
+scheduler_dict = SchedulerDict()
 
 
 async def init_scheduler():
-    _schedule_class_dict: dict[SiteConfig, list[Target]] = {}
-    _schedule_class_platform_dict: dict[SiteConfig, list[str]] = {}
+    _schedule_class_name: dict[SiteName, SiteConfig] = {}
+    _schedule_class_dict: dict[SiteName, list[Target]] = {}
+    _schedule_class_platform_dict: dict[SiteName, list[str]] = {}
     for platform in Platform.registry.values():
         platform: Platform = platform
         site = platform.site_config
         if not hasattr(site, "name") or not site.name:
             site.name = f"AnonymousScheduleConfig[{platform.platform_config.display_name}]"
 
+        site_name = site.name
         platform_name = platform.platform_config.display_name
         targets = await data_access.get_platform_target(platform_name)
-        if site not in _schedule_class_dict:
-            _schedule_class_dict[site] = list(targets)
+        if site_name not in _schedule_class_dict:
+            _schedule_class_name[site_name] = site
+            _schedule_class_dict[site_name] = list(targets)
         else:
-            _schedule_class_dict[site].extend(targets)
-        if site not in _schedule_class_platform_dict:
-            _schedule_class_platform_dict[site] = [platform_name]
+            _schedule_class_dict[site_name].extend(targets)
+        if site_name not in _schedule_class_platform_dict:
+            _schedule_class_platform_dict[site_name] = [platform_name]
         else:
-            _schedule_class_platform_dict[site].append(platform_name)
+            _schedule_class_platform_dict[site_name].append(platform_name)
+
     for site, target_list in _schedule_class_dict.items():
-        if not plugin_config.bison_use_browser and site.require_browser:
-            logger.warning(f"{site.name} requires browser, it will not schedule.")
+        if not plugin_config.bison_use_browser and _schedule_class_name[site].require_browser:
+            logger.warning(f"{site} requires browser, it will not schedule.")
             continue
 
         schedulable_args = []
@@ -46,7 +86,7 @@ async def init_scheduler():
                 (target.platform_name, T_Target(target.target), Platform.registry[target.platform_name].use_batch)
             )
         platform_name_list = _schedule_class_platform_dict[site]
-        scheduler_dict[site] = Scheduler(site, schedulable_args, platform_name_list)
+        scheduler_dict[site] = Scheduler(_schedule_class_name[site], schedulable_args, platform_name_list)
         # if is_cookie_client_manager(site.client_mgr):
         #     client_mgr = cast("CookieClientManager", scheduler_dict[site].client_mgr)
         #     await client_mgr.refresh_client()