From 397572e99344e4170601c08077337b5b964a466a Mon Sep 17 00:00:00 2001 From: n-h-diaz Date: Wed, 27 Mar 2024 15:39:30 -0700 Subject: [PATCH] Add dataBuildGroup to Provenance PiperOrigin-RevId: 619682730 --- core/dcschema_enum_classes.mcf | 6 ------ core/dcschema_enum_instances.mcf | 2 +- core/provenance.mcf | 22 ++++------------------ 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/core/dcschema_enum_classes.mcf b/core/dcschema_enum_classes.mcf index f6ff99f8d..1142ae853 100644 --- a/core/dcschema_enum_classes.mcf +++ b/core/dcschema_enum_classes.mcf @@ -569,12 +569,6 @@ subClassOf: dcs:Enumeration name: "ProvenanceCategoryEnum" description: "Category of data contained within a provenance." -Node: dcid:DataBuildGroupEnum -typeOf: schema:Class -subClassOf: dcs:Enumeration -name: "DataBuildGroupEnum" -description: "Specific build group of a selection of data imports." - Node: dcid:ProcessingMethodEnum typeOf: schema:Class subClassOf: dcs:Enumeration diff --git a/core/dcschema_enum_instances.mcf b/core/dcschema_enum_instances.mcf index 08b8be521..33f04a247 100644 --- a/core/dcschema_enum_instances.mcf +++ b/core/dcschema_enum_instances.mcf @@ -2960,7 +2960,7 @@ description: "No entity resolution is necessary because all entities come with p Node: dcid:IdResolutionWithoutKg typeOf: dcs:EntityResolutionTypeEnum name: "ID resolution without Knowledge Graph" -description: "Requires generation of DCIDs for certain entities (e.g., StatVarObservation), but does require resolution against entities in Data Commons Knowledge Graph." +description: "Requires generation of DCIDs for certain entities (e.g., StatVarObservation), but does not require resolution against entities in Data Commons Knowledge Graph." Node: dcid:IdBasedKgResolution typeOf: dcs:EntityResolutionTypeEnum diff --git a/core/provenance.mcf b/core/provenance.mcf index fa947c96b..1f00d3d6b 100644 --- a/core/provenance.mcf +++ b/core/provenance.mcf @@ -114,7 +114,7 @@ description: "Category of data in the provenance." Node: dcid:dataBuildGroup typeOf: schema:Property domainIncludes: dcs:Provenance -rangeIncludes: dcs:DataBuildGroupEnum +rangeIncludes: dcs:Text name: "dataBuildGroup" description: "The data build that a given data import is part of." @@ -188,19 +188,12 @@ rangeIncludes: dcs:Text name: "resolvedProtoMcfUrl" description: "Location of resolved proto MCF files for the provenance." -Node: dcid:preResolutionCsvUrl -typeOf: schema:Property -domainIncludes: dcs:Provenance -rangeIncludes: dcs:Text -name: "preResolutionCsvUrl" -description: "Location of CSV files for the provenance that are not yet aligned with the Knowledge Graph." - -Node: dcid:preResolutionTemplateMcfUrl +Node: dcid:preResolutionTableUrl typeOf: schema:Property domainIncludes: dcs:Provenance rangeIncludes: dcs:Text -name: "preResolutionTemplateMcfUrl" -description: "Location of template-MCF files for the provenance." +name: "preResolutionTableUrl" +description: "Location of CSV files and corresponding Template-MCF file for the provenance that are not yet aligned with the Knowledge Graph. There should be one Template-MCF file with extension `.tmcf` and one or more CSV files or file patterns." Node: dcid:dataTransformationLogic typeOf: schema:Property @@ -237,13 +230,6 @@ rangeIncludes: dcs:Text name: "sourceDataUrl" description: "Location of source data to download." -Node: dcid:dataBuildGroup -typeOf: schema:Property -domainIncludes: dcs:Provenance -rangeIncludes: dcs:DataBuildGroupEnum -name: "dataBuildGroup" -description: "Data build group consisting of certain provenances." - Node: dcid:earliestObservationDate typeOf: schema:Property domainIncludes: dcs:Provenance