fix: correction for 3.8 and 3.9 type hints (#330)

* fix: fix `3.9` type hints

* fix: 3.9 syntax

* fix: re-enable 3.8 support

* fix: 3.8 lint warnings

* fix: additional ignores

* fix: remove SO reference

* fix: re-renable 3.8 tests for Starlette and FastAPI

* fix: re-enable `3.8` support

* fix: linting...

Author: cofin

advanced_alchemy/extensions/litestar/plugins/init/plugin.py

@@ -99,10 +99,10 @@ def on_app_init(self, app_config: AppConfig) -> AppConfig:
         with contextlib.suppress(ImportError):
             import uuid_utils  # pyright: ignore[reportMissingImports]
 
-            signature_namespace_values.update({"uuid_utils.UUID": uuid_utils.UUID})
-            app_config.type_encoders = {uuid_utils.UUID: str, **(app_config.type_encoders or {})}
+            signature_namespace_values.update({"uuid_utils.UUID": uuid_utils.UUID})  # pyright: ignore[reportUnknownMemberType]
+            app_config.type_encoders = {uuid_utils.UUID: str, **(app_config.type_encoders or {})}  # pyright: ignore[reportUnknownMemberType]
             app_config.type_decoders = [
-                (lambda x: x is uuid_utils.UUID, lambda t, v: t(str(v))),
+                (lambda x: x is uuid_utils.UUID, lambda t, v: t(str(v))),  # pyright: ignore[reportUnknownMemberType]
                 *(app_config.type_decoders or []),
             ]
         configure_exception_handler = False

advanced_alchemy/mixins/nanoid.py

@@ -8,9 +8,11 @@
 from advanced_alchemy.types import NANOID_INSTALLED
 
 if NANOID_INSTALLED and not TYPE_CHECKING:
-    from fastnanoid import generate as nanoid  # pyright: ignore[reportMissingImports]
+    from fastnanoid import (  # type: ignore[import-not-found,unused-ignore]  # pyright: ignore[reportMissingImports]
+        generate as nanoid,
+    )
 else:
-    from uuid import uuid4 as nanoid  # type: ignore[assignment]
+    from uuid import uuid4 as nanoid  # type: ignore[assignment,unused-ignore]
 
 
 @declarative_mixin

advanced_alchemy/mixins/uuid.py

@@ -9,12 +9,16 @@
 from advanced_alchemy.types import UUID_UTILS_INSTALLED
 
 if UUID_UTILS_INSTALLED and not TYPE_CHECKING:
-    from uuid_utils.compat import uuid4, uuid6, uuid7  # pyright: ignore[reportMissingImports]
+    from uuid_utils.compat import (  # type: ignore[no-redef,unused-ignore]  # pyright: ignore[reportMissingImports]
+        uuid4,
+        uuid6,
+        uuid7,
+    )
 else:
-    from uuid import uuid4
+    from uuid import uuid4  # type: ignore[no-redef,unused-ignore]
 
-    uuid6 = uuid4  # type: ignore[assignment]
-    uuid7 = uuid4  # type: ignore[assignment]
+    uuid6 = uuid4  # type: ignore[assignment, unused-ignore]
+    uuid7 = uuid4  # type: ignore[assignment, unused-ignore]
 
 
 @declarative_mixin

docs/conf.py

@@ -252,12 +252,6 @@
                     "url": "https://github.com/litestar-org/advanced-alchemy/discussions",
                     "icon": "coc",
                 },
-                {
-                    "title": "Stack Overflow",
-                    "summary": "We monitor the <code><b>litestar</b></code> tag on Stack Overflow",
-                    "url": "https://stackoverflow.com/questions/tagged/litestar",
-                    "icon": "coc",
-                },
             ],
         },
     ],

examples/fastapi.py

@@ -2,14 +2,14 @@
 
 from contextlib import asynccontextmanager
 from datetime import date  # noqa: TC003
-from typing import AsyncGenerator
+from typing import AsyncGenerator, List
 from uuid import UUID  # noqa: TC003
 
 from fastapi import APIRouter, Depends, FastAPI, Request
 from pydantic import BaseModel as _BaseModel
-from sqlalchemy import ForeignKey, select
+from sqlalchemy import ForeignKey
 from sqlalchemy.ext.asyncio import AsyncSession  # noqa: TC002
-from sqlalchemy.orm import Mapped, mapped_column, relationship, selectinload
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 from typing_extensions import Annotated
 
 from advanced_alchemy.base import UUIDAuditBase, UUIDBase, metadata_registry
@@ -37,7 +37,7 @@ class AuthorModel(UUIDBase):
     __tablename__ = "author"
     name: Mapped[str]
     dob: Mapped[date | None]
-    books: Mapped[list[BookModel]] = relationship(back_populates="author", lazy="noload")
+    books: Mapped[List[BookModel]] = relationship(back_populates="author", lazy="noload")  # noqa: UP006
 
 
 # The `AuditBase` class includes the same UUID` based primary key (`id`) and 2
@@ -95,9 +95,7 @@ async def provide_authors_service(
     db_session: Annotated[AsyncSession, Depends(provide_db_session)],
 ) -> AsyncGenerator[AuthorService, None]:
     """This provides the default Authors repository."""
-    async with AuthorService.new(
-        session=db_session,
-    ) as service:
+    async with AuthorService.new(session=db_session) as service:
         yield service
 
 
@@ -107,10 +105,7 @@ async def provide_author_details_service(
     db_session: Annotated[AsyncSession, Depends(provide_db_session)],
 ) -> AsyncGenerator[AuthorService, None]:
     """This provides a simple example demonstrating how to override the join options for the repository."""
-    async with AuthorService.new(
-        statement=select(AuthorModel).options(selectinload(AuthorModel.books)),
-        session=db_session,
-    ) as service:
+    async with AuthorService.new(load=[AuthorModel.books], session=db_session) as service:
         yield service
 
 

examples/litestar/litestar_repo_only.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import date  # noqa: TC003
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, List, Optional
 from uuid import UUID  # noqa: TC003
 
 from litestar import Litestar
@@ -12,8 +12,8 @@
 from litestar.params import Parameter
 from pydantic import BaseModel as _BaseModel
 from pydantic import TypeAdapter
-from sqlalchemy import ForeignKey, select
-from sqlalchemy.orm import Mapped, mapped_column, relationship, selectinload
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from advanced_alchemy.base import UUIDAuditBase, UUIDBase
 from advanced_alchemy.config import AsyncSessionConfig
@@ -37,8 +37,8 @@ class AuthorModel(UUIDBase):
     # we can optionally provide the table name instead of auto-generating it
     __tablename__ = "author"
     name: Mapped[str]
-    dob: Mapped[date | None]
-    books: Mapped[list[BookModel]] = relationship(back_populates="author", lazy="noload")
+    dob: Mapped[Optional[date]]  # noqa: UP007
+    books: Mapped[List[BookModel]] = relationship(back_populates="author", lazy="noload")  # noqa: UP006
 
 
 # The `AuditBase` class includes the same UUID` based primary key (`id`) and 2
@@ -85,10 +85,7 @@ async def provide_authors_repo(db_session: AsyncSession) -> AuthorRepository:
 # specific SQL options such as join details
 async def provide_author_details_repo(db_session: AsyncSession) -> AuthorRepository:
     """This provides a simple example demonstrating how to override the join options for the repository."""
-    return AuthorRepository(
-        statement=select(AuthorModel).options(selectinload(AuthorModel.books)),
-        session=db_session,
-    )
+    return AuthorRepository(load=[AuthorModel.books], session=db_session)
 
 
 def provide_limit_offset_pagination(

examples/litestar/litestar_service.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, AsyncGenerator
+from datetime import date  # noqa: TC003
+from typing import TYPE_CHECKING, AsyncGenerator, List, Optional
+from uuid import UUID  # noqa: TC003
 
 from litestar import Litestar
 from litestar.controller import Controller
@@ -22,9 +24,6 @@
 from advanced_alchemy.service import OffsetPagination, SQLAlchemyAsyncRepositoryService
 
 if TYPE_CHECKING:
-    from datetime import date
-    from uuid import UUID
-
     from sqlalchemy.ext.asyncio import AsyncSession
 
 
@@ -40,8 +39,8 @@ class AuthorModel(UUIDBase):
     # we can optionally provide the table name instead of auto-generating it
     __tablename__ = "author"
     name: Mapped[str]
-    dob: Mapped[date | None]
-    books: Mapped[list[BookModel]] = relationship(back_populates="author", lazy="noload")
+    dob: Mapped[Optional[date]]  # noqa: UP007
+    books: Mapped[List[BookModel]] = relationship(back_populates="author", lazy="noload")  # noqa: UP006
 
 
 # The `AuditBase` class includes the same UUID` based primary key (`id`) and 2

examples/sanic.py

@@ -1,14 +1,14 @@
 from __future__ import annotations
 
 from datetime import date  # noqa: TC003
-from typing import Any
+from typing import Any, List
 from uuid import UUID  # noqa: TC003
 
 from sanic import Request, Sanic
 from sanic_ext import Extend
-from sqlalchemy import ForeignKey, select
+from sqlalchemy import ForeignKey
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import Mapped, mapped_column, relationship, selectinload
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from advanced_alchemy.base import UUIDAuditBase, UUIDBase
 from advanced_alchemy.config import AsyncSessionConfig, SQLAlchemyAsyncConfig
@@ -24,7 +24,7 @@ class AuthorModel(UUIDBase):
     __tablename__ = "author"
     name: Mapped[str]
     dob: Mapped[date | None]
-    books: Mapped[list[BookModel]] = relationship(back_populates="author", lazy="noload")
+    books: Mapped[List[BookModel]] = relationship(back_populates="author", lazy="noload")  # noqa: UP006
 
 
 # The `AuditBase` class includes the same UUID` based primary key (`id`) and 2
@@ -64,10 +64,7 @@ async def provide_author_details_repo(
     db_session: AsyncSession,
 ) -> AuthorRepository:
     """This provides a simple example demonstrating how to override the join options for the repository."""
-    return AuthorRepository(
-        statement=select(AuthorModel).options(selectinload(AuthorModel.books)),
-        session=db_session,
-    )
+    return AuthorRepository(load=[AuthorModel.books], session=db_session)
 
 
 def provide_limit_offset_pagination(

pyproject.toml

@@ -25,7 +25,13 @@ classifiers = [
   "Topic :: Database",
   "Topic :: Database :: Database Engines/Servers",
 ]
-dependencies = ["sqlalchemy>=2.0.20", "alembic>=1.12.0", "typing-extensions>=4.0.0", "greenlet"]
+dependencies = [
+  "sqlalchemy>=2.0.20",
+  "alembic>=1.12.0",
+  "typing-extensions>=4.0.0",
+  "greenlet",
+  "eval-type-backport ; python_full_version < '3.10'",
+]
 description = "Ready-to-go SQLAlchemy concoctions."
 keywords = ["sqlalchemy", "alembic", "litestar", "sanic", "fastapi", "flask"]
 license = { text = "MIT" }
@@ -104,7 +110,7 @@ doc = [
   "sphinx-autodoc-typehints",
 ]
 duckdb = ["duckdb>=1.1.2", "duckdb-engine>=0.13.4", "pytz>=2024.2"]
-fastapi = ["fastapi[all]>=0.115.3"]
+fastapi = ["fastapi[all]>=0.115.3", "starlette<0.45.0; python_version < '3.9'", "starlette; python_version >= '3.9'"]
 flask = ["flask-sqlalchemy>=3.1.1"]
 lint = [
   "mypy>=1.13.0",
@@ -130,10 +136,17 @@ mssql = ["aioodbc>=0.5.0", "pyodbc>=5.2.0"]
 mysql = ["asyncmy>=0.2.9"]
 oracle = ["oracledb>=2.4.1"]
 postgres = ["asyncpg>=0.29.0", "psycopg2-binary>=2.9.10", "psycopg[binary,pool]>=3.2.3"]
-sanic = ["sanic-testing>=24.6.0", "sanic[ext]>=24.6.0"]
+sanic = [
+  "sanic<24.12; python_version < '3.9'",
+  "sanic; python_version >= '3.9'",
+  "sanic-testing>=24.6.0",
+  "sanic[ext]>=24.6.0",
+]
 spanner = ["sqlalchemy-spanner>=1.7.0"]
 sqlite = ["aiosqlite>=0.20.0"]
 test = [
+  "pydantic-extra-types < 2.9.0; python_version < \"3.9\"",
+  "pydantic-extra-types; python_version >= \"3.9\"",
   "coverage>=7.6.1",
   "pytest>=7.4.4",
   "pytest-asyncio>=0.23.8",

tests/integration/test_loader_and_execution_options.py

@@ -289,7 +289,7 @@ class CountryRepository(SQLAlchemySyncRepository[UUIDCountryTest]):
         assert len(usa_country_1.states) == 2
         usa_country_2 = si1_country_repo.get_one(
             name="United States of America",
-            load=UUIDCountryTest.states,
+            load="*",
             execution_options={"populate_existing": True},
         )
         assert len(usa_country_2.states) == 2