entari-plugin-database 0.3.2__tar.gz → 0.3.3__tar.gz

{entari_plugin_database-0.3.2 → entari_plugin_database-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: entari-plugin-database
-Version: 0.3.2
+Version: 0.3.3
 Summary: Entari plugin for SQLAlchemy ORM
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
 License: MIT

{entari_plugin_database-0.3.2 → entari_plugin_database-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "entari-plugin-database"
-version = "0.3.2"
+version = "0.3.3"
 description = "Entari plugin for SQLAlchemy ORM"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },

{entari_plugin_database-0.3.2 → entari_plugin_database-0.3.3}/src/entari_plugin_database/__init__.py

@@ -24,7 +24,7 @@ plugin.metadata(
     "Database 服务",
     PluginRole.LIBRARY,
     [{"name": "RF-Tar-Railt", "email": "rf_tar_railt@qq.com"}],
-    "0.3.2",
+    "0.3.3",
     description="基于 SQLAlchemy 的数据库服务插件",
     urls={
         "homepage": "https://github.com/ArcletProject/entari-plugin-database",

{entari_plugin_database-0.3.2 → entari_plugin_database-0.3.3}/src/entari_plugin_database/param.py

@@ -7,7 +7,6 @@ from collections.abc import Iterator, Sequence, AsyncIterator
 from sqlalchemy import Row, Result, ScalarResult, select
 from sqlalchemy.ext.asyncio import AsyncResult, AsyncScalarResult
 from sqlalchemy.sql.selectable import ExecutableReturnsRows
-from tarina import generic_issubclass
 from tarina.generic import origin_is_union, isclass
 from typing_extensions import Any
 from typing import cast, get_args, get_origin
@@ -23,6 +22,8 @@ from arclet.letoderea.scope import global_propagators
 from arclet.entari.plugin.model import Plugin
 from sqlalchemy.ext import asyncio as sa_async
 
+from .utils import generic_issubclass
+
 
 class SessionProvider(Provider[sa_async.AsyncSession]):
     priority = 10
@@ -204,7 +205,7 @@ def SQLDepends(statement: ExecutableReturnsRows, option: Option = Option(), cach
 
 
 class ORMProviderFactory(ProviderFactory):
-    priority = 10
+    priority = 20
 
     class _ModelProvider(Provider[Any]):
         def __init__(self, statement: ExecutableReturnsRows, option: Option):
@@ -231,8 +232,10 @@ class ORMProviderFactory(ProviderFactory):
             return result
 
     def validate(self, param: Param):
+        if param.providers:  # skip if already has providers
+            return
         for pattern, option in PATTERNS.items():
-            if models := cast("list[Any]", generic_issubclass(pattern, param.annotation, list_=True)):
+            if models := cast("list[Any]", generic_issubclass(pattern, param.annotation)):
                 break
         else:
             models, option = [], Option()

entari_plugin_database-0.3.3/src/entari_plugin_database/utils.py

@@ -0,0 +1,85 @@
+import types
+from itertools import repeat
+from collections.abc import Iterable
+from typing import Annotated, Any, Union, Literal, get_args, get_origin
+from typing import Literal as LiteralExt
+
+
+from arclet.entari import logger as log_m
+
+logger = log_m.log.wrapper("[Database]")
+
+
+def origin_is_union(origin: type[Any] | None) -> bool:
+    return origin is Union or origin is types.UnionType
+
+
+def origin_is_literal(origin: type[Any] | None) -> bool:
+    """判断是否是 Literal 类型"""
+    return origin is Literal or origin is LiteralExt
+
+
+def generic_issubclass(scls: Any, cls: Any) -> bool | list[Any]:
+    if isinstance(cls, tuple):
+        return _map_generic_issubclass(repeat(scls), cls)
+
+    if scls is Any:
+        return [cls]
+
+    if cls is Any:
+        return True
+
+    try:
+        return issubclass(scls, cls)
+    except TypeError:
+        pass
+
+    scls_origin, scls_args = get_origin(scls) or scls, get_args(scls)
+    cls_origin, cls_args = get_origin(cls) or cls, get_args(cls)
+
+    if scls_origin is tuple and cls_origin is tuple:
+        if len(scls_args) == 2 and scls_args[1] is Ellipsis:
+            return generic_issubclass(scls_args[0], cls_args)
+
+        if len(cls_args) == 2 and cls_args[1] is Ellipsis:
+            return _map_generic_issubclass(scls_args, repeat(cls_args[0]), failfast=True)
+
+    if scls_origin is Annotated:
+        return generic_issubclass(scls_args[0], cls)
+    if cls_origin is Annotated:
+        return generic_issubclass(scls, cls_args[0])
+
+    if origin_is_union(scls_origin):
+        return _map_generic_issubclass(scls_args, repeat(cls), failfast=True)
+    if origin_is_union(cls_origin):
+        return generic_issubclass(scls, cls_args)
+
+    if origin_is_literal(scls_origin) and origin_is_literal(cls_origin):
+        return set(scls_args) <= set(cls_args)
+
+    try:
+        if not issubclass(scls_origin, cls_origin):
+            return False
+    except TypeError:
+        return False
+
+    if not cls_args:
+        return True
+
+    if len(scls_args) != len(cls_args):
+        return False
+
+    return _map_generic_issubclass(scls_args, cls_args, failfast=True)
+
+
+def _map_generic_issubclass(scls: Iterable[Any], cls: Iterable[Any], *, failfast: bool = False) -> bool | list[Any]:
+    results = []
+    for scls_arg, cls_arg in zip(scls, cls):
+        if not (result := generic_issubclass(scls_arg, cls_arg)) and failfast:
+            return False
+        elif isinstance(result, list):
+            results.extend(result)
+        elif not isinstance(result, bool):
+            results.append(result)
+
+    return results or False

entari_plugin_database-0.3.2/src/entari_plugin_database/utils.py

@@ -1,3 +0,0 @@
-from arclet.entari import logger as log_m
-
-logger = log_m.log.wrapper("[Database]")