lush-sqlalchemyx 0.2.0__tar.gz → 0.2.1__tar.gz

{lush_sqlalchemyx-0.2.0 → lush_sqlalchemyx-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lush-sqlalchemyx
-Version: 0.2.0
+Version: 0.2.1
 Summary: SQLAlchemy helpers (DAL) and async MySQL managers, with some web frameworks integrations
 Author: straydragon
 Author-email: straydragon <straydragonl@foxmail.com>
@@ -8,7 +8,7 @@ License: Apache-2.0
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.10
 Requires-Dist: sqlalchemy>=2.0.21
-Requires-Dist: pydantic>=2.11.0,<3.0.0
+Requires-Dist: pydantic>=2.3.0,<3.0.0
 Requires-Dist: typing-extensions>=4.12.2
 Requires-Dist: lush-pydanticx>=0.1.0
 Requires-Dist: lush-stdx>=0.1.0

{lush_sqlalchemyx-0.2.0 → lush_sqlalchemyx-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lush-sqlalchemyx"
-version = "0.2.0"
+version = "0.2.1"
 description = "SQLAlchemy helpers (DAL) and async MySQL managers, with some web frameworks integrations"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -12,7 +12,7 @@ classifiers = [
 ]
 dependencies = [
     "sqlalchemy>=2.0.21",
-    "pydantic>=2.11.0,<3.0.0",
+    "pydantic>=2.3.0,<3.0.0",
     "typing-extensions>=4.12.2",
     "lush-pydanticx>=0.1.0",
     "lush-stdx>=0.1.0",
@@ -138,6 +138,12 @@ ignore = [
     # === 其他 ===
     "D",  # 文档字符串相关规则
     "EM", # 错误消息相关规则
+
+    # === 新增 (ruff v0.15+) ===
+    "PLC0105", # TypeVar 命名约定 (重命名会破坏 API)
+    "PLW0127", # 自赋值重导出 (intentional re-export)
+    "RUF022",  # __all__ 排序 (intentional grouping)
+    "RUF002",  # 中文 docstring 中使用全角标点
 ]
 
 [tool.ruff.lint.per-file-ignores]
@@ -155,6 +161,7 @@ ignore = [
     "N802",    # 函数名不规范
     "PERF401", # 性能相关
     "PT",      # assert 相关
+    "E402",    # 模块级导入不在顶部
 
     # === 测试安全相关 ===
     "S101", # assert语句(测试中使用)

{lush_sqlalchemyx-0.2.0 → lush_sqlalchemyx-0.2.1}/src/lush_sqlalchemyx/_compat.py

@@ -18,7 +18,4 @@ def require_async() -> None:
     以便用户看到清晰的错误信息而非深层调用栈中的 ``AttributeError``.
     """
     if not _HAS_ASYNC:
-        raise ImportError(
-            "Async support requires 'sqlalchemy[asyncio]' (greenlet). "
-            "Install with: pip install 'lush-sqlalchemyx[asyncio]'"
-        )
+        raise ImportError("Async support requires 'sqlalchemy[asyncio]' (greenlet). Install with: pip install 'lush-sqlalchemyx[asyncio]'")

{lush_sqlalchemyx-0.2.0 → lush_sqlalchemyx-0.2.1}/src/lush_sqlalchemyx/base/dal/__init__.py

@@ -4,6 +4,34 @@
 """
 
 # --- shared (sync/async agnostic) ---
+# --- lush-dal-protocol protocols (ORM 无关的抽象层) ---
+from lush_dal_protocol import (
+    AsyncBaseDALProtocol,
+    AsyncReadDALProtocol,
+    AsyncWriteDALProtocol,
+    SyncBaseDALProtocol,
+    SyncReadDALProtocol,
+    SyncWriteDALProtocol,
+)
+
+# --- async (requires sqlalchemy[asyncio]) ---
+from ._async import (
+    AsyncBaseDAL,
+    AsyncRawDAL,
+    AsyncRawReadDAL,
+    AsyncReadDAL,
+    AsyncSqlATableBase,
+    AsyncSQLATableT,
+    AsyncWriteDAL,
+    AsyncXDALOp,
+    BasicAsyncBaseTable,
+    ReadOnlyAsyncBaseDAL,
+    ReadOnlyBasicAsyncBaseTable,
+    StdAsyncBaseTable,
+    StdReadOnlyBasicAsyncBaseTable,
+    async_temp_set_lock_wait_timeout,
+    async_with_retry,
+)
 from ._common import (
     DEFAULT_RETRY_CONFIG,
     OPTIMISTIC_LOCK_ERROR_MSG_TRAIT,
@@ -18,8 +46,8 @@ from ._common import (
     FieldMixin,
     ReadOnlyMixin,
     RetryConfig,
-    SQLATableT,
     SoftDeleteTableMixin,
+    SQLATableT,
     StdBaseCU,
     StdBaseDTO,
     T,
@@ -30,37 +58,8 @@ from ._common import (
 )
 
 # Event listener references — accessed by tests via getattr(module, name).
-from ._common import __prevent_readonly_write as __prevent_readonly_write  # noqa: F401, PLC2701
-from ._common import __receive_before_flush as __receive_before_flush  # noqa: F401, PLC2701
-
-# --- async (requires sqlalchemy[asyncio]) ---
-from ._async import (
-    AsyncBaseDAL,
-    AsyncRawDAL,
-    AsyncRawReadDAL,
-    AsyncReadDAL,
-    AsyncSQLATableT,
-    AsyncSqlATableBase,
-    AsyncWriteDAL,
-    AsyncXDALOp,
-    BasicAsyncBaseTable,
-    ReadOnlyAsyncBaseDAL,
-    ReadOnlyBasicAsyncBaseTable,
-    StdAsyncBaseTable,
-    StdReadOnlyBasicAsyncBaseTable,
-    async_temp_set_lock_wait_timeout,
-    async_with_retry,
-)
-
-# --- lush-dal-protocol protocols (ORM 无关的抽象层) ---
-from lush_dal_protocol import (
-    AsyncBaseDALProtocol,
-    AsyncReadDALProtocol,
-    AsyncWriteDALProtocol,
-    SyncBaseDALProtocol,
-    SyncReadDALProtocol,
-    SyncWriteDALProtocol,
-)
+from ._common import __prevent_readonly_write as __prevent_readonly_write
+from ._common import __receive_before_flush as __receive_before_flush
 
 # --- sync ---
 from ._sync import (
@@ -73,8 +72,8 @@ from ._sync import (
     SyncRawDAL,
     SyncRawReadDAL,
     SyncReadDAL,
-    SyncSQLATableT,
     SyncSqlATableBase,
+    SyncSQLATableT,
     SyncWriteDAL,
     SyncXDALOp,
     sync_temp_set_lock_wait_timeout,

{lush_sqlalchemyx-0.2.0 → lush_sqlalchemyx-0.2.1}/src/lush_sqlalchemyx/base/dal/_async.py

@@ -25,13 +25,10 @@ from ._common import (
     OPTIMISTIC_LOCK_ERROR_MSG_TRAIT,
     PESSIMISTIC_LOCK_ERROR_MSG_TRAIT,
     READONLY_SESSION_FLAG,
-    BaseCU,
-    BaseDTO,
     BaseModelT,
     CUModelT,
     DBRetryableError,
     DTOModelT,
-    FieldMixin,
     ReadOnlyMixin,
     RetryConfig,
     SoftDeleteTableMixin,
@@ -231,7 +228,7 @@ class AsyncRawReadDAL:
         cls,
         session: AsyncSession,
         sql: str | sa.TextClause,
-        params: "_CoreAnyExecuteParams | None" = None,
+        params: _CoreAnyExecuteParams | None = None,
     ) -> sa.Result[Any]:
         if params is None:
             params = {}
@@ -500,7 +497,7 @@ class AsyncRawDAL:
         cls,
         session: AsyncSession,
         sql: str | sa.TextClause,
-        params: "_CoreAnyExecuteParams | None" = None,
+        params: _CoreAnyExecuteParams | None = None,
     ) -> sa.Result[Any]:
         if params is None:
             params = {}

{lush_sqlalchemyx-0.2.0 → lush_sqlalchemyx-0.2.1}/src/lush_sqlalchemyx/base/dal/_common.py

@@ -10,19 +10,15 @@ import logging
 import random
 from collections.abc import Callable, Iterable
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, ClassVar, Final, Generic, TypeVar, cast
+from typing import Any, ClassVar, Final, Generic, TypeVar, cast
 
 import sqlalchemy as sa
 from pydantic import BaseModel, ConfigDict, Field
-from sqlalchemy import ColumnExpressionArgument
 from sqlalchemy import event as sa_event
 from sqlalchemy.exc import OperationalError as SQLAlchemyOperationalError
-from sqlalchemy.orm import DeclarativeBase, InstrumentedAttribute, Mapped, ORMExecuteState, mapped_column, with_loader_criteria
+from sqlalchemy.orm import DeclarativeBase, Mapped, ORMExecuteState, mapped_column, with_loader_criteria
 from sqlalchemy.orm import Session as SyncSession
 
-if TYPE_CHECKING:
-    from sqlalchemy.engine.interfaces import _CoreAnyExecuteParams  # pragma: no cover # pyright: ignore[reportPrivateUsage]
-
 READONLY_SESSION_FLAG: Final[str] = "__lush_sqlalchemyx__readonly_session__"
 
 _LOGGER = logging.getLogger(__name__)
@@ -317,6 +313,7 @@ __all__ = (
     "OPTIMISTIC_LOCK_ERROR_MSG_TRAIT",
     "PESSIMISTIC_LOCK_ERROR_MSG_TRAIT",
     "READONLY_SESSION_FLAG",
+    "_LOGGER",
     "BaseCU",
     "BaseDTO",
     "BaseModelT",
@@ -333,7 +330,6 @@ __all__ = (
     "StdBaseDTO",
     "T",
     "V",
-    "_LOGGER",
     "_ensure_strict_fields",
     "escape_like",
     "filtered_in_sql_values",

{lush_sqlalchemyx-0.2.0 → lush_sqlalchemyx-0.2.1}/src/lush_sqlalchemyx/base/dal/_sync.py

@@ -22,12 +22,10 @@ from ._common import (
     OPTIMISTIC_LOCK_ERROR_MSG_TRAIT,
     PESSIMISTIC_LOCK_ERROR_MSG_TRAIT,
     READONLY_SESSION_FLAG,
-    BaseCU,
     BaseModelT,
     CUModelT,
     DBRetryableError,
     DTOModelT,
-    FieldMixin,
     ReadOnlyMixin,
     RetryConfig,
     SoftDeleteTableMixin,
@@ -116,7 +114,7 @@ def sync_temp_set_lock_wait_timeout(
 # Sync Table bases
 # ---------------------------------------------------------------------------
 
-SyncSQLATableT = TypeVar("SyncSQLATableT", bound="SyncSqlATableBase")
+SyncSQLATableT = TypeVar("SyncSQLATableT", bound=DeclarativeBase)
 
 
 class SyncSqlATableBase(DeclarativeBase):
@@ -224,7 +222,7 @@ class SyncRawReadDAL:
         cls,
         session: Session,
         sql: str | sa.TextClause,
-        params: "_CoreAnyExecuteParams | None" = None,
+        params: _CoreAnyExecuteParams | None = None,
     ) -> sa.Result[Any]:
         if params is None:
             params = {}
@@ -490,7 +488,7 @@ class SyncRawDAL:
         cls,
         session: Session,
         sql: str | sa.TextClause,
-        params: "_CoreAnyExecuteParams | None" = None,
+        params: _CoreAnyExecuteParams | None = None,
     ) -> sa.Result[Any]:
         if params is None:
             params = {}

{lush_sqlalchemyx-0.2.0 → lush_sqlalchemyx-0.2.1}/src/lush_sqlalchemyx/integrations/flask/ext.py

@@ -25,15 +25,11 @@ try:
     from flask import g
     from flask_sqlalchemy import SQLAlchemy
 except ImportError as _exc:  # pragma: no cover
-    raise ImportError(
-        "Flask integration requires 'flask-sqlalchemy'. "
-        "Install with: pip install 'lush-sqlalchemyx[flask]'"
-    ) from _exc
+    raise ImportError("Flask integration requires 'flask-sqlalchemy'. Install with: pip install 'lush-sqlalchemyx[flask]'") from _exc
 
-from sqlalchemy.engine import Engine
 from sqlalchemy.orm import Session
 
-from lush_sqlalchemyx.base.dal._common import BaseCU, BaseDTO, CUModelT, DTOModelT, SQLATableT
+from lush_sqlalchemyx.base.dal._common import CUModelT, DTOModelT, SQLATableT
 from lush_sqlalchemyx.base.dal._sync import SyncBaseDAL, SyncReadDAL, SyncWriteDAL
 from lush_sqlalchemyx.mgrs.mysql.sync_manager import SyncMySQLManager
 from lush_sqlalchemyx.mgrs.mysql.sync_mapper import SyncMySQLManagersMapper
@@ -102,8 +98,7 @@ class MySQLManagerMapperFlaskDepends(Generic[FlaskDBEnumT]):
         mapper = getattr(g, cls.g_attr_name, None)
         if mapper is None:
             raise RuntimeError(
-                f"SyncMySQLManagersMapper not found on flask.g.{cls.g_attr_name}. "
-                "Ensure it is set in a before_request hook."
+                f"SyncMySQLManagersMapper not found on flask.g.{cls.g_attr_name}. Ensure it is set in a before_request hook."
             )
         return mapper
 
@@ -152,10 +147,12 @@ class FlaskSessionDALAdapter(Generic[SQLATableT, DTOModelT, CUModelT]):
             _Table = UserTable
             _DTO = UserDTO
 
+
         # 2. 创建适配器
         class UserFlaskDAL(FlaskSessionDALAdapter[UserTable, UserDTO, UserCU]):
             _dal_class = UserDAL
 
+
         # 3. 在服务启动时绑定 db
         FlaskSessionDALAdapter.bind_db(db)
 
@@ -185,10 +182,7 @@ class FlaskSessionDALAdapter(Generic[SQLATableT, DTOModelT, CUModelT]):
     def session(self) -> Session:
         """获取当前 Flask request 作用域的 session."""
         if self._db is None:
-            raise RuntimeError(
-                "FlaskSessionDALAdapter not bound to db. "
-                "Call FlaskSessionDALAdapter.bind_db(db) during app init."
-            )
+            raise RuntimeError("FlaskSessionDALAdapter not bound to db. Call FlaskSessionDALAdapter.bind_db(db) during app init.")
         return self._db.session
 
     def get_by_id(self, entity_id: int) -> SQLATableT | None: