Parametrize Neo4j query node or relationship alias when formatting required properties

Signed-off-by: Edwin Yu <edwinyyyu@gmail.com>

Author: edwinyyyu

src/memmachine/common/vector_graph_store/neo4j_vector_graph_store.py

@@ -229,7 +229,7 @@ async def search_similar_nodes(
                 f"WHERE n.{embedding_property_name} IS NOT NULL\n"
                 f"AND {
                     Neo4jVectorGraphStore._format_required_properties(
-                        required_properties, include_missing_properties
+                        "n", required_properties, include_missing_properties
                     )
                 }\n"
                 "WITH n,"
@@ -251,7 +251,7 @@ async def search_similar_nodes(
                 }\n"
                 f"AND {
                     Neo4jVectorGraphStore._format_required_properties(
-                        required_properties, include_missing_properties
+                        "n", required_properties, include_missing_properties
                     )
                 }\n"
                 "RETURN n\n"
@@ -305,7 +305,7 @@ async def search_related_nodes(
                     })"
                     f"WHERE {
                         Neo4jVectorGraphStore._format_required_properties(
-                            required_properties, include_missing_properties
+                            "n", required_properties, include_missing_properties
                         )
                     }\n"
                     "RETURN n\n"
@@ -360,7 +360,7 @@ async def search_directional_nodes(
                 }\n"
                 f"AND {
                     Neo4jVectorGraphStore._format_required_properties(
-                        required_properties, include_missing_properties
+                        "n", required_properties, include_missing_properties
                     )
                 }\n"
                 "RETURN n\n"
@@ -392,7 +392,7 @@ async def search_matching_nodes(
                 })\n"
                 f"WHERE {
                     Neo4jVectorGraphStore._format_required_properties(
-                        required_properties, include_missing_properties
+                        "n", required_properties, include_missing_properties
                     )
                 }\n"
                 "RETURN n\n"
@@ -448,13 +448,17 @@ def _format_labels(labels: Iterable[str] | None) -> str:
 
     @staticmethod
     def _format_required_properties(
+        entity_query_alias: str,
         required_properties: Mapping[str, Property],
         include_missing_properties: bool,
     ) -> str:
         """
         Format required properties for use in a Cypher query.
 
         Args:
+            entity_query_alias (str):
+                Alias of the node or relationship in the query
+                (e.g., "n", "r").
             required_properties (Mapping[str, Property]):
                 Mapping of required properties.
             include_missing_properties (bool):
@@ -468,10 +472,10 @@ def _format_required_properties(
         return (
             " AND ".join(
                 [
-                    f"(n.{property_name}"
+                    f"({entity_query_alias}.{property_name}"
                     f"    = $required_properties.{property_name}"
                     f"{
-                        f' OR n.{property_name} IS NULL'
+                        f' OR {entity_query_alias}.{property_name} IS NULL'
                         if include_missing_properties
                         else ''
                     })"