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

infrahub/core/query/branch.py

@@ -2,7 +2,6 @@ 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
@@ -18,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)
 
@@ -70,89 +69,78 @@ CALL (vertex_id) {
         self.add_to_query(query)
 
 
-class GetAllBranchInternalRelationshipQuery(Query):
-    name: str = "get_internal_relationship"
+class RebaseBranchQuery(Query):
+    """Rebase a branch onto the default branch by updating edge timestamps
 
-    type: QueryType = QueryType.READ
-    insert_return: bool = False
-
-    async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
-        query = """
-        MATCH p = ()-[r]-()
-        WHERE r.branch = $branch_name
-        RETURN DISTINCT r
-        """
-        self.add_to_query(query=query)
-        self.params["branch_name"] = self.branch.name
-        self.return_labels = ["r"]
-
-
-class RebaseBranchUpdateRelationshipQuery(Query):
-    name: str = "rebase_branch_update"
+    For every edge on this branch
+        if it has a from time before $at and no to time, update it to $at
+        if it has a to time before $at, delete the edge
+        if it has a to time after $at, update the from time to $at
+    Then delete any orphaned vertices
+    """
 
+    name: str = "rebase_branch"
     type: QueryType = QueryType.WRITE
-
-    def __init__(self, ids: list[str], **kwargs: Any) -> None:
-        self.ids = ids
-        super().__init__(**kwargs)
+    insert_return: bool = False
+    raise_error_if_empty: bool = False
 
     async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
-        query = """
-        MATCH ()-[r]->()
-        WHERE %(id_func)s(r) IN $ids
-        SET r.from = $at
-        SET r.conflict = NULL
-        """ % {
-            "id_func": db.get_id_function_name(),
-        }
-
-        self.add_to_query(query=query)
-
+        self.params["branch_name"] = self.branch.name
         self.params["at"] = self.at.to_string()
-        self.params["ids"] = [db.to_database_id(id) for id in self.ids]
-        self.return_labels = [f"{db.get_id_function_name()}(r)"]
-
-
-class RebaseBranchDeleteRelationshipQuery(Query):
-    name: str = "rebase_branch_delete"
 
-    type: QueryType = QueryType.WRITE
-    insert_return: bool = False
-
-    def __init__(self, ids: list[str], **kwargs: Any) -> None:
-        self.ids = ids
-        super().__init__(**kwargs)
+        query = """
+// --------------
+// Get all edges on this branch with their source and destination vertices
+// --------------
+MATCH (s)-[r]-(d)
+WHERE r.branch = $branch_name
+WITH DISTINCT r, s, d
+WITH r, s, d,
+    CASE
+        // No `to` and `from` <= at: update
+        WHEN r.to IS NULL AND r.from <= $at THEN TRUE
+        // Has `to` and `to` < at: delete
+        WHEN r.to IS NOT NULL AND r.to < $at THEN FALSE
+        // Has `to` and `to` >= at: update
+        ELSE TRUE
+    END AS do_update
 
-    async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
-        if config.SETTINGS.database.db_type == config.DatabaseType.MEMGRAPH:
-            query = """
-            MATCH p = (s)-[r]-(d)
-            WHERE %(id_func)s(r) IN $ids
-            DELETE r
-            """
-        else:
-            query = """
-            MATCH p = (s)-[r]-(d)
-            WHERE %(id_func)s(r) IN $ids
-            DELETE r
-            WITH *
-            UNWIND nodes(p) AS n
-            MATCH (n)
-            WHERE NOT exists((n)--())
-            DELETE n
-            """
-        query %= {
-            "id_func": db.get_id_function_name(),
-        }
+// --------------
+// Process updates: set from = at for relationships we're keeping
+// --------------
+CALL (r, do_update) {
+    WITH r, do_update
+    WHERE do_update = TRUE
+    SET r.from = $at
+}
 
+// --------------
+// Delete the edges
+// --------------
+WITH r, s, d, do_update
+WHERE do_update = FALSE
+CALL (r, s, d) {
+    DELETE r
+}
+// --------------
+// Clean up any orpahned nodes edges
+// --------------
+WITH DISTINCT s, d
+UNWIND [s, d] AS n
+WITH DISTINCT n
+CALL (n) {
+    MATCH (n)
+    WHERE NOT exists((n)--())
+    DELETE n
+}
+        """
         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}'"
 

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
@@ -77,7 +77,7 @@ class DiffCountChanges(Query):
         AND diff_rel.branch in $branch_names
         AND (
             (diff_rel.from >= $from_time AND diff_rel.from < $to_time)
-            OR (diff_rel.to >= $to_time AND diff_rel.to < $to_time)
+            OR (diff_rel.to >= $from_time AND diff_rel.to < $to_time)
         )
         AND (p.branch_support = "aware" OR q.branch_support = "aware")
         WITH diff_rel.branch AS branch_name, count(*) AS num_changes
@@ -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
@@ -335,7 +335,7 @@ CALL (p, q, diff_rel, row_from_time) {
     AND type(r_node) IN ["HAS_ATTRIBUTE", "IS_RELATED"]
     AND any(l in labels(node) WHERE l in ["Attribute", "Relationship"])
     AND node.branch_support IN [$branch_aware, $branch_agnostic]
-    AND type(r_prop) IN ["IS_VISIBLE", "IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE", "IS_RELATED"]
+    AND type(r_prop) IN ["IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE", "IS_RELATED"]
     AND any(l in labels(prop) WHERE l in ["Boolean", "Node", "AttributeValue"])
     AND (top_diff_rel.to IS NULL OR top_diff_rel.to >= r_node.from)
     AND (r_node.to IS NULL OR r_node.to >= r_prop.from)
@@ -532,7 +532,7 @@ CALL (root, r_root, p, diff_rel, q) {
     )
     WHERE %(id_func)s(mid_r_root) =  %(id_func)s(r_root)
     AND %(id_func)s(mid_diff_rel) =  %(id_func)s(diff_rel)
-    AND type(r_prop) IN ["IS_VISIBLE", "IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE", "IS_RELATED"]
+    AND type(r_prop) IN ["IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE", "IS_RELATED"]
     AND any(l in labels(prop) WHERE l in ["Boolean", "Node", "AttributeValue"])
     AND r_prop.from < $to_time AND r_prop.branch = mid_diff_rel.branch
     AND (mid_diff_rel.to IS NULL OR mid_diff_rel.to >= r_prop.from)
@@ -609,7 +609,7 @@ class DiffPropertyPathsQuery(DiffCalculationQuery):
 MATCH diff_rel_path = (root:Root)<-[r_root:IS_PART_OF]-(n:Node)-[r_node]-(p)-[diff_rel {branch: $branch_name}]->(q)
 WHERE p.branch_support = $branch_aware
 AND any(l in labels(p) WHERE l in ["Attribute", "Relationship"])
-AND type(diff_rel) IN ["IS_VISIBLE", "IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE"]
+AND type(diff_rel) IN ["IS_PROTECTED", "HAS_SOURCE", "HAS_OWNER", "HAS_VALUE"]
 AND any(l in labels(q) WHERE l in ["Boolean", "Node", "AttributeValue"])
 AND type(r_node) IN ["HAS_ATTRIBUTE", "IS_RELATED"]
 // node ID and field name filtering first pass

infrahub/core/query/ipam.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Iterable
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.graph.schema import GraphAttributeIPHostNode, GraphAttributeIPNetworkNode
 from infrahub.core.ipam.constants import AllIPTypes, IPAddressType, IPNetworkType
-from infrahub.core.query import QueryType
+from infrahub.core.query import QueryResult, QueryType
 from infrahub.core.registry import registry
 from infrahub.core.utils import convert_ip_to_binary_str
 
@@ -57,7 +57,7 @@ class IPPrefixSubnetFetch(Query):
         obj: IPNetworkType,
         namespace: Node | str | None = None,
         **kwargs,
-    ):
+    ) -> None:
         self.obj = obj
         self.namespace_id = _get_namespace_id(namespace)
 
@@ -146,7 +146,7 @@ class IPPrefixIPAddressFetch(Query):
         obj: IPNetworkType,
         namespace: Node | str | None = None,
         **kwargs,
-    ):
+    ) -> None:
         self.obj = obj
         self.namespace_id = _get_namespace_id(namespace)
 
@@ -242,11 +242,53 @@ async def get_ip_addresses(
     return query.get_addresses()
 
 
+@dataclass(frozen=True)
+class IPPrefixUtilizationResult:
+    """Result from IPPrefixUtilization containing prefix child allocation data."""
+
+    prefix_uuid: str
+    """UUID of the parent prefix node."""
+
+    child_uuid: str
+    """UUID of the child node (prefix or address)."""
+
+    child_kind: str
+    """Kind/type of the child node."""
+
+    child_labels: tuple[str, ...]
+    """Labels of the child node (used to determine if IPADDRESS or IPPREFIX)."""
+
+    ip_value: str
+    """IP value (address or prefix) of the child."""
+
+    prefixlen: int
+    """Prefix length of the child IP value."""
+
+    branch: str
+    """Branch name where this allocation exists."""
+
+    @classmethod
+    def from_db(cls, result: QueryResult) -> IPPrefixUtilizationResult:
+        """Convert raw QueryResult to typed dataclass."""
+        pfx = result.get_node("pfx")
+        child = result.get_node("child")
+        av = result.get_node("av")
+        return cls(
+            prefix_uuid=str(pfx.get("uuid")),
+            child_uuid=str(child.get("uuid")),
+            child_kind=child.get("kind"),
+            child_labels=tuple(child.labels),
+            ip_value=av.get("value"),
+            prefixlen=av.get("prefixlen"),
+            branch=str(result.get("branch")),
+        )
+
+
 class IPPrefixUtilization(Query):
     name = "ipprefix_utilization_prefix"
     type = QueryType.READ
 
-    def __init__(self, ip_prefixes: list[str], allocated_kinds: list[str], **kwargs):
+    def __init__(self, ip_prefixes: list[str], allocated_kinds: list[str], **kwargs) -> None:
         self.ip_prefixes = ip_prefixes
         self.allocated_kinds: list[str] = []
         self.allocated_kinds_rel: list[str] = []
@@ -315,6 +357,55 @@ class IPPrefixUtilization(Query):
         self.return_labels = ["pfx", "child", "av", "branch_level", "branch"]
         self.add_to_query(query)
 
+    def get_data(self) -> list[IPPrefixUtilizationResult]:
+        """Return results as typed dataclass instances.
+
+        Returns:
+            List of IPPrefixUtilizationResult containing prefix child allocation data.
+        """
+        return [IPPrefixUtilizationResult.from_db(result) for result in self.get_results()]
+
+
+@dataclass(frozen=True)
+class IPPrefixReconcileQueryResult:
+    """Result from IPPrefixReconcileQuery containing IP reconciliation data."""
+
+    ip_node_uuid: str | None
+    """UUID of the IP node being reconciled, or None if not found."""
+
+    current_parent_uuid: str | None
+    """UUID of the current parent prefix, or None if no parent exists."""
+
+    calculated_parent_uuid: str | None
+    """UUID of the calculated correct parent prefix, or None if should be top-level."""
+
+    current_children_uuids: tuple[str, ...]
+    """UUIDs of current child prefixes/addresses."""
+
+    calculated_children_uuids: tuple[str, ...]
+    """UUIDs of calculated correct child prefixes/addresses."""
+
+    @classmethod
+    def from_db(cls, result: QueryResult) -> IPPrefixReconcileQueryResult:
+        """Convert raw QueryResult to typed dataclass."""
+
+        def get_optional_node_uuid(label: str) -> str | None:
+            """Extract UUID from an optional node (may be None from OPTIONAL MATCH)."""
+            node = result.get(label)
+            return str(node.get("uuid")) if node and node.get("uuid") else None
+
+        def get_collection_uuids(label: str) -> tuple[str, ...]:
+            """Extract UUIDs from a node collection (may contain None from COLLECT)."""
+            return tuple(str(n.get("uuid")) for n in result.get_node_collection(label) if n and n.get("uuid"))
+
+        return cls(
+            ip_node_uuid=get_optional_node_uuid("ip_node"),
+            current_parent_uuid=get_optional_node_uuid("current_parent"),
+            calculated_parent_uuid=get_optional_node_uuid("new_parent"),
+            current_children_uuids=get_collection_uuids("current_children"),
+            calculated_children_uuids=get_collection_uuids("new_children"),
+        )
+
 
 class IPPrefixReconcileQuery(Query):
     name = "ip_prefix_reconcile"
@@ -326,7 +417,7 @@ class IPPrefixReconcileQuery(Query):
         namespace: Node | str | None = None,
         node_uuid: str | None = None,
         **kwargs,
-    ):
+    ) -> None:
         self.ip_value = ip_value
         self.ip_uuid = node_uuid
         self.namespace_id = _get_namespace_id(namespace)
@@ -702,44 +793,14 @@ class IPPrefixReconcileQuery(Query):
         self.order_by = ["ip_node.uuid"]
         self.return_labels = ["ip_node", "current_parent", "current_children", "new_parent", "new_children"]
 
-    def _get_uuid_from_query(self, node_name: str) -> str | None:
-        results = list(self.get_results())
-        if not results:
-            return None
-        result = results[0]
-        node = result.get(node_name)
-        if not node:
-            return None
-        node_uuid = node.get("uuid")
-        if node_uuid:
-            return str(node_uuid)
-        return None
+    def get_data(self) -> IPPrefixReconcileQueryResult | None:
+        """Return single result as typed dataclass instance.
 
-    def _get_uuids_from_query_list(self, alias_name: str) -> list[str]:
+        Returns:
+            IPPrefixReconcileQueryResult containing reconciliation data,
+            or None if no results found.
+        """
         results = list(self.get_results())
         if not results:
-            return []
-        result = results[0]
-        element_uuids = []
-        for element in result.get(alias_name):
-            if not element:
-                continue
-            element_uuid = element.get("uuid")
-            if element_uuid:
-                element_uuids.append(str(element_uuid))
-        return element_uuids
-
-    def get_ip_node_uuid(self) -> str | None:
-        return self._get_uuid_from_query("ip_node")
-
-    def get_current_parent_uuid(self) -> str | None:
-        return self._get_uuid_from_query("current_parent")
-
-    def get_calculated_parent_uuid(self) -> str | None:
-        return self._get_uuid_from_query("new_parent")
-
-    def get_current_children_uuids(self) -> list[str]:
-        return self._get_uuids_from_query_list("current_children")
-
-    def get_calculated_children_uuids(self) -> list[str]:
-        return self._get_uuids_from_query_list("new_children")
+            return None
+        return IPPrefixReconcileQueryResult.from_db(results[0])