@finos/legend-graph 32.3.22 → 32.3.24

package/src/graph-manager/protocol/pure/v1/lakehouse/entitlements/V1_ConsumerEntitlements.ts

@@ -54,6 +54,7 @@ export class V1_DataContract {
   members: V1_ContractUserMembership[] = [];
   consumer!: V1_OrganizationalScope;
   createdBy!: string;
+  createdAt!: string;
 }
 
 export class V1_DataContractSubscriptions {
@@ -81,6 +82,7 @@ export class V1_LiteDataContract {
   members: V1_ContractUserMembership[] = [];
   consumer!: V1_OrganizationalScope;
   createdBy!: string;
+  createdAt!: string;
   resourceId!: string;
   resourceType!: V1_ResourceType;
   deploymentId!: number;
@@ -93,8 +95,9 @@ export class V1_LiteDataContractsResponse {
 
 export class V1_LiteDataContractWithUserStatus {
   contractResultLite!: V1_LiteDataContract;
-  status!: V1_UserApprovalStatus;
+  status!: V1_EnrichedUserApprovalStatus;
   pendingTaskWithAssignees!: V1_PendingTaskWithAssignees | null;
+  user!: string;
 }
 
 // -------------------------------------- Data Contract Approval ---------------------------------------
@@ -130,6 +133,7 @@ export enum V1_ResourceType {
   ACCESS_POINT_GROUP = 'ACCESS_POINT_GROUP',
   DATA_PRODUCT = 'DATA_PRODUCT',
   DATA_BUNDLE = 'DATA_BUNDLE',
+  UNKNOWN = 'UNKNOWN',
 }
 
 export enum V1_ApprovalType {

package/src/graph-manager/protocol/pure/v1/lakehouse/entitlements/V1_EntitlementsDataProduct.ts

@@ -81,6 +81,7 @@ export class V1_EntitlementsDataProductLite {
   description?: string;
   origin?: V1_EntitlementsDataProductOrigin | null;
   fullPath?: string;
+  lakehouseEnvironment?: V1_EntitlementsLakehouseEnvironment | null;
 }
 
 export class V1_EntitlementsDataProductDetailsResponse {

package/src/graph-manager/protocol/pure/v1/lakehouse/helpers/V1_ConsumerEntitlementsUtils.ts

@@ -16,20 +16,33 @@
 
 import {
   V1_AccessPointGroupReference,
+  V1_DataBundle,
   V1_ResourceType,
   type V1_DataContract,
   type V1_LiteDataContract,
 } from '../entitlements/V1_ConsumerEntitlements.js';
-import { guaranteeType } from '@finos/legend-shared';
 
 export const V1_transformDataContractToLiteDatacontract = (
   dataContract: V1_DataContract,
 ): V1_LiteDataContract => {
-  const accessPointGroupReference = guaranteeType(
-    dataContract.resource,
-    V1_AccessPointGroupReference,
-    'Only access point group reference is supported',
-  );
+  const dataProductName =
+    dataContract.resource instanceof V1_AccessPointGroupReference
+      ? dataContract.resource.dataProduct.name
+      : 'Unknown';
+  const deploymentId =
+    dataContract.resource instanceof V1_AccessPointGroupReference
+      ? dataContract.resource.dataProduct.owner.appDirId
+      : -1;
+  const accessPointGroup =
+    dataContract.resource instanceof V1_AccessPointGroupReference
+      ? dataContract.resource.accessPointGroup
+      : 'Unknown';
+  const resourceType =
+    dataContract.resource instanceof V1_AccessPointGroupReference
+      ? V1_ResourceType.ACCESS_POINT_GROUP
+      : dataContract.resource instanceof V1_DataBundle
+        ? V1_ResourceType.DATA_BUNDLE
+        : V1_ResourceType.UNKNOWN;
   const liteDataContract: V1_LiteDataContract = {
     description: dataContract.description,
     guid: dataContract.guid,
@@ -38,10 +51,11 @@ export const V1_transformDataContractToLiteDatacontract = (
     members: dataContract.members,
     consumer: dataContract.consumer,
     createdBy: dataContract.createdBy,
-    resourceId: accessPointGroupReference.dataProduct.name,
-    resourceType: V1_ResourceType.ACCESS_POINT_GROUP,
-    deploymentId: accessPointGroupReference.dataProduct.owner.appDirId,
-    accessPointGroup: accessPointGroupReference.accessPointGroup,
+    resourceId: dataProductName,
+    createdAt: dataContract.createdAt,
+    resourceType,
+    deploymentId,
+    accessPointGroup,
   };
   return liteDataContract;
 };

package/src/graph-manager/protocol/pure/v1/model/packageableElements/dataProduct/V1_DataProduct.ts

@@ -220,6 +220,81 @@ export class V1_ModelAccessPointGroup extends V1_AccessPointGroup {
   }
 }
 
+export class V1_NativeModelExecutionContext {
+  key!: string;
+  mapping!: V1_PackageableElementPointer;
+  runtime: V1_PackageableElementPointer | undefined;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.DATA_PRODUCT_NATIVE_MODEL_EXECUTION_CONTEXT,
+      this.key,
+      this.mapping.path,
+      this.runtime?.path ?? '',
+    ]);
+  }
+}
+
+export class V1_NativeModelAccess {
+  featuredElements: V1_ElementScope[] | undefined;
+  nativeModelExecutionContexts!: V1_NativeModelExecutionContext[];
+  defaultExecutionContext!: string;
+  diagrams: V1_DataProductDiagram[] | undefined;
+  sampleQueries: V1_SampleQuery[] | undefined;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.DATA_PRODUCT_NATIVE_MODEL_ACCESS,
+      hashArray(this.nativeModelExecutionContexts),
+      hashArray(this.featuredElements ?? []),
+      hashArray(this.diagrams ?? []),
+      hashArray(this.sampleQueries ?? []),
+      this.defaultExecutionContext,
+    ]);
+  }
+}
+
+export abstract class V1_SampleQuery {
+  id!: string;
+  title!: string;
+  description: string | undefined;
+  executionContextKey: string | undefined;
+
+  get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.DATA_PRODUCT_SAMPLE_QUERY,
+      this.id,
+      this.title,
+      this.description ?? '',
+      this.executionContextKey ?? '',
+    ]);
+  }
+}
+
+export class V1_InLineSampleQuery extends V1_SampleQuery {
+  query!: V1_RawLambda;
+
+  override get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.DATA_PRODUCT_INLINE_SAMPLE_QUERY,
+      super.hashCode,
+      this.query,
+    ]);
+  }
+}
+
+export class V1_PackageableElementSampleQuery extends V1_SampleQuery {
+  query!: V1_PackageableElementPointer;
+
+  override get hashCode(): string {
+    return hashArray([
+      CORE_HASH_STRUCTURE.DATA_PRODUCT_PACKAGEABLE_ELEMENT_SAMPLE_QUERY,
+      super.hashCode,
+      this.query.path,
+    ]);
+  }
+}
+
 export enum V1_DeliveryFrequency {
   DAILY = 'DAILY',
   WEEKLY = 'WEEKLY',
@@ -337,6 +412,7 @@ export class V1_DataProduct extends V1_PackageableElement implements Hashable {
   description: string | undefined;
   icon: V1_DataProductIcon | undefined;
   accessPointGroups: V1_AccessPointGroup[] = [];
+  nativeModelAccess: V1_NativeModelAccess | undefined;
   supportInfo: V1_SupportInfo | undefined;
   type: V1_DataProductType | undefined;
   stereotypes: V1_StereotypePtr[] = [];
@@ -351,6 +427,7 @@ export class V1_DataProduct extends V1_PackageableElement implements Hashable {
       this.description ?? '',
       this.icon ?? '',
       hashArray(this.accessPointGroups),
+      this.nativeModelAccess ?? '',
       this.supportInfo ?? '',
       this.type ?? '',
       hashArray(this.stereotypes),

package/src/graph-manager/protocol/pure/v1/model/packageableElements/service/V1_Service.ts

@@ -35,6 +35,7 @@ export class V1_Service extends V1_PackageableElement implements Hashable {
   owners: string[] = [];
   ownership?: V1_ServiceOwnership | undefined;
   documentation!: string;
+  mcpServer?: string | undefined;
   autoActivateUpdates = true;
   execution!: V1_ServiceExecution;
   test?: V1_DEPRECATED__ServiceTest | undefined;
@@ -54,6 +55,7 @@ export class V1_Service extends V1_PackageableElement implements Hashable {
       this.autoActivateUpdates.toString(),
       this.execution,
       this.test ?? '',
+      this.mcpServer ?? '',
       hashArray(this.testSuites),
       hashArray(this.postValidations),
       hashArray(this.taggedValues),

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_DataProductTransformer.ts

@@ -28,6 +28,8 @@ import {
   UnknownAccessPoint,
   UnknownDataProductIcon,
   FunctionAccessPoint,
+  PackageableElementSampleQuery,
+  InLineSampleQuery,
 } from '../../../../../../../graph/metamodel/pure/dataProduct/DataProduct.js';
 import {
   type V1_AccessPoint,
@@ -51,6 +53,10 @@ import {
   V1_FunctionAccessPoint,
   type V1_Expertise,
   V1_DataProductOperationalMetadata,
+  V1_NativeModelAccess,
+  V1_PackageableElementSampleQuery,
+  V1_InLineSampleQuery,
+  V1_NativeModelExecutionContext,
 } from '../../../model/packageableElements/dataProduct/V1_DataProduct.js';
 import { V1_initPackageableElement } from './V1_CoreTransformerHelper.js';
 import { V1_transformRawLambda } from './V1_RawValueSpecificationTransformer.js';
@@ -61,6 +67,8 @@ import {
 } from './V1_DomainTransformer.js';
 import { V1_PackageableElementPointer } from '../../../model/packageableElements/V1_PackageableElement.js';
 import { V1_transformEmbeddedData } from './V1_DataElementTransformer.js';
+import { ConcreteFunctionDefinition } from '../../../../../../../graph/metamodel/pure/packageableElements/function/ConcreteFunctionDefinition.js';
+import { generateFunctionPrettyName } from '../../../../../../../graph/helpers/PureLanguageHelper.js';
 
 const transformAccessPoint = (
   ap: AccessPoint,
@@ -137,6 +145,103 @@ export const V1_transformDataProduct = (
     product.type = dataProductType;
   }
 
+  if (element.nativeModelAccess) {
+    const nativeModelAccess = new V1_NativeModelAccess();
+    const metamodelNativeModelAccess = element.nativeModelAccess;
+    if (metamodelNativeModelAccess.diagrams.length === 0) {
+      nativeModelAccess.diagrams = undefined;
+    } else {
+      nativeModelAccess.diagrams = metamodelNativeModelAccess.diagrams.map(
+        (diagram) => {
+          const v1Diagram = new V1_DataProductDiagram();
+          v1Diagram.title = diagram.title;
+          v1Diagram.description = diagram.description;
+          v1Diagram.diagram = new V1_PackageableElementPointer(
+            undefined,
+            diagram.diagram.path,
+          );
+          return v1Diagram;
+        },
+      );
+    }
+    nativeModelAccess.defaultExecutionContext =
+      metamodelNativeModelAccess.defaultExecutionContext;
+    nativeModelAccess.nativeModelExecutionContexts =
+      metamodelNativeModelAccess.nativeModelExecutionContexts.map(
+        (executionContext) => {
+          const v1ExecutionContext = new V1_NativeModelExecutionContext();
+          v1ExecutionContext.key = executionContext.key;
+          v1ExecutionContext.mapping = new V1_PackageableElementPointer(
+            undefined,
+            executionContext.mapping.valueForSerialization ?? '',
+          );
+          if (executionContext.runtime) {
+            v1ExecutionContext.runtime = new V1_PackageableElementPointer(
+              undefined,
+              executionContext.runtime.valueForSerialization ?? '',
+            );
+          }
+          return v1ExecutionContext;
+        },
+      );
+    nativeModelAccess.featuredElements =
+      metamodelNativeModelAccess.featuredElements.map((metatamodelScope) => {
+        const scope = new V1_ElementScope();
+        scope.exclude = metatamodelScope.exclude;
+        scope.element = new V1_PackageableElementPointer(
+          undefined,
+          metatamodelScope.element.valueForSerialization ?? '',
+        );
+        return scope;
+      });
+    nativeModelAccess.sampleQueries =
+      metamodelNativeModelAccess.sampleQueries.map((metamodelSampleQuery) => {
+        if (metamodelSampleQuery instanceof PackageableElementSampleQuery) {
+          const sampleQuery = new V1_PackageableElementSampleQuery();
+          sampleQuery.id = metamodelSampleQuery.id;
+          sampleQuery.title = metamodelSampleQuery.title;
+          sampleQuery.description = metamodelSampleQuery.description;
+          sampleQuery.executionContextKey =
+            metamodelSampleQuery.executionContextKey;
+          if (
+            metamodelSampleQuery.query.value instanceof
+            ConcreteFunctionDefinition
+          ) {
+            sampleQuery.query = new V1_PackageableElementPointer(
+              undefined,
+              generateFunctionPrettyName(metamodelSampleQuery.query.value, {
+                fullPath: true,
+                spacing: false,
+                notIncludeParamName: true,
+              }),
+            );
+          } else {
+            sampleQuery.query = new V1_PackageableElementPointer(
+              undefined,
+              metamodelSampleQuery.query.valueForSerialization ?? '',
+            );
+          }
+          return sampleQuery;
+        } else if (metamodelSampleQuery instanceof InLineSampleQuery) {
+          const sampleQuery = new V1_InLineSampleQuery();
+          sampleQuery.id = metamodelSampleQuery.id;
+          sampleQuery.title = metamodelSampleQuery.title;
+          sampleQuery.description = metamodelSampleQuery.description;
+          sampleQuery.executionContextKey =
+            metamodelSampleQuery.executionContextKey;
+          sampleQuery.query = V1_transformRawLambda(
+            metamodelSampleQuery.query,
+            context,
+          );
+          return sampleQuery;
+        }
+        throw new UnsupportedOperationError(
+          `Unable to transform data product sample query`,
+        );
+      });
+    product.nativeModelAccess = nativeModelAccess;
+  }
+
   if (!element.icon) {
     product.icon = undefined;
   } else {

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/from/V1_ServiceTransformer.ts

@@ -332,6 +332,7 @@ export const V1_transformService = (
   service.stereotypes = element.stereotypes.map(V1_transformStereotype);
   service.taggedValues = element.taggedValues.map(V1_transformTaggedValue);
   service.autoActivateUpdates = element.autoActivateUpdates;
+  service.mcpServer = element.mcpServer;
   service.documentation = element.documentation;
   service.execution = transformServiceExecution(element.execution, context);
   if (element.ownership) {

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/V1_ElementSecondPassBuilder.ts

@@ -143,6 +143,7 @@ import {
   V1_buildDataProductIcon,
   V1_buildDataProductLink,
   V1_buildDataProductOperationalMetadata,
+  V1_buildNativeModelAccess,
 } from './helpers/V1_DataProductBuilder.js';
 import type { V1_IngestDefinition } from '../../../model/packageableElements/ingest/V1_IngestDefinition.js';
 import { IncludeStore } from '../../../../../../../graph/metamodel/pure/packageableElements/store/relational/model/IncludeStore.js';
@@ -619,6 +620,7 @@ export class V1_ElementSecondPassBuilder
     service.owners = element.owners.slice();
     service.documentation = element.documentation;
     service.autoActivateUpdates = element.autoActivateUpdates;
+    service.mcpServer = element.mcpServer;
     if (element.ownership) {
       service.ownership = V1_buildServiceOwnership(element.ownership, service);
     }
@@ -751,6 +753,12 @@ export class V1_ElementSecondPassBuilder
     dataProduct.accessPointGroups = element.accessPointGroups.map((gr) =>
       V1_buildAccessPointGroup(gr, this.context),
     );
+    if (element.nativeModelAccess) {
+      dataProduct.nativeModelAccess = V1_buildNativeModelAccess(
+        element.nativeModelAccess,
+        this.context,
+      );
+    }
     const protocolSupportInfo = element.supportInfo;
     if (protocolSupportInfo) {
       const supportInfo = new SupportInfo();

package/src/graph-manager/protocol/pure/v1/transformation/pureGraph/to/helpers/V1_DataProductBuilder.ts

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { isNonNullable, UnsupportedOperationError } from '@finos/legend-shared';
+import {
+  guaranteeNonNullable,
+  isNonNullable,
+  UnsupportedOperationError,
+} from '@finos/legend-shared';
 import {
   type AccessPoint,
   type DataProductElement,
@@ -33,6 +37,12 @@ import {
   ModelAccessPointGroup,
   UnknownAccessPoint,
   UnknownDataProductIcon,
+  NativeModelAccess,
+  type SampleQuery,
+  PackageableElementSampleQuery,
+  InLineSampleQuery,
+  DataProductDiagram,
+  NativeModelExecutionContext,
 } from '../../../../../../../../graph/metamodel/pure/dataProduct/DataProduct.js';
 import {
   type V1_AccessPoint,
@@ -45,9 +55,14 @@ import {
   V1_FunctionAccessPoint,
   V1_LakehouseAccessPoint,
   V1_ModelAccessPointGroup,
+  type V1_NativeModelAccess,
+  type V1_SampleQuery,
   V1_UnknownAccessPoint,
   V1_UnknownDataProductIcon,
   type V1_DataProductOperationalMetadata,
+  V1_PackageableElementSampleQuery,
+  V1_InLineSampleQuery,
+  type V1_NativeModelExecutionContext,
 } from '../../../../model/packageableElements/dataProduct/V1_DataProduct.js';
 import type { V1_GraphBuilderContext } from '../V1_GraphBuilderContext.js';
 import { V1_buildRawLambdaWithResolvedPaths } from './V1_ValueSpecificationPathResolver.js';
@@ -59,6 +74,7 @@ import { Package } from '../../../../../../../../graph/metamodel/pure/packageabl
 import { Class } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Class.js';
 import { Enumeration } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Enumeration.js';
 import { Association } from '../../../../../../../../graph/metamodel/pure/packageableElements/domain/Association.js';
+import { generateFunctionPrettyName } from '../../../../../../../../graph/helpers/PureLanguageHelper.js';
 
 export const V1_buildDataProductLink = (
   link: V1_DataProductLink,
@@ -202,3 +218,147 @@ export const V1_buildAccessPointGroup = (
     return group;
   }
 };
+
+export const V1_buildNativeModelExecutionContext = (
+  nativeModelExecutionContext: V1_NativeModelExecutionContext,
+  context: V1_GraphBuilderContext,
+): NativeModelExecutionContext => {
+  const metamodelNativeModelExecutionContext =
+    new NativeModelExecutionContext();
+  metamodelNativeModelExecutionContext.key = nativeModelExecutionContext.key;
+  metamodelNativeModelExecutionContext.mapping =
+    PackageableElementExplicitReference.create(
+      context.graph.getMapping(nativeModelExecutionContext.mapping.path),
+    );
+  if (nativeModelExecutionContext.runtime) {
+    metamodelNativeModelExecutionContext.runtime =
+      PackageableElementExplicitReference.create(
+        context.graph.getRuntime(nativeModelExecutionContext.runtime.path),
+      );
+  }
+  return metamodelNativeModelExecutionContext;
+};
+
+export const V1_buildSampleQuery = (
+  sampleQuery: V1_SampleQuery,
+  defaultExecutionContext: string,
+  context: V1_GraphBuilderContext,
+): SampleQuery => {
+  if (sampleQuery instanceof V1_PackageableElementSampleQuery) {
+    const metamodelSampleQuery = new PackageableElementSampleQuery();
+    metamodelSampleQuery.id = sampleQuery.id;
+    metamodelSampleQuery.title = sampleQuery.title;
+    metamodelSampleQuery.description = sampleQuery.description;
+    metamodelSampleQuery.executionContextKey =
+      sampleQuery.executionContextKey ?? defaultExecutionContext;
+    try {
+      metamodelSampleQuery.query = context.resolveElement(
+        sampleQuery.query.path,
+        false,
+      );
+    } catch {
+      try {
+        metamodelSampleQuery.query = PackageableElementExplicitReference.create(
+          guaranteeNonNullable(
+            context.graph.functions.find(
+              (fn) =>
+                generateFunctionPrettyName(fn, {
+                  fullPath: true,
+                  spacing: false,
+                  notIncludeParamName: true,
+                }) === sampleQuery.query.path.replaceAll(/\s*/gu, ''),
+            ),
+          ),
+        );
+      } catch {
+        throw new UnsupportedOperationError(
+          `Can't analyze data product executable with element in path: ${sampleQuery.query.path}`,
+          sampleQuery,
+        );
+      }
+    }
+
+    return metamodelSampleQuery;
+  } else if (sampleQuery instanceof V1_InLineSampleQuery) {
+    const metamodelSampleQuery = new InLineSampleQuery();
+    metamodelSampleQuery.id = sampleQuery.id;
+    metamodelSampleQuery.title = sampleQuery.title;
+    metamodelSampleQuery.description = sampleQuery.description;
+    metamodelSampleQuery.executionContextKey =
+      sampleQuery.executionContextKey ?? defaultExecutionContext;
+    metamodelSampleQuery.query = V1_buildRawLambdaWithResolvedPaths(
+      sampleQuery.query.parameters,
+      sampleQuery.query.body,
+      context,
+    );
+    return metamodelSampleQuery;
+  }
+
+  throw new UnsupportedOperationError(
+    `Unsupported data product sample query type`,
+  );
+};
+
+export const V1_buildNativeModelAccess = (
+  nativeModelAccess: V1_NativeModelAccess,
+  context: V1_GraphBuilderContext,
+): NativeModelAccess => {
+  const metamodelNativeModelAccess = new NativeModelAccess();
+  metamodelNativeModelAccess.defaultExecutionContext =
+    nativeModelAccess.defaultExecutionContext;
+  metamodelNativeModelAccess.nativeModelExecutionContexts =
+    nativeModelAccess.nativeModelExecutionContexts.map((executionContext) =>
+      V1_buildNativeModelExecutionContext(executionContext, context),
+    );
+  if (nativeModelAccess.sampleQueries) {
+    metamodelNativeModelAccess.sampleQueries =
+      nativeModelAccess.sampleQueries.map((sampleQuery) =>
+        V1_buildSampleQuery(
+          sampleQuery,
+          nativeModelAccess.defaultExecutionContext,
+          context,
+        ),
+      );
+  }
+  if (!nativeModelAccess.diagrams) {
+    metamodelNativeModelAccess.diagrams = [];
+  } else {
+    metamodelNativeModelAccess.diagrams = nativeModelAccess.diagrams.map(
+      (diagram) => {
+        const metadatamodelDiagram = new DataProductDiagram();
+        metadatamodelDiagram.diagram = context.graph.getElement(
+          diagram.diagram.path,
+        );
+        metadatamodelDiagram.title = diagram.title;
+        metadatamodelDiagram.description = diagram.description;
+        return metadatamodelDiagram;
+      },
+    );
+  }
+  if (nativeModelAccess.featuredElements) {
+    metamodelNativeModelAccess.featuredElements =
+      nativeModelAccess.featuredElements.map((pointer) => {
+        const elementReference = context.resolveElement(
+          pointer.element.path,
+          true,
+        );
+        if (
+          elementReference.value instanceof Package ||
+          elementReference.value instanceof Class ||
+          elementReference.value instanceof Enumeration ||
+          elementReference.value instanceof Association
+        ) {
+          const elementPointer = new DataProductElementScope();
+          elementPointer.element =
+            elementReference as unknown as PackageableElementReference<DataProductElement>;
+          elementPointer.exclude = pointer.exclude;
+          return elementPointer;
+        }
+        throw new UnsupportedOperationError(
+          `Can't find data product element (only allow packages, classes, enumerations, and associations) '${pointer.element.path}'`,
+        );
+      });
+  }
+
+  return metamodelNativeModelAccess;
+};