infrahub-server 1.2.12__py3-none-any.whl → 1.3.0__py3-none-any.whl

infrahub/core/node/create.py

@@ -0,0 +1,211 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Mapping
+
+from infrahub.core import registry
+from infrahub.core.constants import RelationshipCardinality, RelationshipKind
+from infrahub.core.constraint.node.runner import NodeConstraintRunner
+from infrahub.core.manager import NodeManager
+from infrahub.core.node import Node
+from infrahub.core.protocols import CoreObjectTemplate
+from infrahub.dependencies.registry import get_component_registry
+
+if TYPE_CHECKING:
+    from infrahub.core.branch import Branch
+    from infrahub.core.relationship.model import RelationshipManager
+    from infrahub.core.schema import MainSchemaTypes, NonGenericSchemaTypes, RelationshipSchema
+    from infrahub.database import InfrahubDatabase
+
+
+async def get_template_relationship_peers(
+    db: InfrahubDatabase, template: CoreObjectTemplate, relationship: RelationshipSchema
+) -> Mapping[str, CoreObjectTemplate]:
+    """For a given relationship on the template, fetch the related peers."""
+    template_relationship_manager: RelationshipManager = getattr(template, relationship.name)
+    if relationship.cardinality == RelationshipCardinality.MANY:
+        return await template_relationship_manager.get_peers(db=db, peer_type=CoreObjectTemplate)
+
+    peers: dict[str, CoreObjectTemplate] = {}
+    template_relationship_peer = await template_relationship_manager.get_peer(db=db, peer_type=CoreObjectTemplate)
+    if template_relationship_peer:
+        peers[template_relationship_peer.id] = template_relationship_peer
+    return peers
+
+
+async def extract_peer_data(
+    db: InfrahubDatabase,
+    template_peer: CoreObjectTemplate,
+    obj_peer_schema: MainSchemaTypes,
+    parent_obj: Node,
+    current_template: CoreObjectTemplate,
+) -> Mapping[str, Any]:
+    obj_peer_data: dict[str, Any] = {}
+
+    for attr in template_peer.get_schema().attribute_names:
+        if attr not in obj_peer_schema.attribute_names:
+            continue
+        obj_peer_data[attr] = {"value": getattr(template_peer, attr).value, "source": template_peer.id}
+
+    for rel in template_peer.get_schema().relationship_names:
+        rel_manager: RelationshipManager = getattr(template_peer, rel)
+        if (
+            rel_manager.schema.kind not in [RelationshipKind.COMPONENT, RelationshipKind.PARENT]
+            or rel_manager.schema.name not in obj_peer_schema.relationship_names
+        ):
+            continue
+
+        if list(await rel_manager.get_peers(db=db)) == [current_template.id]:
+            obj_peer_data[rel] = {"id": parent_obj.id}
+
+    return obj_peer_data
+
+
+async def handle_template_relationships(
+    db: InfrahubDatabase,
+    branch: Branch,
+    obj: Node,
+    template: CoreObjectTemplate,
+    fields: list,
+    constraint_runner: NodeConstraintRunner | None = None,
+) -> None:
+    if constraint_runner is None:
+        component_registry = get_component_registry()
+        constraint_runner = await component_registry.get_component(NodeConstraintRunner, db=db, branch=branch)
+
+    for relationship in obj.get_relationships(kind=RelationshipKind.COMPONENT, exclude=fields):
+        template_relationship_peers = await get_template_relationship_peers(
+            db=db, template=template, relationship=relationship
+        )
+        if not template_relationship_peers:
+            continue
+
+        for template_relationship_peer in template_relationship_peers.values():
+            # We retrieve peer schema for each peer in case we are processing a relationship which is based on a generic
+            obj_peer_schema = registry.schema.get_node_schema(
+                name=template_relationship_peer.get_schema().kind.removeprefix("Template"),
+                branch=branch,
+                duplicate=False,
+            )
+            obj_peer_data = await extract_peer_data(
+                db=db,
+                template_peer=template_relationship_peer,
+                obj_peer_schema=obj_peer_schema,
+                parent_obj=obj,
+                current_template=template,
+            )
+
+            obj_peer = await Node.init(schema=obj_peer_schema, db=db, branch=branch)
+            await obj_peer.new(db=db, **obj_peer_data)
+            await constraint_runner.check(node=obj_peer, field_filters=list(obj_peer_data))
+            await obj_peer.save(db=db)
+
+            await handle_template_relationships(
+                db=db,
+                branch=branch,
+                constraint_runner=constraint_runner,
+                obj=obj_peer,
+                template=template_relationship_peer,
+                fields=fields,
+            )
+
+
+async def get_profile_ids(db: InfrahubDatabase, obj: Node) -> set[str]:
+    if not hasattr(obj, "profiles"):
+        return set()
+    profile_rels = await obj.profiles.get_relationships(db=db)
+    return {pr.peer_id for pr in profile_rels}
+
+
+async def refresh_for_profile_update(
+    db: InfrahubDatabase,
+    branch: Branch,
+    obj: Node,
+    schema: NonGenericSchemaTypes,
+    previous_profile_ids: set[str] | None = None,
+) -> Node:
+    if not hasattr(obj, "profiles"):
+        return obj
+    current_profile_ids = await get_profile_ids(db=db, obj=obj)
+    if previous_profile_ids is None or previous_profile_ids != current_profile_ids:
+        refreshed_node = await NodeManager.get_one_by_id_or_default_filter(
+            db=db,
+            kind=schema.kind,
+            id=obj.get_id(),
+            branch=branch,
+            include_owner=True,
+            include_source=True,
+        )
+        refreshed_node._node_changelog = obj.node_changelog
+        return refreshed_node
+    return obj
+
+
+async def _do_create_node(
+    node_class: type[Node],
+    db: InfrahubDatabase,
+    data: dict,
+    schema: NonGenericSchemaTypes,
+    fields_to_validate: list,
+    branch: Branch,
+    node_constraint_runner: NodeConstraintRunner,
+) -> Node:
+    obj = await node_class.init(db=db, schema=schema, branch=branch)
+    await obj.new(db=db, **data)
+    await node_constraint_runner.check(node=obj, field_filters=fields_to_validate)
+    await obj.save(db=db)
+
+    object_template = await obj.get_object_template(db=db)
+    if object_template:
+        await handle_template_relationships(
+            db=db,
+            branch=branch,
+            template=object_template,
+            obj=obj,
+            fields=fields_to_validate,
+        )
+    return obj
+
+
+async def create_node(
+    data: dict,
+    db: InfrahubDatabase,
+    branch: Branch,
+    schema: NonGenericSchemaTypes,
+) -> Node:
+    """Create a node in the database if constraint checks succeed."""
+
+    component_registry = get_component_registry()
+    node_constraint_runner = await component_registry.get_component(
+        NodeConstraintRunner, db=db.start_session() if not db.is_transaction else db, branch=branch
+    )
+    node_class = Node
+    if schema.kind in registry.node:
+        node_class = registry.node[schema.kind]
+
+    fields_to_validate = list(data)
+    if db.is_transaction:
+        obj = await _do_create_node(
+            node_class=node_class,
+            node_constraint_runner=node_constraint_runner,
+            db=db,
+            schema=schema,
+            branch=branch,
+            fields_to_validate=fields_to_validate,
+            data=data,
+        )
+    else:
+        async with db.start_transaction() as dbt:
+            obj = await _do_create_node(
+                node_class=node_class,
+                node_constraint_runner=node_constraint_runner,
+                db=dbt,
+                schema=schema,
+                branch=branch,
+                fields_to_validate=fields_to_validate,
+                data=data,
+            )
+
+    if await get_profile_ids(db=db, obj=obj):
+        obj = await refresh_for_profile_update(db=db, branch=branch, schema=schema, obj=obj)
+
+    return obj

infrahub/core/node/resource_manager/number_pool.py

@@ -2,22 +2,44 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from infrahub.core import registry
 from infrahub.core.query.resource_manager import NumberPoolGetReserved, NumberPoolGetUsed, NumberPoolSetReserved
+from infrahub.core.schema.attribute_parameters import NumberAttributeParameters
 from infrahub.exceptions import PoolExhaustedError
 
 from .. import Node
 
 if TYPE_CHECKING:
+    from infrahub.core.attribute import BaseAttribute
     from infrahub.core.branch import Branch
     from infrahub.database import InfrahubDatabase
 
 
 class CoreNumberPool(Node):
+    def get_attribute_nb_excluded_values(self) -> int:
+        """
+        Returns the number of excluded values for the attribute of the number pool.
+        """
+
+        pool_node = registry.schema.get(name=self.node.value)  # type: ignore [attr-defined]
+        attribute = [attribute for attribute in pool_node.attributes if attribute.name == self.node_attribute.value][0]  # type: ignore [attr-defined]
+        if not isinstance(attribute.parameters, NumberAttributeParameters):
+            return 0
+
+        sum_excluded_values = 0
+        excluded_ranges = attribute.parameters.get_excluded_ranges()
+        for start_range, end_range in excluded_ranges:
+            sum_excluded_values += end_range - start_range + 1
+
+        res = len(attribute.parameters.get_excluded_single_values()) + sum_excluded_values
+        return res
+
     async def get_resource(
         self,
         db: InfrahubDatabase,
         branch: Branch,
         node: Node,
+        attribute: BaseAttribute,
         identifier: str | None = None,
     ) -> int:
         identifier = identifier or node.get_id()
@@ -31,23 +53,24 @@ class CoreNumberPool(Node):
             return reservation
 
         # If we have not returned a value we need to find one if avaiable
-        number = await self.get_next(db=db, branch=branch)
+        number = await self.get_next(db=db, branch=branch, attribute=attribute)
 
         query_set = await NumberPoolSetReserved.init(
             db=db, pool_id=self.get_id(), identifier=identifier, reserved=number
         )
         await query_set.execute(db=db)
-
         return number
 
-    async def get_next(self, db: InfrahubDatabase, branch: Branch) -> int:
+    async def get_next(self, db: InfrahubDatabase, branch: Branch, attribute: BaseAttribute) -> int:
         query = await NumberPoolGetUsed.init(db=db, branch=branch, pool=self, branch_agnostic=True)
         await query.execute(db=db)
         taken = [result.get_as_optional_type("av.value", return_type=int) for result in query.results]
+        parameters = attribute.schema.parameters
         next_number = find_next_free(
             start=self.start_range.value,  # type: ignore[attr-defined]
             end=self.end_range.value,  # type: ignore[attr-defined]
             taken=taken,
+            parameters=parameters if isinstance(parameters, NumberAttributeParameters) else None,
         )
         if next_number is None:
             raise PoolExhaustedError("There are no more values available in this pool.")
@@ -55,12 +78,15 @@ class CoreNumberPool(Node):
         return next_number
 
 
-def find_next_free(start: int, end: int, taken: list[int | None]) -> int | None:
+def find_next_free(
+    start: int, end: int, taken: list[int | None], parameters: NumberAttributeParameters | None
+) -> int | None:
     used_numbers = [number for number in taken if number is not None]
     used_set = set(used_numbers)
 
     for num in range(start, end + 1):
         if num not in used_set:
-            return num
+            if parameters is None or parameters.is_valid_value(num):
+                return num
 
     return None

infrahub/core/node/standard.py

@@ -210,7 +210,12 @@ class StandardNode(BaseModel):
 
     @classmethod
     async def get_list(
-        cls, db: InfrahubDatabase, limit: int = 1000, ids: list[str] | None = None, name: str | None = None, **kwargs
+        cls,
+        db: InfrahubDatabase,
+        limit: int = 1000,
+        ids: list[str] | None = None,
+        name: str | None = None,
+        **kwargs: dict[str, Any],
     ) -> list[Self]:
         query: Query = await StandardNodeGetListQuery.init(
             db=db, node_class=cls, ids=ids, node_name=name, limit=limit, **kwargs

infrahub/core/path.py

@@ -63,6 +63,20 @@ class DataPath(InfrahubPath):
     peer_id: str | None = Field(default=None, description="")
     value: Any | None = Field(default=None, description="Optional value of the resource")
 
+    def __hash__(self) -> int:
+        return hash(
+            (
+                self.branch,
+                self.path_type,
+                self.node_id,
+                self.kind,
+                self.field_name,
+                self.property_name,
+                self.peer_id,
+                str(self.value),
+            )
+        )
+
     @property
     def resource_type(self) -> PathResourceType:
         return PathResourceType.DATA
@@ -125,7 +139,7 @@ class SchemaPath(InfrahubPath):
         if self.field_name:
             identifier += f"/{self.field_name}"
 
-        if self.property_name and not self.path_type == SchemaPathType.NODE:
+        if self.property_name and self.path_type != SchemaPathType.NODE:
             identifier += f"/{self.property_name}"
 
         return identifier

infrahub/core/protocols.py

@@ -62,6 +62,12 @@ class BuiltinIPPrefix(CoreNode):
     children: RelationshipManager
 
 
+class CoreAction(CoreNode):
+    name: String
+    description: StringOptional
+    triggers: RelationshipManager
+
+
 class CoreArtifactTarget(CoreNode):
     artifacts: RelationshipManager
 
@@ -148,6 +154,10 @@ class CoreMenu(CoreNode):
     children: RelationshipManager
 
 
+class CoreNodeTriggerMatch(CoreNode):
+    trigger: RelationshipManager
+
+
 class CoreObjectComponentTemplate(CoreNode):
     template_name: String
 
@@ -189,6 +199,14 @@ class CoreTransformation(CoreNode):
     tags: RelationshipManager
 
 
+class CoreTriggerRule(CoreNode):
+    name: String
+    description: StringOptional
+    active: Boolean
+    branch_scope: Dropdown
+    action: RelationshipManager
+
+
 class CoreValidator(CoreNode):
     label: StringOptional
     state: Enum
@@ -326,6 +344,10 @@ class CoreFileThread(CoreThread):
     repository: RelationshipManager
 
 
+class CoreGeneratorAction(CoreAction):
+    generator: RelationshipManager
+
+
 class CoreGeneratorCheck(CoreCheck):
     instance: String
 
@@ -380,6 +402,16 @@ class CoreGraphQLQueryGroup(CoreGroup):
     query: RelationshipManager
 
 
+class CoreGroupAction(CoreAction):
+    member_action: Dropdown
+    group: RelationshipManager
+
+
+class CoreGroupTriggerRule(CoreTriggerRule):
+    member_update: Dropdown
+    group: RelationshipManager
+
+
 class CoreIPAddressPool(CoreResourcePool, LineageSource):
     default_address_type: String
     default_prefix_length: IntegerOptional
@@ -399,11 +431,31 @@ class CoreMenuItem(CoreMenu):
     pass
 
 
+class CoreNodeTriggerAttributeMatch(CoreNodeTriggerMatch):
+    attribute_name: String
+    value: StringOptional
+    value_previous: StringOptional
+    value_match: Dropdown
+
+
+class CoreNodeTriggerRelationshipMatch(CoreNodeTriggerMatch):
+    relationship_name: String
+    modification_type: Dropdown
+    peer: StringOptional
+
+
+class CoreNodeTriggerRule(CoreTriggerRule):
+    node_kind: String
+    mutation_action: Enum
+    matches: RelationshipManager
+
+
 class CoreNumberPool(CoreResourcePool, LineageSource):
     node: String
     node_attribute: String
     start_range: Integer
     end_range: Integer
+    pool_type: Enum
 
 
 class CoreObjectPermission(CoreBasePermission):
@@ -446,6 +498,11 @@ class CoreRepository(LineageOwner, LineageSource, CoreGenericRepository, CoreTas
     commit: StringOptional
 
 
+class CoreRepositoryGroup(CoreGroup):
+    content: Dropdown
+    repository: RelationshipManager
+
+
 class CoreRepositoryValidator(CoreValidator):
     repository: RelationshipManager
 

infrahub/core/protocols_base.py

@@ -7,6 +7,7 @@ from typing_extensions import Self
 if TYPE_CHECKING:
     from neo4j import AsyncResult, AsyncSession, AsyncTransaction, Record
 
+    from infrahub.core.schema import NonGenericSchemaTypes
     from infrahub.core.schema.schema_branch import SchemaBranch
 
 
@@ -70,6 +71,8 @@ class CoreNode(Protocol):
 
     def get_id(self) -> str: ...
     def get_kind(self) -> str: ...
+    def get_schema(self) -> NonGenericSchemaTypes: ...
+
     @classmethod
     async def init(
         cls,

infrahub/core/query/__init__.py

@@ -424,8 +424,8 @@ class Query(ABC):
         else:
             self.query_lines.extend([line.strip() for line in query.split("\n") if line.strip()])
 
-    def add_subquery(self, subquery: str, with_clause: str | None = None) -> None:
-        self.add_to_query("CALL {")
+    def add_subquery(self, subquery: str, node_alias: str, with_clause: str | None = None) -> None:
+        self.add_to_query(f"CALL ({node_alias}) {{")
         self.add_to_query(subquery)
         self.add_to_query("}")
         if with_clause:

infrahub/core/query/delete.py

@@ -21,7 +21,7 @@ class DeleteAfterTimeQuery(Query):
         // ---------------------
         // Reset edges with to time after timestamp
         // ---------------------
-        CALL {
+        CALL () {
             OPTIONAL MATCH (p)-[r]-(q)
             WHERE r.to > $timestamp
             SET r.to = NULL
@@ -33,7 +33,7 @@ class DeleteAfterTimeQuery(Query):
             // ---------------------
             // Delete edges with from time after timestamp timestamp
             // ---------------------
-            CALL {
+            CALL () {
                 OPTIONAL MATCH (p)-[r]->(q)
                 WHERE r.from > $timestamp
                 DELETE r
@@ -49,7 +49,7 @@ class DeleteAfterTimeQuery(Query):
             // ---------------------
             // Delete edges with from time after timestamp timestamp
             // ---------------------
-            CALL {
+            CALL () {
                 OPTIONAL MATCH (p)-[r]->(q)
                 WHERE r.from > $timestamp
                 DELETE r

infrahub/core/query/diff.py

@@ -121,10 +121,9 @@ class DiffCalculationQuery(DiffQuery):
 
     previous_base_path_query = """
 WITH DISTINCT diff_path AS diff_path, has_more_data
-CALL {
-    WITH diff_path
-    WITH diff_path, nodes(diff_path) AS d_nodes, relationships(diff_path) AS d_rels
-    WITH diff_path, d_rels[0] AS r_root, d_nodes[1] AS n, d_rels[1] AS r_node, d_nodes[2] AS attr_rel, d_rels[2] AS r_prop
+CALL (diff_path) {
+    WITH nodes(diff_path) AS d_nodes, relationships(diff_path) AS d_rels
+    WITH d_rels[0] AS r_root, d_nodes[1] AS n, d_rels[1] AS r_node, d_nodes[2] AS attr_rel, d_rels[2] AS r_prop
     // -------------------------------------
     // add base branch paths before branched_from, if they exist
     // -------------------------------------
@@ -158,10 +157,9 @@ CALL {
 WITH diff_path, latest_base_path, has_more_data
 UNWIND [diff_path, latest_base_path] AS penultimate_path
 WITH DISTINCT penultimate_path, has_more_data
-CALL {
-    WITH penultimate_path
-    WITH penultimate_path, nodes(penultimate_path) AS d_nodes, relationships(penultimate_path) AS d_rels
-    WITH penultimate_path, d_rels[0] AS r_root, d_nodes[1] AS n, d_rels[1] AS r_node, d_nodes[2] AS attr_rel, d_rels[2] AS r_prop
+CALL (penultimate_path) {
+    WITH nodes(penultimate_path) AS d_nodes, relationships(penultimate_path) AS d_rels
+    WITH d_rels[0] AS r_root, d_nodes[1] AS n, d_rels[1] AS r_node, d_nodes[2] AS attr_rel, d_rels[2] AS r_prop
     // -------------------------------------
     // Add peer-side of any relationships to get the peer's ID
     // -------------------------------------
@@ -299,8 +297,7 @@ WITH one_result[0] AS p, one_result[1] AS q, one_result[2] AS diff_rel, one_resu
 // -------------------------------------
 // Exclude nodes added then removed on branch within timeframe
 // -------------------------------------
-CALL {
-    WITH p, q, row_from_time
+CALL (p, q, row_from_time) {
     OPTIONAL MATCH (q)<-[is_part_of:IS_PART_OF {branch: $branch_name}]-(p)
     WHERE row_from_time <= is_part_of.from < $to_time
     WITH DISTINCT is_part_of.status AS rel_status
@@ -312,8 +309,7 @@ WHERE intra_branch_update = FALSE
 // -------------------------------------
 // Get every path on this branch under each node
 // -------------------------------------
-CALL {
-    WITH p, q, diff_rel, row_from_time
+CALL (p, q, diff_rel, row_from_time) {
     OPTIONAL MATCH path = (
         (q)<-[top_diff_rel:IS_PART_OF]-(p)-[r_node]-(node)-[r_prop]-(prop)
     )
@@ -340,12 +336,11 @@ CALL {
         p.uuid IS NULL OR prop.uuid IS NULL OR p.uuid <> prop.uuid
         OR type(r_node) <> "IS_RELATED" OR type(r_prop) <> "IS_RELATED"
     )
-    WITH path, p, node, prop, r_prop, r_node, type(r_node) AS rel_type, row_from_time
+    WITH path, node, prop, r_prop, r_node, type(r_node) AS rel_type, row_from_time
     // -------------------------------------
     // Exclude attributes/relationships added then removed on branch within timeframe
     // -------------------------------------
-    CALL {
-        WITH p, rel_type, node, row_from_time
+    CALL (p, rel_type, node, row_from_time) {
         OPTIONAL MATCH (p)-[rel_to_check {branch: $branch_name}]-(node)
         WHERE row_from_time <= rel_to_check.from < $to_time
         AND type(rel_to_check) = rel_type
@@ -484,8 +479,7 @@ END AS row_from_time
 // Exclude attributes/relationship under nodes deleted on this branch in the timeframe
 // because those were all handled above at the node level
 // -------------------------------------
-CALL {
-    WITH root, p, row_from_time
+CALL (root, p, row_from_time) {
     OPTIONAL MATCH (root)<-[r_root_deleted:IS_PART_OF {branch: $branch_name}]-(p)
     WHERE row_from_time <= r_root_deleted.from < $to_time
     WITH r_root_deleted
@@ -499,8 +493,7 @@ WHERE node_deleted = FALSE
 // Exclude relationships added and deleted within the timeframe
 // -------------------------------------
 WITH root, r_root, p, diff_rel, q, has_more_data, row_from_time, type(diff_rel) AS rel_type
-CALL {
-    WITH p, rel_type, q, row_from_time
+CALL (p, rel_type, q, row_from_time) {
     OPTIONAL MATCH (p)-[rel_to_check {branch: $branch_name}]-(q)
     WHERE row_from_time <= rel_to_check.from < $to_time
     AND type(rel_to_check) = rel_type
@@ -513,8 +506,7 @@ WHERE intra_branch_update = FALSE
 // -------------------------------------
 // Get every path on this branch under each attribute/relationship
 // -------------------------------------
-CALL {
-    WITH root, r_root, p, diff_rel, q
+CALL (root, r_root, p, diff_rel, q) {
     OPTIONAL MATCH path = (
         (root:Root)<-[mid_r_root:IS_PART_OF]-(p)-[mid_diff_rel]-(q)-[r_prop]-(prop)
     )
@@ -549,8 +541,7 @@ CALL {
 // Exclude properties added and deleted within the timeframe
 // -------------------------------------
 WITH q, nodes(latest_prop_path)[3] AS prop, type(relationships(latest_prop_path)[2]) AS rel_type, latest_prop_path, has_more_data, row_from_time
-CALL {
-    WITH q, rel_type, prop, row_from_time
+CALL (q, rel_type, prop, row_from_time) {
     OPTIONAL MATCH (q)-[rel_to_check {branch: $branch_name}]-(prop)
     WHERE row_from_time <= rel_to_check.from < $to_time
     AND type(rel_to_check) = rel_type
@@ -717,14 +708,12 @@ ORDER BY
     r_node.from DESC,
     r_root.from DESC
 WITH n, p, row_from_time, diff_rel, diff_rel_path, has_more_data
-CALL {
+CALL (n, p, row_from_time){
     // -------------------------------------
     // Exclude properties under nodes and attributes/relationships deleted
     // on this branch in the timeframe because those were all handled above
     // -------------------------------------
-    WITH n, p, row_from_time
-    CALL {
-        WITH n, row_from_time
+    CALL (n, row_from_time) {
         OPTIONAL MATCH (root:Root)<-[r_root_deleted:IS_PART_OF {branch: $branch_name}]-(n)
         WHERE r_root_deleted.from < $to_time
         WITH r_root_deleted
@@ -732,9 +721,8 @@ CALL {
         LIMIT 1
         RETURN COALESCE(r_root_deleted.status = "deleted", FALSE) AS node_deleted
     }
-    WITH n, p, row_from_time, node_deleted
-    CALL {
-        WITH n, p, row_from_time
+    WITH node_deleted
+    CALL (n, p, row_from_time) {
         OPTIONAL MATCH (n)-[r_node_deleted {branch: $branch_name}]-(p)
         WHERE row_from_time <= r_node_deleted.from < $to_time
         AND type(r_node_deleted) IN ["HAS_ATTRIBUTE", "IS_RELATED"]
@@ -803,8 +791,7 @@ AND (
 // -------------------------------------
 // Ignore node created and deleted on this branch
 // -------------------------------------
-CALL {
-    WITH n
+CALL (n) {
     OPTIONAL MATCH (:Root)<-[diff_rel:IS_PART_OF {branch: $branch_name}]-(n)
     WITH diff_rel
     ORDER BY diff_rel.from ASC