Skip to content

Commit

Permalink
Merge branch 'master' into ing-784-lookml-parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
anshbansal authored Dec 27, 2024
2 parents f1723d4 + d7de7eb commit 6fef91d
Show file tree
Hide file tree
Showing 102 changed files with 3,974 additions and 940 deletions.
3 changes: 2 additions & 1 deletion .github/actions/docker-custom-build-and-push/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ runs:
cache-to: |
type=inline
- name: Upload image locally for testing (if not publishing)
uses: ishworkh/docker-image-artifact-upload@v1
uses: ishworkh/container-image-artifact-upload@v2.0.0
if: ${{ inputs.publish != 'true' }}
with:
image: ${{ steps.single_tag.outputs.SINGLE_TAG }}
retention_days: "2"

# Code for building multi-platform images and pushing to Docker Hub.
- name: Set up QEMU
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
run: |
./gradlew :datahub-frontend:build :datahub-web-react:build --parallel
env:
NODE_OPTIONS: "--max-old-space-size=3072"
NODE_OPTIONS: "--max-old-space-size=4096"
- name: Gradle compile (jdk8) for legacy Spark
if: ${{ matrix.command == 'except_metadata_ingestion' && needs.setup.outputs.backend_change == 'true' }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-postgres-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
with:
images: |
acryldata/datahub-postgres-setup
tags: ${{ needs.setup.outputs.tag }}
image_tag: ${{ needs.setup.outputs.tag }}
username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
publish: ${{ needs.setup.outputs.publish == 'true' }}
Expand Down
98 changes: 60 additions & 38 deletions .github/workflows/docker-unified.yml

Large diffs are not rendered by default.

23 changes: 0 additions & 23 deletions .github/workflows/qodana-scan.yml

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ buildscript {
ext.pegasusVersion = '29.57.0'
ext.mavenVersion = '3.6.3'
ext.versionGradle = '8.11.1'
ext.springVersion = '6.1.13'
ext.springVersion = '6.1.14'
ext.springBootVersion = '3.2.9'
ext.springKafkaVersion = '3.1.6'
ext.openTelemetryVersion = '1.18.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private AnalyticsChart getTopUsersChart(OperationContext opContext) {
final DateRange trailingMonthDateRange = dateUtil.getTrailingMonthDateRange();
final List<String> columns = ImmutableList.of("Name", "Title", "Email");

final String topUsersTitle = "Top Users";
final String topUsersTitle = "Top Users (Last 30 Days)";
final List<Row> topUserRows =
_analyticsService.getTopNTableChart(
_analyticsService.getUsageIndexName(),
Expand Down Expand Up @@ -198,7 +198,7 @@ private Row buildNewUsersRow(@Nonnull final SearchEntity entity) {
private AnalyticsChart getNewUsersChart(OperationContext opContext) {
try {
final List<String> columns = ImmutableList.of("Name", "Title", "Email");
final String newUsersTitle = "New Users";
final String newUsersTitle = "Active Users (Last 30 Days)";
final SearchResult result = searchForNewUsers(opContext);
final List<Row> newUserRows = new ArrayList<>();
for (SearchEntity entity : result.getEntities()) {
Expand Down
196 changes: 193 additions & 3 deletions datahub-graphql-core/src/main/resources/entity.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,16 @@ type Query {
Fetch all Business Attributes
"""
listBusinessAttributes(input: ListBusinessAttributesInput!): ListBusinessAttributesResult

"""
Fetch a Data Process Instance by primary key (urn)
"""
dataProcessInstance(urn: String!): DataProcessInstance


}


"""
An ERModelRelationship is a high-level abstraction that dictates what datasets fields are erModelRelationshiped.
"""
Expand Down Expand Up @@ -9832,15 +9840,45 @@ type MLModelGroup implements EntityWithRelationships & Entity & BrowsableEntity
privileges: EntityPrivileges
}

"""
Properties describing a group of related ML models
"""
type MLModelGroupProperties {
"""
Display name of the model group
"""
name: String

"""
Detailed description of the model group's purpose and contents
"""
description: String

createdAt: Long
"""
When this model group was created
"""
created: AuditStamp

"""
When this model group was last modified
"""
lastModified: AuditStamp

"""
Version identifier for this model group
"""
version: VersionTag

"""
Custom key-value properties for the model group
"""
customProperties: [CustomPropertiesEntry!]

"""
Deprecated creation timestamp
@deprecated Use the 'created' field instead
"""
createdAt: Long @deprecated(reason: "Use `created` instead")
}

"""
Expand Down Expand Up @@ -9990,40 +10028,103 @@ description: String
}

type MLMetric {
"""
Name of the metric (e.g. accuracy, precision, recall)
"""
name: String

"""
Description of what this metric measures
"""
description: String

"""
The computed value of the metric
"""
value: String

"""
Timestamp when this metric was recorded
"""
createdAt: Long
}

type MLModelProperties {
"""
The display name of the model used in the UI
"""
name: String!

"""
Detailed description of the model's purpose and characteristics
"""
description: String

date: Long
"""
When the model was last modified
"""
lastModified: AuditStamp

"""
Version identifier for this model
"""
version: String

"""
The type/category of ML model (e.g. classification, regression)
"""
type: String

"""
Mapping of hyperparameter configurations
"""
hyperParameters: HyperParameterMap

hyperParams: [MLHyperParam]
"""
List of hyperparameter settings used to train this model
"""
hyperParams: [MLHyperParam]

"""
Performance metrics from model training
"""
trainingMetrics: [MLMetric]

"""
Names of ML features used by this model
"""
mlFeatures: [String!]

"""
Tags for categorizing and searching models
"""
tags: [String!]

"""
Model groups this model belongs to
"""
groups: [MLModelGroup]

"""
Additional custom properties specific to this model
"""
customProperties: [CustomPropertiesEntry!]

"""
URL to view this model in external system
"""
externalUrl: String

"""
When this model was created
"""
created: AuditStamp

"""
Deprecated timestamp for model creation
@deprecated Use 'created' field instead
"""
date: Long @deprecated(reason: "Use `created` instead")
}

type MLFeatureProperties {
Expand Down Expand Up @@ -12804,3 +12905,92 @@ type CronSchedule {
"""
timezone: String!
}


"""
Properties describing a data process instance's execution metadata
"""
type DataProcessInstanceProperties {
"""
The display name of this process instance
"""
name: String!

"""
URL to view this process instance in the external system
"""
externalUrl: String

"""
When this process instance was created
"""
created: AuditStamp

"""
Additional custom properties specific to this process instance
"""
customProperties: [CustomPropertiesEntry!]
}

"""
Properties specific to an ML model training run instance
"""
type MLTrainingRunProperties {
"""
Unique identifier for this training run
"""
id: String

"""
List of URLs to access training run outputs (e.g. model artifacts, logs)
"""
outputUrls: [String]

"""
Hyperparameters used in this training run
"""
hyperParams: [MLHyperParam]

"""
Performance metrics recorded during this training run
"""
trainingMetrics: [MLMetric]
}

extend type DataProcessInstance {

"""
Additional read only properties associated with the Data Job
"""
properties: DataProcessInstanceProperties

"""
The specific instance of the data platform that this entity belongs to
"""
dataPlatformInstance: DataPlatformInstance

"""
Sub Types that this entity implements
"""
subTypes: SubTypes

"""
The parent container in which the entity resides
"""
container: Container

"""
Standardized platform urn where the data process instance is defined
"""
platform: DataPlatform!

"""
Recursively get the lineage of containers for this entity
"""
parentContainers: ParentContainersResult

"""
Additional properties when subtype is Training Run
"""
mlTrainingRunProperties: MLTrainingRunProperties
}
3 changes: 1 addition & 2 deletions datahub-web-react/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ node {
}

// Version of node to use.
version = '21.2.0'
version = '22.12.0'

// Version of Yarn to use.
yarnVersion = '1.22.22'
Expand Down Expand Up @@ -93,7 +93,6 @@ task yarnLintFix(type: YarnTask, dependsOn: [yarnInstall, yarnGenerate]) {
}

task yarnBuild(type: YarnTask, dependsOn: [yarnInstall, yarnGenerate]) {
environment = [NODE_OPTIONS: "--max-old-space-size=3072 --openssl-legacy-provider"]
args = ['run', 'build']

outputs.cacheIf { true }
Expand Down
2 changes: 1 addition & 1 deletion datahub-web-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"analyze": "source-map-explorer 'dist/assets/*.js'",
"start": "yarn run generate && vite",
"ec2-dev": "yarn run generate && CI=true;export CI;vite",
"build": "yarn run generate && NODE_OPTIONS='--max-old-space-size=3072 --openssl-legacy-provider' CI=false vite build",
"build": "yarn run generate && NODE_OPTIONS='--max-old-space-size=4096 --openssl-legacy-provider' CI=false vite build",
"test": "vitest",
"generate": "graphql-codegen --config codegen.yml",
"lint": "eslint . --ext .ts,.tsx --quiet && yarn format-check && yarn type-check",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ export function getDatasetName(datainput: any): string {
datainput?.editableProperties?.name ||
datainput?.properties?.name ||
datainput?.name ||
datainput?.urn?.split(',').at(1)
datainput?.urn?.split(',')?.at(1)
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ export const filterQueries = (filterText, queries: Query[]) => {
const lowerFilterText = filterText.toLowerCase();
return queries.filter((query) => {
return (
query.title?.toLowerCase().includes(lowerFilterText) ||
query.description?.toLowerCase().includes(lowerFilterText) ||
query.query?.toLowerCase().includes(lowerFilterText)
query.title?.toLowerCase()?.includes(lowerFilterText) ||
query.description?.toLowerCase()?.includes(lowerFilterText) ||
query.query?.toLowerCase()?.includes(lowerFilterText)
);
});
};
Loading

0 comments on commit 6fef91d

Please sign in to comment.