Skip to content

Make the return type of type intersection the same as the argument type. #954

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
dnwpark merged 3 commits into from
Oct 22, 2025
Merged

Make the return type of type intersection the same as the argument type. #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8eb53e8
Make the return type of type intersection the same as the argument type.
dnwpark Oct 22, 2025
f9b2c02
lint
dnwpark Oct 22, 2025
06a876f
Add comment.
dnwpark Oct 22, 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
16 changes: 9 additions & 7 deletions gel/_internal/_qbmodel/_abstract/_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
from collections.abc import Callable


_T_SelfModel = TypeVar("_T_SelfModel", bound="type[BaseGelModel]")
_T_OtherModel = TypeVar("_T_OtherModel", bound="type[BaseGelModel]")
_T_OtherModel = TypeVar("_T_OtherModel", bound="BaseGelModel")


class BaseGelModel(AbstractGelModel):
Expand Down Expand Up @@ -84,10 +83,13 @@ def limit(cls, /, expr: Any) -> type[Self]: ...
@classmethod
def offset(cls, /, expr: Any) -> type[Self]: ...

# We pretend that the return type is _T_OtherModel so that the type
# checker is aware of _T_OtherModel's pointers. We don't get Self's
# pointers, but that's ok most of the time.
@classmethod
def is_(
cls: _T_SelfModel, /, other_model: _T_OtherModel
) -> type[BaseGelModelIntersection[_T_SelfModel, _T_OtherModel]]: ...
cls: type[Self], /, other_model: type[_T_OtherModel]
) -> type[_T_OtherModel]: ...

@classmethod
def __gel_assert_single__(
Expand Down Expand Up @@ -207,11 +209,11 @@ def offset(
@_qb.exprmethod
@classmethod
def is_(
cls: _T_SelfModel,
cls: type[Self],
/,
value: _T_OtherModel,
value: type[_T_OtherModel],
__operand__: _qb.ExprAlias | None = None,
) -> type[BaseGelModelIntersection[_T_SelfModel, _T_OtherModel]]:
) -> type[BaseGelModelIntersection[type[Self], type[_T_OtherModel]]]:
return _qb.AnnotatedExpr( # type: ignore [return-value]
create_intersection(cls, value),
add_object_type_filter(cls, value, __operand__=__operand__),
Expand Down
18 changes: 0 additions & 18 deletions gel/_internal/_qbmodel/_pydantic/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,10 +923,6 @@ def __gel_validate__(cls, value: Any) -> GelSourceModel:
return res


_T_SelfModel = TypeVar("_T_SelfModel", bound="type[_abstract.BaseGelModel]")
_T_OtherModel = TypeVar("_T_OtherModel", bound="type[_abstract.BaseGelModel]")


class GelModel(
GelSourceModel,
_abstract.BaseGelModel,
Expand Down Expand Up @@ -1326,20 +1322,6 @@ def model_copy(
ll_setattr(copied, "__gel_new__", ll_getattr(self, "__gel_new__"))
return copied

if TYPE_CHECKING:
# Pretend that is_ returns a proper GelModel
@classmethod
def is_(
cls: _T_SelfModel, /, other_model: _T_OtherModel
) -> type[GelModelIntersection[_T_SelfModel, _T_OtherModel]]: ...


class GelModelIntersection(
GelModel, _abstract.BaseGelModelIntersection[_T_SelfModel, _T_OtherModel]
):
def __init__(self) -> None:
raise NotImplementedError("Type expressions cannot be instantiated.")


class GelLinkModel(
GelSourceModel,
Expand Down
1 change: 0 additions & 1 deletion tests/test_qb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,7 +1581,6 @@ def test_qb_is_type_basic_03(self):
excluded_fields={'b', 'c', 'ab', 'ac', 'bc', 'abc', 'ab_ac'},
)

@tb.skip_typecheck
def test_qb_is_type_basic_04(self):
# Model Select
# with computed single prop using type intersection
Expand Down