mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-03-01 13:42:12 +01:00
Code

Allow retrieving default field value from top-level model

Browse Source
This commit is contained in:
Daniel Mach 2024-03-02 19:55:33 +01:00
parent 4e928a4505
commit 9cce6dbb8e
2 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osc/util/models.py
View File

@ -71,8 +71,9 @@ NotSet = NotSetClass()
class FromParent(NotSetClass):
def __init__(self, field_name):
def __init__(self, field_name, *, fallback=NotSet):
self.field_name = field_name
self.fallback = fallback
def __repr__(self):
return f"FromParent(field_name={self.field_name})"
@ -256,7 +257,7 @@ class Field(property):
for num, i in enumerate(result):
if isinstance(i, dict):
klass = self.inner_type
result[num] = klass(**i)
result[num] = klass(**i, _parent=obj)
if self.get_callback is not None:
result = self.get_callback(obj, result)
@ -279,7 +280,10 @@ class Field(property):
if isinstance(self.default, FromParent):
if obj._parent is None:
raise RuntimeError(f"The field '{self.name}' has default {self.default} but the model has no parent set")
if self.default.fallback is not NotSet:
return self.default.fallback
else:
raise RuntimeError(f"The field '{self.name}' has default {self.default} but the model has no parent set")
return getattr(obj._parent, self.default.field_name or self.name)
if self.default is NotSet:
@ -308,20 +312,23 @@ class Field(property):
if self.is_model and isinstance(value, dict):
# initialize a model instance from a dictionary
klass = self.origin_type
value = klass(**value) # pylint: disable=not-callable
value = klass(**value, _parent=obj) # pylint: disable=not-callable
elif self.is_model_list and isinstance(value, list):
new_value = []
for i in value:
if isinstance(i, dict):
klass = self.inner_type
new_value.append(klass(**i))
new_value.append(klass(**i, _parent=obj))
else:
i._parent = obj
new_value.append(i)
value = new_value
elif self.is_model and isinstance(value, str) and hasattr(self.origin_type, "XML_TAG_FIELD"):
klass = self.origin_type
key = getattr(self.origin_type, "XML_TAG_FIELD")
value = klass(**{key: value})
value = klass(**{key: value}, _parent=obj)
elif self.is_model and value is not None:
value._parent = obj
self.validate_type(value)
obj._values[self.name] = value

43
tests/test_models.py
View File

@ -291,6 +291,49 @@ class Test(unittest.TestCase):
self.assertEqual(c.field, "new-text")
self.assertEqual(c.field2, "text")
def test_parent_fallback(self):
class SubModel(BaseModel):
field: str = Field(default=FromParent("field", fallback="submodel-fallback"))
class Model(BaseModel):
field: str = Field(default=FromParent("field", fallback="model-fallback"))
sub: Optional[SubModel] = Field()
sub_list: Optional[List[SubModel]] = Field()
m = Model()
s = SubModel(_parent=m)
m.sub = s
self.assertEqual(m.field, "model-fallback")
self.assertEqual(m.sub.field, "model-fallback")
m = Model(sub={})
self.assertEqual(m.field, "model-fallback")
self.assertEqual(m.sub.field, "model-fallback")
m = Model(sub=SubModel())
self.assertEqual(m.field, "model-fallback")
self.assertEqual(m.sub.field, "model-fallback")
m = Model()
s = SubModel(_parent=m)
m.sub_list = [s]
self.assertEqual(m.field, "model-fallback")
self.assertEqual(m.sub_list[0].field, "model-fallback")
m = Model(sub_list=[{}])
self.assertEqual(m.field, "model-fallback")
self.assertEqual(m.sub_list[0].field, "model-fallback")
m = Model(sub_list=[SubModel()])
self.assertEqual(m.field, "model-fallback")
self.assertEqual(m.sub_list[0].field, "model-fallback")
m = Model()
m.sub_list = []
m.sub_list.append({})
self.assertEqual(m.field, "model-fallback")
self.assertEqual(m.sub_list[0].field, "model-fallback")
def test_get_callback(self):
class Model(BaseModel):
quiet: bool = Field(