🧑‍💻 Develop: 完全使用 ruff 替代 isort 与 black (#27)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: he0119

.devcontainer/devcontainer.json

@@ -9,13 +9,11 @@
     "vscode": {
       "settings": {
         "python.analysis.diagnosticMode": "workspace",
-        "python.analysis.typeCheckingMode": "basic",
-        "ruff.organizeImports": false,
         "[python]": {
-          "editor.defaultFormatter": "ms-python.black-formatter",
+          "editor.defaultFormatter": "charliermarsh.ruff",
           "editor.codeActionsOnSave": {
-            "source.fixAll.ruff": true,
-            "source.organizeImports": true
+            "source.fixAll.ruff": "explicit",
+            "source.organizeImports": "explicit"
           }
         },
         "[javascript]": {
@@ -44,8 +42,6 @@
       "extensions": [
         "ms-python.python",
         "ms-python.vscode-pylance",
-        "ms-python.isort",
-        "ms-python.black-formatter",
         "charliermarsh.ruff",
         "EditorConfig.EditorConfig",
         "esbenp.prettier-vscode"

.pre-commit-config.yaml

@@ -7,22 +7,12 @@ ci:
   autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.1
+    rev: v0.8.2
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
         stages: [pre-commit]
-
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        stages: [pre-commit]
-
-  - repo: https://github.com/psf/black
-    rev: 24.10.0
-    hooks:
-      - id: black
+      - id: ruff-format
         stages: [pre-commit]
 
   - repo: https://github.com/pre-commit/mirrors-prettier

README.md

@@ -138,5 +138,5 @@ github = bot.github
 生成事件列表：
 
 ```bash
-python -m codegen && ruff check --fix -e . && isort . && black .
+python -m codegen && ruff check --fix -e . && ruff format .
 ```

codegen/__init__.py

@@ -1,14 +1,14 @@
-import shutil
+from dataclasses import dataclass
 import inspect
-from pathlib import Path
 from itertools import chain
+from pathlib import Path
+import shutil
 from typing import Union, cast
-from dataclasses import dataclass
 from typing_extensions import get_args, get_origin
 
 from githubkit import GitHubModel
-from jinja2 import Environment, PackageLoader
 from githubkit.versions.latest.webhooks import webhook_action_types
+from jinja2 import Environment, PackageLoader
 
 MESSAGE_EVENTS = {
     "CommitCommentCreated",

nonebot/adapters/github/__init__.py

@@ -16,14 +16,14 @@ def __getattr__(name: str):
             raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
 
 
-from .bot import Bot as Bot
-from .bot import OAuthBot as OAuthBot
 from .adapter import Adapter as Adapter
+from .bot import Bot as Bot
 from .bot import GitHubBot as GitHubBot
-from .message import Message as Message
+from .bot import OAuthBot as OAuthBot
 from .exception import ActionFailed as ActionFailed
+from .exception import ActionTimeout as ActionTimeout
+from .exception import GitHubAdapterException as GitHubAdapterException
 from .exception import GraphQLError as GraphQLError
 from .exception import NetworkError as NetworkError
-from .exception import ActionTimeout as ActionTimeout
+from .message import Message as Message
 from .message import MessageSegment as MessageSegment
-from .exception import GitHubAdapterException as GitHubAdapterException

nonebot/adapters/github/adapter.py

@@ -1,32 +1,32 @@
-import json
 import asyncio
-import inspect
 from functools import partial
+import inspect
+import json
+from typing import Any, Callable, Optional, Type, Union, cast
 from typing_extensions import override
-from typing import Any, Type, Union, Callable, Optional, cast
 
+from githubkit.exception import GraphQLFailed, RequestFailed, RequestTimeout
 from githubkit.webhooks import verify
+
+from nonebot import get_plugin_config
+from nonebot.adapters import Adapter as BaseAdapter
 from nonebot.compat import type_validate_python
-from githubkit.exception import GraphQLFailed, RequestFailed, RequestTimeout
 from nonebot.drivers import (
     URL,
     Driver,
+    HTTPServerSetup,
     Request,
     Response,
     ReverseDriver,
-    HTTPServerSetup,
 )
 
-from nonebot import get_plugin_config
-from nonebot.adapters import Adapter as BaseAdapter
-
 from . import event
-from .utils import log
+from .bot import Bot, GitHubBot, OAuthBot
+from .config import Config, GitHubApp, OAuthApp
 from .event import Event, events
-from .bot import Bot, OAuthBot, GitHubBot
+from .exception import ActionFailed, ActionTimeout, GraphQLError, NetworkError
 from .message import Message, MessageSegment
-from .config import Config, OAuthApp, GitHubApp
-from .exception import ActionFailed, GraphQLError, NetworkError, ActionTimeout
+from .utils import log
 
 
 def import_event_model(event_name: str) -> Type[Event]:
@@ -38,6 +38,7 @@ class Adapter(BaseAdapter):
     def __init__(self, driver: Driver, **kwargs: Any):
         super().__init__(driver, **kwargs)
         self.github_config = get_plugin_config(Config)
+        self.tasks: set["asyncio.Task"] = set()
         self._setup()
 
     @classmethod
@@ -101,7 +102,9 @@ async def _handle_webhook(
 
         if event := self.payload_to_event(event_id, event_name, payload):
             bot = cast(Bot, self.bots[app.id])
-            asyncio.create_task(bot.handle_event(event))
+            task = asyncio.create_task(bot.handle_event(event))
+            task.add_done_callback(self.tasks.discard)
+            self.tasks.add(task)
 
         return Response(200, content="OK")
 

nonebot/adapters/github/bot.py

@@ -1,40 +1,40 @@
-import re
-from contextvars import ContextVar
 from contextlib import asynccontextmanager
-from typing_extensions import Self, override
+from contextvars import ContextVar
+import re
 from typing import (
     TYPE_CHECKING,
     Any,
+    AsyncGenerator,
+    Callable,
     Dict,
-    List,
-    Union,
     Generic,
-    TypeVar,
-    Callable,
+    List,
     Optional,
-    AsyncGenerator,
+    TypeVar,
+    Union,
 )
+from typing_extensions import Self, override
 
-from githubkit.utils import UNSET, Unset
-from nonebot.message import handle_event
 from githubkit import (
-    GitHub,
     AppAuthStrategy,
     BaseAuthStrategy,
-    TokenAuthStrategy,
+    GitHub,
     OAuthAppAuthStrategy,
+    TokenAuthStrategy,
 )
+from githubkit.utils import UNSET, Unset
 
 from nonebot.adapters import Bot as BaseBot
+from nonebot.message import handle_event
 
-from .config import OAuthApp, GitHubApp
+from .config import GitHubApp, OAuthApp
+from .event import CommitCommentCreated, Event
 from .message import Message, MessageSegment
-from .event import Event, CommitCommentCreated
 from .utils import APIContext, get_attr_or_item
 
 if TYPE_CHECKING:
-    from githubkit.versions.rest import RestVersionSwitcher
     from githubkit.versions.latest.types import AppPermissionsType
+    from githubkit.versions.rest import RestVersionSwitcher
 
     from .adapter import Adapter
 

nonebot/adapters/github/compat.py

@@ -10,6 +10,6 @@
     from pydantic import validator
 
     def field_validator(
-        __field: str, *fields: str, mode: Literal["before", "after"] = "after"
+        __field: str, /, *fields: str, mode: Literal["before", "after"] = "after"
     ):
         return validator(__field, *fields, pre=mode == "before", allow_reuse=True)

nonebot/adapters/github/config.py

@@ -1,6 +1,6 @@
-from typing import Any, List, Union, Optional
+from typing import Any, List, Optional, Union
 
-from pydantic import Field, BaseModel
+from pydantic import BaseModel, Field
 
 from .compat import field_validator