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

infrahub/graphql/analyzer.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections import deque
 from copy import deepcopy
 from dataclasses import dataclass, field
-from enum import Enum
+from enum import StrEnum
 from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
@@ -49,13 +49,13 @@ if TYPE_CHECKING:
     from infrahub.core.schema.schema_branch import SchemaBranch
 
 
-class MutateAction(str, Enum):
+class MutateAction(StrEnum):
     CREATE = "create"
     DELETE = "delete"
     UPDATE = "update"
 
 
-class ContextType(str, Enum):
+class ContextType(StrEnum):
     EDGE = "edge"
     NODE = "node"
     DIRECT = "direct"
@@ -80,7 +80,7 @@ class ContextType(str, Enum):
                 return cls.NODE
 
 
-class GraphQLOperation(str, Enum):
+class GraphQLOperation(StrEnum):
     QUERY = "query"
     MUTATION = "mutation"
     SUBSCRIPTION = "subscription"

infrahub/graphql/loaders/peers.py

@@ -22,6 +22,8 @@ class QueryPeerParams:
     fields: dict | None = None
     at: Timestamp | str | None = None
     branch_agnostic: bool = False
+    include_source: bool = False
+    include_owner: bool = False
 
     def __hash__(self) -> int:
         frozen_fields: frozenset | None = None
@@ -39,6 +41,8 @@ class QueryPeerParams:
                 self.schema.name,
                 str(self.source_kind),
                 str(self.branch_agnostic),
+                str(self.include_source),
+                str(self.include_owner),
             ]
         )
         return hash(hash_str)
@@ -63,6 +67,8 @@ class PeerRelationshipsDataLoader(DataLoader[str, list[Relationship]]):
                 branch=self.query_params.branch,
                 branch_agnostic=self.query_params.branch_agnostic,
                 fetch_peers=True,
+                include_source=self.query_params.include_source,
+                include_owner=self.query_params.include_owner,
             )
         peer_rels_by_node_id: dict[str, list[Relationship]] = {}
         for rel in peer_rels:

infrahub/graphql/mutations/computed_attribute.py

@@ -110,7 +110,7 @@ class UpdateComputedAttribute(Mutation):
             event = NodeUpdatedEvent(
                 kind=node_schema.kind,
                 node_id=target_node.get_id(),
-                changelog=target_node.node_changelog.model_dump(),
+                changelog=target_node.node_changelog,
                 fields=[str(data.attribute)],
                 meta=EventMeta(
                     context=graphql_context.get_context(),

infrahub/graphql/mutations/convert_object_type.py

@@ -76,7 +76,7 @@ class ConvertObjectType(Mutation):
 
         if target_schema.kind in [REPOSITORY, READONLYREPOSITORY]:
             new_node = await convert_repository_type(
-                repository=node_to_convert,
+                repository=node_to_convert,  # type: ignore[arg-type]
                 target_schema=target_schema,
                 mapping=fields_mapping,
                 branch=graphql_context.branch,

infrahub/graphql/mutations/display_label.py

@@ -101,7 +101,7 @@ class UpdateDisplayLabel(Mutation):
             event = NodeUpdatedEvent(
                 kind=node_schema.kind,
                 node_id=target_node.get_id(),
-                changelog=target_node.node_changelog.model_dump(),
+                changelog=target_node.node_changelog,
                 fields=["display_label"],
                 meta=EventMeta(
                     context=graphql_context.get_context(),

infrahub/graphql/mutations/hfid.py

@@ -108,7 +108,7 @@ class UpdateHFID(Mutation):
             event = NodeUpdatedEvent(
                 kind=node_schema.kind,
                 node_id=target_node.get_id(),
-                changelog=target_node.node_changelog.model_dump(),
+                changelog=target_node.node_changelog,
                 fields=["human_friendly_id"],
                 meta=EventMeta(
                     context=graphql_context.get_context(),

infrahub/graphql/mutations/ipam.py

@@ -48,7 +48,7 @@ async def validate_namespace(
         namespace_id = namespace.id
     elif "hfid" in data["ip_namespace"]:
         namespace = await registry.manager.get_one_by_hfid(
-            db=db, branch=branch, kind=InfrahubKind.IPNAMESPACE, hfid=data["ip_namespace"]["hfid"]
+            db=db, branch=branch, kind=InfrahubKind.IPNAMESPACE, hfid=data["ip_namespace"]["hfid"], raise_on_error=True
         )
         namespace_id = namespace.id
     else:

infrahub/graphql/mutations/profile.py

@@ -57,6 +57,8 @@ class InfrahubProfileMutation(InfrahubMutationMixin, Mutation):
     ) -> None:
         if not node_ids:
             related_nodes = await obj.related_nodes.get_relationships(db=db)  # type: ignore[attr-defined]
+            if hasattr(obj, "related_templates"):
+                related_nodes.extend(await obj.related_templates.get_relationships(db=db))  # type: ignore[attr-defined]
             node_ids = [rel.peer_id for rel in related_nodes]
         if node_ids:
             await workflow_service.submit_workflow(
@@ -79,7 +81,12 @@ class InfrahubProfileMutation(InfrahubMutationMixin, Mutation):
 
     @classmethod
     async def _get_profile_related_node_ids(cls, db: InfrahubDatabase, obj: Node) -> set[str]:
-        related_nodes = await obj.related_nodes.get_relationships(db=db)  # type: ignore[attr-defined]
+        related_nodes = []
+        related_nodes.extend(await obj.related_nodes.get_relationships(db=db))  # type: ignore[attr-defined]
+
+        if hasattr(obj, "related_templates"):
+            related_nodes.extend(await obj.related_templates.get_relationships(db=db))  # type: ignore[attr-defined]
+
         if related_nodes:
             related_node_ids = {rel.peer_id for rel in related_nodes}
         else:
@@ -186,6 +193,7 @@ class InfrahubProfilesRefresh(Mutation):
             branch=branch,
             id=str(data.id),
             include_source=True,
+            raise_on_error=True,
         )
         node_profiles_applier = NodeProfilesApplier(db=db, branch=branch)
         updated_fields = await node_profiles_applier.apply_profiles(node=obj)

infrahub/graphql/mutations/relationship.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 from typing import TYPE_CHECKING, Self
 
 from graphene import Boolean, InputField, InputObjectType, List, Mutation, String
@@ -48,7 +48,7 @@ if TYPE_CHECKING:
 RELATIONSHIP_PEERS_TO_IGNORE = [InfrahubKind.NODE]
 
 
-class GroupUpdateType(str, Enum):
+class GroupUpdateType(StrEnum):
     NONE = "none"
     MEMBERS = "members"
     MEMBER_OF_GROUPS = "member_of_groups"

infrahub/graphql/mutations/resource_manager.py

@@ -122,7 +122,7 @@ class IPAddressPoolGetResource(Mutation):
     ) -> Self:
         graphql_context: GraphqlContext = info.context
 
-        obj: CoreIPAddressPool = await registry.manager.find_object(
+        obj: CoreIPAddressPool = await registry.manager.find_object(  # type: ignore[assignment]
             db=graphql_context.db,
             kind=InfrahubKind.IPADDRESSPOOL,
             id=data.get("id"),

infrahub/graphql/queries/__init__.py

@@ -1,5 +1,5 @@
 from .account import AccountPermissions, AccountToken
-from .branch import BranchQueryList
+from .branch import BranchQueryList, InfrahubBranchQueryList
 from .internal import InfrahubInfo
 from .ipam import (
     DeprecatedIPAddressGetNextAvailable,
@@ -20,6 +20,7 @@ __all__ = [
     "BranchQueryList",
     "DeprecatedIPAddressGetNextAvailable",
     "DeprecatedIPPrefixGetNextAvailable",
+    "InfrahubBranchQueryList",
     "InfrahubIPAddressGetNextAvailable",
     "InfrahubIPPrefixGetNextAvailable",
     "InfrahubInfo",

infrahub/graphql/queries/branch.py

@@ -2,10 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from graphene import ID, Field, List, NonNull, String
+from graphene import ID, Field, Int, List, NonNull, String
 
+from infrahub.core.registry import registry
+from infrahub.exceptions import ValidationError
 from infrahub.graphql.field_extractor import extract_graphql_fields
-from infrahub.graphql.types import BranchType
+from infrahub.graphql.types import BranchType, InfrahubBranch, InfrahubBranchType
 
 if TYPE_CHECKING:
     from graphql import GraphQLResolveInfo
@@ -17,7 +19,7 @@ async def branch_resolver(
     **kwargs: Any,
 ) -> list[dict[str, Any]]:
     fields = extract_graphql_fields(info)
-    return await BranchType.get_list(graphql_context=info.context, fields=fields, **kwargs)
+    return await BranchType.get_list(graphql_context=info.context, fields=fields, exclude_global=True, **kwargs)
 
 
 BranchQueryList = Field(
@@ -28,3 +30,56 @@ BranchQueryList = Field(
     resolver=branch_resolver,
     required=True,
 )
+
+
+async def infrahub_branch_resolver(
+    root: dict,  # noqa: ARG001
+    info: GraphQLResolveInfo,
+    limit: int | None = None,
+    offset: int | None = None,
+    name__value: str | None = None,
+    ids: list[str] | None = None,
+) -> dict[str, Any]:
+    if isinstance(limit, int) and limit < 1:
+        raise ValidationError("limit must be >= 1")
+    if isinstance(offset, int) and offset < 0:
+        raise ValidationError("offset must be >= 0")
+
+    fields = extract_graphql_fields(info)
+    result: dict[str, Any] = {}
+    if "edges" in fields:
+        branches = await InfrahubBranch.get_list(
+            graphql_context=info.context,
+            fields=fields.get("edges", {}).get("node", {}),
+            limit=limit,
+            offset=offset,
+            name=name__value,
+            ids=ids,
+            exclude_global=True,
+        )
+        result["edges"] = [{"node": branch} for branch in branches]
+    if "count" in fields:
+        result["count"] = await InfrahubBranchType.get_list_count(
+            graphql_context=info.context, name=name__value, ids=ids
+        )
+
+    if "default_branch" in fields:
+        result["default_branch"] = await InfrahubBranch.get_by_name(
+            graphql_context=info.context,
+            fields=fields["default_branch"],
+            name=registry.default_branch,
+        )
+
+    return result
+
+
+InfrahubBranchQueryList = Field(
+    InfrahubBranchType,
+    offset=Int(),
+    limit=Int(),
+    name__value=String(),
+    ids=List(ID),
+    description="Retrieve paginated information about active branches.",
+    resolver=infrahub_branch_resolver,
+    required=True,
+)

infrahub/graphql/queries/ipam.py

@@ -8,6 +8,7 @@ from netaddr import IPSet
 
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
+from infrahub.core.protocols import BuiltinIPPrefix
 from infrahub.core.query.ipam import get_ip_addresses, get_subnets
 from infrahub.exceptions import NodeNotFoundError, ValidationError
 from infrahub.pools.address import get_available
@@ -31,7 +32,9 @@ class IPAddressGetNextAvailable(ObjectType):
     ) -> dict[str, str]:
         graphql_context: GraphqlContext = info.context
 
-        prefix = await NodeManager.get_one(id=prefix_id, db=graphql_context.db, branch=graphql_context.branch)
+        prefix = await NodeManager.get_one(
+            id=prefix_id, kind=BuiltinIPPrefix, db=graphql_context.db, branch=graphql_context.branch
+        )
 
         if not prefix:
             raise NodeNotFoundError(
@@ -78,17 +81,19 @@ class IPPrefixGetNextAvailable(ObjectType):
     ) -> dict[str, str]:
         graphql_context: GraphqlContext = info.context
 
-        prefix = await NodeManager.get_one(id=prefix_id, db=graphql_context.db, branch=graphql_context.branch)
+        prefix = await NodeManager.get_one(
+            id=prefix_id, db=graphql_context.db, branch=graphql_context.branch, kind=BuiltinIPPrefix
+        )
 
         if not prefix:
             raise NodeNotFoundError(
                 branch_name=graphql_context.branch.name, node_type=InfrahubKind.IPPREFIX, identifier=prefix_id
             )
 
-        namespace = await prefix.ip_namespace.get_peer(db=graphql_context.db)  # type: ignore[attr-defined]
+        namespace = await prefix.ip_namespace.get_peer(db=graphql_context.db)
         subnets = await get_subnets(
             db=graphql_context.db,
-            ip_prefix=ipaddress.ip_network(prefix.prefix.value),  # type: ignore[attr-defined]
+            ip_prefix=ipaddress.ip_network(prefix.prefix.value),
             namespace=namespace,
             branch=graphql_context.branch,
         )

infrahub/graphql/queries/resource_manager.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from typing import TYPE_CHECKING, Any
 
 from graphene import BigInt, Field, Float, Int, List, NonNull, ObjectType, String
@@ -23,7 +24,6 @@ if TYPE_CHECKING:
 
     from infrahub.core.branch import Branch
     from infrahub.core.node import Node
-    from infrahub.core.protocols import CoreNode
     from infrahub.core.timestamp import Timestamp
     from infrahub.database import InfrahubDatabase
     from infrahub.graphql.initialization import GraphqlContext
@@ -59,7 +59,7 @@ class PoolAllocatedEdge(ObjectType):
     node = Field(PoolAllocatedNode, required=True)
 
 
-def _validate_pool_type(pool_id: str, pool: CoreNode | None = None) -> CoreNode:
+def _validate_pool_type(pool_id: str, pool: Node | None = None) -> Node:
     if not pool or pool.get_kind() not in [
         InfrahubKind.IPADDRESSPOOL,
         InfrahubKind.IPPREFIXPOOL,
@@ -83,9 +83,7 @@ class PoolAllocated(ObjectType):
         limit: int = 10,
     ) -> dict:
         graphql_context: GraphqlContext = info.context
-        pool: CoreNode | None = await NodeManager.get_one(
-            id=pool_id, db=graphql_context.db, branch=graphql_context.branch
-        )
+        pool = await NodeManager.get_one(id=pool_id, db=graphql_context.db, branch=graphql_context.branch)
 
         fields = extract_graphql_fields(info=info)
 
@@ -190,7 +188,7 @@ class PoolUtilization(ObjectType):
     ) -> dict:
         graphql_context: GraphqlContext = info.context
         db: InfrahubDatabase = graphql_context.db
-        pool: CoreNode | None = await NodeManager.get_one(id=pool_id, db=db, branch=graphql_context.branch)
+        pool = await NodeManager.get_one(id=pool_id, db=db, branch=graphql_context.branch)
         pool = _validate_pool_type(pool_id=pool_id, pool=pool)
         if pool.get_kind() == "CoreNumberPool":
             return await resolve_number_pool_utilization(
@@ -199,10 +197,8 @@ class PoolUtilization(ObjectType):
 
         resources_map: dict[str, Node] = {}
 
-        try:
+        with contextlib.suppress(SchemaNotFoundError):
             resources_map = await pool.resources.get_peers(db=db, branch_agnostic=True)  # type: ignore[attr-defined,union-attr]
-        except SchemaNotFoundError:
-            pass
 
         utilization_getter = PrefixUtilizationGetter(
             db=db, ip_prefixes=list(resources_map.values()), at=graphql_context.at
@@ -275,7 +271,7 @@ class PoolUtilization(ObjectType):
 
 
 async def resolve_number_pool_allocation(
-    db: InfrahubDatabase, graphql_context: GraphqlContext, pool: CoreNode, fields: dict, offset: int, limit: int
+    db: InfrahubDatabase, graphql_context: GraphqlContext, pool: Node, fields: dict, offset: int, limit: int
 ) -> dict:
     response: dict[str, Any] = {}
     query = await NumberPoolGetAllocated.init(
@@ -304,7 +300,7 @@ async def resolve_number_pool_allocation(
 
 
 async def resolve_number_pool_utilization(
-    db: InfrahubDatabase, pool: CoreNode, at: Timestamp | str | None, branch: Branch
+    db: InfrahubDatabase, pool: Node, at: Timestamp | str | None, branch: Branch
 ) -> dict:
     """
     Returns a mapping containg utilization info of a number pool.

infrahub/graphql/queries/search.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import ipaddress
 from typing import TYPE_CHECKING, Any
 
@@ -13,7 +14,7 @@ from infrahub.graphql.field_extractor import extract_graphql_fields
 if TYPE_CHECKING:
     from graphql import GraphQLResolveInfo
 
-    from infrahub.core.protocols import CoreNode
+    from infrahub.core.node import Node as InfrahubNode
     from infrahub.graphql.initialization import GraphqlContext
 
 
@@ -106,22 +107,20 @@ async def search_resolver(
 ) -> dict[str, Any]:
     graphql_context: GraphqlContext = info.context
     response: dict[str, Any] = {}
-    results: list[CoreNode] = []
+    results: list[InfrahubNode] = []
 
     fields = extract_graphql_fields(info=info)
 
     if is_valid_uuid(q):
-        matching: CoreNode | None = await NodeManager.get_one(
+        matching = await NodeManager.get_one(
             db=graphql_context.db, branch=graphql_context.branch, at=graphql_context.at, id=q
         )
         if matching:
             results.append(matching)
     else:
-        try:
+        with contextlib.suppress(ValueError, ipaddress.AddressValueError):
             # Convert any IPv6 address, network or partial address to collapsed format as it might be stored in db.
             q = _collapse_ipv6(q)
-        except (ValueError, ipaddress.AddressValueError):
-            pass
 
         for kind in [InfrahubKind.NODE, InfrahubKind.GENERICGROUP]:
             objs = await NodeManager.query(

infrahub/graphql/resolvers/ipam.py

@@ -4,6 +4,7 @@ import ipaddress
 from typing import TYPE_CHECKING, Any
 
 from graphql.type.definition import GraphQLNonNull
+from infrahub_sdk.utils import deep_merge_dict
 from netaddr import IPSet
 from opentelemetry import trace
 
@@ -233,6 +234,23 @@ async def _resolve_available_prefix_nodes(
     return available_nodes
 
 
+def _ensure_display_label_fields(
+    db: InfrahubDatabase, branch: Branch, schema: NodeSchema | GenericSchema, node_fields: dict[str, Any]
+) -> None:
+    """Ensure fields needed to compute display_label are included in node_fields.
+
+    This is mostly for virtual nodes (InternalIPPrefixAvailable, InternalIPRangeAvailable) that are not stored in the
+    database.
+    """
+    if "display_label" not in node_fields or schema.kind not in [InfrahubKind.IPPREFIX, InfrahubKind.IPADDRESS]:
+        return
+
+    schema_branch = db.schema.get_schema_branch(name=branch.name)
+    display_label_fields = schema_branch.generate_fields_for_display_label(name=schema.kind)
+    if display_label_fields:
+        deep_merge_dict(dicta=node_fields, dictb=display_label_fields)
+
+
 def _filter_kinds(nodes: list[Node], kinds: list[str], limit: int | None) -> list[Node]:
     filtered: list[Node] = []
     available_node_kinds = [InfrahubKind.IPPREFIXAVAILABLE, InfrahubKind.IPRANGEAVAILABLE]
@@ -324,6 +342,8 @@ async def ipam_paginated_list_resolver(  # noqa: PLR0915
         edges = fields.get("edges", {})
         node_fields = edges.get("node", {})
 
+        _ensure_display_label_fields(db=db, branch=graphql_context.branch, schema=schema, node_fields=node_fields)
+
         permission_set: dict[str, Any] | None = None
         permissions = (
             await get_permissions(schema=schema, graphql_context=graphql_context)

infrahub/graphql/resolvers/many_relationship.py

@@ -1,7 +1,6 @@
 from typing import TYPE_CHECKING, Any
 
 from graphql import GraphQLResolveInfo
-from infrahub_sdk.utils import deep_merge_dict
 
 from infrahub.core.branch.models import Branch
 from infrahub.core.constants import BranchSupportType, RelationshipHierarchyDirection
@@ -12,6 +11,7 @@ from infrahub.core.schema.relationship_schema import RelationshipSchema
 from infrahub.core.timestamp import Timestamp
 from infrahub.database import InfrahubDatabase
 from infrahub.graphql.field_extractor import extract_graphql_fields
+from infrahub.utils import has_any_key
 
 from ..loaders.peers import PeerRelationshipsDataLoader, QueryPeerParams
 from ..types import RELATIONS_PROPERTY_MAP, RELATIONS_PROPERTY_MAP_REVERSED
@@ -195,6 +195,9 @@ class ManyRelationshipResolver:
         offset: int | None = None,
         limit: int | None = None,
     ) -> list[dict[str, Any]] | None:
+        include_source = has_any_key(data=node_fields, keys=["_relation__source", "source"])
+        include_owner = has_any_key(data=node_fields, keys=["_relation__owner", "owner"])
+
         async with db.start_session(read_only=True) as dbs:
             objs = await NodeManager.query_peers(
                 db=dbs,
@@ -209,6 +212,8 @@ class ManyRelationshipResolver:
                 branch=branch,
                 branch_agnostic=rel_schema.branch is BranchSupportType.AGNOSTIC,
                 fetch_peers=True,
+                include_source=include_source,
+                include_owner=include_owner,
             )
             if not objs:
                 return None
@@ -226,17 +231,11 @@ class ManyRelationshipResolver:
         filters: dict[str, Any],
         node_fields: dict[str, Any],
     ) -> list[dict[str, Any]] | None:
-        if node_fields and "display_label" in node_fields:
-            schema_branch = db.schema.get_schema_branch(name=branch.name)
-            display_label_fields = schema_branch.generate_fields_for_display_label(name=rel_schema.peer)
-            if display_label_fields:
-                node_fields = deep_merge_dict(dicta=node_fields, dictb=display_label_fields)
-
         if node_fields and "hfid" in node_fields:
-            peer_schema = db.schema.get(name=rel_schema.peer, branch=branch, duplicate=False)
-            hfid_fields = peer_schema.generate_fields_for_hfid()
-            if hfid_fields:
-                node_fields = deep_merge_dict(dicta=node_fields, dictb=hfid_fields)
+            node_fields["human_friendly_id"] = None
+
+        include_source = has_any_key(data=node_fields, keys=["_relation__source", "source"])
+        include_owner = has_any_key(data=node_fields, keys=["_relation__owner", "owner"])
 
         query_params = QueryPeerParams(
             branch=branch,
@@ -246,6 +245,8 @@ class ManyRelationshipResolver:
             fields=node_fields,
             at=at,
             branch_agnostic=rel_schema.branch is BranchSupportType.AGNOSTIC,
+            include_source=include_source,
+            include_owner=include_owner,
         )
         if query_params in self._data_loader_instances:
             loader = self._data_loader_instances[query_params]

infrahub/graphql/resolvers/resolver.py

@@ -9,6 +9,7 @@ from infrahub.core.constants import BranchSupportType, InfrahubKind, Relationshi
 from infrahub.core.manager import NodeManager
 from infrahub.exceptions import NodeNotFoundError
 from infrahub.graphql.field_extractor import extract_graphql_fields
+from infrahub.utils import has_any_key
 
 from ..models import OrderModel
 from ..parser import extract_selection
@@ -185,6 +186,9 @@ async def default_paginated_list_resolver(
 
         objs = []
         if edges or "hfid" in filters:
+            include_source = has_any_key(data=node_fields, keys=["_relation__source", "source"])
+            include_owner = has_any_key(data=node_fields, keys=["_relation__owner", "owner"])
+
             objs = await NodeManager.query(
                 db=db,
                 schema=schema,
@@ -195,8 +199,8 @@ async def default_paginated_list_resolver(
                 limit=limit,
                 offset=offset,
                 account=graphql_context.account_session,
-                include_source=True,
-                include_owner=True,
+                include_source=include_source,
+                include_owner=include_owner,
                 partial_match=partial_match,
                 order=order,
             )

infrahub/graphql/resolvers/single_relationship.py

@@ -2,7 +2,6 @@ from typing import TYPE_CHECKING, Any
 
 from graphql import GraphQLResolveInfo
 from graphql.type.definition import GraphQLNonNull
-from infrahub_sdk.utils import deep_merge_dict
 
 from infrahub.core.branch.models import Branch
 from infrahub.core.constants import BranchSupportType
@@ -142,17 +141,8 @@ class SingleRelationshipResolver:
         except (KeyError, IndexError):
             return None
 
-        if node_fields and "display_label" in node_fields:
-            schema_branch = db.schema.get_schema_branch(name=branch.name)
-            display_label_fields = schema_branch.generate_fields_for_display_label(name=rel_schema.peer)
-            if display_label_fields:
-                node_fields = deep_merge_dict(dicta=node_fields, dictb=display_label_fields)
-
         if node_fields and "hfid" in node_fields:
-            peer_schema = db.schema.get(name=rel_schema.peer, branch=branch, duplicate=False)
-            hfid_fields = peer_schema.generate_fields_for_hfid()
-            if hfid_fields:
-                node_fields = deep_merge_dict(dicta=node_fields, dictb=hfid_fields)
+            node_fields["human_friendly_id"] = None
 
         query_params = GetManyParams(
             fields=node_fields,

infrahub/graphql/schema.py

@@ -39,6 +39,7 @@ from .queries import (
     BranchQueryList,
     DeprecatedIPAddressGetNextAvailable,
     DeprecatedIPPrefixGetNextAvailable,
+    InfrahubBranchQueryList,
     InfrahubInfo,
     InfrahubIPAddressGetNextAvailable,
     InfrahubIPPrefixGetNextAvailable,
@@ -65,6 +66,7 @@ class InfrahubBaseQuery(ObjectType):
 
     Relationship = Relationship
 
+    InfrahubBranch = InfrahubBranchQueryList
     InfrahubInfo = InfrahubInfo
     InfrahubStatus = InfrahubStatus
 

infrahub/graphql/types/__init__.py

@@ -21,7 +21,7 @@ from .attribute import (
     StrAttributeType,
     TextAttributeType,
 )
-from .branch import BranchType
+from .branch import BranchType, InfrahubBranch, InfrahubBranchType
 from .interface import InfrahubInterface
 from .node import InfrahubObject
 from .permission import PaginatedObjectPermission
@@ -41,6 +41,8 @@ __all__ = [
     "DropdownType",
     "IPHostType",
     "IPNetworkType",
+    "InfrahubBranch",
+    "InfrahubBranchType",
     "InfrahubInterface",
     "InfrahubObject",
     "InfrahubObjectType",