Merge branch 'main' into main

Author: svlandeg

docs/release-notes.md

@@ -2,6 +2,10 @@
 
 ## Latest Changes
 
+### Refactors
+
+* ♻️ Import `Literal` from the `typing` module directly. PR [#1699](https://github.com/fastapi/sqlmodel/pull/1699) by [@svlandeg](https://github.com/svlandeg).
+
 ### Docs
 
 * 📝 Remove duplicated word in `read-relationships.md`. PR [#1705](https://github.com/fastapi/sqlmodel/pull/1705) by [@stefmolin](https://github.com/stefmolin).

sqlmodel/main.py

@@ -14,6 +14,7 @@
     Any,
     Callable,
     ClassVar,
+    Literal,
     Optional,
     TypeVar,
     Union,
@@ -49,7 +50,7 @@
 from sqlalchemy.sql.schema import MetaData, SchemaEventTarget
 from sqlalchemy.sql.sqltypes import LargeBinary, Time, Uuid
 from sqlalchemy.types import TypeEngine
-from typing_extensions import Literal, TypeAlias, deprecated, get_origin
+from typing_extensions import TypeAlias, deprecated, get_origin
 
 from ._compat import (  # type: ignore[attr-defined]
     PYDANTIC_MINOR_VERSION,

sqlmodel/sql/expression.py

@@ -1,6 +1,7 @@
 from collections.abc import Iterable, Mapping, Sequence
 from typing import (
     Any,
+    Literal,
     Optional,
     TypeVar,
     Union,
@@ -34,7 +35,6 @@
     UnaryExpression,
 )
 from sqlalchemy.sql.type_api import TypeEngine
-from typing_extensions import Literal
 
 from ._expression_select_cls import Select as Select
 from ._expression_select_cls import SelectOfScalar as SelectOfScalar

tests/test_pydantic/test_field.py

@@ -1,10 +1,9 @@
 from decimal import Decimal
-from typing import Optional, Union
+from typing import Literal, Optional, Union
 
 import pytest
 from pydantic import ValidationError
 from sqlmodel import Field, SQLModel
-from typing_extensions import Literal
 
 
 def test_decimal():