⬆️ refactor: support Pydantic V2

Author: ProgramRipper

nonebot_plugin_orm/config.py

@@ -3,8 +3,8 @@
 from typing import Any, Union, Optional
 
 from sqlalchemy import URL
-from nonebot import get_driver
 from pydantic import BaseModel
+from nonebot import get_plugin_config
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 from .migrate import AlembicConfig
@@ -34,4 +34,4 @@ class Config(BaseModel, arbitrary_types_allowed=True):
     alembic_startup_check: bool = True
 
 
-plugin_config = Config.parse_obj(get_driver().config)
+plugin_config = get_plugin_config(Config)

nonebot_plugin_orm/model.py

@@ -6,15 +6,14 @@
 
 from sqlalchemy import Table, MetaData
 from nonebot import get_plugin_by_module_name
-from pydantic.typing import get_args, get_origin
 from sqlalchemy.orm import Mapped, DeclarativeBase
 
 from .utils import DependsInner, get_annotations
 
-if sys.version_info >= (3, 9):
-    from typing import Annotated
+if sys.version_info >= (3, 10):
+    from typing import Annotated, get_args, get_origin
 else:
-    from typing_extensions import Annotated
+    from typing_extensions import Annotated, get_args, get_origin
 
 __all__ = ("Model",)
 

nonebot_plugin_orm/param.py

@@ -2,30 +2,30 @@
 
 import sys
 from itertools import repeat
+from typing import Any, cast
 from dataclasses import dataclass
 from operator import methodcaller
-from typing import Any, Type, cast
 from inspect import Parameter, isclass
 
 from pydantic.fields import FieldInfo
 from nonebot.dependencies import Param
 from nonebot.params import DependParam
-from pydantic.typing import get_args, get_origin
 from sqlalchemy import Row, Result, ScalarResult, select
 from sqlalchemy.sql.selectable import ExecutableReturnsRows
 from sqlalchemy.ext.asyncio import AsyncResult, AsyncScalarResult
 
 from .model import Model
 from .utils import Option, compile_dependency, generic_issubclass
 
-if sys.version_info >= (3, 9):
-    from typing import Annotated
+if sys.version_info >= (3, 10):
+    from typing import Annotated, get_args, get_origin
     from collections.abc import Iterator, Sequence, AsyncIterator
 
     Tuple = tuple
+    Type = type
 else:
-    from typing_extensions import Annotated
-    from typing import Tuple, Iterator, Sequence, AsyncIterator
+    from typing_extensions import Annotated, get_args, get_origin
+    from typing import Type, Tuple, Iterator, Sequence, AsyncIterator
 
 __all__ = (
     "SQLDepends",

nonebot_plugin_orm/utils.py

@@ -8,10 +8,10 @@
 from functools import wraps
 from itertools import repeat
 from contextlib import suppress
-from typing import Any, TypeVar
 from operator import methodcaller
 from typing_extensions import Annotated
 from dataclasses import field, dataclass
+from typing import Any, TypeVar, Coroutine
 from inspect import Parameter, Signature, isclass
 from collections.abc import Callable, Iterable, Generator
 from importlib.metadata import Distribution, PackageNotFoundError, distribution
@@ -21,25 +21,19 @@
 from nonebot.params import Depends
 from nonebot import logger, get_driver
 from sqlalchemy.sql.selectable import ExecutableReturnsRows
-from pydantic.typing import (
-    get_args,
-    is_union,
-    get_origin,
-    is_literal_type,
-    all_literal_values,
-)
+from nonebot.typing import origin_is_union, origin_is_literal, all_literal_values
 
 if sys.version_info >= (3, 9):
     from importlib.resources import files
 else:
     from importlib_resources import files
 
 if sys.version_info >= (3, 10):
-    from typing import ParamSpec
+    from typing import ParamSpec, get_args, get_origin
     from importlib.metadata import packages_distributions
 else:
-    from typing_extensions import ParamSpec
     from importlib_metadata import packages_distributions
+    from typing_extensions import ParamSpec, get_args, get_origin
 
 
 _T = TypeVar("_T")
@@ -160,12 +154,12 @@ def generic_issubclass(scls: Any, cls: Any) -> Any:
     if cls_origin is Annotated:
         return generic_issubclass(scls, cls_args[0])
 
-    if is_union(scls_origin):
+    if origin_is_union(scls_origin):
         return all(map(generic_issubclass, scls_args, repeat(cls)))
-    if is_union(cls_origin):
+    if origin_is_union(cls_origin):
         return generic_issubclass(scls, cls_args)
 
-    if is_literal_type(scls) and is_literal_type(cls):
+    if origin_is_literal(scls) and origin_is_literal(cls):
         return set(all_literal_values(scls)) <= set(all_literal_values(cls))
 
     try: