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

infrahub/core/migrations/schema/attribute_name_update.py

@@ -14,7 +14,7 @@ class AttributeNameUpdateMigrationQuery01(AttributeMigrationQuery, AttributeRena
         self,
         migration: AttributeSchemaMigration,
         **kwargs: Any,
-    ):
+    ) -> None:
         new_attr = AttributeInfo(
             name=migration.new_attribute_schema.name,
             node_kind=migration.new_schema.kind,

infrahub/core/migrations/schema/attribute_supports_profile.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Sequence
 
+from infrahub.core.constants import SYSTEM_USER_ID
 from infrahub.core.migrations.query.attribute_remove import AttributeRemoveQuery
 from infrahub.core.schema.generic_schema import GenericSchema
 from infrahub.core.schema.node_schema import NodeSchema
@@ -33,7 +34,7 @@ class ProfilesAttributeAddMigrationQuery(AttributeMigrationQuery, AttributeAddQu
         self,
         migration: AttributeSchemaMigration,
         **kwargs: Any,
-    ):
+    ) -> None:
         node_kinds = _get_node_kinds(migration.new_schema)
         super().__init__(
             migration=migration,
@@ -53,7 +54,7 @@ class ProfilesAttributeRemoveMigrationQuery(AttributeMigrationQuery, AttributeRe
         self,
         migration: AttributeSchemaMigration,
         **kwargs: Any,
-    ):
+    ) -> None:
         node_kinds = _get_node_kinds(migration.new_schema)
         super().__init__(
             migration=migration,
@@ -73,6 +74,7 @@ class AttributeSupportsProfileUpdateMigration(AttributeSchemaMigration):
         branch: Branch,
         at: Timestamp | str | None = None,
         queries: Sequence[type[MigrationBaseQuery]] | None = None,  # noqa: ARG002
+        user_id: str = SYSTEM_USER_ID,
     ) -> MigrationResult:
         if (
             # no change in whether the attribute should be used on profiles
@@ -87,4 +89,4 @@ class AttributeSupportsProfileUpdateMigration(AttributeSchemaMigration):
         if not self.new_attribute_schema.support_profiles:
             profiles_queries.append(ProfilesAttributeRemoveMigrationQuery)
 
-        return await super().execute(db=db, branch=branch, at=at, queries=profiles_queries)
+        return await super().execute(db=db, branch=branch, at=at, queries=profiles_queries, user_id=user_id)

infrahub/core/migrations/schema/models.py

@@ -3,6 +3,7 @@ from typing import Any
 from pydantic import BaseModel, ConfigDict, Field, field_validator, model_serializer
 
 from infrahub.core.branch import Branch
+from infrahub.core.constants import SYSTEM_USER_ID
 from infrahub.core.models import SchemaUpdateMigrationInfo
 from infrahub.core.path import SchemaPath
 from infrahub.core.schema.schema_branch import SchemaBranch
@@ -15,6 +16,7 @@ class SchemaApplyMigrationData(BaseModel):
     new_schema: SchemaBranch
     previous_schema: SchemaBranch
     migrations: list[SchemaUpdateMigrationInfo]
+    user_id: str = SYSTEM_USER_ID
 
     @model_serializer()
     def serialize_model(self) -> dict[str, Any]:
@@ -23,6 +25,7 @@ class SchemaApplyMigrationData(BaseModel):
             "previous_schema": self.previous_schema.to_dict_schema_object(),
             "new_schema": self.new_schema.to_dict_schema_object(),
             "migrations": [migration.model_dump() for migration in self.migrations],
+            "user_id": self.user_id,
         }
 
     @field_validator("new_schema", "previous_schema", mode="before")

infrahub/core/migrations/schema/node_attribute_add.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any, Sequence
 
 from infrahub.core import registry
+from infrahub.core.constants import SYSTEM_USER_ID
 from infrahub.core.node import Node
 from infrahub.core.schema.generic_schema import GenericSchema
 from infrahub.core.schema.node_schema import NodeSchema
@@ -40,7 +41,7 @@ class NodeAttributeAddMigrationQuery01(AttributeMigrationQuery, AttributeAddQuer
         self,
         migration: AttributeSchemaMigration,
         **kwargs: Any,
-    ):
+    ) -> None:
         node_kinds = self._get_node_kinds(
             schema=migration.new_schema, new_attribute_schema=migration.new_attribute_schema
         )
@@ -65,10 +66,11 @@ class NodeAttributeAddMigration(AttributeSchemaMigration):
         branch: Branch,
         at: Timestamp | str | None = None,
         queries: Sequence[type[MigrationBaseQuery]] | None = None,
+        user_id: str = SYSTEM_USER_ID,
     ) -> MigrationResult:
         if self.new_attribute_schema.inherited is True:
             return MigrationResult()
-        return await super().execute(db=db, branch=branch, at=at, queries=queries)
+        return await super().execute(db=db, branch=branch, at=at, queries=queries, user_id=user_id)
 
     async def execute_post_queries(
         self,
@@ -76,6 +78,7 @@ class NodeAttributeAddMigration(AttributeSchemaMigration):
         result: MigrationResult,
         branch: Branch,
         at: Timestamp,  # noqa: ARG002
+        user_id: str,  # noqa: ARG002
     ) -> MigrationResult:
         if self.new_attribute_schema.kind != "NumberPool":
             return result

infrahub/core/migrations/schema/node_attribute_remove.py

@@ -15,7 +15,7 @@ class NodeAttributeRemoveMigrationQuery01(AttributeMigrationQuery, AttributeRemo
         self,
         migration: AttributeSchemaMigration,
         **kwargs: Any,
-    ):
+    ) -> None:
         super().__init__(
             migration=migration,
             attribute_name=migration.previous_attribute_schema.name,

infrahub/core/migrations/schema/node_kind_update.py

@@ -14,7 +14,7 @@ class NodeKindUpdateMigrationQuery01(MigrationQuery, NodeDuplicateQuery):
         self,
         migration: SchemaMigration,
         **kwargs: Any,
-    ):
+    ) -> None:
         new_node = SchemaNodeInfo(
             name=migration.new_schema.name,
             namespace=migration.new_schema.namespace,

infrahub/core/migrations/schema/node_remove.py

@@ -51,12 +51,17 @@ class NodeRemoveMigrationBaseQuery(MigrationQuery):
         self.params["branch_name"] = self.branch.name
         self.params["branch"] = self.branch.name
         self.params["branch_level"] = self.branch.hierarchy_level
+        self.params["user_id"] = self.user_id
 
         self.params["rel_props"] = {
             "status": RelationshipStatus.DELETED.value,
             "from": self.at.to_string(),
+            "from_user_id": self.user_id,
         }
 
+        # Set metadata for vertex properties on default/global branch
+        self.params["set_metadata"] = self.branch.is_default or self.branch.is_global
+
         node_remove_query = self.render_node_remove_query(branch_filter=branch_filter)
 
         query = """
@@ -72,6 +77,13 @@ class NodeRemoveMigrationBaseQuery(MigrationQuery):
         WITH n1 as active_node, r1 as rb
         WHERE rb.status = "active"
         %(node_remove_query)s
+        WITH active_node
+        // Set metadata on Node vertex if on default/global branch
+        CALL (active_node) {
+            WITH active_node
+            WHERE $set_metadata
+            SET active_node.updated_at = $current_time, active_node.updated_by = $user_id
+        }
         RETURN DISTINCT active_node
         """ % {
             "branch_filter": branch_filter,
@@ -103,12 +115,17 @@ class NodeRemoveMigrationQueryIn(NodeRemoveMigrationBaseQuery):
         }
         WITH n1 as active_node, rel_inband1 as rel_inband, p1 as peer_node
         WHERE rel_inband.status = "active"
+        CALL (peer_node) {
+            WITH peer_node
+            WHERE $set_metadata
+            SET peer_node.updated_at = $current_time, peer_node.updated_by = $user_id
+        }
         CALL (%(sub_query_args)s) {
             %(sub_query)s
         }
         WITH p2 as peer_node, rel_inband, active_node
         FOREACH (i in CASE WHEN rel_inband.branch IN ["-global-", $branch] THEN [1] ELSE [] END |
-            SET rel_inband.to = $current_time
+            SET rel_inband.to = $current_time, rel_inband.to_user_id = $user_id
         )
         """ % {"sub_query": sub_query, "sub_query_args": sub_query_args, "branch_filter": branch_filter}
         return query
@@ -150,11 +167,16 @@ class NodeRemoveMigrationQueryOut(NodeRemoveMigrationBaseQuery):
         }
         WITH n1 as active_node, rel_outband1 as rel_outband, p1 as peer_node
         WHERE rel_outband.status = "active"
+        CALL (peer_node) {
+            WITH peer_node
+            WHERE $set_metadata
+            SET peer_node.updated_at = $current_time, peer_node.updated_by = $user_id
+        }
         CALL (%(sub_query_args)s) {
             %(sub_query)s
         }
         FOREACH (i in CASE WHEN rel_outband.branch IN ["-global-", $branch] THEN [1] ELSE [] END |
-            SET rel_outband.to = $current_time
+            SET rel_outband.to = $current_time, rel_outband.to_user_id = $user_id
         )
         """ % {"sub_query": sub_query, "sub_query_args": sub_query_args, "branch_filter": branch_filter}
 

infrahub/core/migrations/schema/tasks.py

@@ -8,6 +8,7 @@ from prefect.cache_policies import NONE
 from prefect.logging import get_run_logger
 
 from infrahub.core.branch import Branch  # noqa: TC001
+from infrahub.core.constants import SYSTEM_USER_ID
 from infrahub.core.migrations import MIGRATION_MAP
 from infrahub.core.path import SchemaPath  # noqa: TC001
 from infrahub.workers.dependencies import get_database
@@ -57,6 +58,7 @@ async def schema_apply_migrations(message: SchemaApplyMigrationData) -> list[str
             previous_node_schema=previous_node_schema,
             schema_path=migration.path,
             database=await get_database(),
+            user_id=message.user_id,
         )
 
     async for _, result in batch.execute():
@@ -79,6 +81,7 @@ async def schema_path_migrate(
     database: InfrahubDatabase,
     new_node_schema: MainSchemaTypes | None = None,
     previous_node_schema: MainSchemaTypes | None = None,
+    user_id: str = SYSTEM_USER_ID,
 ) -> SchemaMigrationPathResponseData:
     log = get_run_logger()
 
@@ -101,7 +104,7 @@ async def schema_path_migrate(
             previous_node_schema=previous_node_schema,  # type: ignore[arg-type]
             schema_path=schema_path,
         )
-        execution_result = await migration.execute(db=db, branch=branch)
+        execution_result = await migration.execute(db=db, branch=branch, user_id=user_id)
 
         log.info(f"Migration completed for {migration_name}")
         log.debug(f"execution_result {execution_result}")

infrahub/core/migrations/shared.py

@@ -7,6 +7,7 @@ from rich.console import Console
 from typing_extensions import Self
 
 from infrahub.core import registry
+from infrahub.core.constants import SYSTEM_USER_ID
 from infrahub.core.path import SchemaPath  # noqa: TC001
 from infrahub.core.query import Query  # noqa: TC001
 from infrahub.core.schema import AttributeSchema, MainSchemaTypes, RelationshipSchema, SchemaRoot, internal_schema
@@ -62,6 +63,7 @@ class SchemaMigration(BaseModel):
         result: MigrationResult,
         branch: Branch,  # noqa: ARG002
         at: Timestamp,  # noqa: ARG002
+        user_id: str,  # noqa: ARG002
     ) -> MigrationResult:
         return result
 
@@ -71,6 +73,7 @@ class SchemaMigration(BaseModel):
         result: MigrationResult,
         branch: Branch,  # noqa: ARG002
         at: Timestamp,  # noqa: ARG002
+        user_id: str,  # noqa: ARG002
     ) -> MigrationResult:
         return result
 
@@ -81,10 +84,11 @@ class SchemaMigration(BaseModel):
         branch: Branch,
         at: Timestamp,
         queries: Sequence[type[MigrationBaseQuery]],
+        user_id: str,
     ) -> MigrationResult:
         for migration_query in queries:
             try:
-                query = await migration_query.init(db=db, branch=branch, at=at, migration=self)
+                query = await migration_query.init(db=db, branch=branch, at=at, migration=self, user_id=user_id)
                 await query.execute(db=db)
                 result.nbr_migrations_executed += query.get_nbr_migrations_executed()
             except Exception as exc:
@@ -99,15 +103,18 @@ class SchemaMigration(BaseModel):
         branch: Branch,
         at: Timestamp | str | None = None,
         queries: Sequence[type[MigrationBaseQuery]] | None = None,
+        user_id: str = SYSTEM_USER_ID,
     ) -> MigrationResult:
         async with db.start_transaction() as ts:
             result = MigrationResult()
             at = Timestamp(at)
 
-            await self.execute_pre_queries(db=ts, result=result, branch=branch, at=at)
+            await self.execute_pre_queries(db=ts, result=result, branch=branch, at=at, user_id=user_id)
             queries_to_execute = queries or self.queries
-            await self.execute_queries(db=ts, result=result, branch=branch, at=at, queries=queries_to_execute)
-            await self.execute_post_queries(db=ts, result=result, branch=branch, at=at)
+            await self.execute_queries(
+                db=ts, result=result, branch=branch, at=at, queries=queries_to_execute, user_id=user_id
+            )
+            await self.execute_post_queries(db=ts, result=result, branch=branch, at=at, user_id=user_id)
 
         return result
 
@@ -209,14 +216,14 @@ class InternalSchemaMigration(BaseModel):
     async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
         raise NotImplementedError
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, db: InfrahubDatabase, user_id: str = SYSTEM_USER_ID) -> MigrationResult:
         result = MigrationResult()
 
         default_branch = registry.get_branch_from_registry()
 
         for migration in self.migrations:
             try:
-                execution_result = await migration.execute(db=db, branch=default_branch)
+                execution_result = await migration.execute(db=db, branch=default_branch, user_id=user_id)
                 result.errors.extend(execution_result.errors)
             except Exception as exc:
                 result.errors.append(str(exc))

infrahub/core/models.py

@@ -267,7 +267,7 @@ class SchemaUpdateValidationResult(BaseModel):
                 if prop_name in PROPERTY_NAMES_TO_IGNORE:
                     continue
 
-                field_info = field.model_fields[prop_name]
+                field_info = field.__class__.model_fields[prop_name]
                 field_update = str(field_info.json_schema_extra.get("update"))  # type: ignore[union-attr]
 
                 if isinstance(prop_diff, HashableModelDiff):
@@ -275,7 +275,7 @@ class SchemaUpdateValidationResult(BaseModel):
                         # override field_update if this field has its own json_schema_extra.update
                         try:
                             prop_field = getattr(field, prop_name)
-                            param_field_info = prop_field.model_fields[param_field_name]
+                            param_field_info = prop_field.__class__.model_fields[param_field_name]
                             param_field_update = str(param_field_info.json_schema_extra.get("update"))
                         except (AttributeError, KeyError):
                             param_field_update = None
@@ -306,7 +306,7 @@ class SchemaUpdateValidationResult(BaseModel):
                 )
 
     def _process_node_attributes(self, schema: MainSchemaTypes, node_field_name: str) -> None:
-        field_info = schema.model_fields[node_field_name]
+        field_info = schema.__class__.model_fields[node_field_name]
         field_update = str(field_info.json_schema_extra.get("update"))  # type: ignore[union-attr]
 
         # No need to execute a migration for generic nodes attributes because they are not stored in the database
@@ -424,7 +424,7 @@ class HashableModel(BaseModel):
 
         values = []
         md5hash = hashlib.md5(usedforsecurity=False)
-        for field_name in sorted(self.model_fields.keys()):
+        for field_name in sorted(self.__class__.model_fields.keys()):
             if field_name.startswith("_") or field_name in self._exclude_from_hash:
                 continue
 
@@ -577,7 +577,7 @@ class HashableModel(BaseModel):
         TODO Implement other fields type like dict
         """
 
-        for field_name in other.model_fields.keys():
+        for field_name in other.__class__.model_fields.keys():
             if not hasattr(self, field_name):
                 with contextlib.suppress(ValueError):
                     # handles the case where self and other are different types and other has fields that self does not
@@ -613,7 +613,7 @@ class HashableModel(BaseModel):
         return attr_other
 
     def _get_field_names_for_diff(self) -> list[str]:
-        return list(self.model_fields.keys())
+        return list(self.__class__.model_fields.keys())
 
     def diff(self, other: Self) -> HashableModelDiff:
         in_both, local_only, other_only = compare_lists(