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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lush-sqlalchemyx
-Version: 0.2.0
+Version: 0.3.0
 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.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lush-sqlalchemyx"
-version = "0.2.0"
+version = "0.3.0"
 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",
@@ -47,6 +47,8 @@ dev = [
     "sqlalchemy[asyncio]>=2.0.43",
     "flask-sqlalchemy>=3.1.1",
     "flask>=3.0.0",
+    "pytest-benchmark>=5.2.3",
+    "pymysql>=1.1.2",
 ]
 
 [tool.pytest.ini_options]
@@ -138,9 +140,18 @@ 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]
+"**/dal/_*_v2.py" = [
+    "ARG003",  # extra 参数是 ABC 合规所必需但在部分方法中未使用
+]
 "tests/**/*.py" = [
     # === 测试代码质量 ===
     "B011",    # assert False应改为raise AssertionError
@@ -155,6 +166,7 @@ ignore = [
     "N802",    # 函数名不规范
     "PERF401", # 性能相关
     "PT",      # assert 相关
+    "E402",    # 模块级导入不在顶部
 
     # === 测试安全相关 ===
     "S101", # assert语句(测试中使用)
@@ -242,6 +254,7 @@ reportAny = "none"
 reportExplicitAny = "none"
 reportConstantRedefinition = "none"
 reportUnnecessaryComparison = "none"
+reportImplicitOverride = false
 
 [[tool.basedpyright.executionEnvironments]]
 root = "tests"
@@ -270,10 +283,24 @@ reportMissingTypeArgument = false
 reportOptionalMemberAccess = false
 reportAttributeAccessIssue = "none"
 reportGeneralTypeIssues = false
+reportAssignmentType = false
 reportOperatorIssue = false
 reportIndexIssue = false
 reportInvalidTypeArguments = "none"
+reportUnknownLambdaType = false
+reportImplicitOverride = false
+reportUnusedClass = false
+
 
+[[tool.basedpyright.executionEnvironments]]
+root = "src/lush_sqlalchemyx/integrations"
+reportAttributeAccessIssue = "none"
+reportAssignmentType = false
+reportImportCycles = false
+reportUnknownVariableType = false
+reportUnknownParameterType = false
+reportUnknownMemberType = false
+reportUnknownArgumentType = false
 
 [[tool.basedpyright.executionEnvironments]]
 root = "src"

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

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 _HAS_ASYNC: bool
 try:
-    from sqlalchemy.ext.asyncio import AsyncSession as _AsyncSession  # noqa: F401
+    from sqlalchemy.ext.asyncio import AsyncSession as _AsyncSession  # noqa: F401  # pyright: ignore[reportUnusedImport]
 
     _HAS_ASYNC = True
 except ImportError:  # pragma: no cover
@@ -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.3.0}/src/lush_sqlalchemyx/base/dal/__init__.py

@@ -4,6 +4,45 @@
 """
 
 # --- shared (sync/async agnostic) ---
+# --- lush-dal-protocol ABCs (ORM 无关的抽象层) ---
+from lush_dal_protocol import (
+    AbstractAsyncAdvancedWriteDAL,
+    AbstractAsyncBaseDAL,
+    AbstractAsyncBatchFieldDAL,
+    AbstractAsyncLockDAL,
+    AbstractAsyncRawSQLDAL,
+    AbstractAsyncReadDAL,
+    AbstractAsyncWriteDAL,
+    AbstractSyncAdvancedWriteDAL,
+    AbstractSyncBaseDAL,
+    AbstractSyncBatchFieldDAL,
+    AbstractSyncLockDAL,
+    AbstractSyncRawSQLDAL,
+    AbstractSyncReadDAL,
+    AbstractSyncWriteDAL,
+)
+
+# --- 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,
+)
+
+# --- V2 (ABC-compliant, options-based) ---
+from ._async_v2 import AsyncBaseDALV2, AsyncReadDALV2, AsyncWriteDALV2
 from ._common import (
     DEFAULT_RETRY_CONFIG,
     OPTIMISTIC_LOCK_ERROR_MSG_TRAIT,
@@ -11,56 +50,37 @@ from ._common import (
     READONLY_SESSION_FLAG,
     BaseCU,
     BaseDTO,
-    BaseModelT,
     CUModelT,
     DBRetryableError,
     DTOModelT,
     FieldMixin,
     ReadOnlyMixin,
     RetryConfig,
-    SQLATableT,
     SoftDeleteTableMixin,
+    SQLATableT,
     StdBaseCU,
     StdBaseDTO,
-    T,
-    V,
-    _ensure_strict_fields,
     escape_like,
     filtered_in_sql_values,
 )
 
 # 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  # pyright: ignore[reportPrivateUsage]
+from ._common import __receive_before_flush as __receive_before_flush  # pyright: ignore[reportPrivateUsage]
+from ._pagination import (
+    CursorPagination,
+    CursorResult,
+    OffsetPagination,
+    PageResult,
+    build_cursor_stmt,
+    build_offset_stmt,
+    decode_cursor,
+    encode_cursor,
+    make_cursor_result,
+    make_page_result,
 )
+from ._params import SQLAExtra
+from ._repository import AsyncSQLAlchemyRepository, SyncSQLAlchemyRepository
 
 # --- sync ---
 from ._sync import (
@@ -73,13 +93,14 @@ from ._sync import (
     SyncRawDAL,
     SyncRawReadDAL,
     SyncReadDAL,
-    SyncSQLATableT,
     SyncSqlATableBase,
+    SyncSQLATableT,
     SyncWriteDAL,
     SyncXDALOp,
     sync_temp_set_lock_wait_timeout,
     sync_with_retry,
 )
+from ._sync_v2 import SyncBaseDALV2, SyncReadDALV2, SyncWriteDALV2
 
 __all__ = (
     # common
@@ -89,7 +110,6 @@ __all__ = (
     "READONLY_SESSION_FLAG",
     "BaseCU",
     "BaseDTO",
-    "BaseModelT",
     "CUModelT",
     "DBRetryableError",
     "DTOModelT",
@@ -100,9 +120,6 @@ __all__ = (
     "SoftDeleteTableMixin",
     "StdBaseCU",
     "StdBaseDTO",
-    "T",
-    "V",
-    "_ensure_strict_fields",
     "escape_like",
     "filtered_in_sql_values",
     # async
@@ -137,11 +154,41 @@ __all__ = (
     "SyncXDALOp",
     "sync_temp_set_lock_wait_timeout",
     "sync_with_retry",
-    # lush-dal-protocol protocols
-    "AsyncBaseDALProtocol",
-    "AsyncReadDALProtocol",
-    "AsyncWriteDALProtocol",
-    "SyncBaseDALProtocol",
-    "SyncReadDALProtocol",
-    "SyncWriteDALProtocol",
+    # pagination
+    "CursorPagination",
+    "CursorResult",
+    "OffsetPagination",
+    "PageResult",
+    "build_cursor_stmt",
+    "build_offset_stmt",
+    "decode_cursor",
+    "encode_cursor",
+    "make_cursor_result",
+    "make_page_result",
+    # V2
+    "AsyncBaseDALV2",
+    "AsyncReadDALV2",
+    "AsyncWriteDALV2",
+    "SQLAExtra",
+    "SyncBaseDALV2",
+    "SyncReadDALV2",
+    "SyncWriteDALV2",
+    # repository
+    "AsyncSQLAlchemyRepository",
+    "SyncSQLAlchemyRepository",
+    # lush-dal-protocol ABCs
+    "AbstractAsyncAdvancedWriteDAL",
+    "AbstractAsyncBaseDAL",
+    "AbstractAsyncBatchFieldDAL",
+    "AbstractAsyncLockDAL",
+    "AbstractAsyncRawSQLDAL",
+    "AbstractAsyncReadDAL",
+    "AbstractAsyncWriteDAL",
+    "AbstractSyncAdvancedWriteDAL",
+    "AbstractSyncBaseDAL",
+    "AbstractSyncBatchFieldDAL",
+    "AbstractSyncLockDAL",
+    "AbstractSyncRawSQLDAL",
+    "AbstractSyncReadDAL",
+    "AbstractSyncWriteDAL",
 )