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

infrahub/core/diff/repository/repository.py

@@ -49,7 +49,9 @@ log = get_logger()
 
 
 class DiffRepository:
-    def __init__(self, db: InfrahubDatabase, deserializer: EnrichedDiffDeserializer, max_save_batch_size: int = 1000):
+    def __init__(
+        self, db: InfrahubDatabase, deserializer: EnrichedDiffDeserializer, max_save_batch_size: int = 1000
+    ) -> None:
         self.db = db
         self.deserializer = deserializer
         self.max_save_batch_size = max_save_batch_size

infrahub/core/graph/__init__.py

@@ -1 +1 @@
-GRAPH_VERSION = 48
+GRAPH_VERSION = 50

infrahub/core/graph/constraints.py

@@ -165,7 +165,7 @@ class ConstraintManagerBase:
     constraint_node_class: Optional[type[ConstraintItem]] = ConstraintItem
     constraint_rel_class: Optional[type[ConstraintItem]] = ConstraintItem
 
-    def __init__(self, db: InfrahubDatabase):
+    def __init__(self, db: InfrahubDatabase) -> None:
         self.db = db
 
         self.nodes: list[ConstraintItem] = []
@@ -176,12 +176,12 @@ class ConstraintManagerBase:
         return self.nodes + self.rels
 
     @classmethod
-    def from_graph_schema(cls, db: InfrahubDatabase, schema: dict[str, dict[str, BaseModel]]) -> Self:
+    def from_graph_schema(cls, db: InfrahubDatabase, schema: dict[str, dict[str, type[BaseModel]]]) -> Self:
         manager = cls(db=db)
 
         # Process the nodes first
         for schema_item in schema["nodes"].values():
-            properties_class: BaseModel = schema_item.model_fields["properties"].annotation  # type: ignore[assignment]
+            properties_class: type[BaseModel] = schema_item.model_fields["properties"].annotation  # type: ignore[assignment]
             default_label = str(schema_item.model_fields["default_label"].default)
             for field_name, field in properties_class.model_fields.items():
                 clean_field_name = field.alias or field_name

infrahub/core/graph/schema.py

@@ -95,9 +95,6 @@ class GraphRelationshipRelationships(BaseModel):
     HAS_OWNER: GraphRelationship = Field(
         GraphRelationship(peer="Node", direction=GraphRelDirection.OUTBOUND), description=""
     )
-    IS_VISIBLE: GraphRelationship = Field(
-        GraphRelationship(peer="Boolean", direction=GraphRelDirection.OUTBOUND), description=""
-    )
     IS_PROTECTED: GraphRelationship = Field(
         GraphRelationship(peer="Boolean", direction=GraphRelDirection.OUTBOUND), description=""
     )
@@ -133,9 +130,6 @@ class GraphAttributeRelationships(BaseModel):
     HAS_OWNER: GraphRelationship = Field(
         GraphRelationship(peer="Node", direction=GraphRelDirection.OUTBOUND), description=""
     )
-    IS_VISIBLE: GraphRelationship = Field(
-        GraphRelationship(peer="Boolean", direction=GraphRelDirection.OUTBOUND), description=""
-    )
     IS_PROTECTED: GraphRelationship = Field(
         GraphRelationship(peer="Boolean", direction=GraphRelDirection.OUTBOUND), description=""
     )
@@ -208,9 +202,6 @@ class GraphBooleanProperties(BaseModel):
 
 
 class GraphBooleanRelationships(BaseModel):
-    IS_VISIBLE: GraphRelationship = Field(
-        GraphRelationship(peer="Attribute|Relationship", direction=GraphRelDirection.INBOUND), description=""
-    )
     IS_PROTECTED: GraphRelationship = Field(
         GraphRelationship(peer="Attribute|Relationship", direction=GraphRelDirection.INBOUND), description=""
     )
@@ -243,7 +234,7 @@ class GraphRelationshipDefault(BaseModel):
     hierarchy: Optional[str] = Field(None, description="Name of the hierarchy this relationship is part of")
 
 
-def get_graph_schema() -> dict[str, dict[str, Any]]:
+def get_graph_schema() -> dict[str, dict[str, type[Any]]]:
     """Generate the graph schema dictionary containing nodes and relationships."""
     graph_node_list: list[type[GraphVertex]] = [
         GraphNodeNode,
@@ -265,10 +256,9 @@ def get_graph_schema() -> dict[str, dict[str, Any]]:
             "IS_RELATED": GraphRelationshipDefault,
             "HAS_SOURCE": GraphRelationshipDefault,
             "HAS_OWNER": GraphRelationshipDefault,
-            "IS_VISIBLE": GraphRelationshipDefault,
             "IS_PROTECTED": GraphRelationshipDefault,
         },
     }
 
 
-GRAPH_SCHEMA: dict[str, dict[str, Any]] = get_graph_schema()
+GRAPH_SCHEMA: dict[str, dict[str, type[Any]]] = get_graph_schema()

infrahub/core/ipam/reconciler.py

@@ -101,16 +101,18 @@ class IpamReconciler:
         )
         await query.execute(db=self.db)
 
-        ip_node_uuid = query.get_ip_node_uuid()
-        if not ip_node_uuid:
+        data = query.get_data()
+        if not data or not data.ip_node_uuid:
             node_type = InfrahubKind.IPPREFIX
             if isinstance(ip_value, ipaddress.IPv6Interface | ipaddress.IPv4Interface):
                 node_type = InfrahubKind.IPADDRESS
             raise NodeNotFoundError(node_type=node_type, identifier=str(ip_value))
-        current_parent_uuid = query.get_current_parent_uuid()
-        calculated_parent_uuid = query.get_calculated_parent_uuid()
-        current_children_uuids = set(query.get_current_children_uuids())
-        calculated_children_uuids = set(query.get_calculated_children_uuids())
+
+        ip_node_uuid = data.ip_node_uuid
+        current_parent_uuid = data.current_parent_uuid
+        calculated_parent_uuid = data.calculated_parent_uuid
+        current_children_uuids = set(data.current_children_uuids)
+        calculated_children_uuids = set(data.calculated_children_uuids)
 
         all_uuids: set[str] = set()
         all_uuids = (all_uuids | {ip_node_uuid}) if ip_node_uuid else all_uuids

infrahub/core/ipam/utilization.py

@@ -40,25 +40,18 @@ class PrefixUtilizationGetter:
         )
         await query.execute(db=self.db)
 
-        for result in query.get_results():
-            prefix_node = result.get_node("pfx")
-            prefix_id = str(prefix_node.get("uuid"))
-            branch_name = str(result.get("branch"))
-            child_node = result.get_node("child")
-            if InfrahubKind.IPADDRESS in child_node.labels:
+        for item in query.get_data():
+            if InfrahubKind.IPADDRESS in item.child_labels:
                 child_type = PrefixMemberType.ADDRESS
             else:
                 child_type = PrefixMemberType.PREFIX
-            child_value_node = result.get_node("av")
-            child_prefixlen = child_value_node.get("prefixlen")
-            child_ip_value = child_value_node.get("value")
 
-            if prefix_id not in self._results_by_prefix_id:
-                self._results_by_prefix_id[prefix_id] = {}
-            if branch_name not in self._results_by_prefix_id[prefix_id]:
-                self._results_by_prefix_id[prefix_id][branch_name] = []
-            self._results_by_prefix_id[prefix_id][branch_name].append(
-                PrefixChildDetails(child_type=child_type, prefixlen=child_prefixlen, ip_value=child_ip_value)
+            if item.prefix_uuid not in self._results_by_prefix_id:
+                self._results_by_prefix_id[item.prefix_uuid] = {}
+            if item.branch not in self._results_by_prefix_id[item.prefix_uuid]:
+                self._results_by_prefix_id[item.prefix_uuid][item.branch] = []
+            self._results_by_prefix_id[item.prefix_uuid][item.branch].append(
+                PrefixChildDetails(child_type=child_type, prefixlen=item.prefixlen, ip_value=item.ip_value)
             )
 
     async def get_children(