Skip to content

Commit fe5a27b

Browse files
committed
Introducing getter method for _per_property.get(property_name)
1 parent 5daf8a4 commit fe5a27b

1 file changed

Lines changed: 32 additions & 6 deletions

File tree

‎src/osw/core.py‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -747,9 +747,7 @@ class OverwriteClassParam(OswBaseModel):
747747
"""Defines the overall overwriting behavior. Used for any property if the
748748
property specific setting is not set."""
749749
per_property: Optional[Dict[str, OverwriteOptions]] = None
750-
"""A key (property name) - value (overwrite setting) pair. Careful! - When
751-
setting values of this dictionary after validation, the validator won't be
752-
called again. The same applies for the __init__ function!"""
750+
"""A key (property name) - value (overwrite setting) pair."""
753751
_per_property: Dict[str, OVERWRITE_CLASS_OPTIONS] = PrivateAttr()
754752
"""Private property, for internal use only. Use 'per_property' instead"""
755753

@@ -766,6 +764,29 @@ def validate_per_property(cls, per_property, values):
766764

767765
return per_property
768766

767+
def __setattr__(self, key, value):
768+
"""Called when setting an attribute"""
769+
super().__setattr__(key, value)
770+
if key == "per_property":
771+
# compare value and self.per_property
772+
if value != self.per_property and value is not None:
773+
self._per_property = {
774+
field_name: value.get(field_name, self.overwrite)
775+
for field_name in self.model.__fields__.keys()
776+
}
777+
elif key == "overwrite":
778+
if self.per_property is not None:
779+
self._per_property = {
780+
field_name: self.per_property.get(field_name, self.overwrite)
781+
for field_name in self.model.__fields__.keys()
782+
}
783+
elif key == "model":
784+
if self.per_property is not None:
785+
self._per_property = {
786+
field_name: self.per_property.get(field_name, self.overwrite)
787+
for field_name in self.model.__fields__.keys()
788+
}
789+
769790
def __init__(self, **data):
770791
"""Called after validation. Sets the fallback for every property that
771792
has not been specified in per_property."""
@@ -780,6 +801,10 @@ def __init__(self, **data):
780801
# todo: from class definition get properties with hidden /
781802
# read_only option # those can be safely overwritten - set the to True
782803

804+
def get_overwrite_setting(self, property_name: str) -> OverwriteOptions:
805+
"""Returns the fallback overwrite option for the given field name"""
806+
return self._per_property.get(property_name, self.overwrite)
807+
783808
class _ApplyOverwriteParam(OswBaseModel):
784809
page: WtPage
785810
entity: OswBaseModel # actually model.Entity but this causes the "type" error
@@ -944,7 +969,7 @@ def set_content(content_to_set: dict) -> None:
944969
{
945970
key: value
946971
for (key, value) in local_content["jsondata"].items()
947-
if param.policy._per_property.get(key) == OverwriteOptions.true
972+
if param.policy.get_overwrite_setting(key) == OverwriteOptions.true
948973
}
949974
)
950975
if param.debug:
@@ -953,7 +978,7 @@ def set_content(content_to_set: dict) -> None:
953978
{
954979
key: value
955980
for (key, value) in remote_content["jsondata"].items()
956-
if param.policy._per_property.get(key) == OverwriteOptions.false
981+
if param.policy.get_overwrite_setting(key) == OverwriteOptions.false
957982
}
958983
)
959984
if param.debug:
@@ -963,7 +988,8 @@ def set_content(content_to_set: dict) -> None:
963988
key: value
964989
for (key, value) in local_content["jsondata"].items()
965990
if (
966-
param.policy._per_property.get(key) == OverwriteOptions.only_empty
991+
param.policy.get_overwrite_setting(key)
992+
== OverwriteOptions.only_empty
967993
and is_empty(remote_content["jsondata"].get(key))
968994
)
969995
}

0 commit comments

Comments
 (0)