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

infrahub/git/tasks.py

@@ -60,7 +60,7 @@ from .models import (
     UserCheckDefinitionData,
 )
 from .repository import InfrahubReadOnlyRepository, InfrahubRepository, get_initialized_repo
-from .utils import fetch_artifact_definition_targets, fetch_check_definition_targets
+from .utils import fetch_artifact_definition_targets, fetch_check_definition_targets, get_repositories_commit_per_branch
 
 
 @flow(
@@ -195,13 +195,17 @@ async def sync_git_repo_with_origin_and_tag_on_failure(
 @flow(name="git_repositories_sync", flow_run_name="Sync Git Repositories")
 async def sync_remote_repositories() -> None:
     log = get_run_logger()
+    db = await get_database()
 
     client = get_client()
 
     branches = await client.branch.all()
-    repositories = await client.get_list_repositories(branches=branches, kind=InfrahubKind.REPOSITORY)
+    async with db.start_session() as dbs:
+        repositories = await get_repositories_commit_per_branch(db=dbs, kind=InfrahubKind.REPOSITORY)
 
     for repo_name, repository_data in repositories.items():
+        repository: CoreRepository = repository_data.repository
+
         active_internal_status = RepositoryInternalStatus.ACTIVE.value
         default_internal_status = repository_data.branch_info[registry.default_branch].internal_status
         staging_branch = None
@@ -215,12 +219,12 @@ async def sync_remote_repositories() -> None:
             init_failed = False
             try:
                 repo = await InfrahubRepository.init(
-                    id=repository_data.repository.id,
-                    name=repository_data.repository.name.value,
-                    location=repository_data.repository.location.value,
+                    id=repository.id,
+                    name=repository.name.value,
+                    location=repository.location.value,
                     client=client,
                     internal_status=active_internal_status,
-                    default_branch_name=repository_data.repository.default_branch.value,
+                    default_branch_name=repository.default_branch.value,
                 )
             except RepositoryError as exc:
                 get_logger().error(str(exc))
@@ -229,12 +233,12 @@ async def sync_remote_repositories() -> None:
             if init_failed:
                 try:
                     repo = await InfrahubRepository.new(
-                        id=repository_data.repository.id,
-                        name=repository_data.repository.name.value,
-                        location=repository_data.repository.location.value,
+                        id=repository.id,
+                        name=repository.name.value,
+                        location=repository.location.value,
                         client=client,
                         internal_status=active_internal_status,
-                        default_branch_name=repository_data.repository.default_branch.value,
+                        default_branch_name=repository.default_branch.value,
                     )
                     await repo.import_objects_from_files(  # type: ignore[call-overload]
                         git_branch_name=registry.default_branch, infrahub_branch_name=infrahub_branch
@@ -246,22 +250,22 @@ async def sync_remote_repositories() -> None:
             try:
                 await sync_git_repo_with_origin_and_tag_on_failure(
                     client=client,
-                    repository_id=repository_data.repository.id,
-                    repository_name=repository_data.repository.name.value,
-                    repository_location=repository_data.repository.location.value,
+                    repository_id=repository.id,
+                    repository_name=repository.name.value,
+                    repository_location=repository.location.value,
                     internal_status=active_internal_status,
-                    default_branch_name=repository_data.repository.default_branch.value,
-                    operational_status=repository_data.repository.operational_status.value,
+                    default_branch_name=repository.default_branch.value,
+                    operational_status=repository.operational_status.value,
                     staging_branch=staging_branch,
                     infrahub_branch=infrahub_branch,
                 )
                 # Tell workers to fetch to stay in sync
                 message = messages.RefreshGitFetch(
                     meta=Meta(initiator_id=WORKER_IDENTITY, request_id=get_log_data().get("request_id", "")),
-                    location=repository_data.repository.location.value,
-                    repository_id=repository_data.repository.id,
-                    repository_name=repository_data.repository.name.value,
-                    repository_kind=repository_data.repository.get_kind(),
+                    location=repository.location.value,
+                    repository_id=repository.id,
+                    repository_name=repository.name.value,
+                    repository_kind=repository.get_kind(),
                     infrahub_branch_name=infrahub_branch,
                     infrahub_branch_id=branches[infrahub_branch].id,
                 )

infrahub/git/utils.py

@@ -1,10 +1,16 @@
 import re
 from collections import defaultdict
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from infrahub_sdk import InfrahubClient
 from infrahub_sdk.node import RelationshipManager
-from infrahub_sdk.protocols import CoreArtifactDefinition, CoreCheckDefinition, CoreGroup
+from infrahub_sdk.protocols import (
+    CoreArtifactDefinition,
+    CoreCheckDefinition,
+    CoreGroup,
+    CoreReadOnlyRepository,
+    CoreRepository,
+)
 from infrahub_sdk.types import Order
 
 from infrahub.core import registry
@@ -12,16 +18,15 @@ from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
 from infrahub.database import InfrahubDatabase
 from infrahub.generators.models import ProposedChangeGeneratorDefinition
+from infrahub.graphql.models import OrderModel
 
 from .. import config
 from .models import RepositoryBranchInfo, RepositoryData
 
-if TYPE_CHECKING:
-    from infrahub.core.protocols import CoreGenericRepository
-
 
 async def get_repositories_commit_per_branch(
     db: InfrahubDatabase,
+    kind: str = InfrahubKind.GENERICREPOSITORY,
 ) -> dict[str, RepositoryData]:
     """Get a list of all repositories and their commit on each branches.
 
@@ -33,11 +38,12 @@ async def get_repositories_commit_per_branch(
     repositories: dict[str, RepositoryData] = {}
 
     for branch in list(registry.branch.values()):
-        repos: list[CoreGenericRepository] = await NodeManager.query(
+        repos: list[CoreRepository | CoreReadOnlyRepository] = await NodeManager.query(
             db=db,
             branch=branch,
-            fields={"id": None, "name": None, "commit": None, "internal_status": None},
-            schema=InfrahubKind.GENERICREPOSITORY,
+            fields={"id": None, "name": None, "commit": None, "internal_status": None, "location": None, "ref": None},
+            schema=kind,
+            order=OrderModel(disable=True),
         )
 
         for repository in repos:
@@ -46,10 +52,11 @@ async def get_repositories_commit_per_branch(
                 repositories[repo_name] = RepositoryData(
                     repository_id=repository.get_id(),
                     repository_name=repo_name,
+                    repository=repository,
                     branches={},
                 )
 
-            repositories[repo_name].branches[branch.name] = repository.commit.value  # type: ignore[attr-defined]
+            repositories[repo_name].branches[branch.name] = repository.commit.value
             repositories[repo_name].branch_info[branch.name] = RepositoryBranchInfo(
                 internal_status=repository.internal_status.value
             )

infrahub/graphql/app.py

@@ -172,9 +172,9 @@ class InfrahubGraphQLApp:
 
         response = handler(request)
         if isawaitable(response):
-            return await cast(Awaitable[Response], response)
+            return await cast("Awaitable[Response]", response)
 
-        return cast(Response, response)
+        return cast("Response", response)
 
     async def _handle_http_request(
         self, request: Request, db: InfrahubDatabase, branch: Branch, account_session: AccountSession
@@ -350,8 +350,8 @@ class InfrahubGraphQLApp:
         websocket: WebSocket,
         subscriptions: dict[str, AsyncGenerator[Any, None]],
     ) -> None:
-        operation_id = cast(str, message.get("id"))
-        message_type = cast(str, message.get("type"))
+        operation_id = cast("str", message.get("id"))
+        message_type = cast("str", message.get("type"))
 
         if message_type == GQL_CONNECTION_INIT:
             websocket.scope["connection_params"] = message.get("payload")
@@ -445,7 +445,7 @@ class InfrahubGraphQLApp:
         if isinstance(result, ExecutionResult) and result.errors:
             return result.errors
 
-        asyncgen = cast(AsyncGenerator[Any, None], result)
+        asyncgen = cast("AsyncGenerator[Any, None]", result)
         subscriptions[operation_id] = asyncgen
         task = asyncio.create_task(self._observe_subscription(asyncgen, operation_id, websocket))
         subscription_tasks.add(task)
@@ -479,7 +479,7 @@ async def _get_operation_from_request(request: Request) -> dict[str, Any] | list
     content_type = request.headers.get("Content-Type", "").split(";")[0]
     if content_type == "application/json":
         try:
-            return cast(dict[str, Any] | list[Any], await request.json())
+            return cast("dict[str, Any] | list[Any]", await request.json())
         except (TypeError, ValueError) as err:
             raise ValueError("Request body is not a valid JSON") from err
     elif content_type == "multipart/form-data":

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/action.py

@@ -5,7 +5,6 @@ from typing import TYPE_CHECKING, Any, cast
 from graphene import InputObjectType, Mutation
 from typing_extensions import Self
 
-from infrahub.core.protocols import CoreNodeTriggerAttributeMatch, CoreNodeTriggerRelationshipMatch, CoreNodeTriggerRule
 from infrahub.exceptions import SchemaNotFoundError, ValidationError
 from infrahub.log import get_logger
 
@@ -16,6 +15,11 @@ if TYPE_CHECKING:
 
     from infrahub.core.branch import Branch
     from infrahub.core.node import Node
+    from infrahub.core.protocols import (
+        CoreNodeTriggerAttributeMatch,
+        CoreNodeTriggerRelationshipMatch,
+        CoreNodeTriggerRule,
+    )
     from infrahub.core.schema import NodeSchema
     from infrahub.database import InfrahubDatabase
 
@@ -104,9 +108,11 @@ class InfrahubTriggerRuleMatchMutation(InfrahubMutationMixin, Mutation):
             trigger_match, result = await super().mutate_create(
                 info=info, data=data, branch=branch, database=dbt, override_data=override_data
             )
-            trigger_match_model = cast(CoreNodeTriggerAttributeMatch | CoreNodeTriggerRelationshipMatch, trigger_match)
+            trigger_match_model = cast(
+                "CoreNodeTriggerAttributeMatch | CoreNodeTriggerRelationshipMatch", trigger_match
+            )
             node_trigger_rule = await trigger_match_model.trigger.get_peer(db=dbt, raise_on_error=True)
-            node_trigger_rule_model = cast(CoreNodeTriggerRule, node_trigger_rule)
+            node_trigger_rule_model = cast("CoreNodeTriggerRule", node_trigger_rule)
             node_schema = dbt.schema.get_node_schema(name=node_trigger_rule_model.node_kind.value, duplicate=False)
             _validate_node_kind_field(data=data, node_schema=node_schema)
 
@@ -124,9 +130,11 @@ class InfrahubTriggerRuleMatchMutation(InfrahubMutationMixin, Mutation):
         graphql_context: GraphqlContext = info.context
         async with graphql_context.db.start_transaction() as dbt:
             trigger_match, result = await super().mutate_update(info=info, data=data, branch=branch, database=dbt)
-            trigger_match_model = cast(CoreNodeTriggerAttributeMatch | CoreNodeTriggerRelationshipMatch, trigger_match)
+            trigger_match_model = cast(
+                "CoreNodeTriggerAttributeMatch | CoreNodeTriggerRelationshipMatch", trigger_match
+            )
             node_trigger_rule = await trigger_match_model.trigger.get_peer(db=dbt, raise_on_error=True)
-            node_trigger_rule_model = cast(CoreNodeTriggerRule, node_trigger_rule)
+            node_trigger_rule_model = cast("CoreNodeTriggerRule", node_trigger_rule)
             node_schema = dbt.schema.get_node_schema(name=node_trigger_rule_model.node_kind.value, duplicate=False)
             _validate_node_kind_field(data=data, node_schema=node_schema)
 
@@ -134,7 +142,7 @@ class InfrahubTriggerRuleMatchMutation(InfrahubMutationMixin, Mutation):
 
 
 def _validate_node_kind(data: InputObjectType, db: InfrahubDatabase) -> None:
-    input_data = cast(dict[str, dict[str, Any]], data)
+    input_data = cast("dict[str, dict[str, Any]]", data)
     if node_kind := input_data.get("node_kind"):
         value = node_kind.get("value")
         if isinstance(value, str):
@@ -149,7 +157,7 @@ def _validate_node_kind(data: InputObjectType, db: InfrahubDatabase) -> None:
 
 
 def _validate_node_kind_field(data: InputObjectType, node_schema: NodeSchema) -> None:
-    input_data = cast(dict[str, dict[str, Any]], data)
+    input_data = cast("dict[str, dict[str, Any]]", data)
     if attribute_name := input_data.get("attribute_name"):
         value = attribute_name.get("value")
         if isinstance(value, str):

infrahub/graphql/mutations/hfid.py

@@ -55,7 +55,7 @@ class UpdateHFID(Mutation):
                 input_value=f"{node_schema.kind}.human_friendly_id has not been defined for this kind."
             )
 
-        updated_hfid = cast(list[str], data.value)
+        updated_hfid = cast("list[str]", data.value)
 
         if len(node_schema.human_friendly_id) != len(updated_hfid):
             raise ValidationError(

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:

infrahub/graphql/mutations/repository.py

@@ -9,7 +9,6 @@ from graphene import Boolean, Field, InputObjectType, Mutation, String
 from infrahub import config
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
-from infrahub.core.protocols import CoreReadOnlyRepository, CoreRepository
 from infrahub.core.schema import NodeSchema
 from infrahub.git.models import (
     GitRepositoryImportObjects,
@@ -34,6 +33,7 @@ if TYPE_CHECKING:
 
     from infrahub.core.branch import Branch
     from infrahub.core.node import Node
+    from infrahub.core.protocols import CoreReadOnlyRepository, CoreRepository
     from infrahub.database import InfrahubDatabase
     from infrahub.graphql.initialization import GraphqlContext
 
@@ -107,7 +107,7 @@ class InfrahubRepositoryMutation(InfrahubMutationMixin, Mutation):
         if node.get_kind() != InfrahubKind.READONLYREPOSITORY:
             return await super().mutate_update(info, data, branch, database=graphql_context.db, node=node)
 
-        node = cast(CoreReadOnlyRepository, node)
+        node = cast("CoreReadOnlyRepository", node)
         current_commit = node.commit.value
         current_ref = node.ref.value
         new_commit = None
@@ -118,7 +118,7 @@ class InfrahubRepositoryMutation(InfrahubMutationMixin, Mutation):
             new_ref = data.ref.value
 
         obj, result = await super().mutate_update(info, data, branch, database=graphql_context.db, node=node)
-        obj = cast(CoreReadOnlyRepository, obj)
+        obj = cast("CoreReadOnlyRepository", obj)
 
         send_update_message = (new_commit and new_commit != current_commit) or (new_ref and new_ref != current_ref)
         if not send_update_message:

infrahub/graphql/mutations/schema.py

@@ -81,7 +81,7 @@ class SchemaDropdownAdd(Mutation):
         _validate_schema_permission(graphql_context=graphql_context)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=True)
         attribute = str(data.attribute)
         validate_kind_dropdown(kind=kind, attribute=attribute)
         dropdown = str(data.dropdown)
@@ -141,7 +141,7 @@ class SchemaDropdownRemove(Mutation):
         graphql_context: GraphqlContext = info.context
 
         _validate_schema_permission(graphql_context=graphql_context)
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=True)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)
@@ -197,7 +197,7 @@ class SchemaEnumAdd(Mutation):
         graphql_context: GraphqlContext = info.context
 
         _validate_schema_permission(graphql_context=graphql_context)
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=True)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)
@@ -243,7 +243,7 @@ class SchemaEnumRemove(Mutation):
         graphql_context: GraphqlContext = info.context
 
         _validate_schema_permission(graphql_context=graphql_context)
-        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=False)
+        kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name, duplicate=True)
         await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)

infrahub/graphql/mutations/webhook.py

@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING, Any, Self, cast
 from graphene import InputObjectType, Mutation
 
 from infrahub.core.manager import NodeManager
-from infrahub.core.protocols import CoreWebhook
 from infrahub.core.schema import NodeSchema
 from infrahub.database import retry_db_transaction
 from infrahub.events.utils import get_all_infrahub_node_kind_events
@@ -20,6 +19,7 @@ if TYPE_CHECKING:
 
     from infrahub.core.branch import Branch
     from infrahub.core.node import Node
+    from infrahub.core.protocols import CoreWebhook
     from infrahub.database import InfrahubDatabase
     from infrahub.graphql.initialization import GraphqlContext
 
@@ -107,7 +107,7 @@ class InfrahubWebhookMutation(InfrahubMutationMixin, Mutation):
             branch=branch,
         )
 
-        webhook = cast(CoreWebhook, obj)
+        webhook = cast("CoreWebhook", obj)
 
         event_type = input_data.event_type.value if input_data.event_type else webhook.event_type.value.value
         node_kind = input_data.node_kind.value if input_data.node_kind else webhook.node_kind.value

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
@@ -196,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

infrahub/graphql/queries/search.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import ipaddress
 from typing import TYPE_CHECKING, Any
 
@@ -117,11 +118,9 @@ async def search_resolver(
         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/log.py

@@ -10,7 +10,7 @@ from structlog.dev import plain_traceback
 if TYPE_CHECKING:
     from structlog.types import Processor
 
-INFRAHUB_PRODUCTION = TypeAdapter(bool).validate_python(os.environ.get("INFRAHUB_PRODUCTION", True))
+INFRAHUB_PRODUCTION = TypeAdapter(bool).validate_python(os.environ.get("INFRAHUB_PRODUCTION", "true"))
 INFRAHUB_LOG_LEVEL = os.environ.get("INFRAHUB_LOG_LEVEL", "INFO")
 
 

infrahub/message_bus/messages/__init__.py

@@ -22,20 +22,8 @@ RESPONSE_MAP: dict[str, type[InfrahubResponse]] = {
 }
 
 PRIORITY_MAP = {
-    "check.artifact.create": 2,
-    "check.repository.check_definition": 2,
-    "check.repository.merge_conflicts": 2,
     "send.echo.request": 5,  # Currently only for testing purposes, will be removed once all message bus have been migrated to prefect
-    "event.branch.delete": 5,
-    "event.branch.merge": 5,
-    "event.schema.update": 5,
-    "git.diff.names_only": 4,
     "git.file.get": 4,
-    "request.artifact.generate": 2,
-    "request.git.sync": 4,
-    "request.proposed_change.pipeline": 5,
-    "transform.jinja.template": 4,
-    "transform.python.data": 4,
 }