infrahub-server 1.5.5__py3-none-any.whl → 1.6.0b0__py3-none-any.whl

infrahub/core/manager.py

@@ -59,7 +59,7 @@ def identify_node_class(node: NodeToProcess) -> type[Node]:
     return Node
 
 
-def get_schema(
+def get_schema[SchemaProtocol](
     db: InfrahubDatabase,
     branch: Branch,
     node_schema: type[SchemaProtocol] | MainSchemaTypes | str,
@@ -455,7 +455,7 @@ class NodeManager:
         branch: Branch | str | None = ...,
         id: str | None = ...,
         hfid: list[str] | None = ...,
-    ) -> Any: ...
+    ) -> Node: ...
 
     @classmethod
     async def find_object(
@@ -466,10 +466,7 @@ class NodeManager:
         branch: Branch | str | None = None,
         id: str | None = None,
         hfid: list[str] | None = None,
-    ) -> Any:
-        if not id and not hfid:
-            raise ProcessingError(message="either id or hfid must be provided.")
-
+    ) -> Node | SchemaProtocol:
         if id and is_valid_uuid(id):
             return await cls.get_one(
                 db=db,
@@ -494,16 +491,19 @@ class NodeManager:
                 raise_on_error=True,
             )
 
-        return await cls.get_one_by_default_filter(
-            db=db,
-            kind=kind,
-            id=id,
-            branch=branch,
-            at=at,
-            include_owner=True,
-            include_source=True,
-            raise_on_error=True,
-        )
+        if id:
+            return await cls.get_one_by_default_filter(
+                db=db,
+                kind=kind,
+                id=id,
+                branch=branch,
+                at=at,
+                include_owner=True,
+                include_source=True,
+                raise_on_error=True,
+            )
+
+        raise ProcessingError(message="either id or hfid must be provided.")
 
     @overload
     @classmethod
@@ -557,7 +557,43 @@ class NodeManager:
         prefetch_relationships: bool = ...,
         account=...,
         branch_agnostic: bool = ...,
-    ) -> SchemaProtocol: ...
+    ) -> SchemaProtocol | None: ...
+
+    @overload
+    @classmethod
+    async def get_one_by_default_filter(
+        cls,
+        db: InfrahubDatabase,
+        id: str,
+        kind: str,
+        raise_on_error: Literal[False] = ...,
+        fields: dict | None = ...,
+        at: Timestamp | str | None = ...,
+        branch: Branch | str | None = ...,
+        include_source: bool = ...,
+        include_owner: bool = ...,
+        prefetch_relationships: bool = ...,
+        account=...,
+        branch_agnostic: bool = ...,
+    ) -> Node | None: ...
+
+    @overload
+    @classmethod
+    async def get_one_by_default_filter(
+        cls,
+        db: InfrahubDatabase,
+        id: str,
+        kind: str,
+        raise_on_error: Literal[True] = ...,
+        fields: dict | None = ...,
+        at: Timestamp | str | None = ...,
+        branch: Branch | str | None = ...,
+        include_source: bool = ...,
+        include_owner: bool = ...,
+        prefetch_relationships: bool = ...,
+        account=...,
+        branch_agnostic: bool = ...,
+    ) -> Node: ...
 
     @overload
     @classmethod
@@ -575,7 +611,7 @@ class NodeManager:
         prefetch_relationships: bool = ...,
         account=...,
         branch_agnostic: bool = ...,
-    ) -> Any: ...
+    ) -> Node | None: ...
 
     @classmethod
     async def get_one_by_default_filter(
@@ -592,7 +628,7 @@ class NodeManager:
         prefetch_relationships: bool = False,
         account=None,
         branch_agnostic: bool = False,
-    ) -> Any:
+    ) -> Node | SchemaProtocol | None:
         branch = await registry.get_branch(branch=branch, db=db)
         at = Timestamp(at)
 
@@ -688,7 +724,7 @@ class NodeManager:
         prefetch_relationships: bool = ...,
         account=...,
         branch_agnostic: bool = ...,
-    ) -> SchemaProtocol: ...
+    ) -> SchemaProtocol | None: ...
 
     @overload
     @classmethod
@@ -706,7 +742,25 @@ class NodeManager:
         prefetch_relationships: bool = ...,
         account=...,
         branch_agnostic: bool = ...,
-    ) -> Any: ...
+    ) -> Node: ...
+
+    @overload
+    @classmethod
+    async def get_one_by_hfid(
+        cls,
+        db: InfrahubDatabase,
+        hfid: list[str],
+        kind: str,
+        raise_on_error: Literal[False],
+        fields: dict | None = ...,
+        at: Timestamp | str | None = ...,
+        branch: Branch | str | None = ...,
+        include_source: bool = ...,
+        include_owner: bool = ...,
+        prefetch_relationships: bool = ...,
+        account=...,
+        branch_agnostic: bool = ...,
+    ) -> Node | None: ...
 
     @overload
     @classmethod
@@ -724,7 +778,7 @@ class NodeManager:
         prefetch_relationships: bool = ...,
         account=...,
         branch_agnostic: bool = ...,
-    ) -> Any: ...
+    ) -> Node | None: ...
 
     @classmethod
     async def get_one_by_hfid(
@@ -741,7 +795,7 @@ class NodeManager:
         prefetch_relationships: bool = False,
         account=None,
         branch_agnostic: bool = False,
-    ) -> Any:
+    ) -> Node | SchemaProtocol | None:
         branch = await registry.get_branch(branch=branch, db=db)
         at = Timestamp(at)
 
@@ -770,14 +824,14 @@ class NodeManager:
         for key, item in zip(node_schema.human_friendly_id, hfid, strict=False):
             path = node_schema.parse_schema_path(path=key, schema=registry.schema.get_schema_branch(name=branch.name))
 
-            if path.is_type_relationship:
+            if path.is_type_relationship and path.related_schema:
                 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)
                 )
 
-            filters[key] = path.attribute_schema.get_class().deserialize_from_string(item)
+            filters[key] = path.active_attribute_schema.get_class().deserialize_from_string(item)
 
         items = await NodeManager.query(
             db=db,
@@ -948,6 +1002,42 @@ class NodeManager:
         branch_agnostic: bool = ...,
     ) -> SchemaProtocol: ...
 
+    @overload
+    @classmethod
+    async def get_one(
+        cls,
+        id: str,
+        db: InfrahubDatabase,
+        kind: str,
+        raise_on_error: Literal[True] = ...,
+        fields: dict | None = ...,
+        at: Timestamp | str | None = ...,
+        branch: Branch | str | None = ...,
+        include_source: bool = ...,
+        include_owner: bool = ...,
+        prefetch_relationships: bool = ...,
+        account=...,
+        branch_agnostic: bool = ...,
+    ) -> Node: ...
+
+    @overload
+    @classmethod
+    async def get_one(
+        cls,
+        id: str,
+        db: InfrahubDatabase,
+        kind: str,
+        raise_on_error: Literal[False] = ...,
+        fields: dict | None = ...,
+        at: Timestamp | str | None = ...,
+        branch: Branch | str | None = ...,
+        include_source: bool = ...,
+        include_owner: bool = ...,
+        prefetch_relationships: bool = ...,
+        account=...,
+        branch_agnostic: bool = ...,
+    ) -> Node | None: ...
+
     @overload
     @classmethod
     async def get_one(
@@ -964,7 +1054,43 @@ class NodeManager:
         prefetch_relationships: bool = ...,
         account=...,
         branch_agnostic: bool = ...,
-    ) -> Any: ...
+    ) -> Node | None: ...
+
+    @overload
+    @classmethod
+    async def get_one(
+        cls,
+        id: str,
+        db: InfrahubDatabase,
+        kind: None = ...,
+        raise_on_error: Literal[True] = ...,
+        fields: dict | None = ...,
+        at: Timestamp | str | None = ...,
+        branch: Branch | str | None = ...,
+        include_source: bool = ...,
+        include_owner: bool = ...,
+        prefetch_relationships: bool = ...,
+        account=...,
+        branch_agnostic: bool = ...,
+    ) -> Node: ...
+
+    @overload
+    @classmethod
+    async def get_one(
+        cls,
+        id: str,
+        db: InfrahubDatabase,
+        kind: None = ...,
+        raise_on_error: Literal[False] = ...,
+        fields: dict | None = ...,
+        at: Timestamp | str | None = ...,
+        branch: Branch | str | None = ...,
+        include_source: bool = ...,
+        include_owner: bool = ...,
+        prefetch_relationships: bool = ...,
+        account=...,
+        branch_agnostic: bool = ...,
+    ) -> Node | None: ...
 
     @overload
     @classmethod
@@ -982,7 +1108,7 @@ class NodeManager:
         prefetch_relationships: bool = ...,
         account=...,
         branch_agnostic: bool = ...,
-    ) -> Any: ...
+    ) -> Node | None: ...
 
     @classmethod
     async def get_one(
@@ -999,7 +1125,7 @@ class NodeManager:
         prefetch_relationships: bool = False,
         account=None,
         branch_agnostic: bool = False,
-    ) -> Any | None:
+    ) -> Node | SchemaProtocol | None:
         """Return one node based on its ID."""
         branch = await registry.get_branch(branch=branch, db=db)
 
@@ -1264,7 +1390,7 @@ class NodeManager:
         db: InfrahubDatabase,
         nodes: list[Node],
         branch: Branch | str | None = None,
-        at: Timestamp | str | None = None,
+        at: Timestamp | None = None,
         cascade_delete: bool = True,
     ) -> list[Node]:
         """Returns list of deleted nodes because of cascading deletes"""

infrahub/core/merge.py

@@ -2,11 +2,11 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from infrahub.core.constants import RepositoryInternalStatus
+from infrahub.core.constants import InfrahubKind, RepositoryInternalStatus
 from infrahub.core.diff.model.path import BranchTrackingId
 from infrahub.core.manager import NodeManager
 from infrahub.core.models import SchemaUpdateValidationResult
-from infrahub.core.protocols import CoreRepository
+from infrahub.core.protocols import CoreReadOnlyRepository, CoreRepository
 from infrahub.core.registry import registry
 from infrahub.core.timestamp import Timestamp
 from infrahub.exceptions import MergeFailedError, ValidationError
@@ -223,6 +223,32 @@ class BranchMerger:
         await self.diff_merger.rollback(at=self._merge_at)
 
     async def merge_repositories(self) -> None:
+        await self.merge_core_read_only_repositories()
+        await self.merge_core_repositories()
+
+    async def merge_core_read_only_repositories(self) -> None:
+        repos_in_main_list = await NodeManager.query(schema=CoreReadOnlyRepository, db=self.db)
+        repos_in_main = {repo.id: repo for repo in repos_in_main_list}
+
+        repos_in_branch_list = await NodeManager.query(
+            schema=CoreReadOnlyRepository, db=self.db, branch=self.source_branch
+        )
+        for repo in repos_in_branch_list:
+            if repo.id not in repos_in_main:
+                continue
+
+            model = GitRepositoryMerge(
+                repository_id=repo.id,
+                repository_name=repo.name.value,
+                source_branch=self.source_branch.name,
+                destination_branch=self.destination_branch.name,
+                destination_branch_id=str(self.destination_branch.get_uuid()),
+                internal_status=repo.internal_status.value,
+                repository_kind=InfrahubKind.READONLYREPOSITORY,
+            )
+            await self.workflow.submit_workflow(workflow=GIT_REPOSITORIES_MERGE, parameters={"model": model})
+
+    async def merge_core_repositories(self) -> None:
         # Collect all Repositories in Main because we'll need the commit in Main for each one.
         repos_in_main_list = await NodeManager.query(schema=CoreRepository, db=self.db)
         repos_in_main = {repo.id: repo for repo in repos_in_main_list}
@@ -245,5 +271,6 @@ class BranchMerger:
                     destination_branch=self.destination_branch.name,
                     destination_branch_id=str(self.destination_branch.get_uuid()),
                     default_branch=repo.default_branch.value,
+                    repository_kind=InfrahubKind.REPOSITORY,
                 )
                 await self.workflow.submit_workflow(workflow=GIT_REPOSITORIES_MERGE, parameters={"model": model})

infrahub/core/migrations/graph/m041_deleted_dup_edges.py

@@ -87,15 +87,14 @@ CALL (node_uuid) {
     // ------------
     MATCH (n:Node {uuid: node_uuid})-[:IS_RELATED]-(rel:Relationship)
     WITH DISTINCT rel
-    MATCH (rel)-[e]-(peer)
+    MATCH (rel)-[e]->(peer)
     WITH
-        elementId(rel) AS rel_element_id,
         type(e) AS e_type,
         e.branch AS e_branch,
         e.from AS e_from,
         e.to AS e_to,
         e.status AS e_status,
-        elementId(peer) AS peer_element_id,
+        e.peer AS e_peer,
         CASE
             WHEN startNode(e) = rel THEN "out" ELSE "in"
         END AS direction,

infrahub/core/migrations/shared.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Sequence, TypeAlias
+from typing import TYPE_CHECKING, Any, Sequence
 
 from pydantic import BaseModel, ConfigDict, Field
 from rich.console import Console
@@ -261,4 +261,4 @@ class MigrationRequiringRebase(BaseModel):
         raise NotImplementedError()
 
 
-MigrationTypes: TypeAlias = GraphMigration | InternalSchemaMigration | ArbitraryMigration | MigrationRequiringRebase
+type MigrationTypes = GraphMigration | InternalSchemaMigration | ArbitraryMigration | MigrationRequiringRebase

infrahub/core/node/__init__.py

@@ -1088,7 +1088,7 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
 
             if key in self._relationships:
                 rel: RelationshipManager = getattr(self, key)
-                changed |= await rel.update(db=db, data=value, process_delete=process_pools)
+                changed |= await rel.update(db=db, data=value)
 
         return changed
 

infrahub/core/node/ipam.py

@@ -40,8 +40,8 @@ class BuiltinIPPrefix(Node):
                     retrieved = await NodeManager.get_one(
                         db=db, branch=self._branch, id=self.id, fields={"member_type": None, "prefix": None}
                     )
-                    self.member_type = retrieved.member_type  # type: ignore[union-attr]
-                    self.prefix = retrieved.prefix  # type: ignore[union-attr]
+                    self.member_type = retrieved.member_type  # type: ignore[attr-defined,union-attr]
+                    self.prefix = retrieved.prefix  # type: ignore[attr-defined,union-attr]
                 utilization_getter = PrefixUtilizationGetter(db=db, ip_prefixes=[self])
                 utilization = await utilization_getter.get_use_percentage(
                     ip_prefixes=[self], branch_names=[self._branch.name]
@@ -57,6 +57,6 @@ class BuiltinIPPrefix(Node):
             retrieved = await NodeManager.get_one(
                 db=db, branch=self._branch, id=self.id, fields={"member_type": None, "prefix": None}
             )
-            self.member_type = retrieved.member_type  # type: ignore[union-attr]
-            self.prefix = retrieved.prefix  # type: ignore[union-attr]
+            self.member_type = retrieved.member_type  # type: ignore[attr-defined,union-attr]
+            self.prefix = retrieved.prefix  # type: ignore[attr-defined,union-attr]
         return get_prefix_space(self)

infrahub/core/node/node_property_attribute.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from abc import abstractmethod
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Generic, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
 
 from infrahub_sdk.template import Jinja2Template
 
@@ -21,7 +21,7 @@ if TYPE_CHECKING:
 T = TypeVar("T")
 
 
-class NodePropertyAttribute(Generic[T]):
+class NodePropertyAttribute[T]:
     """A node property attribute is a construct that seats between a property and an attribute.
 
     View it as a property, set at the node level but stored in the database as an attribute. It usually is something computed from other components of

infrahub/core/protocols.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Optional, Protocol, runtime_checkable
 
 from infrahub.core.protocols_base import CoreNode
 
@@ -16,16 +16,22 @@ if TYPE_CHECKING:
         DateTime,
         DateTimeOptional,
         Dropdown,
+        DropdownOptional,
         HashedPassword,
+        HashedPasswordOptional,
         Integer,
         IntegerOptional,
         IPHost,
+        IPHostOptional,
         IPNetwork,
+        IPNetworkOptional,
         JSONAttribute,
         JSONAttributeOptional,
+        ListAttribute,
         ListAttributeOptional,
         String,
         StringOptional,
+        URLOptional,
     )
     from infrahub.core.relationship import RelationshipManager
 

infrahub/core/query/branch.py

@@ -3,8 +3,10 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from infrahub import config
+from infrahub.core.branch.enums import BranchStatus
 from infrahub.core.constants import GLOBAL_BRANCH_NAME
 from infrahub.core.query import Query, QueryType
+from infrahub.core.query.standard_node import StandardNodeGetListQuery
 
 if TYPE_CHECKING:
     from infrahub.database import InfrahubDatabase
@@ -146,3 +148,12 @@ class RebaseBranchDeleteRelationshipQuery(Query):
         self.add_to_query(query=query)
 
         self.params["ids"] = [db.to_database_id(id) for id in self.ids]
+
+
+class BranchNodeGetListQuery(StandardNodeGetListQuery):
+    def __init__(self, exclude_global: bool = False, **kwargs: Any) -> None:
+        self.raw_filter = f"n.status <> '{BranchStatus.DELETING.value}'"
+        if exclude_global:
+            self.raw_filter += f" AND n.name <> '{GLOBAL_BRANCH_NAME}'"
+
+        super().__init__(**kwargs)

infrahub/core/query/standard_node.py

@@ -132,6 +132,7 @@ class StandardNodeGetItemQuery(Query):
 class StandardNodeGetListQuery(Query):
     name = "standard_node_list"
     type = QueryType.READ
+    raw_filter: str | None = None
 
     def __init__(
         self, node_class: StandardNode, ids: list[str] | None = None, node_name: str | None = None, **kwargs: Any
@@ -150,6 +151,8 @@ class StandardNodeGetListQuery(Query):
         if self.node_name:
             filters.append("n.name = $name")
             self.params["name"] = self.node_name
+        if self.raw_filter:
+            filters.append(self.raw_filter)
 
         where = ""
         if filters:

infrahub/core/relationship/model.py

@@ -1061,12 +1061,7 @@ class RelationshipManager:
 
         return self._relationships.as_list()
 
-    async def update(
-        self,
-        data: list[str | Node] | dict[str, Any] | str | Node | None,
-        db: InfrahubDatabase,
-        process_delete: bool = True,
-    ) -> bool:
+    async def update(self, data: list[str | Node] | dict[str, Any] | str | Node | None, db: InfrahubDatabase) -> bool:
         """Replace and Update the list of relationships with this one."""
         if not isinstance(data, list):
             list_data: Sequence[str | Node | dict[str, Any] | None] = [data]
@@ -1092,9 +1087,8 @@ class RelationshipManager:
 
             if item is None:
                 if previous_relationships:
-                    if process_delete:
-                        for rel in previous_relationships.values():
-                            await rel.delete(db=db)
+                    for rel in previous_relationships.values():
+                        await rel.delete(db=db)
                     changed = True
                 continue
 

infrahub/core/schema/__init__.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import uuid
 from enum import Enum
-from typing import Any, TypeAlias
+from typing import Any
 
 from infrahub_sdk.utils import deep_merge_dict
 from pydantic import BaseModel, ConfigDict, Field
@@ -22,8 +22,8 @@ from .profile_schema import ProfileSchema
 from .relationship_schema import RelationshipSchema
 from .template_schema import TemplateSchema
 
-NonGenericSchemaTypes: TypeAlias = NodeSchema | ProfileSchema | TemplateSchema
-MainSchemaTypes: TypeAlias = NonGenericSchemaTypes | GenericSchema
+NonGenericSchemaTypes = NodeSchema | ProfileSchema | TemplateSchema
+MainSchemaTypes = NonGenericSchemaTypes | GenericSchema
 
 
 # -----------------------------------------------------

infrahub/core/task/user_task.py

@@ -6,6 +6,7 @@ from typing_extensions import Self
 
 from infrahub.core import registry
 from infrahub.core.constants import Severity, TaskConclusion
+from infrahub.core.protocols import CoreGenericAccount
 from infrahub.log import get_logger
 
 from .task import Task
@@ -16,7 +17,6 @@ if TYPE_CHECKING:
 
     from structlog.stdlib import BoundLogger
 
-    from infrahub.core.protocols import CoreGenericAccount
     from infrahub.database import InfrahubDatabase
     from infrahub.graphql.initialization import GraphqlContext
     from infrahub.services.protocols import InfrahubLogger
@@ -67,7 +67,7 @@ class UserTask:
         if self._account:
             return False
 
-        account: CoreGenericAccount | None = await registry.manager.get_one(id=self.account_id, db=self.db)
+        account = await registry.manager.get_one(id=self.account_id, db=self.db, kind=CoreGenericAccount)
         if not account:
             raise ValueError(f"Unable to find the account associated with {self.account_id}")
         self._account = account

infrahub/core/validators/enum.py

@@ -1,7 +1,7 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class ConstraintIdentifier(str, Enum):
+class ConstraintIdentifier(StrEnum):
     ATTRIBUTE_PARAMETERS_REGEX_UPDATE = "attribute.parameters.regex.update"
     ATTRIBUTE_PARAMETERS_MIN_LENGTH_UPDATE = "attribute.parameters.min_length.update"
     ATTRIBUTE_PARAMETERS_MAX_LENGTH_UPDATE = "attribute.parameters.max_length.update"

infrahub/dependencies/interface.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import Generic, TypeVar
+from typing import TypeVar
 
 from infrahub.core.branch import Branch
 from infrahub.database import InfrahubDatabase
@@ -14,7 +14,7 @@ class DependencyBuilderContext:
     branch: Branch
 
 
-class DependencyBuilder(ABC, Generic[T]):
+class DependencyBuilder[T](ABC):
     @classmethod
     @abstractmethod
     def build(cls, context: DependencyBuilderContext) -> T: ...

infrahub/events/constants.py

@@ -1,8 +1,8 @@
-from enum import Enum
+from enum import StrEnum
 
 EVENT_NAMESPACE = "infrahub"
 
 
-class EventSortOrder(str, Enum):
+class EventSortOrder(StrEnum):
     ASC = "asc"
     DESC = "desc"