From 1c34ecb311b979484aa3bd6291485fcf343073ad Mon Sep 17 00:00:00 2001 From: mferrera Date: Tue, 9 Apr 2024 08:52:45 +0200 Subject: [PATCH] ENH: Add precision to contractual `tracklog` items --- schema/definitions/0.8.0/schema/fmu_meta.json | 50 ++++++++++--------- src/fmu/dataio/datastructure/meta/meta.py | 50 ++++++++++--------- 2 files changed, 52 insertions(+), 48 deletions(-) diff --git a/schema/definitions/0.8.0/schema/fmu_meta.json b/schema/definitions/0.8.0/schema/fmu_meta.json index fb601446e..9c26418fe 100644 --- a/schema/definitions/0.8.0/schema/fmu_meta.json +++ b/schema/definitions/0.8.0/schema/fmu_meta.json @@ -1,41 +1,43 @@ { "$contractual": [ + "access", "class", - "source", - "version", - "tracklog", - "data.format", - "data.name", - "data.stratigraphic", "data.alias", - "data.stratigraphic_alias", - "data.offset", + "data.bbox", "data.content", - "data.tagname", - "data.vertical_domain", + "data.format", "data.grid_model", - "data.bbox", - "data.time", - "data.is_prediction", "data.is_observation", + "data.is_prediction", + "data.name", + "data.offset", "data.seismic.attribute", "data.spec.columns", - "access", - "masterdata", - "fmu.model", - "fmu.workflow", + "data.stratigraphic", + "data.stratigraphic_alias", + "data.tagname", + "data.time", + "data.vertical_domain", + "file.checksum_md5", + "file.relative_path", + "file.size_bytes", + "fmu.aggregation.operation", + "fmu.aggregation.realization_ids", "fmu.case", + "fmu.context.stage", "fmu.iteration.name", "fmu.iteration.uuid", - "fmu.realization.name", + "fmu.model", "fmu.realization.id", + "fmu.realization.name", "fmu.realization.uuid", - "fmu.aggregation.operation", - "fmu.aggregation.realization_ids", - "fmu.context.stage", - "file.relative_path", - "file.checksum_md5", - "file.size_bytes" + "fmu.workflow", + "masterdata", + "source", + "tracklog.datetime", + "tracklog.event", + "tracklog.user.id", + "version" ], "$defs": { "Access": { diff --git a/src/fmu/dataio/datastructure/meta/meta.py b/src/fmu/dataio/datastructure/meta/meta.py index 89fa225d3..66fc83276 100644 --- a/src/fmu/dataio/datastructure/meta/meta.py +++ b/src/fmu/dataio/datastructure/meta/meta.py @@ -532,42 +532,44 @@ def dump() -> Dict: ChainMap( { "$contractual": [ + "access", "class", - "source", - "version", - "tracklog", - "data.format", - "data.name", - "data.stratigraphic", "data.alias", - "data.stratigraphic_alias", - "data.offset", + "data.bbox", "data.content", - "data.tagname", - "data.vertical_domain", + "data.format", "data.grid_model", - "data.bbox", - "data.time", - "data.is_prediction", "data.is_observation", + "data.is_prediction", + "data.name", + "data.offset", "data.seismic.attribute", "data.spec.columns", - "access", - "masterdata", - "fmu.model", - "fmu.workflow", + "data.stratigraphic", + "data.stratigraphic_alias", + "data.tagname", + "data.time", + "data.vertical_domain", + "file.checksum_md5", + "file.relative_path", + "file.size_bytes", + "fmu.aggregation.operation", + "fmu.aggregation.realization_ids", "fmu.case", + "fmu.context.stage", "fmu.iteration.name", "fmu.iteration.uuid", - "fmu.realization.name", + "fmu.model", "fmu.realization.id", + "fmu.realization.name", "fmu.realization.uuid", - "fmu.aggregation.operation", - "fmu.aggregation.realization_ids", - "fmu.context.stage", - "file.relative_path", - "file.checksum_md5", - "file.size_bytes", + "fmu.workflow", + "masterdata", + "source", + "tracklog.datetime", + "tracklog.event", + "tracklog.user.id", + "version", ], # schema must be present for "dependencies" key to work. "$schema": "https://json-schema.org/draft/2020-12/schema",