Merge branch 'main' into feat/contrib-msgspec-cleanup

cofin · web-flow · commit 2ddfe4b39c1e · 2026-04-26T07:20:40.000-07:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -153,6 +153,7 @@
     (PY_CLASS, "anyio.abc.BlockingPortal"),
     (PY_CLASS, "litestar.contrib.sqlalchemy.types.JsonB"),
     (PY_CLASS, "litestar.contrib.sqlalchemy.plugins.SQLAlchemyInitPlugin"),
+    (PY_CLASS, "litestar.contrib.msgspec.MsgspecDTO"),
     (PY_CLASS, "litestar.contrib.repository.filters.NotInCollectionFilter"),
     (PY_CLASS, "litestar.contrib.repository.filters.NotInSearchFilter"),
     (PY_CLASS, "litestar.contrib.repository.filters.OnBeforeAfter"),
diff --git a/docs/examples/sqla/plugins/sqlalchemy_async_before_send_handler.py b/docs/examples/sqla/plugins/sqlalchemy_async_before_send_handler.py
@@ -1,12 +1,13 @@
 from __future__ import annotations
 
-from litestar import Litestar
-from litestar.plugins.sqlalchemy import (
+from advanced_alchemy.extensions.litestar import (
     SQLAlchemyAsyncConfig,
     SQLAlchemyInitPlugin,
     async_autocommit_before_send_handler,
 )
 
+from litestar import Litestar
+
 config = SQLAlchemyAsyncConfig(
     connection_string="sqlite+aiosqlite:///:memory:", before_send_handler=async_autocommit_before_send_handler
 )
diff --git a/docs/examples/sqla/plugins/sqlalchemy_async_dependencies.py b/docs/examples/sqla/plugins/sqlalchemy_async_dependencies.py
@@ -2,10 +2,10 @@
 
 from typing import TYPE_CHECKING
 
+from advanced_alchemy.extensions.litestar import SQLAlchemyAsyncConfig, SQLAlchemyInitPlugin
 from sqlalchemy import select
 
 from litestar import Litestar, post
-from litestar.plugins.sqlalchemy import SQLAlchemyAsyncConfig, SQLAlchemyInitPlugin
 
 if TYPE_CHECKING:
     from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession
diff --git a/docs/examples/sqla/plugins/sqlalchemy_async_init_plugin_example.py b/docs/examples/sqla/plugins/sqlalchemy_async_init_plugin_example.py
@@ -2,11 +2,11 @@
 
 from typing import TYPE_CHECKING
 
+from advanced_alchemy.extensions.litestar import SQLAlchemyAsyncConfig, SQLAlchemyInitPlugin
 from sqlalchemy import select
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, post
-from litestar.plugins.sqlalchemy import SQLAlchemyAsyncConfig, SQLAlchemyInitPlugin
 
 if TYPE_CHECKING:
     from typing import Any
diff --git a/docs/examples/sqla/plugins/sqlalchemy_async_plugin_example.py b/docs/examples/sqla/plugins/sqlalchemy_async_plugin_example.py
@@ -3,11 +3,11 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING
 
+from advanced_alchemy.extensions.litestar import SQLAlchemyAsyncConfig, SQLAlchemyPlugin
 from sqlalchemy import select
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, post
-from litestar.plugins.sqlalchemy import SQLAlchemyAsyncConfig, SQLAlchemyPlugin
 
 if TYPE_CHECKING:
     from sqlalchemy.ext.asyncio import AsyncSession
diff --git a/docs/examples/sqla/plugins/sqlalchemy_async_serialization_dto.py b/docs/examples/sqla/plugins/sqlalchemy_async_serialization_dto.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+from advanced_alchemy.extensions.litestar import SQLAlchemyDTO
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, post
-from litestar.plugins.sqlalchemy import SQLAlchemyDTO
 
 
 class Base(DeclarativeBase): ...
diff --git a/docs/examples/sqla/plugins/sqlalchemy_async_serialization_plugin.py b/docs/examples/sqla/plugins/sqlalchemy_async_serialization_plugin.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+from advanced_alchemy.extensions.litestar import SQLAlchemySerializationPlugin
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, post
-from litestar.plugins.sqlalchemy import SQLAlchemySerializationPlugin
 
 
 class Base(DeclarativeBase): ...
diff --git a/docs/examples/sqla/plugins/sqlalchemy_async_serialization_plugin_marking_fields.py b/docs/examples/sqla/plugins/sqlalchemy_async_serialization_plugin_marking_fields.py
@@ -1,10 +1,10 @@
 from __future__ import annotations
 
+from advanced_alchemy.extensions.litestar import SQLAlchemySerializationPlugin
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, post
 from litestar.dto import dto_field
-from litestar.plugins.sqlalchemy import SQLAlchemySerializationPlugin
 
 
 class Base(DeclarativeBase): ...
diff --git a/docs/examples/sqla/plugins/sqlalchemy_sync_before_send_handler.py b/docs/examples/sqla/plugins/sqlalchemy_sync_before_send_handler.py
@@ -1,7 +1,12 @@
 from __future__ import annotations
 
+from advanced_alchemy.extensions.litestar import (
+    SQLAlchemyInitPlugin,
+    SQLAlchemySyncConfig,
+    sync_autocommit_before_send_handler,
+)
+
 from litestar import Litestar
-from litestar.plugins.sqlalchemy import SQLAlchemyInitPlugin, SQLAlchemySyncConfig, sync_autocommit_before_send_handler
 
 config = SQLAlchemySyncConfig(
     connection_string="sqlite:///:memory:",
diff --git a/docs/examples/sqla/plugins/sqlalchemy_sync_dependencies.py b/docs/examples/sqla/plugins/sqlalchemy_sync_dependencies.py
@@ -2,10 +2,10 @@
 
 from typing import TYPE_CHECKING
 
+from advanced_alchemy.extensions.litestar import SQLAlchemyInitPlugin, SQLAlchemySyncConfig
 from sqlalchemy import select
 
 from litestar import Litestar, post
-from litestar.plugins.sqlalchemy import SQLAlchemyInitPlugin, SQLAlchemySyncConfig
 
 if TYPE_CHECKING:
     from sqlalchemy import Engine
diff --git a/docs/examples/sqla/plugins/sqlalchemy_sync_init_plugin_example.py b/docs/examples/sqla/plugins/sqlalchemy_sync_init_plugin_example.py
@@ -2,11 +2,11 @@
 
 from typing import TYPE_CHECKING
 
+from advanced_alchemy.extensions.litestar import SQLAlchemyInitPlugin, SQLAlchemySyncConfig
 from sqlalchemy import select
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, post
-from litestar.plugins.sqlalchemy import SQLAlchemyInitPlugin, SQLAlchemySyncConfig
 
 if TYPE_CHECKING:
     from typing import Any
diff --git a/docs/examples/sqla/plugins/sqlalchemy_sync_plugin_example.py b/docs/examples/sqla/plugins/sqlalchemy_sync_plugin_example.py
@@ -3,11 +3,11 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING
 
+from advanced_alchemy.extensions.litestar import SQLAlchemyPlugin, SQLAlchemySyncConfig
 from sqlalchemy import select
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, post
-from litestar.plugins.sqlalchemy import SQLAlchemyPlugin, SQLAlchemySyncConfig
 
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session
diff --git a/docs/examples/sqla/plugins/sqlalchemy_sync_serialization_plugin.py b/docs/examples/sqla/plugins/sqlalchemy_sync_serialization_plugin.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+from advanced_alchemy.extensions.litestar import SQLAlchemySerializationPlugin
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, post
-from litestar.plugins.sqlalchemy import SQLAlchemySerializationPlugin
 
 
 class Base(DeclarativeBase): ...
diff --git a/docs/examples/sqla/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py b/docs/examples/sqla/plugins/sqlalchemy_sync_serialization_plugin_marking_fields.py
@@ -1,10 +1,10 @@
 from __future__ import annotations
 
+from advanced_alchemy.extensions.litestar import SQLAlchemySerializationPlugin
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, post
 from litestar.dto import dto_field
-from litestar.plugins.sqlalchemy import SQLAlchemySerializationPlugin
 
 
 class Base(DeclarativeBase): ...
diff --git a/docs/examples/sqla/plugins/tutorial/full_app_with_init_plugin.py b/docs/examples/sqla/plugins/tutorial/full_app_with_init_plugin.py
@@ -1,17 +1,17 @@
 from collections.abc import AsyncGenerator
 
+from advanced_alchemy.extensions.litestar import (
+    SQLAlchemyAsyncConfig,
+    SQLAlchemyInitPlugin,
+    SQLAlchemySerializationPlugin,
+)
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError, NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, get, post, put
 from litestar.exceptions import ClientException, NotFoundException
-from litestar.plugins.sqlalchemy import (
-    SQLAlchemyAsyncConfig,
-    SQLAlchemyInitPlugin,
-    SQLAlchemySerializationPlugin,
-)
 from litestar.status_codes import HTTP_409_CONFLICT
 
 
diff --git a/docs/examples/sqla/plugins/tutorial/full_app_with_plugin.py b/docs/examples/sqla/plugins/tutorial/full_app_with_plugin.py
@@ -1,13 +1,13 @@
 from collections.abc import AsyncGenerator
 
+from advanced_alchemy.extensions.litestar import SQLAlchemyAsyncConfig, SQLAlchemyPlugin
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError, NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from litestar import Litestar, get, post, put
 from litestar.exceptions import ClientException, NotFoundException
-from litestar.plugins.sqlalchemy import SQLAlchemyAsyncConfig, SQLAlchemyPlugin
 from litestar.status_codes import HTTP_409_CONFLICT
 
 
diff --git a/docs/examples/sqla/plugins/tutorial/full_app_with_serialization_plugin.py b/docs/examples/sqla/plugins/tutorial/full_app_with_serialization_plugin.py
@@ -1,6 +1,7 @@
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 
+from advanced_alchemy.extensions.litestar import SQLAlchemySerializationPlugin
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError, NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
@@ -9,7 +10,6 @@
 from litestar import Litestar, get, post, put
 from litestar.datastructures import State
 from litestar.exceptions import ClientException, NotFoundException
-from litestar.plugins.sqlalchemy import SQLAlchemySerializationPlugin
 from litestar.status_codes import HTTP_409_CONFLICT
 
 
diff --git a/docs/examples/sqla/sqlalchemy_async_repository.py b/docs/examples/sqla/sqlalchemy_async_repository.py
@@ -4,6 +4,14 @@
 from typing import TYPE_CHECKING
 from uuid import UUID
 
+from advanced_alchemy.extensions.litestar import (
+    AsyncSessionConfig,
+    SQLAlchemyAsyncConfig,
+    SQLAlchemyInitPlugin,
+    base,
+    filters,
+    repository,
+)
 from pydantic import BaseModel as _BaseModel
 from pydantic import TypeAdapter
 from sqlalchemy import ForeignKey, select
@@ -15,14 +23,6 @@
 from litestar.handlers.http_handlers.decorators import delete, patch, post
 from litestar.pagination import OffsetPagination
 from litestar.params import Parameter
-from litestar.plugins.sqlalchemy import (
-    AsyncSessionConfig,
-    SQLAlchemyAsyncConfig,
-    SQLAlchemyInitPlugin,
-    base,
-    filters,
-    repository,
-)
 
 if TYPE_CHECKING:
     from sqlalchemy.ext.asyncio import AsyncSession
diff --git a/docs/examples/sqla/sqlalchemy_declarative_models.py b/docs/examples/sqla/sqlalchemy_declarative_models.py
@@ -4,12 +4,12 @@
 from datetime import date
 from uuid import UUID
 
+from advanced_alchemy.extensions.litestar import AsyncSessionConfig, SQLAlchemyAsyncConfig, SQLAlchemyPlugin, base
 from sqlalchemy import ForeignKey, func, select
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from litestar import Litestar, get
-from litestar.plugins.sqlalchemy import AsyncSessionConfig, SQLAlchemyAsyncConfig, SQLAlchemyPlugin, base
 
 
 # The SQLAlchemy base includes a declarative model for you to use in your models.
diff --git a/docs/examples/sqla/sqlalchemy_repository_bulk_operations.py b/docs/examples/sqla/sqlalchemy_repository_bulk_operations.py
@@ -2,11 +2,11 @@
 from pathlib import Path
 from typing import Any
 
+from advanced_alchemy.extensions.litestar import base, repository
 from rich import get_console
 from sqlalchemy import create_engine
 from sqlalchemy.orm import Mapped, Session, sessionmaker
 
-from litestar.plugins.sqlalchemy import base, repository
 from litestar.repository.filters import LimitOffset
 
 here = Path(__file__).parent
diff --git a/docs/examples/sqla/sqlalchemy_repository_crud.py b/docs/examples/sqla/sqlalchemy_repository_crud.py
@@ -6,12 +6,11 @@
 from uuid import UUID
 
 import anyio
+from advanced_alchemy.extensions.litestar import base, repository
 from rich import get_console
 from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
 from sqlalchemy.orm import Mapped
 
-from litestar.plugins.sqlalchemy import base, repository
-
 console = get_console()
 
 
diff --git a/docs/examples/sqla/sqlalchemy_repository_extension.py b/docs/examples/sqla/sqlalchemy_repository_extension.py
@@ -7,20 +7,20 @@
 from typing import TYPE_CHECKING, Any
 from uuid import UUID
 
+from advanced_alchemy.extensions.litestar import (
+    AsyncSessionConfig,
+    SQLAlchemyAsyncConfig,
+    SQLAlchemyInitPlugin,
+    base,
+    repository,
+)
 from pydantic import BaseModel as _BaseModel
 from pydantic import TypeAdapter
 from sqlalchemy.orm import Mapped, declarative_mixin, mapped_column
 from sqlalchemy.types import String
 
 from litestar import Litestar, get, post
 from litestar.di import Provide
-from litestar.plugins.sqlalchemy import (
-    AsyncSessionConfig,
-    SQLAlchemyAsyncConfig,
-    SQLAlchemyInitPlugin,
-    base,
-    repository,
-)
 
 if TYPE_CHECKING:
     from sqlalchemy.ext.asyncio import AsyncSession
diff --git a/docs/examples/sqla/sqlalchemy_sync_repository.py b/docs/examples/sqla/sqlalchemy_sync_repository.py
@@ -4,6 +4,12 @@
 from typing import TYPE_CHECKING
 from uuid import UUID
 
+from advanced_alchemy.extensions.litestar import (
+    SQLAlchemyInitPlugin,
+    SQLAlchemySyncConfig,
+    base,
+    repository,
+)
 from pydantic import BaseModel as _BaseModel
 from pydantic import TypeAdapter
 from sqlalchemy import ForeignKey, select
@@ -15,12 +21,6 @@
 from litestar.handlers.http_handlers.decorators import delete, patch, post
 from litestar.pagination import OffsetPagination
 from litestar.params import Parameter
-from litestar.plugins.sqlalchemy import (
-    SQLAlchemyInitPlugin,
-    SQLAlchemySyncConfig,
-    base,
-    repository,
-)
 from litestar.repository.filters import LimitOffset
 
 if TYPE_CHECKING:
diff --git a/docs/release-notes/2.x-changelog.rst b/docs/release-notes/2.x-changelog.rst
@@ -2612,7 +2612,7 @@
         :type: feature
         :pr: 1780
 
-        When using the :class:`litestar.contrib.sqlalchemy.types.JsonB` type with an
+        When using the ``litestar.contrib.sqlalchemy.types.JsonB`` type with an
         Oracle Database engine, a JSON check constraint will be created for that
         column.
 
@@ -3610,7 +3610,7 @@
         :type: feature
         :pr: 1395
 
-        A :class:`SQLAlchemyInitPlugin <litestar.contrib.sqlalchemy.plugins.SQLAlchemyInitPlugin>` was added,
+        A ``SQLAlchemyInitPlugin`` was added,
         providing support for managed synchronous and asynchronous sessions.
 
         .. note::
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`from __future__ import annotations`
`2`	`2`
`3`		`-from litestar import Litestar`
`4`		`-from litestar.plugins.sqlalchemy import (`
	`3`	`+from advanced_alchemy.extensions.litestar import (`
`5`	`4`	`SQLAlchemyAsyncConfig,`
`6`	`5`	`SQLAlchemyInitPlugin,`
`7`	`6`	`async_autocommit_before_send_handler,`
`8`	`7`	`)`
`9`	`8`
	`9`	`+from litestar import Litestar`
	`10`	`+`
`10`	`11`	`config = SQLAlchemyAsyncConfig(`
`11`	`12`	`connection_string="sqlite+aiosqlite:///:memory:", before_send_handler=async_autocommit_before_send_handler`
`12`	`13`	`)`