fix(backend): fetch only required attributes for group members

fatih-acar · fatih-acar · commit 72ca59083227 · 2025-10-17T00:16:57.000+02:00
Signed-off-by: Fatih Acar &lt;fatih@opsmill.com&gt;
diff --git a/backend/infrahub/generators/tasks.py b/backend/infrahub/generators/tasks.py
@@ -21,6 +21,7 @@
 )
 from infrahub.git.base import extract_repo_file_information
 from infrahub.git.repository import get_initialized_repo
+from infrahub.git.utils import fetch_definition_targets
 from infrahub.workers.dependencies import get_client, get_workflow
 from infrahub.workflows.catalogue import REQUEST_GENERATOR_DEFINITION_RUN, REQUEST_GENERATOR_RUN
 from infrahub.workflows.utils import add_tags
@@ -177,14 +178,7 @@ async def request_generator_definition_run(
         branch=model.branch,
     )
 
-    group = await client.get(
-        kind=InfrahubKind.GENERICGROUP,
-        prefetch_relationships=True,
-        populate_store=True,
-        id=model.generator_definition.group_id,
-        branch=model.branch,
-    )
-    await group.members.fetch()
+    group = await fetch_definition_targets(client=client, branch=model.branch, definition=model.generator_definition)
 
     instance_by_member = {}
     for instance in existing_instances:
diff --git a/backend/infrahub/git/tasks.py b/backend/infrahub/git/tasks.py
@@ -1,6 +1,3 @@
-from collections import defaultdict
-from typing import Any
-
 from infrahub_sdk import InfrahubClient
 from infrahub_sdk.protocols import (
     CoreArtifact,
@@ -10,7 +7,6 @@
     CoreRepositoryValidator,
     CoreUserValidator,
 )
-from infrahub_sdk.types import Order
 from infrahub_sdk.uuidt import UUIDT
 from prefect import flow, task
 from prefect.cache_policies import NONE
@@ -57,72 +53,7 @@
     UserCheckDefinitionData,
 )
 from .repository import InfrahubReadOnlyRepository, InfrahubRepository, get_initialized_repo
-
-
-def _collect_parameter_first_segments(params: Any) -> set[str]:
-    segments: set[str] = set()
-
-    def _walk(value: Any) -> None:
-        if isinstance(value, str):
-            segment = value.split("__", 1)[0]
-            if segment:
-                segments.add(segment)
-        elif isinstance(value, dict):
-            for nested in value.values():
-                _walk(nested)
-        elif isinstance(value, (list, tuple, set)):
-            for nested in value:
-                _walk(nested)
-
-    _walk(params)
-    return segments
-
-
-async def _prefetch_group_member_nodes(
-    *,
-    client: InfrahubClient,
-    members: Any,
-    branch: str,
-    required_fields: set[str],
-) -> None:
-    ids_per_kind: dict[str, list[str]] = defaultdict(list)
-    for related in getattr(members, "peers", []):
-        related_id = getattr(related, "id", None)
-        related_type = getattr(related, "typename", None)
-        if related_id and related_type:
-            ids_per_kind[related_type].append(related_id)
-
-    if not ids_per_kind:
-        return
-
-    batch = await client.create_batch()
-
-    for kind, ids in ids_per_kind.items():
-        schema = await client.schema.get(kind=kind, branch=branch)
-
-        keep_attributes = {field for field in required_fields if field in schema.attribute_names}
-        keep_relationships = {field for field in required_fields if field in schema.relationship_names}
-
-        exclude_attributes = [attr for attr in schema.attribute_names if attr not in keep_attributes]
-        exclude_relationships = [rel for rel in schema.relationship_names if rel not in keep_relationships]
-
-        unique_ids = list(dict.fromkeys(ids))
-        kwargs: dict[str, Any] = {
-            "kind": kind,
-            "ids": unique_ids,
-            "branch": branch,
-            "exclude": exclude_attributes + exclude_relationships,
-            "populate_store": True,
-            "order": Order(disable=True),
-        }
-
-        if keep_relationships:
-            kwargs["include"] = list(keep_relationships)
-
-        batch.add(task=client.filters, **kwargs)
-
-    async for _ in batch.execute():
-        pass
+from .utils import fetch_definition_targets
 
 
 @flow(
@@ -393,20 +324,7 @@ async def generate_request_artifact_definition(
         kind=CoreArtifactDefinition, id=model.artifact_definition_id, branch=model.branch
     )
 
-    group = await client.get(
-        kind=artifact_definition.targets.typename,
-        id=artifact_definition.targets.id,
-        branch=model.branch,
-        include=["members"],
-    )
-
-    parameter_fields = _collect_parameter_first_segments(artifact_definition.parameters.value)
-    await _prefetch_group_member_nodes(
-        client=client,
-        members=group.members,
-        branch=model.branch,
-        required_fields=parameter_fields,
-    )
+    group = await fetch_definition_targets(client=client, branch=model.branch, definition=artifact_definition)
 
     current_members = [member.id for member in group.members.peers]
 
@@ -659,9 +577,7 @@ async def trigger_repository_user_checks_definitions(model: UserCheckDefinitionD
 
     if definition.targets.id:
         # Check against a group of targets
-        await definition.targets.fetch()
-        group = definition.targets.peer
-        await group.members.fetch()
+        group = await fetch_definition_targets(client=client, branch=model.branch_name, definition=definition)
         check_models = []
         for relationship in group.members.peers:
             member = relationship.peer
diff --git a/backend/infrahub/git/utils.py b/backend/infrahub/git/utils.py
@@ -1,9 +1,16 @@
-from typing import TYPE_CHECKING
+from collections import defaultdict
+from typing import TYPE_CHECKING, Any
+
+from infrahub_sdk import InfrahubClient
+from infrahub_sdk.node import InfrahubNode
+from infrahub_sdk.protocols import CoreArtifactDefinition, CoreCheckDefinition, CoreGroup
+from infrahub_sdk.types import Order
 
 from infrahub.core import registry
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
 from infrahub.database import InfrahubDatabase
+from infrahub.generators.models import ProposedChangeGeneratorDefinition
 
 from .models import RepositoryBranchInfo, RepositoryData
 
@@ -46,3 +53,103 @@ async def get_repositories_commit_per_branch(
             )
 
     return repositories
+
+
+def _collect_parameter_first_segments(params: Any) -> set[str]:
+    segments: set[str] = set()
+
+    def _walk(value: Any) -> None:
+        if isinstance(value, str):
+            segment = value.split("__", 1)[0]
+            if segment:
+                segments.add(segment)
+        elif isinstance(value, dict):
+            for nested in value.values():
+                _walk(nested)
+        elif isinstance(value, (list, tuple, set)):
+            for nested in value:
+                _walk(nested)
+
+    _walk(params)
+    return segments
+
+
+async def _prefetch_group_member_nodes(
+    *,
+    client: InfrahubClient,
+    members: Any,
+    branch: str,
+    required_fields: set[str],
+) -> None:
+    ids_per_kind: dict[str, list[str]] = defaultdict(list)
+    for related in getattr(members, "peers", []):
+        related_id = getattr(related, "id", None)
+        related_type = getattr(related, "typename", None)
+        if related_id and related_type:
+            ids_per_kind[related_type].append(related_id)
+
+    if not ids_per_kind:
+        return
+
+    batch = await client.create_batch()
+
+    for kind, ids in ids_per_kind.items():
+        schema = await client.schema.get(kind=kind, branch=branch)
+
+        keep_attributes = {field for field in required_fields if field in schema.attribute_names}
+        keep_relationships = {field for field in required_fields if field in schema.relationship_names}
+
+        exclude_attributes = [attr for attr in schema.attribute_names if attr not in keep_attributes]
+        exclude_relationships = [rel for rel in schema.relationship_names if rel not in keep_relationships]
+
+        unique_ids = list(dict.fromkeys(ids))
+        kwargs: dict[str, Any] = {
+            "kind": kind,
+            "ids": unique_ids,
+            "branch": branch,
+            "exclude": exclude_attributes + exclude_relationships,
+            "populate_store": True,
+            "order": Order(disable=True),
+        }
+
+        if keep_relationships:
+            kwargs["include"] = list(keep_relationships)
+
+        batch.add(task=client.filters, **kwargs)
+
+    async for _ in batch.execute():
+        pass
+
+
+async def fetch_definition_targets(
+    client: InfrahubClient,
+    branch: str,
+    definition: CoreArtifactDefinition | CoreCheckDefinition | ProposedChangeGeneratorDefinition,
+) -> CoreGroup:
+    group_id: str
+    parameters: Any
+
+    if isinstance(definition, InfrahubNode):
+        if definition.typename in [InfrahubKind.ARTIFACTDEFINITION, InfrahubKind.CHECKDEFINITION]:
+            group_id = definition.targets.id
+            parameters = definition.parameters.value
+    elif isinstance(definition, ProposedChangeGeneratorDefinition):
+        group_id = definition.group_id
+        parameters = definition.parameters
+
+    group = await client.get(
+        kind=CoreGroup,
+        id=group_id,
+        branch=branch,
+        include=["members"],
+    )
+
+    parameter_fields = _collect_parameter_first_segments(parameters)
+    await _prefetch_group_member_nodes(
+        client=client,
+        members=group.members,
+        branch=branch,
+        required_fields=parameter_fields,
+    )
+
+    return group
diff --git a/backend/infrahub/proposed_change/tasks.py b/backend/infrahub/proposed_change/tasks.py
@@ -58,6 +58,7 @@
 from infrahub.git.base import extract_repo_file_information
 from infrahub.git.models import TriggerRepositoryInternalChecks, TriggerRepositoryUserChecks
 from infrahub.git.repository import InfrahubRepository, get_initialized_repo
+from infrahub.git.utils import fetch_definition_targets
 from infrahub.log import get_logger
 from infrahub.message_bus.types import (
     ProposedChangeArtifactDefinition,
@@ -652,9 +653,7 @@ async def validate_artifacts_generation(model: RequestArtifactDefinitionCheck, c
         branch=model.source_branch,
     )
 
-    await artifact_definition.targets.fetch()
-    group = artifact_definition.targets.peer
-    await group.members.fetch()
+    group = await fetch_definition_targets(client=client, branch=model.source_branch, definition=artifact_definition)
 
     artifacts_by_member = {}
     for artifact in existing_artifacts:
@@ -918,14 +917,9 @@ async def request_generator_definition_check(model: RequestGeneratorDefinitionCh
         branch=model.source_branch,
     )
 
-    group = await client.get(
-        kind=InfrahubKind.GENERICGROUP,
-        prefetch_relationships=True,
-        populate_store=True,
-        id=model.generator_definition.group_id,
-        branch=model.source_branch,
+    group = await fetch_definition_targets(
+        client=client, branch=model.source_branch, definition=model.generator_definition
     )
-    await group.members.fetch()
 
     instance_by_member = {}
     for instance in existing_instances:
