infrahub-server 1.6.2__py3-none-any.whl → 1.7.0__py3-none-any.whl

infrahub/core/manager.py

@@ -5,9 +5,17 @@ from typing import TYPE_CHECKING, Any, Iterable, Literal, TypeVar, overload
 
 from infrahub_sdk.utils import deep_merge_dict, is_valid_uuid
 
-from infrahub.core.constants import InfrahubKind, RelationshipCardinality, RelationshipDirection
+from infrahub.core.constants import (
+    SYSTEM_USER_ID,
+    InfrahubKind,
+    MetadataOptions,
+    RelationshipCardinality,
+    RelationshipDirection,
+)
+from infrahub.core.metadata.model import MetadataQueryOptions
 from infrahub.core.node import Node
 from infrahub.core.node.delete_validator import NodeDeleteValidator
+from infrahub.core.order import OrderModel
 from infrahub.core.query.node import (
     AttributeFromDB,
     GroupedPeerNodes,
@@ -21,6 +29,7 @@ from infrahub.core.query.node import (
 from infrahub.core.query.relationship import RelationshipGetPeerQuery
 from infrahub.core.registry import registry
 from infrahub.core.relationship import Relationship, RelationshipManager
+from infrahub.core.relationship.model import PeerWithRelationshipMetadata
 from infrahub.core.schema import (
     GenericSchema,
     MainSchemaTypes,
@@ -31,7 +40,6 @@ from infrahub.core.schema import (
 )
 from infrahub.core.timestamp import Timestamp
 from infrahub.exceptions import NodeNotFoundError, ProcessingError, SchemaNotFoundError
-from infrahub.graphql.models import OrderModel
 
 if TYPE_CHECKING:
     from infrahub.core.branch import Branch
@@ -88,10 +96,8 @@ class NodeManager:
         limit: int | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         partial_match: bool = ...,
         branch_agnostic: bool = ...,
         order: OrderModel | None = ...,
@@ -109,10 +115,8 @@ class NodeManager:
         limit: int | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         partial_match: bool = ...,
         branch_agnostic: bool = ...,
         order: OrderModel | None = ...,
@@ -129,10 +133,8 @@ class NodeManager:
         limit: int | None = None,
         at: Timestamp | str | None = None,
         branch: Branch | str | None = None,
-        include_source: bool = False,
-        include_owner: bool = False,
+        include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
-        account=None,
         partial_match: bool = False,
         branch_agnostic: bool = False,
         order: OrderModel | None = None,
@@ -164,10 +166,8 @@ class NodeManager:
                 fields=fields,
                 at=at,
                 branch=branch,
-                include_source=include_source,
-                include_owner=include_owner,
+                include_metadata=include_metadata,
                 prefetch_relationships=prefetch_relationships,
-                account=account,
                 branch_agnostic=branch_agnostic,
             )
             return [node] if node else []
@@ -209,10 +209,8 @@ class NodeManager:
             ids=node_ids,
             fields=fields,
             branch=branch,
-            account=account,
             at=at,
-            include_source=include_source,
-            include_owner=include_owner,
+            include_metadata=include_metadata,
             db=db,
             prefetch_relationships=prefetch_relationships,
             branch_agnostic=branch_agnostic,
@@ -228,7 +226,6 @@ class NodeManager:
         filters: dict | None = None,
         at: Timestamp | str | None = None,
         branch: Branch | str | None = None,
-        account=None,  # noqa: ARG003
         partial_match: bool = False,
         branch_agnostic: bool = False,
     ) -> int:
@@ -276,15 +273,14 @@ class NodeManager:
         branch = await registry.get_branch(branch=branch, db=db)
         at = Timestamp(at)
 
-        rel = Relationship(schema=schema, branch=branch, node_id="PLACEHOLDER")
-
         query = await RelationshipGetPeerQuery.init(
             db=db,
+            branch=branch,
             source_ids=ids,
             source_kind=source_kind,
             schema=schema,
             filters=filters,
-            rel=rel,
+            rel=Relationship,
             at=at,
             branch_agnostic=branch_agnostic,
         )
@@ -305,25 +301,29 @@ class NodeManager:
         branch: Branch | str | None = None,
         branch_agnostic: bool = False,
         fetch_peers: bool = False,
-        include_source: bool = False,
-        include_owner: bool = False,
+        include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
     ) -> list[Relationship]:
         branch = await registry.get_branch(branch=branch, db=db)
         at = Timestamp(at)
 
-        rel = Relationship(schema=schema, branch=branch, node_id="PLACEHOLDER")
-
+        relationship_metadata_options = (
+            include_metadata.relationship_level
+            if isinstance(include_metadata, MetadataQueryOptions)
+            else include_metadata
+        )
         query = await RelationshipGetPeerQuery.init(
             db=db,
+            branch=branch,
             source_ids=ids,
             source_kind=source_kind,
             schema=schema,
             filters=filters,
-            rel=rel,
+            rel=Relationship,
             offset=offset,
             limit=limit,
             at=at,
             branch_agnostic=branch_agnostic,
+            include_metadata=relationship_metadata_options,
         )
         await query.execute(db=db)
 
@@ -354,17 +354,21 @@ class NodeManager:
                 at=at,
                 branch=branch,
                 branch_agnostic=branch_agnostic,
-                include_source=include_source,
-                include_owner=include_owner,
+                include_metadata=include_metadata,
             )
 
         results = []
         for peer in peers_info:
-            result = Relationship(schema=schema, branch=branch, at=at, node_id=peer.source_id).load(
+            result = Relationship(
+                schema=schema,
+                branch=branch,
+                source_kind=peer.source_kind,
+                at=at,
+                node_id=peer.source_id,
+            ).load(
                 db=db,
                 id=peer.rel_node_id,
                 db_id=peer.rel_node_db_id,
-                updated_at=peer.updated_at,
                 data=peer,
             )
             if fetch_peers:
@@ -435,7 +439,12 @@ class NodeManager:
             return {}
 
         return await cls.get_many(
-            db=db, ids=peers_ids, fields=fields, at=at, branch=branch, include_owner=True, include_source=True
+            db=db,
+            ids=peers_ids,
+            fields=fields,
+            at=at,
+            branch=branch,
+            include_metadata=MetadataOptions.LINKED_NODES,
         )
 
     @overload
@@ -479,8 +488,7 @@ class NodeManager:
                 id=id,
                 branch=branch,
                 at=at,
-                include_owner=True,
-                include_source=True,
+                include_metadata=MetadataOptions.LINKED_NODES,
                 raise_on_error=True,
             )
 
@@ -491,8 +499,7 @@ class NodeManager:
                 hfid=hfid,
                 branch=branch,
                 at=at,
-                include_owner=True,
-                include_source=True,
+                include_metadata=MetadataOptions.LINKED_NODES,
                 raise_on_error=True,
             )
 
@@ -503,8 +510,7 @@ class NodeManager:
                 id=id,
                 branch=branch,
                 at=at,
-                include_owner=True,
-                include_source=True,
+                include_metadata=MetadataOptions.LINKED_NODES,
                 raise_on_error=True,
             )
 
@@ -521,10 +527,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol | None: ...
 
@@ -539,10 +543,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol: ...
 
@@ -557,10 +559,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol | None: ...
 
@@ -575,10 +575,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -593,10 +591,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node: ...
 
@@ -611,10 +607,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -628,10 +622,8 @@ class NodeManager:
         fields: dict | None = None,
         at: Timestamp | str | None = None,
         branch: Branch | str | None = None,
-        include_source: bool = False,
-        include_owner: bool = False,
+        include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
-        account=None,
         branch_agnostic: bool = False,
     ) -> Node | SchemaProtocol | None:
         branch = await registry.get_branch(branch=branch, db=db)
@@ -651,10 +643,8 @@ class NodeManager:
             filters={node_schema.default_filter: id},
             branch=branch,
             at=at,
-            include_owner=include_owner,
-            include_source=include_source,
+            include_metadata=include_metadata,
             prefetch_relationships=prefetch_relationships,
-            account=account,
             branch_agnostic=branch_agnostic,
             order=OrderModel(disable=True),
         )
@@ -689,10 +679,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
     ) -> SchemaProtocol | None: ...
 
     @overload
@@ -706,10 +694,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol: ...
 
@@ -724,10 +710,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol | None: ...
 
@@ -742,10 +726,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node: ...
 
@@ -760,10 +742,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -778,10 +758,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -795,15 +773,12 @@ class NodeManager:
         fields: dict | None = None,
         at: Timestamp | str | None = None,
         branch: Branch | str | None = None,
-        include_source: bool = False,
-        include_owner: bool = False,
+        include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
-        account=None,
         branch_agnostic: bool = False,
     ) -> Node | SchemaProtocol | None:
         branch = await registry.get_branch(branch=branch, db=db)
         at = Timestamp(at)
-
         node_schema = get_schema(db=db, branch=branch, node_schema=kind)
         kind_str = node_schema.kind
 
@@ -833,7 +808,8 @@ class NodeManager:
                 rel_schema = path.related_schema
                 # Keep the relationship attribute path and parse it
                 path = rel_schema.parse_schema_path(
-                    path=key.split("__", maxsplit=1)[1], schema=registry.schema.get_schema_branch(name=branch.name)
+                    path=key.split("__", maxsplit=1)[1],
+                    schema=registry.schema.get_schema_branch(name=branch.name),
                 )
 
             filters[key] = path.active_attribute_schema.get_class().deserialize_from_string(item)
@@ -846,10 +822,8 @@ class NodeManager:
             filters=filters,
             branch=branch,
             at=at,
-            include_owner=include_owner,
-            include_source=include_source,
+            include_metadata=include_metadata,
             prefetch_relationships=prefetch_relationships,
-            account=account,
             branch_agnostic=branch_agnostic,
             order=OrderModel(disable=True),
         )
@@ -879,10 +853,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol: ...
 
@@ -896,10 +868,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Any: ...
 
@@ -912,10 +882,8 @@ class NodeManager:
         fields: dict | None = None,
         at: Timestamp | str | None = None,
         branch: Branch | str | None = None,
-        include_source: bool = False,
-        include_owner: bool = False,
+        include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
-        account=None,
         branch_agnostic: bool = False,
     ) -> Any:
         branch = await registry.get_branch(branch=branch, db=db)
@@ -926,11 +894,9 @@ class NodeManager:
             fields=fields,
             at=at,
             branch=branch,
-            include_owner=include_owner,
-            include_source=include_source,
+            include_metadata=include_metadata,
             db=db,
             prefetch_relationships=prefetch_relationships,
-            account=account,
             branch_agnostic=branch_agnostic,
         )
         if node:
@@ -943,10 +909,8 @@ class NodeManager:
             fields=fields,
             at=at,
             branch=branch,
-            include_source=include_source,
-            include_owner=include_owner,
+            include_metadata=include_metadata,
             prefetch_relationships=prefetch_relationships,
-            account=account,
             branch_agnostic=branch_agnostic,
         )
         if not node:
@@ -964,10 +928,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol | None: ...
 
@@ -982,10 +944,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol: ...
 
@@ -1000,10 +960,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol: ...
 
@@ -1018,10 +976,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node: ...
 
@@ -1036,10 +992,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -1054,10 +1008,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -1072,10 +1024,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node: ...
 
@@ -1090,10 +1040,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -1108,10 +1056,8 @@ class NodeManager:
         fields: dict | None = ...,
         at: Timestamp | str | None = ...,
         branch: Branch | str | None = ...,
-        include_source: bool = ...,
-        include_owner: bool = ...,
+        include_metadata: MetadataQueryOptions | MetadataOptions = ...,
         prefetch_relationships: bool = ...,
-        account=...,
         branch_agnostic: bool = ...,
     ) -> Node | None: ...
 
@@ -1125,10 +1071,8 @@ class NodeManager:
         fields: dict | None = None,
         at: Timestamp | str | None = None,
         branch: Branch | str | None = None,
-        include_source: bool = False,
-        include_owner: bool = False,
+        include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
-        account=None,
         branch_agnostic: bool = False,
     ) -> Node | SchemaProtocol | None:
         """Return one node based on its ID."""
@@ -1139,9 +1083,7 @@ class NodeManager:
             fields=fields,
             at=at,
             branch=branch,
-            include_source=include_source,
-            include_owner=include_owner,
-            account=account,
+            include_metadata=include_metadata,
             prefetch_relationships=prefetch_relationships,
             db=db,
             branch_agnostic=branch_agnostic,
@@ -1189,10 +1131,8 @@ class NodeManager:
         fields: dict | None = None,
         at: Timestamp | str | None = None,
         branch: Branch | str | None = None,
-        include_source: bool = False,
-        include_owner: bool = False,
+        include_metadata: MetadataQueryOptions | MetadataOptions = MetadataOptions.NONE,
         prefetch_relationships: bool = False,
-        account=None,
         branch_agnostic: bool = False,
     ) -> dict[str, Node]:
         """Return a list of nodes based on their IDs."""
@@ -1200,22 +1140,34 @@ class NodeManager:
         branch = await registry.get_branch(branch=branch, db=db)
         at = Timestamp(at)
 
+        if not ids:
+            return {}
+
         # Query all nodes
+        node_metadata_options = (
+            include_metadata.node_level if isinstance(include_metadata, MetadataQueryOptions) else include_metadata
+        )
         query = await NodeListGetInfoQuery.init(
-            db=db, ids=ids, branch=branch, account=account, at=at, branch_agnostic=branch_agnostic
+            db=db,
+            ids=ids,
+            branch=branch,
+            at=at,
+            branch_agnostic=branch_agnostic,
+            include_metadata=node_metadata_options,
         )
         await query.execute(db=db)
         nodes_info_by_id: dict[str, NodeToProcess] = {node.node_uuid: node async for node in query.get_nodes(db=db)}
 
         # Query list of all Attributes
+        attribute_metadata_options = (
+            include_metadata.attribute_level if isinstance(include_metadata, MetadataQueryOptions) else include_metadata
+        )
         query = await NodeListGetAttributeQuery.init(
             db=db,
             ids=list(nodes_info_by_id.keys()),
             fields=fields,
             branch=branch,
-            include_source=include_source,
-            include_owner=include_owner,
-            account=account,
+            include_metadata=attribute_metadata_options,
             at=at,
             branch_agnostic=branch_agnostic,
         )
@@ -1232,7 +1184,6 @@ class NodeManager:
             new_node_data: dict[str, str | AttributeFromDB] = {
                 "db_id": node.node_id,
                 "id": node_id,
-                "updated_at": node.updated_at,
             }
 
             if not node.schema:
@@ -1253,17 +1204,26 @@ class NodeManager:
             node_branch = await registry.get_branch(db=db, branch=node.branch)
             item = await node_class.init(schema=node.schema, branch=node_branch, at=at, db=db)
             await item.load(**new_node_data, db=db)
+            item._set_created_at(node.created_at)
+            item._set_created_by(node.created_by)
+            item._set_updated_at(node.updated_at)
+            item._set_updated_by(node.updated_by)
 
             nodes[node_id] = item
 
+        relationships_metadata_options = (
+            include_metadata.relationship_level
+            if isinstance(include_metadata, MetadataQueryOptions)
+            else include_metadata
+        )
+
         await cls._enrich_node_dicts_with_relationships(
             db=db,
             branch=branch,
             at=at,
             nodes_by_id=nodes,
             branch_agnostic=branch_agnostic,
-            include_owner=include_owner,
-            include_source=include_source,
+            include_metadata=relationships_metadata_options,
             prefetch_relationships=prefetch_relationships,
             fields=fields,
         )
@@ -1278,8 +1238,7 @@ class NodeManager:
         at: Timestamp,
         nodes_by_id: dict[str, Node],
         branch_agnostic: bool,
-        include_owner: bool,
-        include_source: bool,
+        include_metadata: MetadataOptions,
         prefetch_relationships: bool,
         fields: dict[str, Any] | None,
     ) -> None:
@@ -1314,6 +1273,7 @@ class NodeManager:
             branch=branch,
             at=at,
             branch_agnostic=branch_agnostic,
+            include_metadata=include_metadata,
         )
         await query.execute(db=db)
         grouped_peer_nodes = query.get_peers_group_by_node()
@@ -1331,8 +1291,7 @@ class NodeManager:
                 branch=branch,
                 at=at,
                 db=db,
-                include_owner=include_owner,
-                include_source=include_source,
+                include_metadata=include_metadata,
             )
 
         for node in nodes_by_id.values():
@@ -1361,7 +1320,9 @@ class NodeManager:
         node_schema = node.get_schema()
         for rel_schema in node_schema.relationships:
             peer_ids = grouped_peer_nodes.get_peer_ids(
-                node_id=node.get_id(), rel_name=rel_schema.get_identifier(), direction=rel_schema.direction
+                node_id=node.get_id(),
+                rel_name=rel_schema.get_identifier(),
+                direction=rel_schema.direction,
             )
             if not peer_ids:
                 continue
@@ -1386,8 +1347,27 @@ class NodeManager:
             if rel_schema.cardinality is RelationshipCardinality.ONE and len(rel_peers) > 1:
                 raise ValueError("At most, one relationship expected")
 
+            rel_peers_with_metadata: list[PeerWithRelationshipMetadata] = []
+            for peer in rel_peers:
+                peer_id = peer.get_id() if isinstance(peer, Node) else peer
+                metadata_map = grouped_peer_nodes.get_metadata_map(
+                    node_id=node.get_id(),
+                    rel_name=rel_schema.get_identifier(),
+                    direction=rel_schema.direction,
+                    peer_id=peer_id,
+                )
+                peer_with_metadata = PeerWithRelationshipMetadata(peer=peer)
+                if not metadata_map:
+                    rel_peers_with_metadata.append(peer_with_metadata)
+                    continue
+                peer_with_metadata.created_at = metadata_map.get(MetadataOptions.CREATED_AT)
+                peer_with_metadata.created_by = metadata_map.get(MetadataOptions.CREATED_BY)
+                peer_with_metadata.updated_at = metadata_map.get(MetadataOptions.UPDATED_AT)
+                peer_with_metadata.updated_by = metadata_map.get(MetadataOptions.UPDATED_BY)
+                rel_peers_with_metadata.append(peer_with_metadata)
+
             rel_manager.has_fetched_relationships = True
-            await rel_manager.update(db=db, data=rel_peers)
+            await rel_manager.update(db=db, data=rel_peers_with_metadata)
 
     @classmethod
     async def delete(
@@ -1397,6 +1377,7 @@ class NodeManager:
         branch: Branch | str | None = None,
         at: Timestamp | None = None,
         cascade_delete: bool = True,
+        user_id: str = SYSTEM_USER_ID,
     ) -> list[Node]:
         """Returns list of deleted nodes because of cascading deletes"""
         branch = await registry.get_branch(branch=branch, db=db)
@@ -1411,7 +1392,7 @@ class NodeManager:
                 nodes_to_delete += list(node_map.values())
 
         for node in nodes_to_delete:
-            await node.delete(db=db, at=at)
+            await node.delete(db=db, at=at, user_id=user_id)
 
         return nodes_to_delete