Skip to content

chore: 🔧 modify All Fields return type #1445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
collerek merged 2 commits into from
Apr 1, 2025
Merged

chore: 🔧 modify All Fields return type #1445

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8efdab
chore: 🔧 modify All Fields return type
Sube-mm Mar 20, 2025
95761cf
Merge branch 'master' into master
collerek Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions ormar/fields/model_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
from typing import Literal # type: ignore
except ImportError: # pragma: no cover
from typing_extensions import Literal # type: ignore

try:
from typing import Self # type: ignore
except ImportError: # pragma: no cover
from typing_extensions import Self # type: ignore


def is_field_nullable(
Expand Down Expand Up @@ -65,7 +70,7 @@ class ModelFieldFactory:
_type: Any = None
_sample: Any = None

def __new__(cls, *args: Any, **kwargs: Any) -> BaseField: # type: ignore
def __new__(cls, *args: Any, **kwargs: Any) -> Self: # type: ignore
cls.validate(**kwargs)

default = kwargs.pop("default", None)
Expand Down Expand Up @@ -161,7 +166,7 @@ def __new__( # type: ignore # noqa CFQ002
min_length: Optional[int] = None,
regex: Optional[str] = None,
**kwargs: Any
) -> BaseField: # type: ignore
) -> Self: # type: ignore
kwargs = {
**kwargs,
**{
Expand Down Expand Up @@ -214,7 +219,7 @@ def __new__( # type: ignore
maximum: Optional[int] = None,
multiple_of: Optional[int] = None,
**kwargs: Any
) -> BaseField:
) -> Self:
autoincrement = kwargs.pop("autoincrement", None)
autoincrement = (
autoincrement
Expand Down Expand Up @@ -255,7 +260,7 @@ class Text(ModelFieldFactory, str):
_type = str
_sample = "text"

def __new__(cls, **kwargs: Any) -> BaseField: # type: ignore
def __new__(cls, **kwargs: Any) -> Self: # type: ignore
kwargs = {
**kwargs,
**{
Expand Down Expand Up @@ -295,7 +300,7 @@ def __new__( # type: ignore
maximum: Optional[float] = None,
multiple_of: Optional[int] = None,
**kwargs: Any
) -> BaseField:
) -> Self:
kwargs = {
**kwargs,
**{
Expand Down Expand Up @@ -361,7 +366,7 @@ class DateTime(ModelFieldFactory, datetime.datetime):

def __new__( # type: ignore # noqa CFQ002
cls, *, timezone: bool = False, **kwargs: Any
) -> BaseField: # type: ignore
) -> Self: # type: ignore
kwargs = {
**kwargs,
**{
Expand Down Expand Up @@ -418,7 +423,7 @@ class Time(ModelFieldFactory, datetime.time):

def __new__( # type: ignore # noqa CFQ002
cls, *, timezone: bool = False, **kwargs: Any
) -> BaseField: # type: ignore
) -> Self: # type: ignore
kwargs = {
**kwargs,
**{
Expand Down Expand Up @@ -504,7 +509,7 @@ def __new__( # type: ignore # noqa CFQ002
max_length: int,
represent_as_base64_str: bool = False,
**kwargs: Any
) -> BaseField: # type: ignore
) -> Self: # type: ignore
kwargs = {
**kwargs,
**{
Expand Down Expand Up @@ -557,7 +562,7 @@ def __new__( # type: ignore
maximum: Optional[int] = None,
multiple_of: Optional[int] = None,
**kwargs: Any
) -> BaseField:
) -> Self:
autoincrement = kwargs.pop("autoincrement", None)
autoincrement = (
autoincrement
Expand Down Expand Up @@ -605,7 +610,7 @@ def __new__( # type: ignore
maximum: Optional[int] = None,
multiple_of: Optional[int] = None,
**kwargs: Any
) -> BaseField:
) -> Self:
autoincrement = kwargs.pop("autoincrement", None)
autoincrement = (
autoincrement
Expand Down Expand Up @@ -657,7 +662,7 @@ def __new__( # type: ignore # noqa CFQ002
max_digits: Optional[int] = None,
decimal_places: Optional[int] = None,
**kwargs: Any
) -> BaseField:
) -> Self:
kwargs = {
**kwargs,
**{
Expand Down Expand Up @@ -721,7 +726,7 @@ class UUID(ModelFieldFactory, uuid.UUID):

def __new__( # type: ignore # noqa CFQ002
cls, *, uuid_format: str = "hex", **kwargs: Any
) -> BaseField:
) -> Self:
kwargs = {
**kwargs,
**{
Expand Down Expand Up @@ -766,7 +771,7 @@ class Enum(ModelFieldFactory):

def __new__( # type: ignore # noqa CFQ002
cls, *, enum_class: Type[E], **kwargs: Any
) -> BaseField:
) -> Self:
kwargs = {
**kwargs,
**{
Expand Down