@finos/legend-graph 10.0.0 → 10.1.0

package/src/models/protocols/pure/v1/V1_PureGraphManager.ts

@@ -37,11 +37,11 @@ import {
   StopWatch,
   filterByType,
   isNonNullable,
-  guaranteeNonEmptyString,
   addUniqueEntry,
   uuid,
   deleteEntry,
   assertType,
+  uniq,
 } from '@finos/legend-shared';
 import type { TEMPORARY__AbstractEngineConfig } from '../../../../graphManager/action/TEMPORARY__AbstractEngineConfig.js';
 import {
@@ -51,10 +51,7 @@ import {
   type ExecutionOptions,
 } from '../../../../graphManager/AbstractPureGraphManager.js';
 import type { Mapping } from '../../../metamodels/pure/packageableElements/mapping/Mapping.js';
-import {
-  type Runtime,
-  EngineRuntime,
-} from '../../../metamodels/pure/packageableElements/runtime/Runtime.js';
+import type { Runtime } from '../../../metamodels/pure/packageableElements/runtime/Runtime.js';
 import type {
   ImportConfigurationDescription,
   ImportMode,
@@ -82,7 +79,6 @@ import type { GenerationOutput } from '../../../../graphManager/action/generatio
 import type { ValueSpecification } from '../../../metamodels/pure/valueSpecification/ValueSpecification.js';
 import { ServiceExecutionMode } from '../../../../graphManager/action/service/ServiceExecutionMode.js';
 import {
-  KeyedExecutionParameter,
   PureMultiExecution,
   PureSingleExecution,
 } from '../../../metamodels/pure/packageableElements/service/ServiceExecution.js';
@@ -173,7 +169,6 @@ import type { V1_Multiplicity } from './model/packageableElements/domain/V1_Mult
 import type { V1_RawVariable } from './model/rawValueSpecification/V1_RawVariable.js';
 import { V1_setupDatabaseSerialization } from './transformation/pureProtocol/serializationHelpers/V1_DatabaseSerializationHelper.js';
 import {
-  V1_PACKAGEABLE_RUNTIME_ELEMENT_PROTOCOL_TYPE,
   V1_setupEngineRuntimeSerialization,
   V1_setupLegacyRuntimeSerialization,
 } from './transformation/pureProtocol/serializationHelpers/V1_RuntimeSerializationHelper.js';
@@ -221,23 +216,13 @@ import {
   PureClientVersion,
   SystemGraphBuilderError,
 } from '../../../../graphManager/GraphManagerUtils.js';
-import {
-  PackageableElementExplicitReference,
-  PackageableElementReference,
-} from '../../../metamodels/pure/packageableElements/PackageableElementReference.js';
+import { PackageableElementReference } from '../../../metamodels/pure/packageableElements/PackageableElementReference.js';
 import type { GraphPluginManager } from '../../../../GraphPluginManager.js';
 import type { QuerySearchSpecification } from '../../../../graphManager/action/query/QuerySearchSpecification.js';
 import type { ExternalFormatDescription } from '../../../../graphManager/action/externalFormat/ExternalFormatDescription.js';
 import type { ConfigurationProperty } from '../../../metamodels/pure/packageableElements/fileGeneration/ConfigurationProperty.js';
 import { V1_ExternalFormatModelGenerationInput } from './engine/externalFormat/V1_ExternalFormatModelGeneration.js';
 import { GraphBuilderReport } from '../../../../graphManager/GraphBuilderReport.js';
-import {
-  V1_PureMultiExecution,
-  V1_PureSingleExecution,
-} from './model/packageableElements/service/V1_ServiceExecution.js';
-import { V1_MAPPING_ELEMENT_PROTOCOL_TYPE } from './transformation/pureProtocol/serializationHelpers/V1_MappingSerializationHelper.js';
-import { V1_SERVICE_ELEMENT_PROTOCOL_TYPE } from './transformation/pureProtocol/serializationHelpers/V1_ServiceSerializationHelper.js';
-import { MappingInclude } from '../../../metamodels/pure/packageableElements/mapping/MappingInclude.js';
 import type { ModelGenerationConfiguration } from '../../../ModelGenerationConfiguration.js';
 import type { MappingGeneration_PureProtocolProcessorPlugin_Extension } from '../MappingGeneration_PureProtocolProcessorPlugin_Extension.js';
 import type { Package } from '../../../metamodels/pure/packageableElements/domain/Package.js';
@@ -255,7 +240,6 @@ import {
 } from '../../../metamodels/pure/test/result/TestResult.js';
 import type { Service } from '../../../../DSLService_Exports.js';
 import type { Testable } from '../../../metamodels/pure/test/Testable.js';
-import { stub_RawLambda } from '../../../../graphManager/action/creation/RawValueSpecificationCreatorHelper.js';
 import {
   getNullableIDFromTestable,
   getNullableTestable,
@@ -266,9 +250,7 @@ import {
   type AtomicTest,
   TestSuite,
 } from '../../../metamodels/pure/test/Test.js';
-import { V1_getIncludedMappingPath } from './helper/V1_DSLMapping_Helper.js';
 import { pruneSourceInformation } from '../../../../MetaModelUtils.js';
-import { stub_Mapping } from '../../../../graphManager/action/creation/DSLMapping_ModelCreatorHelper.js';
 import {
   V1_buildModelCoverageAnalysisResult,
   V1_MappingModelCoverageAnalysisInput,
@@ -469,17 +451,23 @@ export interface V1_EngineSetupConfig {
 }
 
 export class V1_PureGraphManager extends AbstractPureGraphManager {
+  // Organizing these constants will help with configuring
+  // target protocol version in the future
+  // See https://github.com/finos/legend-studio/issues/475
+  private static readonly TARGET_PROTOCOL_VERSION = PureClientVersion.VX_X_X;
+
   engine: V1_Engine;
-  extensions: V1_GraphBuilderExtensions;
+  graphBuilderExtensions: V1_GraphBuilderExtensions;
 
   constructor(pluginManager: GraphPluginManager, log: Log) {
     super(pluginManager, log);
     this.engine = new V1_Engine({}, log);
 
     // setup plugins
-    this.extensions = new V1_GraphBuilderExtensions(
+    this.graphBuilderExtensions = new V1_GraphBuilderExtensions(
       this.pluginManager.getPureProtocolProcessorPlugins(),
     );
+
     // setup serialization plugins
     V1_setupPureModelContextDataSerialization(
       this.pluginManager.getPureProtocolProcessorPlugins(),
@@ -515,6 +503,10 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     await this.engine.setup(config);
   }
 
+  getSupportedProtocolVersion(): string {
+    return PureClientVersion.V1_0_0;
+  }
+
   // --------------------------------------------- Graph Builder ---------------------------------------------
 
   async buildSystem(
@@ -552,7 +544,11 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       const buildInputs = [
         {
           model: systemModel,
-          data: indexPureModelContextData(report, systemData, this.extensions),
+          data: indexPureModelContextData(
+            report,
+            systemData,
+            this.graphBuilderExtensions,
+          ),
         },
       ];
 
@@ -634,7 +630,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         data: indexPureModelContextData(
           report,
           dependencyData,
-          this.extensions,
+          this.graphBuilderExtensions,
         ),
       }));
 
@@ -693,7 +689,11 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       const buildInputs: V1_GraphBuilderInput[] = [
         {
           model: graph,
-          data: indexPureModelContextData(report, data, this.extensions),
+          data: indexPureModelContextData(
+            report,
+            data,
+            this.graphBuilderExtensions,
+          ),
         },
       ];
 
@@ -776,7 +776,11 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         generatedDataMap.entries(),
       ).map(([generationParentPath, generatedData]) => ({
         model: generatedModel,
-        data: indexPureModelContextData(report, generatedData, this.extensions),
+        data: indexPureModelContextData(
+          report,
+          generatedData,
+          this.graphBuilderExtensions,
+        ),
       }));
 
       // build
@@ -884,7 +888,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     return new V1_GraphBuilderContextBuilder(
       graph,
       currentSubGraph,
-      this.extensions,
+      this.graphBuilderExtensions,
       this.log,
       options,
     )
@@ -932,23 +936,24 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
           ),
         );
         await Promise.all(
-          this.extensions.sortedExtraElementBuilders.flatMap(async (builder) =>
-            (input.data.otherElementsByBuilder.get(builder) ?? []).map(
-              (element) =>
-                this.visitWithGraphBuilderErrorHandling(
-                  element,
-                  new V1_ProtocolToMetaModelGraphFirstPassBuilder(
-                    this.getBuilderContext(
-                      graph,
-                      input.model,
-                      element,
-                      options,
+          this.graphBuilderExtensions.sortedExtraElementBuilders.flatMap(
+            async (builder) =>
+              (input.data.otherElementsByBuilder.get(builder) ?? []).map(
+                (element) =>
+                  this.visitWithGraphBuilderErrorHandling(
+                    element,
+                    new V1_ProtocolToMetaModelGraphFirstPassBuilder(
+                      this.getBuilderContext(
+                        graph,
+                        input.model,
+                        element,
+                        options,
+                      ),
+                      packageCache,
+                      elementPathCache,
                     ),
-                    packageCache,
-                    elementPathCache,
                   ),
-                ),
-            ),
+              ),
           ),
         );
       }),
@@ -1317,80 +1322,82 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     options?: GraphBuilderOptions,
   ): Promise<void> {
     await Promise.all(
-      this.extensions.sortedExtraElementBuilders.map(async (builder) => {
-        await Promise.all(
-          inputs.flatMap((input) =>
-            (input.data.otherElementsByBuilder.get(builder) ?? []).map(
-              (element) =>
-                this.visitWithGraphBuilderErrorHandling(
-                  element,
-                  new V1_ProtocolToMetaModelGraphSecondPassBuilder(
-                    this.getBuilderContext(
-                      graph,
-                      input.model,
-                      element,
-                      options,
+      this.graphBuilderExtensions.sortedExtraElementBuilders.map(
+        async (builder) => {
+          await Promise.all(
+            inputs.flatMap((input) =>
+              (input.data.otherElementsByBuilder.get(builder) ?? []).map(
+                (element) =>
+                  this.visitWithGraphBuilderErrorHandling(
+                    element,
+                    new V1_ProtocolToMetaModelGraphSecondPassBuilder(
+                      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_ProtocolToMetaModelGraphThirdPassBuilder(
-                    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_ProtocolToMetaModelGraphThirdPassBuilder(
+                      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_ProtocolToMetaModelGraphFourthPassBuilder(
-                    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_ProtocolToMetaModelGraphFourthPassBuilder(
+                      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_ProtocolToMetaModelGraphFifthPassBuilder(
-                    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_ProtocolToMetaModelGraphFifthPassBuilder(
+                      this.getBuilderContext(
+                        graph,
+                        input.model,
+                        element,
+                        options,
+                      ),
                     ),
                   ),
-                ),
+              ),
             ),
-          ),
-        );
-      }),
+          );
+        },
+      ),
     );
   }
 
@@ -1751,7 +1758,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       new V1_GraphBuilderContextBuilder(
         graph,
         graph,
-        this.extensions,
+        this.graphBuilderExtensions,
         this.log,
       ).build(),
     );
@@ -1778,7 +1785,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         new V1_GraphBuilderContextBuilder(
           graph,
           graph,
-          this.extensions,
+          this.graphBuilderExtensions,
           this.log,
         ).build(),
       ),
@@ -1923,21 +1930,23 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         (element) => element.V1_getExtraExecutionInputCollectors?.() ?? [],
       )
       .flatMap((getter) => getter(graph, mapping, runtime, graphData));
-    prunedGraphData.elements = graphData.elements
-      .filter(
-        (element) =>
-          element instanceof V1_Class ||
-          element instanceof V1_Enumeration ||
-          element instanceof V1_Profile ||
-          element instanceof V1_Association ||
-          element instanceof V1_ConcreteFunctionDefinition ||
-          element instanceof V1_Measure ||
-          element instanceof V1_Store ||
-          element instanceof V1_PackageableConnection ||
-          element instanceof V1_PackageableRuntime ||
-          element instanceof V1_Mapping,
-      )
-      .concat(extraExecutionElements);
+    prunedGraphData.elements = uniq(
+      graphData.elements
+        .filter(
+          (element) =>
+            element instanceof V1_Class ||
+            element instanceof V1_Enumeration ||
+            element instanceof V1_Profile ||
+            element instanceof V1_Association ||
+            element instanceof V1_ConcreteFunctionDefinition ||
+            element instanceof V1_Measure ||
+            element instanceof V1_Store ||
+            element instanceof V1_PackageableConnection ||
+            element instanceof V1_PackageableRuntime ||
+            element instanceof V1_Mapping,
+        )
+        .concat(extraExecutionElements),
+    );
     // NOTE: for execution, we usually will just assume that we send the connections embedded in the runtime value, since we don't want the user to have to create
     // packageable runtime and connection just to play with execution.
     executeInput.clientVersion = clientVersion;
@@ -1973,7 +1982,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
           mapping,
           lambda,
           runtime,
-          PureClientVersion.VX_X_X,
+          V1_PureGraphManager.TARGET_PROTOCOL_VERSION,
         ),
         options,
       ),
@@ -1997,7 +2006,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       mapping,
       lambda,
       runtime,
-      PureClientVersion.VX_X_X,
+      V1_PureGraphManager.TARGET_PROTOCOL_VERSION,
       testDataGenerationExecuteInput,
     );
     testDataGenerationExecuteInput.parameters = parameters;
@@ -2019,7 +2028,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         mapping,
         lambda,
         runtime,
-        PureClientVersion.VX_X_X,
+        V1_PureGraphManager.TARGET_PROTOCOL_VERSION,
       ),
     );
   }
@@ -2036,7 +2045,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         mapping,
         lambda,
         runtime,
-        PureClientVersion.VX_X_X,
+        V1_PureGraphManager.TARGET_PROTOCOL_VERSION,
       ),
     );
     return {
@@ -2054,7 +2063,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
       new V1_GraphBuilderContextBuilder(
         graph,
         graph,
-        this.extensions,
+        this.graphBuilderExtensions,
         this.log,
       ).build(),
     );
@@ -2225,17 +2234,14 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
         V1_transformQuerySearchSpecification(searchSpecification),
       )
     ).map((protocol) =>
-      V1_buildLightQuery(
-        protocol,
-        this.engine.getEngineServerClient().currentUserId,
-      ),
+      V1_buildLightQuery(protocol, this.engine.getCurrentUserId()),
     );
   }
 
   async getLightQuery(queryId: string): Promise<LightQuery> {
     return V1_buildLightQuery(
       await this.engine.getQuery(queryId),
-      this.engine.getEngineServerClient().currentUserId,
+      this.engine.getCurrentUserId(),
     );
   }
 
@@ -2279,7 +2285,11 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     const dependencyGraphBuilderInput: V1_GraphBuilderInput[] = Array.from(
       dependencyDataMap.entries(),
     ).map(([dependencyKey, dependencyData]) => ({
-      data: indexPureModelContextData(report, dependencyData, this.extensions),
+      data: indexPureModelContextData(
+        report,
+        dependencyData,
+        this.graphBuilderExtensions,
+      ),
       model: graph.dependencyManager.getModel(dependencyKey),
     }));
     // build main pmcd
@@ -2292,7 +2302,11 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     const mainGraphBuilderInput: V1_GraphBuilderInput[] = [
       {
         model: graph,
-        data: indexPureModelContextData(report, data, this.extensions),
+        data: indexPureModelContextData(
+          report,
+          data,
+          this.graphBuilderExtensions,
+        ),
       },
     ];
     const graphBuilderInput = [
@@ -2303,157 +2317,13 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     return graphBuilderInput;
   }
 
-  // We could optimize this further by omitting parts of the entities we don't need
-  async buildGraphForCreateQuerySetup(
-    graph: PureModel,
-    entities: Entity[],
-    dependencyEntities: Map<string, Entity[]>,
-  ): Promise<void> {
-    try {
-      const graphBuilderInput = await this.indexEntitiesWithDependencyIntoGraph(
-        graph,
-        entities,
-        dependencyEntities,
-        (entity: Entity): boolean =>
-          ((entity.content as PlainObject<V1_PackageableElement>)
-            ._type as string) === V1_MAPPING_ELEMENT_PROTOCOL_TYPE ||
-          ((entity.content as PlainObject<V1_PackageableElement>)
-            ._type as string) === V1_PACKAGEABLE_RUNTIME_ELEMENT_PROTOCOL_TYPE,
-      );
-      // handle mapping includes
-      const mappings = [
-        ...graph.ownMappings,
-        ...graph.dependencyManager.mappings,
-      ];
-      const v1Mappings = graphBuilderInput
-        .map((e) => e.data.elements.filter(filterByType(V1_Mapping)))
-        .flat();
-      const context = new V1_GraphBuilderContextBuilder(
-        graph,
-        graph,
-        this.extensions,
-        this.log,
-      ).build();
-      // build include index for compatible runtime analysis
-      v1Mappings.forEach((element) => {
-        const mapping = mappings.find((e) => e.path === element.path);
-        if (mapping) {
-          mapping.includes = element.includedMappings.map(
-            (i) =>
-              new MappingInclude(
-                mapping,
-                context.resolveMapping(
-                  guaranteeNonEmptyString(
-                    V1_getIncludedMappingPath(i),
-                    `Mapping include path is missing or empty`,
-                  ),
-                ),
-              ),
-          );
-        }
-      });
-      // handle runtimes
-      const runtimes = [
-        ...graph.ownRuntimes,
-        ...graph.dependencyManager.runtimes,
-      ];
-      const v1Runtimes = graphBuilderInput
-        .map((e) => e.data.elements.filter(filterByType(V1_PackageableRuntime)))
-        .flat();
-      v1Runtimes.forEach((element) => {
-        const runtime = runtimes.find((e) => e.path === element.path);
-        if (runtime) {
-          const runtimeValue = new EngineRuntime();
-          runtime.runtimeValue = runtimeValue;
-          runtimeValue.mappings = element.runtimeValue.mappings.map((mapping) =>
-            context.resolveMapping(mapping.path),
-          );
-        }
-      });
-    } catch (error) {
-      assertErrorThrown(error);
-      /**
-       * Wrap all error with `GraphBuilderError`, as we throw a lot of assertion error in the graph builder
-       * But we might want to rethink this decision in the future and throw appropriate type of error
-       */
-      throw error instanceof GraphBuilderError
-        ? error
-        : new GraphBuilderError(error);
-    }
-  }
-
-  // We could optimize this further by omitting parts of the entities we don't need
-  // i.e service entity would only keep execution
-  async buildGraphForServiceQuerySetup(
-    graph: PureModel,
-    entities: Entity[],
-    dependencyEntities: Map<string, Entity[]>,
-  ): Promise<void> {
-    try {
-      const graphBuilderInput = await this.indexEntitiesWithDependencyIntoGraph(
-        graph,
-        entities,
-        dependencyEntities,
-        (entity: Entity): boolean =>
-          ((entity.content as PlainObject<V1_PackageableElement>)
-            ._type as string) === V1_SERVICE_ELEMENT_PROTOCOL_TYPE,
-      );
-      // handle servicess
-      const services = [
-        ...graph.ownServices,
-        ...graph.dependencyManager.services,
-      ];
-      const v1Services = graphBuilderInput
-        .map((e) => e.data.elements.filter(filterByType(V1_Service)))
-        .flat();
-      // build service multi execution keys
-      v1Services.forEach((element) => {
-        const service = services.find((e) => e.path === element.path);
-        if (service) {
-          const serviceExecution = element.execution;
-          if (serviceExecution instanceof V1_PureMultiExecution) {
-            const execution = new PureMultiExecution(
-              serviceExecution.executionKey,
-              stub_RawLambda(),
-              service,
-            );
-            execution.executionParameters =
-              serviceExecution.executionParameters.map(
-                (keyedExecutionParameter) =>
-                  new KeyedExecutionParameter(
-                    keyedExecutionParameter.key,
-                    PackageableElementExplicitReference.create(stub_Mapping()),
-                    new EngineRuntime(),
-                  ),
-              );
-            service.execution = execution;
-          } else if (serviceExecution instanceof V1_PureSingleExecution) {
-            service.execution = new PureSingleExecution(
-              stub_RawLambda(),
-              service,
-              PackageableElementExplicitReference.create(stub_Mapping()),
-              new EngineRuntime(),
-            );
-          }
-        }
-      });
-    } catch (error) {
-      assertErrorThrown(error);
-      /**
-       * Wrap all error with `GraphBuilderError`, as we throw a lot of assertion error in the graph builder
-       * But we might want to rethink this decision in the future and throw appropriate type of error
-       */
-      throw error instanceof GraphBuilderError
-        ? error
-        : new GraphBuilderError(error);
-    }
-  }
+  // --------------------------------------------- Query ------------------------------------------------------
 
   async getQuery(queryId: string, graph: PureModel): Promise<Query> {
     return V1_buildQuery(
       await this.engine.getQuery(queryId),
       graph,
-      this.engine.getEngineServerClient().currentUserId,
+      this.engine.getCurrentUserId(),
     );
   }
 
@@ -2465,7 +2335,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     return V1_buildQuery(
       await this.engine.createQuery(V1_transformQuery(query)),
       graph,
-      this.engine.getEngineServerClient().currentUserId,
+      this.engine.getCurrentUserId(),
     );
   }
 
@@ -2473,7 +2343,7 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     return V1_buildQuery(
       await this.engine.updateQuery(V1_transformQuery(query)),
       graph,
-      this.engine.getEngineServerClient().currentUserId,
+      this.engine.getCurrentUserId(),
     );
   }
 
@@ -2514,19 +2384,21 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
           [],
       )
       .flatMap((getter) => getter(graph, graphData));
-    prunedGraphData.elements = this.getFullGraphModelData(graph)
-      .elements.filter(
-        (element) =>
-          element instanceof V1_Class ||
-          element instanceof V1_Enumeration ||
-          element instanceof V1_Profile ||
-          element instanceof V1_Association ||
-          element instanceof V1_ConcreteFunctionDefinition ||
-          element instanceof V1_Measure ||
-          element instanceof V1_Store ||
-          element instanceof V1_Mapping,
-      )
-      .concat(extraElements);
+    prunedGraphData.elements = uniq(
+      this.getFullGraphModelData(graph)
+        .elements.filter(
+          (element) =>
+            element instanceof V1_Class ||
+            element instanceof V1_Enumeration ||
+            element instanceof V1_Profile ||
+            element instanceof V1_Association ||
+            element instanceof V1_ConcreteFunctionDefinition ||
+            element instanceof V1_Measure ||
+            element instanceof V1_Store ||
+            element instanceof V1_Mapping,
+        )
+        .concat(extraElements),
+    );
     return prunedGraphData;
   };
 
@@ -2536,7 +2408,8 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
   ): Promise<MappingModelCoverageAnalysisResult> {
     const modelCoverageAnalysisInput =
       new V1_MappingModelCoverageAnalysisInput();
-    modelCoverageAnalysisInput.clientVersion = PureClientVersion.VX_X_X;
+    modelCoverageAnalysisInput.clientVersion =
+      V1_PureGraphManager.TARGET_PROTOCOL_VERSION;
     modelCoverageAnalysisInput.mapping = mapping.path;
     modelCoverageAnalysisInput.model =
       this.buildMappingModelCoverageAnalysisInputContextData(graph);