infrahub-server 1.7.0b0__py3-none-any.whl → 1.7.0rc0__py3-none-any.whl

infrahub/core/migrations/graph/m012_convert_account_generic.py

@@ -43,7 +43,7 @@ class Migration012RenameTypeAttributeData(AttributeRenameQuery):
     name = "migration_012_rename_attr_type"
     type = QueryType.WRITE
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         new_attr = AttributeInfo(
             name="account_type",
             node_kind=InfrahubKind.ACCOUNT,
@@ -83,7 +83,7 @@ class Migration012AddLabelData(NodeDuplicateQuery):
     name = "migration_012_add_labels"
     type = QueryType.WRITE
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         new_node = SchemaNodeInfo(
             name="Account",
             namespace="Core",
@@ -132,7 +132,7 @@ class Migration012RenameTypeAttributeSchema(SchemaAttributeUpdateQuery):
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(
             attribute_name="name",
             node_name="Account",
@@ -150,7 +150,7 @@ class Migration012RenameRelationshipAccountTokenData(RelationshipDuplicateQuery)
     name = "migration_012_rename_rel_account_token_data"
     type = QueryType.WRITE
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         new_rel = SchemaRelationshipInfo(
             name="account__token",
             branch_support=BranchSupportType.AGNOSTIC.value,
@@ -173,7 +173,7 @@ class Migration012RenameRelationshipRefreshTokenData(RelationshipDuplicateQuery)
     name = "migration_012_rename_rel_refresh_token_data"
     type = QueryType.WRITE
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         new_rel = SchemaRelationshipInfo(
             name="account__refreshtoken",
             branch_support=BranchSupportType.AGNOSTIC.value,
@@ -196,7 +196,7 @@ class Migration012RenameRelationshipThreadData(RelationshipDuplicateQuery):
     name = "migration_012_rename_rel_thread_data"
     type = QueryType.WRITE
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         new_rel = SchemaRelationshipInfo(
             name="thread__account",
             branch_support=BranchSupportType.AGNOSTIC.value,
@@ -219,7 +219,7 @@ class Migration012RenameRelationshipCommentData(RelationshipDuplicateQuery):
     name = "migration_012_rename_rel_comment_data"
     type = QueryType.WRITE
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         new_rel = SchemaRelationshipInfo(
             name="comment__account",
             branch_support=BranchSupportType.AGNOSTIC.value,
@@ -243,7 +243,7 @@ class Migration012DeleteOldElementsSchema(DeleteElementInSchemaQuery):
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         kwargs.pop("branch", None)
 
         super().__init__(
@@ -260,7 +260,7 @@ class Migration012UpdateDisplayLabels(SchemaAttributeUpdateQuery):
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         kwargs.pop("branch", None)
 
         super().__init__(
@@ -277,7 +277,7 @@ class Migration012UpdateOrderBy(SchemaAttributeUpdateQuery):
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         kwargs.pop("branch", None)
 
         super().__init__(
@@ -294,7 +294,7 @@ class Migration012UpdateDefaultFilter(SchemaAttributeUpdateQuery):
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         kwargs.pop("branch", None)
 
         super().__init__(
@@ -311,7 +311,7 @@ class Migration012UpdateHFID(SchemaAttributeUpdateQuery):
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         kwargs.pop("branch", None)
 
         super().__init__(

infrahub/core/migrations/graph/m013_convert_git_password_credential.py

@@ -228,7 +228,7 @@ class Migration013DeleteUsernamePasswordGenericSchema(DeleteElementInSchemaQuery
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         kwargs.pop("branch", None)
 
         super().__init__(
@@ -245,7 +245,7 @@ class Migration013DeleteUsernamePasswordReadWriteSchema(DeleteElementInSchemaQue
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         kwargs.pop("branch", None)
 
         super().__init__(
@@ -262,7 +262,7 @@ class Migration013DeleteUsernamePasswordReadOnlySchema(DeleteElementInSchemaQuer
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         kwargs.pop("branch", None)
 
         super().__init__(
@@ -277,7 +277,7 @@ class Migration013DeleteUsernamePasswordReadOnlySchema(DeleteElementInSchemaQuer
 class Migration013AddInternalStatusData(AttributeAddQuery):
     type = QueryType.WRITE
 
-    def __init__(self, **kwargs: Any):
+    def __init__(self, **kwargs: Any) -> None:
         kwargs.pop("branch", None)
 
         super().__init__(

infrahub/core/migrations/graph/m041_deleted_dup_edges.py

@@ -73,7 +73,7 @@ class DeleteDuplicatedRelationshipEdges(Query):
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, migrated_kind_nodes_only: bool = True, **kwargs: Any):
+    def __init__(self, migrated_kind_nodes_only: bool = True, **kwargs: Any) -> None:
         self.migrated_kind_nodes_only = migrated_kind_nodes_only
         super().__init__(**kwargs)
 

infrahub/core/migrations/graph/m049_remove_is_visible_relationship.py

@@ -26,10 +26,25 @@ class RemoveIsVisibleRelationshipQuery(Query):
         self.add_to_query(query)
 
 
+class RemoveIsVisibleFromDiffsQuery(Query):
+    name = "remove_is_visible_from_diffs"
+    type = QueryType.WRITE
+    insert_return = False
+
+    async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
+        query = """
+        MATCH (diff_prop:DiffProperty {property_type: "IS_VISIBLE"})
+        CALL (diff_prop) {
+            DETACH DELETE diff_prop
+        } IN TRANSACTIONS
+        """
+        self.add_to_query(query)
+
+
 class Migration049(GraphMigration):
     name: str = "049_remove_is_visible_relationship"
     minimum_version: int = 48
-    queries: Sequence[type[Query]] = [RemoveIsVisibleRelationshipQuery]
+    queries: Sequence[type[Query]] = [RemoveIsVisibleRelationshipQuery, RemoveIsVisibleFromDiffsQuery]
 
     async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         return MigrationResult()

infrahub/core/migrations/query/__init__.py

@@ -20,7 +20,7 @@ class MigrationQuery(MigrationBaseQuery):
         self,
         migration: SchemaMigration,
         **kwargs: Any,
-    ):
+    ) -> None:
         self.migration = migration
         super().__init__(**kwargs)
 
@@ -32,6 +32,6 @@ class AttributeMigrationQuery(MigrationBaseQuery):
         self,
         migration: AttributeSchemaMigration,
         **kwargs: Any,
-    ):
+    ) -> None:
         self.migration = migration
         super().__init__(**kwargs)

infrahub/core/migrations/query/schema_attribute_update.py

@@ -24,7 +24,7 @@ class SchemaAttributeUpdateQuery(Query):
         new_value: Any,
         previous_value: Any | None = None,
         **kwargs: Any,
-    ):
+    ) -> None:
         self.attr_name = attribute_name
         self.node_name = node_name
         self.node_namespace = node_namespace

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

@@ -34,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,
@@ -54,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,

infrahub/core/migrations/schema/node_attribute_add.py

@@ -41,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
         )

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/node/__init__.py

@@ -82,7 +82,7 @@ class Node(BaseNode, MetadataInterface, metaclass=BaseNodeMeta):
         _meta.default_filter = default_filter
         super().__init_subclass_with_meta__(_meta=_meta, **options)
 
-    def __init__(self, schema: NodeSchema | ProfileSchema | TemplateSchema, branch: Branch, at: Timestamp):
+    def __init__(self, schema: NodeSchema | ProfileSchema | TemplateSchema, branch: Branch, at: Timestamp) -> None:
         super().__init__()
         self._schema: NodeSchema | ProfileSchema | TemplateSchema = schema
         self._branch: Branch = branch

infrahub/core/node/base.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Any
+
 from ..utils import SubclassWithMeta, SubclassWithMeta_Meta
 
 
@@ -9,19 +11,19 @@ class BaseOptions:
 
     _frozen: bool = False
 
-    def __init__(self, class_type):
+    def __init__(self, class_type: type) -> None:
         self.class_type = class_type
 
     def freeze(self) -> None:
         self._frozen = True
 
-    def __setattr__(self, name, value):
+    def __setattr__(self, name: str, value: Any) -> None:
         if not self._frozen:
             super().__setattr__(name, value)
         else:
             raise Exception(f"Can't modify frozen Options {self}")
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<{self.__class__.__name__} name={repr(self.name)}>"
 
 
@@ -34,7 +36,9 @@ class BaseNode(SubclassWithMeta):
     #     return type(class_name, (cls,), {"Meta": options})
 
     @classmethod
-    def __init_subclass_with_meta__(cls, name=None, description=None, _meta=None, **_kwargs) -> None:
+    def __init_subclass_with_meta__(
+        cls, name: str | None = None, description: str | None = None, _meta: BaseOptions | None = None, **_kwargs: Any
+    ) -> None:
         assert "_meta" not in cls.__dict__, "Can't assign meta directly"
         if not _meta:
             return
@@ -52,7 +56,7 @@ class BaseNodeOptions(BaseOptions):
 
 
 class ObjectNodeMeta(BaseNodeMeta):
-    def __new__(mcs, name_, bases, namespace, **options):
+    def __new__(mcs, name_: str, bases: tuple[type, ...], namespace: dict[str, Any], **options: Any) -> type:
         # Note: it's safe to pass options as keyword arguments as they are still type-checked by NodeOptions.
 
         # We create this type, to then overload it with the dataclass attrs

infrahub/core/node/delete_validator.py

@@ -117,7 +117,7 @@ class NodeDeleteIndex:
 
 
 class NodeDeleteValidator:
-    def __init__(self, db: InfrahubDatabase, branch: Branch):
+    def __init__(self, db: InfrahubDatabase, branch: Branch) -> None:
         self.db = db
         self.branch = branch
         schema_branch = registry.schema.get_schema_branch(name=self.branch.name)

infrahub/core/order.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from typing import Self
+
+from pydantic import BaseModel, model_validator
+
+from infrahub.constants.enums import OrderDirection  # noqa: TC001
+from infrahub.exceptions import ValidationError
+
+# Metadata field name constants
+METADATA_CREATED_AT = "created_at"
+METADATA_CREATED_BY = "created_by"
+METADATA_UPDATED_AT = "updated_at"
+METADATA_UPDATED_BY = "updated_by"
+
+
+class NodeMetaOrder(BaseModel):
+    created_at: OrderDirection | None = None
+    updated_at: OrderDirection | None = None
+
+
+class OrderModel(BaseModel):
+    disable: bool | None = None
+    node_metadata: NodeMetaOrder | None = None
+
+    @model_validator(mode="after")
+    def validate_metadata(self) -> Self:
+        if self.node_metadata and self.node_metadata.created_at and self.node_metadata.updated_at:
+            raise ValidationError("Cannot order by both created_at and updated_at simultaneously.")
+        return self

infrahub/core/protocols.py

@@ -221,6 +221,7 @@ class CoreValidator(CoreNode):
 class CoreWebhook(CoreNode):
     name: String
     event_type: Enum
+    active: Boolean
     branch_scope: Dropdown
     node_kind: StringOptional
     description: StringOptional

infrahub/core/protocols_base.py

@@ -106,3 +106,7 @@ class CoreNode(Protocol):
     ) -> dict: ...
     async def render_display_label(self, db: InfrahubDatabase | None = None) -> str: ...
     async def from_graphql(self, data: dict, db: InfrahubDatabase) -> bool: ...
+    def _get_created_at(self) -> Timestamp | None: ...
+    def _get_created_by(self) -> str | None: ...
+    def _get_updated_at(self) -> Timestamp | None: ...
+    def _get_updated_by(self) -> str | None: ...

infrahub/core/query/__init__.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from abc import ABC, abstractmethod
 from collections import defaultdict
 from dataclasses import dataclass, field
 from enum import Enum
@@ -160,7 +159,7 @@ def cleanup_return_labels(labels: list[str]) -> list[str]:
 
 
 class QueryResult:
-    def __init__(self, data: list[Neo4jNode | Neo4jRelationship | list[Neo4jNode]], labels: list[str]):
+    def __init__(self, data: list[Neo4jNode | Neo4jRelationship | list[Neo4jNode]], labels: list[str]) -> None:
         self.data = data
         self.labels = labels
         self.branch_score: int = 0
@@ -336,7 +335,7 @@ class QueryStat:
         return cls(**data)
 
 
-class Query(ABC):
+class Query:
     name: str = "base-query"
     type: QueryType
 
@@ -353,7 +352,7 @@ class Query(ABC):
         order_by: list[str] | None = None,
         branch_agnostic: bool = False,
         user_id: str = SYSTEM_USER_ID,
-    ):
+    ) -> None:
         if branch:
             self.branch = branch
 
@@ -405,8 +404,12 @@ class Query(ABC):
 
         return query
 
-    @abstractmethod
     async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:
+        # Avoid using this method for new queries and look at migrating older queries. The
+        # problem here is that we loose so much information with the `**kwargs` we should instead
+        # populate this information via the constructor and anything done within the existing query_init methods
+        # could either be handled within __init__ or via dedicated methods within each Query class where appropriate,
+        # i.e. things might need to happend in a certain order or we just want to separate the logic better.
         raise NotImplementedError
 
     def get_context(self) -> dict[str, str]:

infrahub/core/query/attribute.py

@@ -31,7 +31,7 @@ class AttributeQuery(Query):
         at: Timestamp | str | None = None,
         branch: Branch | None = None,
         **kwargs: Any,
-    ):
+    ) -> None:
         self.attr = attr
         self.attr_id = attr_id or attr.db_id
 
@@ -171,7 +171,7 @@ class AttributeUpdateNodePropertyQuery(AttributeQuery):
         prop_name: str,
         prop_id: str | None = None,
         **kwargs: Any,
-    ):
+    ) -> None:
         self.prop_name = prop_name
         self.prop_id = prop_id
 
@@ -246,7 +246,7 @@ class AttributeClearNodePropertyQuery(AttributeQuery):
         self,
         prop_name: str,
         **kwargs: Any,
-    ):
+    ) -> None:
         self.prop_name = prop_name
 
         super().__init__(**kwargs)

infrahub/core/query/branch.py

@@ -17,7 +17,7 @@ class DeleteBranchRelationshipsQuery(Query):
 
     type: QueryType = QueryType.WRITE
 
-    def __init__(self, branch_name: str, **kwargs: Any):
+    def __init__(self, branch_name: str, **kwargs: Any) -> None:
         self.branch_name = branch_name
         super().__init__(**kwargs)
 

infrahub/core/query/delete.py

@@ -11,7 +11,7 @@ class DeleteAfterTimeQuery(Query):
     insert_return: bool = False
     type: QueryType = QueryType.WRITE
 
-    def __init__(self, timestamp: Timestamp, **kwargs: Any):
+    def __init__(self, timestamp: Timestamp, **kwargs: Any) -> None:
         self.timestamp = timestamp
         super().__init__(**kwargs)
 

infrahub/core/query/diff.py

@@ -26,7 +26,7 @@ class DiffQuery(Query):
         diff_from: Timestamp | str = None,
         diff_to: Timestamp | str = None,
         **kwargs,
-    ):
+    ) -> None:
         """A diff is always in the context of a branch"""
 
         if not diff_from and branch.is_default:
@@ -59,7 +59,7 @@ class DiffCountChanges(Query):
         diff_from: Timestamp,
         diff_to: Timestamp,
         **kwargs,
-    ):
+    ) -> None:
         self.branch_names = branch_names
         self.diff_from = diff_from
         self.diff_to = diff_to
@@ -122,7 +122,7 @@ class DiffCalculationQuery(DiffQuery):
         current_node_field_specifiers: NodeFieldSpecifierMap | None = None,
         new_node_field_specifiers: NodeFieldSpecifierMap | None = None,
         **kwargs: Any,
-    ):
+    ) -> None:
         self.base_branch = base_branch
         self.diff_branch_from_time = diff_branch_from_time
         self.current_node_field_specifiers = current_node_field_specifiers