entari-plugin-database 0.2.4__tar.gz → 0.3.1__tar.gz

{entari_plugin_database-0.2.4 → entari_plugin_database-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: entari-plugin-database
-Version: 0.2.4
+Version: 0.3.1
 Summary: Entari plugin for SQLAlchemy ORM
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
 License: MIT
@@ -11,7 +11,7 @@ Requires-Dist: graia-amnesia>=0.11.4
 Requires-Dist: tarina<0.8.0,>=0.7.1
 Requires-Dist: arclet-letoderea>=0.19.5
 Requires-Dist: alembic>=1.16.5
-Requires-Dist: arclet-entari<0.18.0,>=0.17.0
+Requires-Dist: arclet-entari<0.19.0,>=0.18.0rc1
 Description-Content-Type: text/markdown
 
 # entari-plugin-database

{entari_plugin_database-0.2.4 → entari_plugin_database-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "entari-plugin-database"
-version = "0.2.4"
+version = "0.3.1"
 description = "Entari plugin for SQLAlchemy ORM"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
@@ -12,7 +12,7 @@ dependencies = [
     "tarina<0.8.0,>=0.7.1",
     "arclet-letoderea>=0.19.5",
     "alembic>=1.16.5",
-    "arclet-entari<0.18.0,>=0.17.0",
+    "arclet-entari<0.19.0,>=0.18.0rc1",
 ]
 requires-python = ">=3.10"
 readme = "README.md"
@@ -29,11 +29,6 @@ build-backend = "pdm.backend"
 [tool.pdm]
 distribution = true
 
-[tool.pdm.dev-dependencies]
-dev = [
-    "arclet-entari[full]>=0.17.0",
-]
-
 [tool.ruff]
 line-length = 120
 target-version = "py310"
@@ -61,3 +56,13 @@ ignore = [
     "PYI055",
     "UP038",
 ]
+
+[tool.pyright]
+pythonVersion = "3.10"
+pythonPlatform = "All"
+typeCheckingMode = "basic"
+
+[dependency-groups]
+dev = [
+    "arclet-entari[full]>=0.17.0",
+]

{entari_plugin_database-0.2.4 → entari_plugin_database-0.3.1}/src/entari_plugin_database/__init__.py

@@ -1,8 +1,6 @@
 from sqlalchemy.ext.asyncio import create_async_engine
-from arclet.letoderea.provider import global_providers
-from arclet.letoderea.scope import global_propagators
-from arclet.letoderea.core import add_task
-from arclet.entari import plugin
+from arclet.letoderea.utils import add_task
+from arclet.entari import Plugin, plugin
 from arclet.entari.config import config_model_validate
 from arclet.entari.event.config import ConfigReload
 from graia.amnesia.builtins.sqla import SqlalchemyService
@@ -14,7 +12,6 @@ from sqlalchemy.ext import asyncio as sa_async
 from sqlalchemy.orm import Mapped as Mapped, instrumentation
 from sqlalchemy.orm import mapped_column as mapped_column
 
-from .param import db_supplier, sess_provider, orm_factory
 from .param import SQLDepends as SQLDepends
 from .utils import logger
 from .migration import run_migration, register_custom_migration
@@ -25,7 +22,7 @@ plugin.declare_static()
 plugin.metadata(
     "Database 服务",
     [{"name": "RF-Tar-Railt", "email": "rf_tar_railt@qq.com"}],
-    "0.2.4",
+    "0.3.1",
     description="基于 SQLAlchemy 的数据库服务插件",
     urls={
         "homepage": "https://github.com/ArcletProject/entari-plugin-database",
@@ -33,11 +30,6 @@ plugin.metadata(
     config=Config,
     readme="README.md",
 )
-plugin.collect_disposes(
-    lambda: global_propagators.remove(db_supplier),
-    lambda: global_providers.remove(sess_provider),
-    lambda: global_providers.remove(orm_factory),
-)
 
 _config = plugin.get_config(Config)
 
@@ -133,12 +125,17 @@ def migration_callback(cls: type[Base], kwargs: dict):
     task.add_done_callback(_PENDING_TASKS.discard)
 
 
-register_callback(_setup_tablename)
-register_callback(_clean_exist)
-register_callback(migration_callback, after=True)
-plugin.collect_disposes(lambda: remove_callback(_clean_exist))
-plugin.collect_disposes(lambda: remove_callback(_setup_tablename))
-plugin.collect_disposes(lambda: remove_callback(migration_callback))
+def _register_callbacks():
+    register_callback(_setup_tablename)
+    register_callback(_clean_exist)
+    register_callback(migration_callback, after=True)
+    yield lambda: remove_callback(_clean_exist)
+    yield lambda: remove_callback(_setup_tablename)
+    yield lambda: remove_callback(migration_callback)
+
+
+plg = Plugin.current()
+plg.effect(_register_callbacks, "database model callbacks")
 
 
 BaseOrm = Base

{entari_plugin_database-0.2.4 → entari_plugin_database-0.3.1}/src/entari_plugin_database/migration.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import re
 import hashlib
 import json
 from collections.abc import Callable, Iterable
@@ -31,6 +32,9 @@ from sqlalchemy import (
     MetaData,
     PrimaryKeyConstraint,
     UniqueConstraint,
+    Column,
+    DefaultClause,
+    TextClause,
 )
 from sqlalchemy.schema import Table
 
@@ -202,6 +206,44 @@ def _serialize_constraint(const: Any) -> dict[str, Any]:
     return const_info
 
 
+def _serialize_column(column: Column[Any]) -> str:
+    kwargs = {}
+    if column.key != column.name:
+        kwargs["key"] = repr(column.key)
+    if column.primary_key:
+        kwargs["primary_key"] = repr(column.primary_key)
+    if not column.nullable:
+        kwargs["nullable"] = repr(column.nullable)
+    if column.onupdate:
+        kwargs["onupdate"] = repr(column.onupdate)
+    if column.default:
+        kwargs["default"] = repr(column.default)
+    if column.server_default:
+        if isinstance(column.server_default, DefaultClause) and isinstance(column.server_default.arg, TextClause):
+            kwargs["server_default"] = f"text({column.server_default.arg.text!r})"
+        else:
+            kwargs["server_default"] = repr(column.server_default)
+    if column.comment:
+        kwargs["comment"] = repr(column.comment)
+    ans = (
+        "Column("
+        + ", ".join(
+            [repr(column.name)]
+            + [repr(column.type)]
+            + [repr(x) for x in column.foreign_keys if x is not None]
+            + [repr(_serialize_constraint(x)) for x in column.constraints]
+            + [f"table={repr(column.table.description) if column.table is not None else 'None'}"]
+            + [f"{k}={v}" for k, v in kwargs.items()]
+        )
+        + ")"
+    )
+    return re.sub(
+        r"\s*at\s*0x[0-9a-fA-F]+",
+        "",
+        ans,
+    )
+
+
 def _get_table_structure(table: Table) -> dict[str, Any]:
     """将 SQLAlchemy Table 对象序列化为字典，用于后续哈希计算。"""
     # 按名称排序约束和索引以确保稳定性
@@ -214,8 +256,8 @@ def _get_table_structure(table: Table) -> dict[str, Any]:
     return {
         "name": table.name,
         "metadata": repr(table.metadata),
-        "columns": [repr(col) for col in sorted(table.columns, key=lambda c: c.name)],
-        "schema": f"schema={table.schema!r}",
+        "columns": [_serialize_column(col) for col in sorted(table.columns, key=lambda c: c.name)],
+        "schema": f"{table.schema!r}",
         "constraints": [_serialize_constraint(c) for c in sorted_constraints],
         "indexes": [repr(i) for i in sorted_indexes],
     }
@@ -269,6 +311,29 @@ def _include_tables_factory(target_tables: set[str]) -> Callable[[Any, str, str,
     return include
 
 
+def _unwrap_default_clause(value: Any) -> Any:
+    """将 SQLAlchemy DefaultClause 还原为 Alembic/SQLAlchemy 期望的原始默认值。"""
+    if isinstance(value, DefaultClause):
+        return value.arg
+    return value
+
+
+def _normalize_alembic_ops(ops_list: Iterable[Any]) -> list[Any]:
+    """在执行前归一化 Alembic 操作对象，修复 server_default 类型不兼容问题。"""
+    normalized: list[Any] = []
+
+    for op in ops_list:
+        if isinstance(op, alembic_ops.ModifyTableOps):
+            op.ops = _normalize_alembic_ops(op.ops)
+        elif isinstance(op, AlterColumnOp):
+            op.modify_server_default = _unwrap_default_clause(op.modify_server_default)
+            op.existing_server_default = _unwrap_default_clause(op.existing_server_default)
+
+        normalized.append(op)
+
+    return normalized
+
+
 def _execute_script(
     sync_conn: Connection,
     table: str,
@@ -722,6 +787,7 @@ async def _execute_auto_migration(
 def _apply_ops_direct(op_runner: Operations, ops_list: Iterable[Any]) -> bool:
     """直接应用迁移操作（非 SQLite）。"""
     applied = False
+    ops_list = _normalize_alembic_ops(ops_list)
 
     def apply(ops: Iterable[Any]) -> None:
         nonlocal applied
@@ -742,6 +808,7 @@ def _apply_ops_sqlite_batch(
     target_tables: set[str],
 ) -> bool:
     """使用 batch 模式应用迁移操作（SQLite）。"""
+    ops_list = _normalize_alembic_ops(ops_list)
 
     def iter_ops(ops: Iterable[Any]):
         for op in ops:

{entari_plugin_database-0.2.4 → entari_plugin_database-0.3.1}/src/entari_plugin_database/param.py

@@ -20,22 +20,40 @@ from arclet.letoderea import Propagator, Contexts, STACK, Provider, ProviderFact
 from arclet.letoderea.ref import Deref, generate
 from arclet.letoderea.provider import global_providers
 from arclet.letoderea.scope import global_propagators
+from arclet.entari.plugin.model import Plugin
 from sqlalchemy.ext import asyncio as sa_async
 
 
+class SessionProvider(Provider[sa_async.AsyncSession]):
+    priority = 10
+
+    async def __call__(self, context: Contexts):
+        if "$db_session" in context:
+            return context["$db_session"]
+        try:
+            db = it(Launart).get_component(SqlalchemyService)
+            stack = context[STACK]
+            sess = await stack.enter_async_context(db.get_session())
+            context["$db_session"] = sess
+            return sess
+        except ValueError:
+            return
+
+
 class DatabasePropagator(Propagator):
     def validate(self, subscriber: Subscriber):
         params = subscriber.params
         if any((p.depend and isinstance(p.depend, SQLDepend)) for p in params):
             return True
-        if any(
-            isinstance(prod, (SessionProvider, ORMProviderFactory._ModelProvider))
-            for p in params
-            for prod in p.providers
-        ):  # noqa: E501,UP038
+        if any(isinstance(p.annotation, sa_async.AsyncSession) for p in params):
+            return True
+        if any(isinstance(prod, ORMProviderFactory._ModelProvider) for p in params for prod in p.providers):  # noqa: E501,UP038
             return True
         return False
 
+    def providers(self):
+        return [SessionProvider()]
+
     async def supply(self, ctx: Contexts, serv: SqlalchemyService | None = None):
         if serv is None:
             return
@@ -48,22 +66,6 @@ class DatabasePropagator(Propagator):
         yield self.supply, True, 20
 
 
-class SessionProvider(Provider[sa_async.AsyncSession]):
-    priority = 10
-
-    async def __call__(self, context: Contexts):
-        if "$db_session" in context:
-            return context["$db_session"]
-        try:
-            db = it(Launart).get_component(SqlalchemyService)
-            stack = context[STACK]
-            sess = await stack.enter_async_context(db.get_session())
-            context["$db_session"] = sess
-            return sess
-        except ValueError:
-            return
-
-
 @dataclass(unsafe_hash=True)
 class Option:
     stream: bool = True
@@ -254,6 +256,14 @@ class ORMProviderFactory(ProviderFactory):
         return self._ModelProvider(statement, option)
 
 
-global_propagators.append(db_supplier := DatabasePropagator())
-global_providers.append(sess_provider := SessionProvider())
-global_providers.append(orm_factory := ORMProviderFactory())
+plg = Plugin.current()
+
+
+def _provides():
+    global_propagators.append(db_supplier := DatabasePropagator())
+    global_providers.append(orm_factory := ORMProviderFactory())
+    yield lambda: global_propagators.remove(db_supplier)
+    yield lambda: global_providers.remove(orm_factory)
+
+
+plg.effect(_provides, "database providers")