handle default issue with multiple inheritance

aredis_om/model/model.py

@@ -1320,11 +1320,13 @@ def __new__(cls, name, bases, attrs, **kwargs): # noqa C901
  meta = meta or getattr(new_class, "Meta", None)
  base_meta = getattr(new_class, "_meta", None)
 
- if len(bases) == 1:
- for f_name in bases[0].model_fields:
- field = bases[0].model_fields[f_name]
- print(field)
- new_class.model_fields[f_name] = field
+ if len(bases) >= 1:
+ for base_index in range(len(bases)):
+ model_fields = getattr(bases[base_index], "model_fields", [])
+ for f_name in model_fields:
+ field = model_fields[f_name]
+ print(field)
+ new_class.model_fields[f_name] = field
 
  if meta and meta != DefaultMeta and meta != base_meta:
  new_class.Meta = meta

tests/test_hash_model.py

@@ -976,3 +976,40 @@ class Child(Model):
 
  assert rematerialized.age == 18
  assert rematerialized.bio is None
+
+@py_test_mark_asyncio
+async def test_grandchild_class_expression_proxy():
+ # https://github.com/redis/redis-om-python/issues/669 seeing weird issue with child classes initalizing all their undefined members as ExpressionProxies
+ class Model(HashModel):
+ first_name: str
+ last_name: str
+ age: int = Field(default=18)
+ bio: Optional[str] = Field(default=None)
+
+ class Child(Model):
+ other_name: str = "test"
+
+ class GrandChild(Child):
+ grand_name: str = "test"
+
+ class GreatGrandChild(GrandChild):
+ great_name: str = "test"
+
+ await Migrator().run()
+ m = GreatGrandChild(first_name="Steve", last_name="Lorello")
+ assert m.age == 18
+ await m.save()
+
+ assert m.age == 18
+ assert m.other_name == "test"
+ assert m.grand_name == "test"
+ assert m.great_name == "test"
+
+ rematerialized = await GreatGrandChild.find(GreatGrandChild.pk == m.pk).first()
+
+ assert rematerialized.age == 18
+ assert rematerialized.age != 19
+ assert rematerialized.bio is None
+ assert rematerialized.other_name == "test"
+ assert rematerialized.grand_name == "test"
+ assert rematerialized.great_name == "test"

tests/test_json_model.py

@@ -1195,6 +1195,43 @@ class Child(Model):
  assert rematerialized.age != 19
  assert rematerialized.bio is None
 
+@py_test_mark_asyncio
+async def test_grandchild_class_expression_proxy():
+ # https://github.com/redis/redis-om-python/issues/669 seeing weird issue with child classes initalizing all their undefined members as ExpressionProxies
+ class Model(JsonModel):
+ first_name: str
+ last_name: str
+ age: int = Field(default=18)
+ bio: Optional[str] = Field(default=None)
+
+ class Child(Model):
+ is_new: bool = True
+
+ class GrandChild(Child):
+ is_newer: bool = True
+
+ class GreatGrandChild(GrandChild):
+ is_great: bool = True
+
+ await Migrator().run()
+ m = GreatGrandChild(first_name="Steve", last_name="Lorello")
+ assert m.age == 18
+ await m.save()
+
+ assert m.age == 18
+ assert m.is_new is True
+ assert m.is_newer is True
+ assert m.is_great is True
+
+ rematerialized = await GreatGrandChild.find(GreatGrandChild.pk == m.pk).first()
+
+ assert rematerialized.age == 18
+ assert rematerialized.age != 19
+ assert rematerialized.bio is None
+ assert rematerialized.is_new is True
+ assert rematerialized.is_newer is True
+ assert rematerialized.is_great is True
+
 @py_test_mark_asyncio
 async def test_merged_model_error():
  class Player(EmbeddedJsonModel):