♻️ rename scheduler_config -> site

nonebot_bison/utils/__init__.py

@@ -8,27 +8,17 @@ from bs4 import BeautifulSoup as bs
 from nonebot.log import logger, default_format
 from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
 
-from .http import http_client
-from .context import ProcessContext
+from .site import Site as Site
 from ..plugin_config import plugin_config
-from .image import pic_merge, text_to_image, is_pics_mergable, pic_url_to_image
-from .scheduler_config import ClientManager, SchedulerConfig, DefaultClientManager, scheduler
-
-__all__ = [
-    "http_client",
-    "Singleton",
-    "parse_text",
-    "ProcessContext",
-    "ClientManager",
-    "DefaultClientManager",
-    "html_to_text",
-    "SchedulerConfig",
-    "scheduler",
-    "pic_merge",
-    "pic_url_to_image",
-    "is_pics_mergable",
-    "text_to_image",
-]
+from .image import pic_merge as pic_merge
+from .http import http_client as http_client
+from .site import ClientManager as ClientManager
+from .image import text_to_image as text_to_image
+from .site import anonymous_site as anonymous_site
+from .context import ProcessContext as ProcessContext
+from .image import is_pics_mergable as is_pics_mergable
+from .image import pic_url_to_image as pic_url_to_image
+from .site import DefaultClientManager as DefaultClientManager
 
 
 class Singleton(type):

nonebot_bison/utils/context.py

@@ -4,7 +4,7 @@ from httpx import Response, AsyncClient
 
 from nonebot_bison.types import Target
 
-from .scheduler_config import ClientManager
+from .site import ClientManager
 
 
 class ProcessContext:

nonebot_bison/utils/site.py

@@ -28,7 +28,7 @@ class DefaultClientManager(ClientManager):
         return http_client()
 
 
-class SchedulerConfig:
+class Site:
     schedule_type: Literal["date", "interval", "cron"]
     schedule_setting: dict
     name: str
@@ -42,10 +42,10 @@ class SchedulerConfig:
         self.default_http_client = http_client()
 
 
-def scheduler(schedule_type: Literal["date", "interval", "cron"], schedule_setting: dict) -> type[SchedulerConfig]:
+def anonymous_site(schedule_type: Literal["date", "interval", "cron"], schedule_setting: dict) -> type[Site]:
     return type(
-        "AnonymousScheduleConfig",
-        (SchedulerConfig,),
+        "AnonymousSite",
+        (Site,),
         {
             "schedule_type": schedule_type,
             "schedule_setting": schedule_setting,