♻️ rename scheduler_config -> site

tests/platforms/test_arknights.py

@@ -11,9 +11,8 @@ from .utils import get_file, get_json
 
 @pytest.fixture()
 def arknights(app: App):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     return platform_manager["arknights"](ProcessContext(DefaultClientManager()))
 
@@ -45,8 +44,7 @@ def monster_siren_list_1():
 
 @respx.mock
 async def test_url_parse(app: App):
-    from nonebot_bison.utils import ProcessContext
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
     from nonebot_bison.platform.arknights import Arknights, BulletinData, BulletinListItem, ArkBulletinResponse
 
     cid_router = respx.get("https://ak-webview.hypergryph.com/api/game/bulletin/1")
@@ -114,8 +112,7 @@ async def test_url_parse(app: App):
 
 @pytest.mark.asyncio()
 async def test_get_date_in_bulletin(app: App):
-    from nonebot_bison.utils import ProcessContext
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
     from nonebot_bison.platform.arknights import Arknights, BulletinListItem
 
     arknights = Arknights(ProcessContext(DefaultClientManager()))
@@ -137,8 +134,7 @@ async def test_get_date_in_bulletin(app: App):
 @pytest.mark.asyncio()
 @respx.mock
 async def test_parse_with_breakline(app: App):
-    from nonebot_bison.utils import ProcessContext
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
     from nonebot_bison.platform.arknights import Arknights, BulletinListItem
 
     detail = get_json("arknights-detail-805")

tests/platforms/test_bilibili.py

@@ -23,9 +23,8 @@ if typing.TYPE_CHECKING:
 
 @pytest.fixture()
 def bilibili(app: App) -> "Bilibili":
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     return platform_manager["bilibili"](ProcessContext(DefaultClientManager()))  # type: ignore
 

tests/platforms/test_bilibili_bangumi.py

@@ -13,9 +13,8 @@ if typing.TYPE_CHECKING:
 
 @pytest.fixture()
 def bili_bangumi(app: App):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     return platform_manager["bilibili-bangumi"](ProcessContext(DefaultClientManager()))
 

tests/platforms/test_ff14.py

@@ -8,9 +8,8 @@ from .utils import get_json
 
 @pytest.fixture()
 def ff14(app: App):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     return platform_manager["ff14"](ProcessContext(DefaultClientManager()))
 

tests/platforms/test_ncm_artist.py

@@ -14,9 +14,8 @@ if typing.TYPE_CHECKING:
 
 @pytest.fixture()
 def ncm_artist(app: App):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     return platform_manager["ncm-artist"](ProcessContext(DefaultClientManager()))
 

tests/platforms/test_ncm_radio.py

@@ -14,9 +14,8 @@ if typing.TYPE_CHECKING:
 
 @pytest.fixture()
 def ncm_radio(app: App):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     return platform_manager["ncm-radio"](ProcessContext(DefaultClientManager()))
 

tests/platforms/test_platform.py

@@ -84,12 +84,12 @@ def mock_platform_without_cats_tags(app: App):
 @pytest.fixture()
 def mock_platform(app: App):
     from nonebot_bison.post import Post
-    from nonebot_bison.utils import SchedulerConfig
+    from nonebot_bison.utils import Site
     from nonebot_bison.platform.platform import NewMessage
     from nonebot_bison.types import Tag, Target, RawPost, Category
 
-    class MockPlatformSchedConf(SchedulerConfig):
-        name = "mock"
+    class MockSite(Site):
+        name = "mock_site"
         schedule_type = "interval"
         schedule_setting = {"seconds": 100}
 
@@ -100,7 +100,7 @@ def mock_platform(app: App):
         is_common = True
         enable_tag = True
         has_target = True
-        scheduler = MockPlatformSchedConf
+        site = MockSite
         categories = {
             Category(1): "转发",
             Category(2): "视频",
@@ -144,19 +144,19 @@ def mock_platform(app: App):
 
 
 @pytest.fixture()
-def mock_scheduler_conf(app):
-    from nonebot_bison.utils import SchedulerConfig
+def mock_site(app):
+    from nonebot_bison.utils import Site
 
-    class MockPlatformSchedConf(SchedulerConfig):
-        name = "mock"
+    class MockSite(Site):
+        name = "mock_site"
         schedule_type = "interval"
         schedule_setting = {"seconds": 100}
 
-    return MockPlatformSchedConf
+    return MockSite
 
 
 @pytest.fixture()
-def mock_platform_no_target(app: App, mock_scheduler_conf):
+def mock_platform_no_target(app: App, mock_site):
     from nonebot_bison.post import Post
     from nonebot_bison.types import Tag, Target, RawPost, Category
     from nonebot_bison.platform.platform import NewMessage, CategoryNotSupport
@@ -166,7 +166,7 @@ def mock_platform_no_target(app: App, mock_scheduler_conf):
         name = "Mock Platform"
         enabled = True
         is_common = True
-        scheduler = mock_scheduler_conf
+        site = mock_site
         enable_tag = True
         has_target = False
         categories = {Category(1): "转发", Category(2): "视频", Category(3): "不支持"}
@@ -211,7 +211,7 @@ def mock_platform_no_target(app: App, mock_scheduler_conf):
 
 
 @pytest.fixture()
-def mock_platform_no_target_2(app: App, mock_scheduler_conf):
+def mock_platform_no_target_2(app: App, mock_site):
     from nonebot_bison.post import Post
     from nonebot_bison.platform.platform import NewMessage
     from nonebot_bison.types import Tag, Target, RawPost, Category
@@ -220,7 +220,7 @@ def mock_platform_no_target_2(app: App, mock_scheduler_conf):
         platform_name = "mock_platform"
         name = "Mock Platform"
         enabled = True
-        scheduler = mock_scheduler_conf
+        site = mock_site
         is_common = True
         enable_tag = True
         has_target = False
@@ -323,9 +323,8 @@ def mock_status_change(app: App):
 
 @pytest.mark.asyncio
 async def test_new_message_target_without_cats_tags(mock_platform_without_cats_tags, user_info_factory):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.types import Target, SubUnit
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     res1 = await mock_platform_without_cats_tags(ProcessContext(DefaultClientManager())).fetch_new_post(
         SubUnit(Target("dummy"), [user_info_factory([1, 2], [])])
@@ -345,9 +344,8 @@ async def test_new_message_target_without_cats_tags(mock_platform_without_cats_t
 
 @pytest.mark.asyncio
 async def test_new_message_target(mock_platform, user_info_factory):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.types import Target, SubUnit
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     res1 = await mock_platform(ProcessContext(DefaultClientManager())).fetch_new_post(
         SubUnit(Target("dummy"), [user_info_factory([1, 2], [])])
@@ -381,9 +379,8 @@ async def test_new_message_target(mock_platform, user_info_factory):
 
 @pytest.mark.asyncio
 async def test_new_message_no_target(mock_platform_no_target, user_info_factory):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.types import Target, SubUnit
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     res1 = await mock_platform_no_target(ProcessContext(DefaultClientManager())).fetch_new_post(
         SubUnit(Target("dummy"), [user_info_factory([1, 2], [])])
@@ -421,9 +418,8 @@ async def test_new_message_no_target(mock_platform_no_target, user_info_factory)
 
 @pytest.mark.asyncio
 async def test_status_change(mock_status_change, user_info_factory):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.types import Target, SubUnit
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     res1 = await mock_status_change(ProcessContext(DefaultClientManager())).fetch_new_post(
         SubUnit(Target("dummy"), [user_info_factory([1, 2], [])])
@@ -462,10 +458,9 @@ async def test_group(
     mock_platform_no_target_2,
     user_info_factory,
 ):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.types import Target, SubUnit
     from nonebot_bison.platform.platform import make_no_target_group
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     dummy = Target("dummy")
 
@@ -488,10 +483,10 @@ async def test_batch_fetch_new_message(app: App):
     from nonebot_plugin_saa import TargetQQGroup
 
     from nonebot_bison.post import Post
+    from nonebot_bison.utils import DefaultClientManager
     from nonebot_bison.platform.platform import NewMessage
     from nonebot_bison.utils.context import ProcessContext
     from nonebot_bison.types import Target, RawPost, SubUnit, UserSubInfo
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
 
     class BatchNewMessage(NewMessage):
         platform_name = "mock_platform"
@@ -575,9 +570,9 @@ async def test_batch_fetch_compare_status(app: App):
     from nonebot_plugin_saa import TargetQQGroup
 
     from nonebot_bison.post import Post
+    from nonebot_bison.utils import DefaultClientManager
     from nonebot_bison.utils.context import ProcessContext
     from nonebot_bison.platform.platform import StatusChange
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
     from nonebot_bison.types import Target, RawPost, SubUnit, Category, UserSubInfo
 
     class BatchStatusChange(StatusChange):

tests/platforms/test_platform_tag_filter.py

@@ -12,9 +12,8 @@ def test_cases():
 # 测试正反tag的判断情况
 @pytest.mark.asyncio
 async def test_filter_user_custom_tag(app: App, test_cases):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     bilibili = platform_manager["bilibili"](ProcessContext(DefaultClientManager()))
     for case in test_cases:
@@ -25,9 +24,8 @@ async def test_filter_user_custom_tag(app: App, test_cases):
 # 测试正反tag的分离情况
 @pytest.mark.asyncio
 async def test_tag_separator(app: App):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     bilibili = platform_manager["bilibili"](ProcessContext(DefaultClientManager()))
     tags = ["~111", "222", "333", "~444", "555"]

tests/platforms/test_rss.py

@@ -34,9 +34,8 @@ def user_info_factory(app: App, dummy_user):
 
 @pytest.fixture()
 def rss(app: App):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     return platform_manager["rss"](ProcessContext(DefaultClientManager()))
 

tests/platforms/test_weibo.py

@@ -18,9 +18,8 @@ image_cdn_router = respx.route(host__regex=r"wx\d.sinaimg.cn", path__startswith=
 
 @pytest.fixture()
 def weibo(app: App):
-    from nonebot_bison.utils import ProcessContext
     from nonebot_bison.platform import platform_manager
-    from nonebot_bison.utils.scheduler_config import DefaultClientManager
+    from nonebot_bison.utils import ProcessContext, DefaultClientManager
 
     return platform_manager["weibo"](ProcessContext(DefaultClientManager()))