@finos/legend-graph 32.5.0 → 32.5.2

package/lib/graph-manager/protocol/pure/v1/V1_PureGraphManager.js

@@ -17,6 +17,8 @@ import { GRAPH_MANAGER_EVENT } from '../../../../__lib__/GraphManagerEvent.js';
 import { CORE_PURE_PATH, PackageableElementPointerType, } from '../../../../graph/MetaModelConst.js';
 import { ActionState, TracerService, LogEvent, getClass, guaranteeNonNullable, UnsupportedOperationError, assertErrorThrown, promisify, StopWatch, isNonNullable, filterByType, isString, assertNonEmptyString, uniq, guaranteeType, guaranteeNonEmptyString, uuid, } from '@finos/legend-shared';
 import { AbstractPureGraphManager, } from '../../../../graph-manager/AbstractPureGraphManager.js';
+import { Mapping } from '../../../../graph/metamodel/pure/packageableElements/mapping/Mapping.js';
+import { PackageableRuntime } from '../../../../graph/metamodel/pure/packageableElements/runtime/PackageableRuntime.js';
 import { PureModel, } from '../../../../graph/PureModel.js';
 import { RawLambda } from '../../../../graph/metamodel/pure/rawValueSpecification/RawLambda.js';
 import { ServiceRegistrationSuccess, ServiceRegistrationFail, } from '../../../../graph-manager/action/service/ServiceRegistrationResult.js';
@@ -125,7 +127,7 @@ import { V1_INTERNAL__UnknownElement } from './model/packageableElements/V1_INTE
 import { V1_HostedService } from './model/packageableElements/function/V1_HostedService.js';
 import { V1_UserListOwnership } from './model/packageableElements/service/V1_ServiceOwnership.js';
 import { V1_PureSingleExecution } from './model/packageableElements/service/V1_ServiceExecution.js';
-import { V1_RuntimePointer, } from './model/packageableElements/runtime/V1_Runtime.js';
+import { V1_EngineRuntime, V1_RuntimePointer, } from './model/packageableElements/runtime/V1_Runtime.js';
 import { V1_buildDebugTestsResult } from './engine/test/V1_DebugTestsResult.js';
 import { V1_CompleteCodeInput } from './engine/compilation/V1_CompleteCodeInput.js';
 import { V1_QueryParameterValue } from './engine/query/V1_Query.js';
@@ -134,7 +136,7 @@ import { V1_buildFunctionSignature, V1_createGenericTypeWithElementPath, } from
 import { V1_DataProduct } from './model/packageableElements/dataProduct/V1_DataProduct.js';
 import { V1_DataProductArtifact, V1_ModelAccessPointGroupInfo, } from './lakehouse/deploy/V1_DataProductArtifact.js';
 import { DataProductAnalysisQueryResult, DataProductAnalysis, } from '../../../action/analytics/data-product/DataProductAnalysis.js';
-import { DataProductAccessType, ModelAccessPointGroup, NativeModelAccess, NativeModelExecutionContext, } from '../../../../graph/metamodel/pure/dataProduct/DataProduct.js';
+import { DataProductAccessType, DataProductElementScope, ModelAccessPointGroup, NativeModelAccess, NativeModelExecutionContext, } from '../../../../graph/metamodel/pure/dataProduct/DataProduct.js';
 import { V1_MemSQLFunction } from './model/packageableElements/function/V1_MemSQLFunction.js';
 import { LineageModel } from '../../../../graph/metamodel/pure/lineage/LineageModel.js';
 import { V1_LineageInput, } from './model/lineage/V1_Lineage.js';
@@ -143,6 +145,11 @@ import { V1_DevMetadataPushRequest, V1_MetadataRequestOptions, V1_MetadatProject
 import { IngestDefinition } from '../../../../graph/metamodel/pure/packageableElements/ingest/IngestDefinition.js';
 import { Database } from '../../../../graph/metamodel/pure/packageableElements/store/relational/model/Database.js';
 import { V1_createAccessorFromPackageableElement } from './helpers/V1_AccessorHelper.js';
+/**
+ * Number of elements to process synchronously before yielding to the event loop.
+ * This avoids per-element setTimeout overhead while keeping the UI responsive.
+ */
+const GRAPH_BUILDER_BATCH_SIZE = 100;
 class V1_PureModelContextDataIndex {
     elements = [];
     nativeElements = [];
@@ -694,82 +701,122 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         // this way, as we build the a graph, we know the next step's duplication check
         // has path cache consisting of all element from its base graphs
         const elementPathCache = new Set(graph.allElements.map((el) => el.path));
-        await Promise.all(inputs.flatMap(async (input) => {
-            // create the package cache
+        // NOTE: We must index ALL native elements across ALL inputs before indexing
+        // plugin-contributed ("other") elements. Plugin elements
+        // may resolve references to native elements (e.g. Mapping, Runtime) from
+        // other inputs during their first pass. If we process each input fully
+        // (native + other) before moving to the next, a plugin element in input[0]
+        // could fail to find a native element that only exists in input[1].
+        const packageCaches = new Map();
+        const createFirstPassBuilder = (input, packageCache, element) => new V1_ElementFirstPassBuilder(this.getBuilderContext(graph, input.model, element, options), packageCache, elementPathCache);
+        for (const input of inputs) {
             const packageCache = new Map();
-            await Promise.all(input.data.nativeElements.map((element) => {
-                return this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFirstPassBuilder(this.getBuilderContext(graph, input.model, element, options), packageCache, elementPathCache));
-            }));
-            await Promise.all(this.graphBuilderExtensions.sortedExtraElementBuilders.flatMap((builder) => (input.data.otherElementsByBuilder.get(builder) ?? []).map((element) => {
-                return this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFirstPassBuilder(this.getBuilderContext(graph, input.model, element, options), packageCache, elementPathCache));
-            })));
-        }));
+            packageCaches.set(input, packageCache);
+            // Phase 1: index native elements for this input
+            await this.runBatchedLoop(input.data.nativeElements, (element) => this.visitWithGraphBuilderErrorHandling(element, createFirstPassBuilder(input, packageCache, element)));
+        }
+        // Phase 2: index other (plugin-contributed) elements across all inputs,
+        // now that all native elements have been indexed
+        for (const input of inputs) {
+            const packageCache = guaranteeNonNullable(packageCaches.get(input));
+            const otherElements = this.graphBuilderExtensions.sortedExtraElementBuilders.flatMap((builder) => input.data.otherElementsByBuilder.get(builder) ?? []);
+            await this.runBatchedLoop(otherElements, (element) => this.visitWithGraphBuilderErrorHandling(element, createFirstPassBuilder(input, packageCache, element)));
+        }
     }
     async buildTypes(graph, inputs, options) {
         // Second pass
-        await Promise.all(inputs.flatMap((input) => input.data.profiles.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.classes.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.enumerations.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.measures.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.functions.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.profiles, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.classes, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.enumerations, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.measures, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.functions, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
         // Third pass
-        await Promise.all(inputs.flatMap((input) => input.data.classes.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementThirdPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.associations.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementThirdPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.classes, (ctx) => new V1_ElementThirdPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.associations, (ctx) => new V1_ElementThirdPassBuilder(ctx), options);
         // Fourth Pass
-        await Promise.all(inputs.flatMap((input) => input.data.classes.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFourthPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.associations.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFourthPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.classes, (ctx) => new V1_ElementFourthPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.associations, (ctx) => new V1_ElementFourthPassBuilder(ctx), options);
         // Fifth pass
-        await Promise.all(inputs.flatMap((input) => input.data.classes.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFifthPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.classes, (ctx) => new V1_ElementFifthPassBuilder(ctx), options);
     }
     async buildFunctionActivators(graph, inputs, options) {
-        await Promise.all(inputs.flatMap((input) => input.data.functionActivators.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.functionActivators, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
     }
     async buildStores(graph, inputs, options) {
-        await Promise.all(inputs.flatMap((input) => input.data.stores.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.stores.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementThirdPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.stores.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFourthPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.stores.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFifthPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.stores, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.stores, (ctx) => new V1_ElementThirdPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.stores, (ctx) => new V1_ElementFourthPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.stores, (ctx) => new V1_ElementFifthPassBuilder(ctx), options);
     }
     async buildMappings(graph, inputs, options) {
-        await Promise.all(inputs.flatMap((input) => input.data.mappings.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.mappings.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementThirdPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.mappings.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFourthPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.mappings, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.mappings, (ctx) => new V1_ElementThirdPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.mappings, (ctx) => new V1_ElementFourthPassBuilder(ctx), options);
     }
     async buildConnectionsAndRuntimes(graph, inputs, options) {
         // NOTE: connections must be built before runtimes
-        await Promise.all(inputs.flatMap((input) => input.data.connections.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.runtimes.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.connections, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.runtimes, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
     }
     async buildServices(graph, inputs, options) {
-        await Promise.all(inputs.flatMap((input) => input.data.services.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        await Promise.all(inputs.flatMap((input) => input.data.executionEnvironments.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.services, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
+        await this.processElementsInBatches(graph, inputs, (data) => data.executionEnvironments, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
     }
     async buildDataElements(graph, inputs, options) {
-        await Promise.all(inputs.flatMap((input) => input.data.dataElements.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.dataElements, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
     }
     async buildDataProducts(graph, inputs, options) {
-        await Promise.all(inputs.flatMap((input) => input.data.products.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.products, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
     }
     async buildFileGenerations(graph, inputs, options) {
-        await Promise.all(inputs.flatMap((input) => input.data.fileGenerations.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.fileGenerations, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
     }
     async buildGenerationSpecifications(graph, inputs, options) {
-        await Promise.all(inputs.flatMap((input) => input.data.generationSpecifications.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.generationSpecifications, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
     }
     async buildSectionIndices(graph, inputs, options) {
-        await Promise.all(inputs.flatMap((input) => input.data.sectionIndices.map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
+        await this.processElementsInBatches(graph, inputs, (data) => data.sectionIndices, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
     }
     async buildOtherElements(graph, inputs, options) {
-        await Promise.all(this.graphBuilderExtensions.sortedExtraElementBuilders.map(async (builder) => {
-            await Promise.all(inputs.flatMap((input) => (input.data.otherElementsByBuilder.get(builder) ?? []).map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementSecondPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-            await Promise.all(inputs.flatMap((input) => (input.data.otherElementsByBuilder.get(builder) ?? []).map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementThirdPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-            await Promise.all(inputs.flatMap((input) => (input.data.otherElementsByBuilder.get(builder) ?? []).map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFourthPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-            await Promise.all(inputs.flatMap((input) => (input.data.otherElementsByBuilder.get(builder) ?? []).map((element) => this.visitWithGraphBuilderErrorHandling(element, new V1_ElementFifthPassBuilder(this.getBuilderContext(graph, input.model, element, options))))));
-        }));
+        for (const builder of this.graphBuilderExtensions
+            .sortedExtraElementBuilders) {
+            const getElements = (data) => data.otherElementsByBuilder.get(builder) ?? [];
+            await this.processElementsInBatches(graph, inputs, getElements, (ctx) => new V1_ElementSecondPassBuilder(ctx), options);
+            await this.processElementsInBatches(graph, inputs, getElements, (ctx) => new V1_ElementThirdPassBuilder(ctx), options);
+            await this.processElementsInBatches(graph, inputs, getElements, (ctx) => new V1_ElementFourthPassBuilder(ctx), options);
+            await this.processElementsInBatches(graph, inputs, getElements, (ctx) => new V1_ElementFifthPassBuilder(ctx), options);
+        }
+    }
+    /**
+     * Run a callback for each item in the array, processing items in batches
+     * of {@link GRAPH_BUILDER_BATCH_SIZE} and yielding to the event loop between
+     * batches to keep the UI responsive.
+     */
+    async runBatchedLoop(items, process) {
+        for (let i = 0; i < items.length; i += GRAPH_BUILDER_BATCH_SIZE) {
+            if (i > 0) {
+                await new Promise((resolve) => setTimeout(resolve, 0));
+            }
+            const end = Math.min(i + GRAPH_BUILDER_BATCH_SIZE, items.length);
+            for (let j = i; j < end; j++) {
+                process(guaranteeNonNullable(items[j]));
+            }
+        }
+    }
+    /**
+     * Process elements from inputs in batches, yielding to the event loop
+     * between batches to keep the UI responsive.
+     */
+    async processElementsInBatches(graph, inputs, getElements, createVisitor, options) {
+        const allItems = inputs.flatMap((input) => getElements(input.data).map((element) => ({
+            element,
+            model: input.model,
+        })));
+        await this.runBatchedLoop(allItems, (item) => this.visitWithGraphBuilderErrorHandling(item.element, createVisitor(this.getBuilderContext(graph, item.model, item.element, options))));
     }
     visitWithGraphBuilderErrorHandling(element, visitor) {
         try {
-            return promisify(() => element.accept_PackageableElementVisitor(visitor));
+            return element.accept_PackageableElementVisitor(visitor);
         }
         catch (err) {
             assertErrorThrown(err);
@@ -1722,22 +1769,21 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         const artifact = V1_DataProductArtifact.serialization.fromJson(artifactJson);
         return this.buildDataProductAnalysis(artifact, dataProductPath, pureGraph, accessPointId, dataProductAccessType, projectInfo, graphReport);
     }
-    async buildDataProductAnalysis(artifact, dataProductPath, pureGraph, accessPointId, dataProductAccessType, projectInfo, graphReport) {
-        // Collect all mapping generation infos from model access point groups and native model access
-        const allMappingGenInfos = new Map();
-        const modelAccessPointGroups = artifact.accessPointGroups.filter((group) => group instanceof V1_ModelAccessPointGroupInfo);
-        for (const group of modelAccessPointGroups) {
-            allMappingGenInfos.set(group.mappingGeneration.path, group.mappingGeneration);
-        }
-        if (artifact.nativeModelAccess?.mappingGenerations) {
-            for (const [path, genInfo] of artifact.nativeModelAccess
-                .mappingGenerations) {
-                if (!allMappingGenInfos.has(path)) {
-                    allMappingGenInfos.set(path, genInfo);
-                }
+    resolveArtifactElements(elementPaths, pureGraph) {
+        const scopes = [];
+        for (const path of elementPaths) {
+            const el = pureGraph.getNullableElement(path, true);
+            if (el) {
+                const scope = new DataProductElementScope();
+                scope.element = PackageableElementExplicitReference.create(el);
+                scopes.push(scope);
             }
         }
-        // Resolve mapping path from accessPointId and dataProductAccessType
+        return scopes;
+    }
+    async buildDataProductAnalysis(artifact, dataProductPath, pureGraph, accessPointId, dataProductAccessType, projectInfo, graphReport) {
+        const modelAccessPointGroups = artifact.accessPointGroups.filter((group) => group instanceof V1_ModelAccessPointGroupInfo);
+        // Resolve the target access group and mapping path
         let mappingPath;
         let accessGroup = undefined;
         if (dataProductAccessType === DataProductAccessType.MODEL) {
@@ -1754,23 +1800,53 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
                 accessGroup = nativeCtx;
             }
         }
+        if (!accessGroup) {
+            throw new Error(`Can't resolve access point '${accessPointId}' (type: ${dataProductAccessType}) in data product '${dataProductPath}'`);
+        }
         if (!mappingPath) {
-            throw new Error(`Can't resolve mapping path for access point '${accessPointId}' (type: ${dataProductAccessType}) in data product '${dataProductPath}'`);
+            throw new Error(`Can't resolve mapping path '${mappingPath}' for access point '${accessPointId}' (type: ${dataProductAccessType}) in data product '${dataProductPath}'`);
         }
-        if (!accessGroup) {
-            throw new Error(`Can't resolve access group for access point '${accessPointId}' (type: ${dataProductAccessType}) in data product '${dataProductPath}'`);
+        // prevent refetching artifact
+        const includedGenInfos = new Map();
+        if (artifact.nativeModelAccess?.mappingGenerations) {
+            for (const [path, genInfo] of artifact.nativeModelAccess
+                .mappingGenerations) {
+                includedGenInfos.set(path, genInfo);
+            }
+        }
+        for (const group of modelAccessPointGroups) {
+            if (!includedGenInfos.has(group.mappingGeneration.path)) {
+                includedGenInfos.set(group.mappingGeneration.path, group.mappingGeneration);
+            }
+        }
+        const nativeRuntimePaths = new Map();
+        if (artifact.nativeModelAccess?.nativeModelExecutionContexts) {
+            for (const ctx of artifact.nativeModelAccess
+                .nativeModelExecutionContexts) {
+                const rtPath = ctx.runtimeGeneration?.path;
+                if (rtPath) {
+                    nativeRuntimePaths.set(ctx.key, rtPath);
+                }
+            }
         }
-        // Build the minimal graph using ONLY the elements from the resolved mapping
-        const resolvedMappingGenInfo = mappingPath
-            ? allMappingGenInfos.get(mappingPath)
+        // Only add a stub for the resolved mapping to the graph
+        const resolvedMappingStub = new V1_Mapping();
+        resolvedMappingStub.package = extractPackagePathFromPath(mappingPath) ?? '';
+        resolvedMappingStub.name = extractElementNameFromPath(mappingPath);
+        // Only add a runtime stub for the resolved native context (if applicable)
+        const resolvedRuntimePath = dataProductAccessType === DataProductAccessType.NATIVE
+            ? nativeRuntimePaths.get(accessPointId)
             : undefined;
-        if (!resolvedMappingGenInfo) {
-            throw new Error(`Can't find mapping generation info for access point '${accessPointId}' (type: ${dataProductAccessType}) in data product '${dataProductPath}'`);
+        let resolvedRuntimeStub;
+        if (resolvedRuntimePath) {
+            resolvedRuntimeStub = new V1_PackageableRuntime();
+            resolvedRuntimeStub.package =
+                extractPackagePathFromPath(resolvedRuntimePath) ?? '';
+            resolvedRuntimeStub.name =
+                extractElementNameFromPath(resolvedRuntimePath);
+            resolvedRuntimeStub.runtimeValue = new V1_EngineRuntime();
         }
-        // Create a dummy mapping for the resolved mapping path
-        const dummyMapping = new V1_Mapping();
-        dummyMapping.package = extractPackagePathFromPath(mappingPath) ?? '';
-        dummyMapping.name = extractElementNameFromPath(mappingPath);
+        // Create a dummy data product element
         // Create a dummy data product element
         const dummyDataProduct = new V1_DataProduct();
         dummyDataProduct.package =
@@ -1778,9 +1854,11 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         dummyDataProduct.name = extractElementNameFromPath(dataProductPath);
         dummyDataProduct.title = artifact.dataProduct.title;
         dummyDataProduct.description = artifact.dataProduct.description;
-        // Build the minimal graph from the resolved mapping's model elements + dummy mapping + dummy data product
-        const graphEntities = resolvedMappingGenInfo.model.elements
-            .concat([dummyMapping])
+        // Only load model elements for the resolved mapping
+        const allModelElements = includedGenInfos.get(mappingPath)?.model.elements ?? [];
+        const graphEntities = allModelElements
+            .concat(resolvedMappingStub)
+            .concat(resolvedRuntimeStub ? [resolvedRuntimeStub] : [])
             .concat(dummyDataProduct)
             .filter((el) => !pureGraph.getNullableElement(el.path, false))
             .map((el) => this.elementProtocolToEntity(el));
@@ -1788,30 +1866,74 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
             origin: new LegendSDLC(projectInfo.groupId, projectInfo.artifactId, projectInfo.versionId),
         }, graphReport);
         const data = pureGraph.getDataProduct(dataProductPath);
-        // build access point group
         let exec;
+        if (artifact.nativeModelAccess?.defaultExecutionContext &&
+            artifact.nativeModelAccess.nativeModelExecutionContexts.length) {
+            const na = new NativeModelAccess();
+            na.nativeModelExecutionContexts =
+                artifact.nativeModelAccess.nativeModelExecutionContexts.map((ctxInfo) => {
+                    const ctx = new NativeModelExecutionContext();
+                    ctx.key = ctxInfo.key;
+                    const ctxMappingPath = ctxInfo.mapping;
+                    const ctxMapping = ctxMappingPath === mappingPath
+                        ? pureGraph.getMapping(ctxMappingPath)
+                        : new Mapping(ctxMappingPath);
+                    ctx.mapping =
+                        PackageableElementExplicitReference.create(ctxMapping);
+                    const rtPath = nativeRuntimePaths.get(ctxInfo.key);
+                    if (rtPath) {
+                        const ctxRuntime = rtPath === resolvedRuntimePath
+                            ? pureGraph.getRuntime(rtPath)
+                            : new PackageableRuntime(rtPath);
+                        ctx.runtime =
+                            PackageableElementExplicitReference.create(ctxRuntime);
+                    }
+                    ctx.__owner = na;
+                    return ctx;
+                });
+            const defaultExecutionContext = na.nativeModelExecutionContexts.find((ctx) => ctx.key === artifact.nativeModelAccess?.defaultExecutionContext);
+            if (!defaultExecutionContext) {
+                throw new Error(`Can't find execution context matching default context in '${dataProductPath}'`);
+            }
+            na.defaultExecutionContext = defaultExecutionContext;
+            na.featuredElements = this.resolveArtifactElements(artifact.nativeModelAccess.elements, pureGraph);
+            data.nativeModelAccess = na;
+        }
+        if (modelAccessPointGroups.length > 0) {
+            data.accessPointGroups = modelAccessPointGroups.map((groupInfo) => {
+                const group = new ModelAccessPointGroup();
+                group.id = groupInfo.id;
+                const groupMappingPath = groupInfo.mappingGeneration.path;
+                const groupMapping = groupMappingPath === mappingPath
+                    ? pureGraph.getMapping(groupMappingPath)
+                    : new Mapping(groupMappingPath);
+                group.mapping =
+                    PackageableElementExplicitReference.create(groupMapping);
+                group.featuredElements = this.resolveArtifactElements(groupInfo.elements, pureGraph);
+                return group;
+            });
+        }
+        // Resolve the target exec state
         if (accessGroup instanceof V1_ModelAccessPointGroupInfo) {
-            const group = new ModelAccessPointGroup();
-            group.id = accessGroup.id;
-            data.accessPointGroups = [group];
-            group.mapping = PackageableElementExplicitReference.create(pureGraph.getMapping(mappingPath));
-            exec = group;
+            exec = data.accessPointGroups.find((g) => g instanceof ModelAccessPointGroup && g.id === accessGroup.id);
         }
         else {
-            const nativeAccess = new NativeModelExecutionContext();
-            nativeAccess.key = accessGroup.key;
-            nativeAccess.mapping = PackageableElementExplicitReference.create(pureGraph.getMapping(mappingPath));
-            const na = new NativeModelAccess();
-            na.nativeModelExecutionContexts = [nativeAccess];
-            data.nativeModelAccess = na;
-            exec = nativeAccess;
+            exec = data.nativeModelAccess?.nativeModelExecutionContexts.find((ctx) => ctx.key === accessGroup.key);
+        }
+        if (!exec) {
+            throw new Error(`Can't find execution matching access id in '${dataProductPath}'`);
         }
-        // Build MappingModelCoverageAnalysisResult for the resolved mapping only
+        // Build MappingModelCoverageAnalysisResult for all included mappings
         const mappingToMappingCoverageResult = new Map();
-        const v1Result = new V1_MappingModelCoverageAnalysisResult();
-        v1Result.mappedEntities = resolvedMappingGenInfo.mappedEntities;
-        v1Result.model = resolvedMappingGenInfo.model;
-        mappingToMappingCoverageResult.set(mappingPath, V1_buildModelCoverageAnalysisResult(v1Result, this, pureGraph.getMapping(mappingPath), resolvedMappingGenInfo.model));
+        for (const [mPath, genInfo] of includedGenInfos) {
+            const v1Result = new V1_MappingModelCoverageAnalysisResult();
+            v1Result.mappedEntities = genInfo.mappedEntities;
+            v1Result.model = genInfo.model;
+            const coverageMapping = mPath === mappingPath
+                ? pureGraph.getMapping(mPath)
+                : new Mapping(mPath);
+            mappingToMappingCoverageResult.set(mPath, V1_buildModelCoverageAnalysisResult(v1Result, this, coverageMapping, genInfo.model));
+        }
         // Build the analysis result
         const result = new DataProductAnalysis();
         result.path = dataProductPath;