Moved self.process_nodes into self.run.

Author: FragmentedPacket

infrahub_sdk/ctl/generator.py

@@ -64,7 +64,6 @@ async def run(
             infrahub_node=InfrahubNode,
         )
         await generator._init_client.schema.all(branch=generator.branch_name)
-        await generator.process_nodes(data=data)
         await generator.run(identifier=generator_config.name, data=data)
 
     else:
@@ -101,7 +100,6 @@ async def run(
                 repository_config=repository_config,
             )
             await generator._init_client.schema.all(branch=generator.branch_name)
-            await generator.process_nodes(data=data)
             await generator.run(identifier=generator_config.name, data=data)
 
 

infrahub_sdk/generator.py

@@ -97,16 +97,15 @@ async def collect_data(self) -> dict:
             update_group=True,
             subscribers=self.subscribers,
         )
-        unpacked = data.get("data") or data
-        await self.process_nodes(data=unpacked)
-        return data
+        return data.get("data") or data
 
     async def run(self, identifier: str, data: Optional[dict] = None) -> None:
         """Execute the generator after collecting the data from the GraphQL query."""
 
         if not data:
             data = await self.collect_data()
         unpacked = data.get("data") or data
+        await self.process_nodes(data=unpacked)
 
         async with self._init_client.start_tracking(
             identifier=identifier, params=self.params, delete_unused_nodes=True, group_type="CoreGeneratorGroup"