Merge branch 'main' into fix/647

Author: ivanbelenky

.github/workflows/spellcheck.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@0.40.0
+        uses: rojopolis/spellcheck-github-actions@0.44.0
         with:
           config_path: .github/spellcheck-settings.yml
           task_name: Markdown

aredis_om/model/encoders.py

@@ -90,7 +90,7 @@ def jsonable_encoder(
             sqlalchemy_safe=sqlalchemy_safe,
         )
     if dataclasses.is_dataclass(obj):
-        return dataclasses.asdict(obj)  # type: ignore[call-overload]
+        return dataclasses.asdict(obj)  # type: ignore
     if isinstance(obj, Enum):
         return obj.value
     if isinstance(obj, PurePath):

aredis_om/model/model.py

@@ -309,7 +309,7 @@ def score_field(self) -> str:
 class ExpressionProxy:
     def __init__(self, field: ModelField, parents: List[Tuple[str, "RedisModel"]]):
         self.field = field
-        self.parents = parents
+        self.parents = parents.copy()  # Ensure a copy is stored
 
     def __eq__(self, other: Any) -> Expression:  # type: ignore[override]
         return Expression(
@@ -387,13 +387,14 @@ def __getattr__(self, item):
             attr = getattr(embedded_cls, item)
         else:
             attr = getattr(outer_type, item)
+
         if isinstance(attr, self.__class__):
+            # Clone the parents to ensure isolation
+            new_parents = self.parents.copy()
             new_parent = (self.field.alias, outer_type)
-            if new_parent not in attr.parents:
-                attr.parents.append(new_parent)
-            new_parents = list(set(self.parents) - set(attr.parents))
-            if new_parents:
-                attr.parents = new_parents + attr.parents
+            if new_parent not in new_parents:
+                new_parents.append(new_parent)
+            attr.parents = new_parents
         return attr
 
 
@@ -632,10 +633,11 @@ def resolve_value(
         value: Any,
         parents: List[Tuple[str, "RedisModel"]],
     ) -> str:
+        # The 'field_name' should already include the correct prefix
+        result = ""
         if parents:
             prefix = "_".join([p[0] for p in parents])
             field_name = f"{prefix}_{field_name}"
-        result = ""
         if field_type is RediSearchFieldTypes.TEXT:
             result = f"@{field_name}_fts:"
             if op is Operators.EQ:
@@ -792,8 +794,6 @@ def resolve_redisearch_query(cls, expression: ExpressionOrNegated) -> str:
 
         if expression.op is Operators.ALL:
             if encompassing_expression_is_negated:
-                # TODO: Is there a use case for this, perhaps for dynamic
-                #  scoring purposes with full-text search?
                 raise QueryNotSupportedError(
                     "You cannot negate a query for all results."
                 )
@@ -827,6 +827,11 @@ def resolve_redisearch_query(cls, expression: ExpressionOrNegated) -> str:
                 f"or an expression enclosed in parentheses. Docs: {ERRORS_URL}#E7"
             )
 
+        if isinstance(expression.left, ModelField) and expression.parents:
+            # Build field_name using the specific parents for this expression
+            prefix = "_".join([p[0] for p in expression.parents])
+            field_name = f"{prefix}_{field_name}"
+
         right = expression.right
 
         if isinstance(right, Expression) or isinstance(right, NegatedExpression):
@@ -842,8 +847,6 @@ def resolve_redisearch_query(cls, expression: ExpressionOrNegated) -> str:
 
             if isinstance(right, NegatedExpression):
                 result += "-"
-                # We're handling the RediSearch operator in this call ("-"), so resolve the
-                # inner expression instead of the NegatedExpression.
                 right = right.expression
 
             result += f"({cls.resolve_redisearch_query(right)})"
@@ -1432,7 +1435,8 @@ def outer_type_or_annotation(field):
 
 class RedisModel(BaseModel, abc.ABC, metaclass=ModelMeta):
     pk: Optional[str] = Field(default=None, primary_key=True)
-    ConfigDict: ClassVar
+    if PYDANTIC_V2:
+        ConfigDict: ClassVar
 
     Meta = DefaultMeta
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redis-om"
-version = "0.3.2"
+version = "0.3.3"
 description = "Object mappings, and more, for Redis."
 authors = ["Redis OSS <[email protected]>"]
 maintainers = ["Redis OSS <[email protected]>"]
@@ -44,7 +44,7 @@ python-ulid = "^1.0.3"
 typing-extensions = "^4.4.0"
 hiredis = ">=2.2.3,<4.0.0"
 more-itertools = ">=8.14,<11.0"
-setuptools = {version = ">=70.0,<73.0", markers = "python_version >= '3.12'"}
+setuptools = {version = ">=70.0,<76.0", markers = "python_version >= '3.12'"}
 
 [tool.poetry.dev-dependencies]
 mypy = "^1.9.0"
@@ -58,7 +58,7 @@ coverage = "^7.1"
 pytest-cov = "^5.0.0"
 pytest-xdist = "^3.1.0"
 unasync = "^0.6.0"
-pytest-asyncio = "^0.23.5"
+pytest-asyncio = "^0.24.0"
 email-validator = "^2.0.0"
 tox = "^4.14.1"
 tox-pyenv = "^1.1.0"

tests/test_json_model.py

@@ -1157,3 +1157,19 @@ class TestLiterals(JsonModel):
     await item.save()
     rematerialized = await TestLiterals.find(TestLiterals.flavor == "pumpkin").first()
     assert rematerialized.pk == item.pk
+
+
+@py_test_mark_asyncio
+async def test_merged_model_error():
+    class Player(EmbeddedJsonModel):
+        username: str = Field(index=True)
+
+    class Game(JsonModel):
+        player1: Optional[Player]
+        player2: Optional[Player]
+
+    q = Game.find(
+        (Game.player1.username == "username") | (Game.player2.username == "username")
+    )
+    print(q.query)
+    assert q.query == "(@player1_username:{username})| (@player2_username:{username})"