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

infrahub/core/changelog/diff.py

@@ -116,13 +116,6 @@ class DiffChangelogCollector:
                             value_current=self._convert_string_boolean_value(value=attr_property.new_value),
                             value_previous=self._convert_string_boolean_value(value=attr_property.previous_value),
                         )
-                case DatabaseEdgeType.IS_VISIBLE:
-                    if _keep_branch_update(diff_property=attr_property):
-                        changelog_attribute.add_property(
-                            name="is_visible",
-                            value_current=self._convert_string_boolean_value(value=attr_property.new_value),
-                            value_previous=self._convert_string_boolean_value(value=attr_property.previous_value),
-                        )
                 case DatabaseEdgeType.HAS_SOURCE:
                     if _keep_branch_update(diff_property=attr_property):
                         changelog_attribute.add_property(
@@ -176,12 +169,6 @@ class DiffChangelogCollector:
                             value_current=self._convert_string_boolean_value(value=rel_prop.new_value),
                             value_previous=self._convert_string_boolean_value(value=rel_prop.previous_value),
                         )
-                    case DatabaseEdgeType.IS_VISIBLE:
-                        changelog_rel.add_property(
-                            name="is_visible",
-                            value_current=self._convert_string_boolean_value(value=rel_prop.new_value),
-                            value_previous=self._convert_string_boolean_value(value=rel_prop.previous_value),
-                        )
                     case DatabaseEdgeType.HAS_OWNER:
                         changelog_rel.add_property(
                             name="owner",
@@ -198,7 +185,7 @@ class DiffChangelogCollector:
         node.add_relationship(relationship_changelog=changelog_rel)
 
     def _convert_string_boolean_value(self, value: str | None) -> bool | None:
-        """Convert string based boolean for is_protected and is_visible."""
+        """Convert string based boolean for is_protected."""
         if value is not None:
             return str_to_bool(value)
 
@@ -218,12 +205,6 @@ class DiffChangelogCollector:
             )
             for peer_prop in peer.properties:
                 match peer_prop.property_type:
-                    case DatabaseEdgeType.IS_VISIBLE:
-                        peer_log.add_property(
-                            name="is_visible",
-                            value_current=self._convert_string_boolean_value(value=peer_prop.new_value),
-                            value_previous=self._convert_string_boolean_value(value=peer_prop.previous_value),
-                        )
                     case DatabaseEdgeType.IS_PROTECTED:
                         peer_log.add_property(
                             name="is_protected",

infrahub/core/changelog/models.py

@@ -186,9 +186,6 @@ class RelationshipCardinalityManyChangelog(BaseModel):
         properties["is_protected"] = PropertyChangelog(
             name="is_protected", value=relationship.is_protected, value_previous=None
         )
-        properties["is_visible"] = PropertyChangelog(
-            name="is_visible", value=relationship.is_protected, value_previous=None
-        )
         if owner := getattr(relationship, "owner_id", None):
             properties["owner"] = PropertyChangelog(name="owner", value=owner, value_previous=None)
         if source := getattr(relationship, "source_id", None):
@@ -280,9 +277,6 @@ class NodeChangelog(BaseModel):
             changelog_relationship.add_property(
                 name="is_protected", value_current=relationship.is_protected, value_previous=None
             )
-            changelog_relationship.add_property(
-                name="is_visible", value_current=relationship.is_visible, value_previous=None
-            )
             self.relationships[changelog_relationship.name] = changelog_relationship
         elif relationship.schema.cardinality == RelationshipCardinality.MANY:
             if relationship.schema.name not in self.relationships:
@@ -340,7 +334,6 @@ class NodeChangelog(BaseModel):
         if owner_id := getattr(attribute, "owner_id", None):
             changelog_attribute.add_property(name="owner", value_current=owner_id, value_previous=None)
         changelog_attribute.add_property(name="is_protected", value_current=attribute.is_protected, value_previous=None)
-        changelog_attribute.add_property(name="is_visible", value_current=attribute.is_visible, value_previous=None)
         self.attributes[changelog_attribute.name] = changelog_attribute
 
     def get_related_nodes(self) -> list[ChangelogRelatedNode]:

infrahub/core/constants/__init__.py

@@ -46,6 +46,8 @@ NULL_VALUE = "NULL"
 
 EVENT_NAMESPACE = "infrahub"
 
+SYSTEM_USER_ID = "__system__"
+
 
 class EventType(InfrahubStringEnum):
     BRANCH_CREATED = f"{EVENT_NAMESPACE}.branch.created"
@@ -359,6 +361,21 @@ class AttributeDBNodeType(Flag):
     IPNETWORK = DEFAULT | INDEX_ONLY | IPNETWORK_ONLY
 
 
+class MetadataOptions(Flag):
+    NONE = 0
+    SOURCE = auto()
+    OWNER = auto()
+    LINKED_NODES = SOURCE | OWNER
+    IS_PROTECTED = auto()
+    CREATED_BY = auto()
+    CREATED_AT = auto()
+    UPDATED_BY = auto()
+    UPDATED_AT = auto()
+    TIMESTAMPS = CREATED_AT | UPDATED_AT
+    USERS = CREATED_BY | UPDATED_BY
+    USER_TIMESTAMPS = TIMESTAMPS | USERS
+
+
 RESTRICTED_NAMESPACES: list[str] = [
     "Account",
     "Branch",

infrahub/core/constants/database.py

@@ -8,7 +8,6 @@ class DatabaseEdgeType(Enum):
     HAS_ATTRIBUTE = "HAS_ATTRIBUTE"
     IS_RELATED = "IS_RELATED"
     HAS_VALUE = "HAS_VALUE"
-    IS_VISIBLE = "IS_VISIBLE"
     IS_PROTECTED = "IS_PROTECTED"
     HAS_OWNER = "HAS_OWNER"
     HAS_SOURCE = "HAS_SOURCE"

infrahub/core/constants/schema.py

@@ -4,7 +4,6 @@ PARENT_CHILD_IDENTIFIER = "parent__child"
 
 
 class FlagProperty(Enum):
-    IS_VISIBLE = "is_visible"
     IS_PROTECTED = "is_protected"
 
 

infrahub/core/convert_object_type/repository_conversion.py

@@ -1,6 +1,5 @@
 from infrahub import lock
 from infrahub.core.branch import Branch
-from infrahub.core.constants.infrahubkind import REPOSITORYVALIDATOR, USERVALIDATOR
 from infrahub.core.convert_object_type.object_conversion import (
     ConversionFieldInput,
     convert_object_type,
@@ -8,7 +7,7 @@ from infrahub.core.convert_object_type.object_conversion import (
 )
 from infrahub.core.manager import NodeManager
 from infrahub.core.node import Node
-from infrahub.core.protocols import CoreReadOnlyRepository, CoreRepository
+from infrahub.core.protocols import CoreReadOnlyRepository, CoreRepository, CoreRepositoryValidator, CoreUserValidator
 from infrahub.core.schema import NodeSchema
 from infrahub.core.timestamp import Timestamp
 from infrahub.database import InfrahubDatabase
@@ -35,11 +34,11 @@ async def convert_repository_type(
 
             # Fetch validators before deleting the repository otherwise validator-repository would no longer exist
             user_validators = await NodeManager.query(
-                db=dbt, schema=USERVALIDATOR, prefetch_relationships=True, filters={"repository__id": repository.id}
+                db=dbt, schema=CoreUserValidator, prefetch_relationships=True, filters={"repository__id": repository.id}
             )
             repository_validators = await NodeManager.query(
                 db=dbt,
-                schema=REPOSITORYVALIDATOR,
+                schema=CoreRepositoryValidator,
                 prefetch_relationships=True,
                 filters={"repository__id": repository.id},
             )

infrahub/core/diff/branch_differ.py

@@ -41,7 +41,7 @@ class BranchDiffer:
         diff_to: str | Timestamp | None = None,
         db: InfrahubDatabase | None = None,
         service: InfrahubServices | None = None,
-    ):
+    ) -> None:
         """_summary_
 
         Args:

infrahub/core/diff/conflict_transferer.py

@@ -9,7 +9,7 @@ from .model.path import (
 
 
 class DiffConflictTransferer:
-    def __init__(self, diff_combiner: DiffCombiner):
+    def __init__(self, diff_combiner: DiffCombiner) -> None:
         self.diff_combiner = diff_combiner
 
     async def transfer(self, earlier: EnrichedDiffRoot, later: EnrichedDiffRoot) -> None:

infrahub/core/diff/data_check_synchronizer.py

@@ -1,10 +1,11 @@
 from enum import Enum
 
-from infrahub.core.constants import BranchConflictKeep, InfrahubKind
+from infrahub.core.constants import BranchConflictKeep
 from infrahub.core.diff.query.filters import EnrichedDiffQueryFilters
 from infrahub.core.integrity.object_conflict.conflict_recorder import ObjectConflictValidatorRecorder
 from infrahub.core.manager import NodeManager
 from infrahub.core.node import Node
+from infrahub.core.protocols import CoreProposedChange
 from infrahub.database import InfrahubDatabase
 from infrahub.exceptions import SchemaNotFoundError
 from infrahub.proposed_change.constants import ProposedChangeState
@@ -28,7 +29,7 @@ class DiffDataCheckSynchronizer:
         conflicts_extractor: DiffConflictsExtractor,
         conflict_recorder: ObjectConflictValidatorRecorder,
         diff_repository: DiffRepository,
-    ):
+    ) -> None:
         self.db = db
         self.conflicts_extractor = conflicts_extractor
         self.conflict_recorder = conflict_recorder
@@ -52,7 +53,7 @@ class DiffDataCheckSynchronizer:
         try:
             proposed_changes = await NodeManager.query(
                 db=self.db,
-                schema=InfrahubKind.PROPOSEDCHANGE,
+                schema=CoreProposedChange,
                 filters={"source_branch": enriched_diff.diff_branch_name, "state": ProposedChangeState.OPEN},
             )
         except SchemaNotFoundError:

infrahub/core/diff/enricher/cardinality_one.py

@@ -28,10 +28,10 @@ class DiffCardinalityOneEnricher(DiffEnricherInterface):
      - the peer_id property of the element will be the latest non-null peer ID for this element
      - the element MUST have an EnrichedDiffProperty of property_type=IS_RELATED that correctly records
         the previous and new values of the peer ID for this element
-     - changes to properties (IS_VISIBLE, etc) of a cardinality=one relationship are consolidated as well
+     - changes to properties (IS_PROTECTED, etc) of a cardinality=one relationship are consolidated as well
     """
 
-    def __init__(self, db: InfrahubDatabase):
+    def __init__(self, db: InfrahubDatabase) -> None:
         self.db = db
         self._node_schema_map: dict[str, MainSchemaTypes] = {}
 

infrahub/core/diff/enricher/hierarchy.py

@@ -24,7 +24,7 @@ log = get_logger()
 class DiffHierarchyEnricher(DiffEnricherInterface):
     """Add hierarchy and parent/component nodes to diff even if the higher-level nodes are unchanged"""
 
-    def __init__(self, db: InfrahubDatabase, parent_adder: DiffParentNodeAdder):
+    def __init__(self, db: InfrahubDatabase, parent_adder: DiffParentNodeAdder) -> None:
         self.db = db
         self.parent_adder = parent_adder
 

infrahub/core/diff/enricher/labels.py

@@ -35,7 +35,7 @@ class DisplayLabelRequest:
 class DiffLabelsEnricher(DiffEnricherInterface):
     """Add display labels for nodes and labels for relationships"""
 
-    def __init__(self, db: InfrahubDatabase):
+    def __init__(self, db: InfrahubDatabase) -> None:
         self.db = db
         self._base_branch_name: str | None = None
         self._diff_branch_name: str | None = None

infrahub/core/diff/merger/merger.py

@@ -6,6 +6,7 @@ from infrahub.core import registry
 from infrahub.core.constants import DiffAction
 from infrahub.core.diff.model.path import BranchTrackingId
 from infrahub.core.diff.query.merge import (
+    DiffMergeMetadataQuery,
     DiffMergeMigratedKindsQuery,
     DiffMergePropertiesQuery,
     DiffMergeQuery,
@@ -26,6 +27,8 @@ log = get_logger()
 
 
 class DiffMerger:
+    metadata_batch_size = 500
+
     def __init__(
         self,
         db: InfrahubDatabase,
@@ -33,12 +36,13 @@ class DiffMerger:
         destination_branch: Branch,
         diff_repository: DiffRepository,
         serializer: DiffMergeSerializer,
-    ):
+    ) -> None:
         self.source_branch = source_branch
         self.destination_branch = destination_branch
         self.db = db
         self.diff_repository = diff_repository
         self.serializer = serializer
+        self._affected_node_uuids: list[str] = []
 
     async def merge_graph(self, at: Timestamp) -> EnrichedDiffRoot:
         tracking_id = BranchTrackingId(name=self.source_branch.name)
@@ -69,6 +73,7 @@ class DiffMerger:
                 # make sure that we use the ADDED db_id if it exists
                 # it will not if a node was migrated and then deleted
                 migrated_kinds_id_map[n.uuid] = n.identifier.db_id
+
         async for node_diff_dicts, property_diff_dicts in self.serializer.serialize_diff(diff=enriched_diff):
             if node_diff_dicts:
                 log.info(f"Merging batch of nodes #{batch_num}")
@@ -105,13 +110,34 @@ class DiffMerger:
             )
             await migrated_merge_query.execute(db=self.db)
 
+        affected_node_uuids = [n.uuid for n in enriched_diff.nodes]
+        self._affected_node_uuids = affected_node_uuids
+        if affected_node_uuids:
+            for i in range(0, len(affected_node_uuids), self.metadata_batch_size):
+                batch_uuids = affected_node_uuids[i : i + self.metadata_batch_size]
+                log.info(f"Updating metadata for batch {i // self.metadata_batch_size + 1} ({len(batch_uuids)} nodes)")
+                metadata_query = await DiffMergeMetadataQuery.init(
+                    db=self.db,
+                    branch=self.source_branch,
+                    at=at,
+                    target_branch=self.destination_branch,
+                    node_uuids=batch_uuids,
+                )
+                await metadata_query.execute(db=self.db)
+
         self.source_branch.branched_from = at.to_string()
         await self.source_branch.save(db=self.db)
         registry.branch[self.source_branch.name] = self.source_branch
         return enriched_diff
 
     async def rollback(self, at: Timestamp) -> None:
+        if not self._affected_node_uuids:
+            return
         rollback_query = await DiffMergeRollbackQuery.init(
-            db=self.db, branch=self.source_branch, target_branch=self.destination_branch, at=at
+            db=self.db,
+            branch=self.source_branch,
+            target_branch=self.destination_branch,
+            at=at,
+            node_uuids=self._affected_node_uuids,
         )
         await rollback_query.execute(db=self.db)

infrahub/core/diff/merger/serializer.py

@@ -93,9 +93,7 @@ class DiffMergeSerializer:
         if property_type in (DatabaseEdgeType.HAS_OWNER, DatabaseEdgeType.HAS_SOURCE, DatabaseEdgeType.IS_RELATED):
             return raw_value
         # these are boolean
-        if (property_type in (DatabaseEdgeType.IS_VISIBLE, DatabaseEdgeType.IS_PROTECTED)) and isinstance(
-            raw_value, str
-        ):
+        if property_type == DatabaseEdgeType.IS_PROTECTED and isinstance(raw_value, str):
             return raw_value.lower() == "true"
         # this must be HAS_VALUE
         if raw_value in (None, NULL_VALUE):
@@ -249,13 +247,8 @@ class DiffMergeSerializer:
         return attr_dict, attr_prop_dict
 
     def _get_default_property_merge_dicts(self, action: DiffAction) -> dict[DatabaseEdgeType, PropertyMergeDict]:
-        # start with default values for IS_VISIBLE and IS_PROTECTED b/c we always want to update them during a merge
+        # start with default values for IS_PROTECTED b/c we always want to update them during a merge
         return {
-            DatabaseEdgeType.IS_VISIBLE: PropertyMergeDict(
-                property_type=DatabaseEdgeType.IS_VISIBLE.value,
-                action=self._to_action_str(action),
-                value=None,
-            ),
             DatabaseEdgeType.IS_PROTECTED: PropertyMergeDict(
                 property_type=DatabaseEdgeType.IS_PROTECTED.value,
                 action=self._to_action_str(action),
@@ -335,7 +328,7 @@ class DiffMergeSerializer:
                 # handled above
                 continue
             python_value_type: type = str
-            if property_diff.property_type in (DatabaseEdgeType.IS_VISIBLE, DatabaseEdgeType.IS_PROTECTED):
+            if property_diff.property_type is DatabaseEdgeType.IS_PROTECTED:
                 python_value_type = bool
             actions_and_values = self._get_property_actions_and_values(
                 property_diff=property_diff, python_value_type=python_value_type

infrahub/core/diff/model/diff.py

@@ -26,7 +26,7 @@ class BaseDiffElement(BaseModel):
         """
         resp: dict[str, Any] = {}
         for key, value in self:
-            field_info = self.model_fields[key]
+            field_info = self.__class__.model_fields[key]
             if isinstance(value, BaseModel):
                 resp[key] = value.to_graphql()  # type: ignore[attr-defined]
             elif isinstance(value, dict):