⬇️ fix: use typing-extensions for Python < 3.11

Author: ProgramRipper

nonebot_plugin_orm/__init__.py

@@ -27,7 +27,7 @@
 from .config import Config, plugin_config
 from .utils import LoguruHandler, StreamToLogger, get_subclasses
 
-if sys.version_info >= (3, 10):
+if sys.version_info >= (3, 9):
     from typing import Annotated
 else:
     from typing_extensions import Annotated

nonebot_plugin_orm/__main__.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
+import sys
 from pathlib import Path
 from typing import TypeVar
 from functools import wraps
 from argparse import Namespace
 from collections.abc import Callable, Iterable
-from typing_extensions import ParamSpec, Concatenate
 
 import click
 from alembic.script import Script
@@ -14,6 +14,11 @@
 from .config import plugin_config
 from .migrate import AlembicConfig
 
+if sys.version_info >= (3, 10):
+    from typing import ParamSpec, Concatenate
+else:
+    from typing_extensions import ParamSpec, Concatenate
+
 _P = ParamSpec("_P")
 _R = TypeVar("_R")
 

nonebot_plugin_orm/config.py

@@ -1,5 +1,6 @@
-import os
-from typing import Any, Dict, Union
+import sys
+from pathlib import Path
+from typing import Any, Union, Optional
 
 from sqlalchemy import URL
 from nonebot import get_driver
@@ -8,6 +9,11 @@
 
 from .migrate import AlembicConfig
 
+if sys.version_info >= (3, 9):
+    Dict = dict
+else:
+    from typing import Dict
+
 __all__ = (
     "Config",
     "plugin_config",
@@ -21,11 +27,9 @@ class Config(BaseModel, arbitrary_types_allowed=True):
     sqlalchemy_engine_options: Dict[str, Any] = {}
     sqlalchemy_session_options: Dict[str, Any] = {}
 
-    alembic_config: Union[str, os.PathLike, AlembicConfig] = ""
-    alembic_script_location: Union[str, os.PathLike] = ""
-    alembic_version_locations: Union[
-        str, os.PathLike, Dict[str, os.PathLike], None
-    ] = None
+    alembic_config: Union[Path, AlembicConfig, None] = None
+    alembic_script_location: Optional[Path] = None
+    alembic_version_locations: Union[Path, Dict[str, Path], None] = None
     alembic_context: Dict[str, Any] = {}
     alembic_startup_check: bool = True
 

nonebot_plugin_orm/migrate.py

@@ -7,10 +7,9 @@
 from pathlib import Path
 from pprint import pformat
 from argparse import Namespace
-from operator import methodcaller
+from typing import Any, TextIO, cast
 from tempfile import TemporaryDirectory
 from configparser import DuplicateSectionError
-from typing import Any, Set, Tuple, TextIO, cast
 from contextlib import ExitStack, suppress, contextmanager
 from collections.abc import Mapping, Iterable, Sequence, Generator
 
@@ -35,11 +34,14 @@
 
 from .utils import is_editable, return_progressbar
 
-if sys.version_info >= (3, 12):
+if sys.version_info >= (3, 11):
     from typing import Self
-    from importlib.resources import files, as_file
 else:
     from typing_extensions import Self
+
+if sys.version_info >= (3, 12):
+    from importlib.resources import files, as_file
+else:
     from importlib_resources import files, as_file
 
 

nonebot_plugin_orm/param.py

@@ -2,10 +2,9 @@
 
 import sys
 from itertools import repeat
+from typing import Any, cast
 from dataclasses import dataclass
 from inspect import Parameter, isclass
-from typing_extensions import Annotated
-from typing import Any, Tuple, Iterator, Sequence, AsyncIterator, cast
 
 from pydantic.fields import FieldInfo
 from nonebot.dependencies import Param
@@ -18,6 +17,15 @@
 from .model import Model
 from .utils import Option, methodcaller, compile_dependency, generic_issubclass
 
+if sys.version_info >= (3, 9):
+    from typing import Annotated
+    from collections.abc import Iterator, Sequence, AsyncIterator
+
+    Tuple = tuple
+else:
+    from typing_extensions import Annotated
+    from typing import Tuple, Iterator, Sequence, AsyncIterator
+
 __all__ = (
     "SQLDepends",
     "ORMParam",

pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
     "nonebot-plugin-localstore~=0.5",
     "nonebot2~=2.1",
     "sqlalchemy~=2.0",
-    "typing-extensions~=4.8; python_version < '3.12'",
+    "typing-extensions~=4.8; python_version < '3.11'",
 ]
 requires-python = ">=3.8,<4.0"
 readme = "README.md"