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.

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

state: _init_mutable_fields for backend vars as well #1729

Merged
merged 3 commits into from
Aug 31, 2023
Merged

state: _init_mutable_fields for backend vars as well #1729

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecfae7c
state: _init_mutable_fields for backend vars as well
masenf Aug 31, 2023
d195028
Fix TypeError: Subscripted generics cannot be used with class and ins…
masenf Aug 31, 2023
fec85ad
Merge remote-tracking branch 'origin/main' into masenf/mutable-backen…
masenf Aug 31, 2023
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
35 changes: 21 additions & 14 deletions reflex/state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,28 +127,33 @@ def __init__(self, *args, parent_state: Optional[State] = None, **kwargs):
parent_state.parent_state,
)

# Initialize the mutable fields.
self._init_mutable_fields()

# Create a fresh copy of the backend variables for this instance
self._backend_vars = copy.deepcopy(self.backend_vars)

# Initialize the mutable fields.
self._init_mutable_fields()

def _init_mutable_fields(self):
"""Initialize mutable fields.

So that mutation to them can be detected by the app:
* list
Allow mutation to dict, list, and set to be detected by the app.
"""
for field in self.base_vars.values():
value = getattr(self, field.name)

value_in_rx_data = _convert_mutable_datatypes(
value, self._reassign_field, field.name
)

if types._issubclass(field.type_, Union[List, Dict]):
if types._issubclass(field.type_, Union[List, Dict, Set]):
value_in_rx_data = _convert_mutable_datatypes(
value, self._reassign_field, field.name
)
setattr(self, field.name, value_in_rx_data)

for field_name, value in self._backend_vars.items():
if isinstance(value, (list, dict, set)):
value_in_rx_data = _convert_mutable_datatypes(
value, self._reassign_field, field_name
)
self._backend_vars[field_name] = value_in_rx_data

self._clean()

def _init_event_handlers(self, state: State | None = None):
Expand Down Expand Up @@ -651,16 +656,18 @@ def __setattr__(self, name: str, value: Any):
setattr(self.parent_state, name, value)
return

# Make sure lists and dicts are converted to ReflexList, ReflexDict and ReflexSet.
if name in (*self.base_vars, *self.backend_vars) and types._isinstance(
value, Union[List, Dict, Set]
):
value = _convert_mutable_datatypes(value, self._reassign_field, name)

if types.is_backend_variable(name) and name != "_backend_vars":
self._backend_vars.__setitem__(name, value)
self.dirty_vars.add(name)
self._mark_dirty()
return

# Make sure lists and dicts are converted to ReflexList, ReflexDict and ReflexSet.
if name in self.vars and types._isinstance(value, Union[List, Dict, Set]):
value = _convert_mutable_datatypes(value, self._reassign_field, name)

# Set the attribute.
super().__setattr__(name, value)

Expand Down