Add Runtime Components to Execution Environment

.changeset/khaki-jars-fix.md

@@ -0,0 +1,3 @@
+---
+'@finos/legend-graph': patch
+---

.changeset/twenty-avocados-doubt.md

@@ -0,0 +1,5 @@
+---
+'@finos/legend-extension-store-service-store': patch
+---
+
+Add Runtime Components to Execution Environment

packages/legend-extension-store-service-store/src/graph-manager/action/changeDetection/STO_ServiceStore_ObserverHelper.ts

@@ -94,6 +94,7 @@ export const observe_ComplexTypeReference = skipObserved(
     });
 
     observe_PackageableElementReference(metamodel.type);
+    //hre
     observe_PackageableElementReference(metamodel.binding);
 
     return metamodel;

packages/legend-graph/src/graph-manager/protocol/pure/v1/model/packageableElements/service/V1_ExecutionEnvironmentInstance.ts

@@ -18,8 +18,9 @@ import { type Hashable, hashArray } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../graph/Core_HashUtils.js';
 import type { V1_Runtime } from '../runtime/V1_Runtime.js';
 import {
-  V1_PackageableElement,
+  type V1_PackageableElementPointer,
   type V1_PackageableElementVisitor,
+  V1_PackageableElement,
 } from '../V1_PackageableElement.js';
 
 export class V1_ExecutionEnvironmentInstance
@@ -47,20 +48,37 @@ export abstract class V1_ExecutionParameters implements Hashable {
   abstract get hashCode(): string;
 }
 
+export class V1_RuntimeComponents implements Hashable {
+  runtime!: V1_Runtime;
+  binding!: V1_PackageableElementPointer;
+  clazz!: V1_PackageableElementPointer;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.RUNTIME_COMPONENTS,
+      this.binding.path,
+      this.clazz.path,
+      this.runtime,
+    ]);
+  }
+}
+
 export class V1_SingleExecutionParameters
   extends V1_ExecutionParameters
   implements Hashable
 {
   key!: string;
   mapping!: string;
-  runtime!: V1_Runtime;
+  runtime?: V1_Runtime;
+  runtimeComponents?: V1_RuntimeComponents;
 
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.SINGLE_EXECUTION_PARAMETER,
       this.key,
       this.mapping,
-      this.runtime,
+      this.runtime ?? '',
+      this.runtimeComponents ?? '',
     ]);
   }
 }

packages/legend-graph/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_ExecutionEnvironmentTransformer.ts

@@ -26,10 +26,13 @@ import {
   type V1_ExecutionParameters,
   V1_ExecutionEnvironmentInstance,
   V1_MultiExecutionParameters,
+  V1_RuntimeComponents,
   V1_SingleExecutionParameters,
 } from '../../../model/packageableElements/service/V1_ExecutionEnvironmentInstance.js';
 import { V1_transformRuntime } from './V1_RuntimeTransformer.js';
 import { UnsupportedOperationError } from '@finos/legend-shared';
+import { PackageableElementPointerType } from '../../../../../../../graph/MetaModelConst.js';
+import { V1_PackageableElementPointer } from '../../../model/packageableElements/V1_PackageableElement.js';
 
 const V1_transformSingleExecutionParameters = (
   element: SingleExecutionParameters,
@@ -38,7 +41,25 @@ const V1_transformSingleExecutionParameters = (
   const _val = new V1_SingleExecutionParameters();
   _val.key = element.key;
   _val.mapping = element.mapping.valueForSerialization ?? '';
-  _val.runtime = V1_transformRuntime(element.runtime, context);
+  if (element.runtime) {
+    _val.runtime = V1_transformRuntime(element.runtime, context);
+  }
+  if (element.runtimeComponents) {
+    _val.runtimeComponents = new V1_RuntimeComponents();
+    _val.runtimeComponents.binding = new V1_PackageableElementPointer(
+      PackageableElementPointerType.BINDING,
+      element.runtimeComponents.binding.valueForSerialization ?? '',
+    );
+    _val.runtimeComponents.clazz = new V1_PackageableElementPointer(
+      PackageableElementPointerType.CLASS,
+      element.runtimeComponents.clazz.valueForSerialization ?? '',
+    );
+    _val.runtimeComponents.runtime = V1_transformRuntime(
+      element.runtimeComponents.runtime,
+      context,
+    );
+  }
+
   return _val;
 };
 

packages/legend-graph/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_ExecutionEnvironmentBuilderHelper.ts

@@ -16,6 +16,7 @@
 
 import {
   assertNonNullable,
+  guaranteeNonEmptyString,
   UnsupportedOperationError,
 } from '@finos/legend-shared';
 import {
@@ -25,6 +26,7 @@ import {
 import {
   type ExecutionParameters,
   MultiExecutionParameters,
+  RuntimeComponents,
   SingleExecutionParameters,
 } from '../../../../../../../graph/metamodel/pure/packageableElements/service/ExecutionEnvironmentInstance.js';
 import {
@@ -39,6 +41,7 @@ import {
 } from '../../../model/packageableElements/service/V1_ExecutionEnvironmentInstance.js';
 import { V1_buildEngineRuntime } from './helpers/V1_RuntimeBuilderHelper.js';
 import type { V1_GraphBuilderContext } from './V1_GraphBuilderContext.js';
+import { V1_resolveBinding } from './V1_DSL_ExternalFormat_GraphBuilderHelper.js';
 
 const buildExecutionRuntime = (
   runtime: V1_Runtime,
@@ -63,7 +66,27 @@ export const V1_buildSingleExecutionParameters = (
   const element = new SingleExecutionParameters();
   element.key = protocol.key;
   element.mapping = context.resolveMapping(protocol.mapping);
-  element.runtime = buildExecutionRuntime(protocol.runtime, context);
+  if (protocol.runtime) {
+    element.runtime = buildExecutionRuntime(protocol.runtime, context);
+  }
+  if (protocol.runtimeComponents) {
+    const runtimeComponents = new RuntimeComponents();
+    runtimeComponents.binding = V1_resolveBinding(
+      guaranteeNonEmptyString(
+        protocol.runtimeComponents.binding.path,
+        `Service runtime components 'binding' field is missing or empty`,
+      ),
+      context,
+    );
+    runtimeComponents.clazz = context.resolveClass(
+      protocol.runtimeComponents.clazz.path,
+    );
+    runtimeComponents.runtime = buildExecutionRuntime(
+      protocol.runtimeComponents.runtime,
+      context,
+    );
+    element.runtimeComponents = runtimeComponents;
+  }
 
   return element;
 };

packages/legend-graph/src/graph-manager/protocol/pure/v1/transformation/pureProtocol/serializationHelpers/V1_ExecutionEnvironmentSerializationHelper.ts

@@ -19,6 +19,8 @@ import {
   usingConstantValueSchema,
   usingModelSchema,
   UnsupportedOperationError,
+  optionalCustom,
+  optionalCustomUsingModelSchema,
 } from '@finos/legend-shared';
 import {
   createModelSchema,
@@ -31,13 +33,15 @@ import {
 import {
   V1_ExecutionEnvironmentInstance,
   V1_MultiExecutionParameters,
+  V1_RuntimeComponents,
   V1_SingleExecutionParameters,
   type V1_ExecutionParameters,
 } from '../../../model/packageableElements/service/V1_ExecutionEnvironmentInstance.js';
 import {
   V1_deserializeRuntime,
   V1_serializeRuntime,
 } from './V1_RuntimeSerializationHelper.js';
+import { V1_packageableElementPointerModelSchema } from './V1_CoreSerializationHelper.js';
 
 export const V1_EXECUTION_ENVIRONMENT_ELEMENT_PROTOCOL_TYPE =
   'executionEnvironmentInstance';
@@ -47,6 +51,24 @@ enum V1_ExecEnvirParameterType {
   PURE_MULTI_EXECUTION = 'multiExecutionParameters',
 }
 
+const V1_runtimeComponentsModelSchema = createModelSchema(
+  V1_RuntimeComponents,
+  {
+    clazz: custom(
+      (val) => serialize(V1_packageableElementPointerModelSchema, val),
+      (val) => deserialize(V1_packageableElementPointerModelSchema, val),
+    ),
+    binding: custom(
+      (val) => serialize(V1_packageableElementPointerModelSchema, val),
+      (val) => deserialize(V1_packageableElementPointerModelSchema, val),
+    ),
+    runtime: custom(
+      (val) => V1_serializeRuntime(val),
+      (val) => V1_deserializeRuntime(val),
+    ),
+  },
+);
+
 const V1_singleExecutionParametersModelSchema = createModelSchema(
   V1_SingleExecutionParameters,
   {
@@ -55,10 +77,13 @@ const V1_singleExecutionParametersModelSchema = createModelSchema(
     ),
     key: primitive(),
     mapping: primitive(),
-    runtime: custom(
+    runtime: optionalCustom(
       (val) => V1_serializeRuntime(val),
       (val) => V1_deserializeRuntime(val),
     ),
+    runtimeComponents: optionalCustomUsingModelSchema(
+      V1_runtimeComponentsModelSchema,
+    ),
   },
 );
 

packages/legend-graph/src/graph/Core_HashUtils.ts

@@ -235,6 +235,7 @@ export enum CORE_HASH_STRUCTURE {
   EXECUTION_ENVIRONMENT_INSTANCE = 'EXECUTION_ENVIRONMENT_INSTANCE',
   SINGLE_EXECUTION_PARAMETER = 'SINGLE_EXECUTION_PARAMETER',
   MULTI_EXECUTION_PARAMETER = 'MULTI_EXECUTION_PARAMETER',
+  RUNTIME_COMPONENTS = 'RUNTIME_COMPONENTS',
 
   // ---------------------------------- STO Relational --------------------------------------
 

packages/legend-graph/src/graph/metamodel/pure/packageableElements/service/ExecutionEnvironmentInstance.ts

@@ -23,6 +23,8 @@ import {
   PackageableElement,
 } from '../PackageableElement.js';
 import type { PackageableElementReference } from '../PackageableElementReference.js';
+import type { Class } from '../domain/Class.js';
+import type { Binding } from '../externalFormat/store/DSL_ExternalFormat_Binding.js';
 
 export class ExecutionEnvironmentInstance
   extends PackageableElement
@@ -49,17 +51,34 @@ export abstract class ExecutionParameters implements Hashable {
   abstract get hashCode(): string;
 }
 
+export class RuntimeComponents implements Hashable {
+  runtime!: Runtime;
+  binding!: PackageableElementReference<Binding>;
+  clazz!: PackageableElementReference<Class>;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.RUNTIME_COMPONENTS,
+      this.binding.valueForSerialization ?? '',
+      this.clazz.valueForSerialization ?? '',
+      this.runtime,
+    ]);
+  }
+}
+
 export class SingleExecutionParameters implements Hashable {
   key!: string;
   mapping!: PackageableElementReference<Mapping>;
-  runtime!: Runtime;
+  runtime?: Runtime;
+  runtimeComponents?: RuntimeComponents;
 
   get hashCode(): string {
     return hashArray([
       CORE_HASH_STRUCTURE.SINGLE_EXECUTION_PARAMETER,
       this.key,
       this.mapping.valueForSerialization ?? '',
-      this.runtime,
+      this.runtime ?? '',
+      this.runtimeComponents ?? '',
     ]);
   }
 }

packages/legend-manual-tests/src/__tests__/roundtrip-grammar/cases/DSL_ExecutionEnvironment-with-runtime-components.pure

@@ -0,0 +1,68 @@
+###Service
+ExecutionEnvironment test::executionEnvironment
+{
+  executions:
+  [
+    UAT:
+    {
+      mapping: test::mapping;
+      runtimeComponents:
+      {
+        class: test::class;
+        binding: test::bind;
+        runtime: test::runtime;
+      }
+    },
+    PROD:
+    {
+      mapping: test::mapping;
+      runtimeComponents:
+      {
+        class: test::class;
+        binding: test::bind;
+        runtime: test::runtime;
+      }
+    }
+  ];
+}
+
+
+###ExternalFormat
+Binding test::bind
+{
+  contentType: 'application/json';
+  modelIncludes: [
+    test::class
+  ];
+}
+
+
+###Pure
+Class test::class
+{
+  prop1: Integer[0..1];
+}
+
+
+###Mapping
+Mapping test::mapping
+(
+)
+
+
+###Connection
+JsonModelConnection test::connection
+{
+  class: test::class;
+  url: 'asd';
+}
+
+
+###Runtime
+Runtime test::runtime
+{
+  mappings:
+  [
+    test::mapping
+  ];
+}