Skip to content
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.

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

Specify target attribute type in DynamicAssociationProxy #426

Merged
merged 1 commit into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 17 additions & 9 deletions src/coaster/sqlalchemy/roles.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ def roles_for(

RoleMixinType = t.TypeVar('RoleMixinType', bound='RoleMixin')
_T = t.TypeVar('_T')
_V = t.TypeVar('_V')


class RoleAttrs(te.TypedDict, total=False):
Expand Down Expand Up @@ -588,7 +589,7 @@ def copy(self) -> LazyRoleSet:
symmetric_difference_update = nary_op(abc.MutableSet.__ixor__)


class DynamicAssociationProxy:
class DynamicAssociationProxy(t.Generic[_V]):
"""
Association proxy for dynamic relationships.

Expand All @@ -601,18 +602,23 @@ class DynamicAssociationProxy:
# Assuming a relationship like this:
Document.child_relationship = relationship(ChildDocument, lazy='dynamic')

# Proxy to an attribute on the target of the relationship:
Document.child_attributes = DynamicAssociationProxy(
# Proxy to an attribute on the target of the relationship (specifying the type):
Document.child_attributes = DynamicAssociationProxy[attribute_type](
'child_relationship', 'attribute')

This proxy does not provide access to the query capabilities of dynamic
relationships. It merely optimizes for containment queries. A query like this::

Document.child_relationship.filter_by(attribute=value).exists()
document.child_relationship.filter_by(attribute=value).exists()

Can be reduced to this::

value in Document.child_attributes
value in document.child_attributes

The proxy can also be iterated, and the return type is set to the generic type
specified in the constructor::

list(document.child_attributes) # type: list[attribute_type]

:param str rel: Relationship name (must use ``lazy='dynamic'``)
:param str attr: Attribute on the target of the relationship
Expand All @@ -632,18 +638,20 @@ def __get__(self, obj: None, cls: t.Type) -> te.Self:
...

@overload
def __get__(self, obj: _T, cls: t.Type[_T]) -> DynamicAssociationProxyWrapper[_T]:
def __get__(
self, obj: _T, cls: t.Type[_T]
) -> DynamicAssociationProxyWrapper[_V, _T]:
...

def __get__(
self, obj: t.Optional[_T], cls: t.Type[_T]
) -> t.Union[te.Self, DynamicAssociationProxyWrapper[_T]]:
) -> t.Union[te.Self, DynamicAssociationProxyWrapper[_V, _T]]:
if obj is None:
return self
return DynamicAssociationProxyWrapper(obj, self.rel, self.attr)


class DynamicAssociationProxyWrapper(abc.Set, t.Generic[_T]):
class DynamicAssociationProxyWrapper(abc.Set, t.Generic[_V, _T]):
""":class:`DynamicAssociationProxy` wrapped around an instance."""

__slots__ = ('obj', 'rel', 'relattr', 'attr')
Expand Down Expand Up @@ -673,7 +681,7 @@ def __contains__(self, value: t.Any) -> bool:
relattr.filter_by(**{self.attr: value}).exists()
).scalar()

def __iter__(self) -> t.Iterator[t.Any]:
def __iter__(self) -> t.Iterator[_V]:
for obj in self.relattr:
yield getattr(obj, self.attr)

Expand Down
2 changes: 1 addition & 1 deletion tests/coaster_tests/sqlalchemy_roles_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class RelationshipParent(BaseNameMixin, Model):
'children_dict_attr,children_list,children_list_lazy,children_set,parent'
),
)
children_names = DynamicAssociationProxy('children_list_lazy', 'name')
children_names = DynamicAssociationProxy[str]('children_list_lazy', 'name')

__roles__ = {
'all': {
Expand Down