ENH: Set Realization and Iteration access without ssdl

equinor · Sep 20, 2024 · 369994a · 369994a
1 parent a565fa0
commit 369994a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/schema/definitions/0.8.0/schema/fmu_results.json b/schema/definitions/0.8.0/schema/fmu_results.json
@@ -419,21 +419,6 @@
       "title": "Case",
       "type": "object"
     },
-    "CaseContext": {
-      "properties": {
-        "stage": {
-          "const": "case",
-          "default": "case",
-          "enum": [
-            "case"
-          ],
-          "title": "Stage",
-          "type": "string"
-        }
-      },
-      "title": "CaseContext",
-      "type": "object"
-    },
     "CaseMetadata": {
       "description": "The FMU metadata model for an FMU case.\n\nA case represent a set of iterations that belong together, either by being part of\nthe same run (i.e. history matching) or by being placed together by the user,\ncorresponding to /scratch/<asset>/<user>/<my case name>/.",
       "properties": {
@@ -1144,13 +1129,13 @@
       "type": "string"
     },
     "FMUIteration": {
-      "description": "The ``fmu`` block contains all attributes specific to FMU. The idea is that the FMU\nresults data model can be applied to data from *other* sources - in which the\nfmu-specific stuff may not make sense or be applicable.\nThis is a specialization of the FMU block for Iteration objects.",
+      "description": "The ``fmu`` block contains all attributes specific to FMU. The idea is that the FMU\nresults data model can be applied to data from *other* sources - in which the\nfmu-specific stuff may not make sense or be applicable.\nThis is a specialization of the FMU block for ``iteration`` objects.",
       "properties": {
         "case": {
           "$ref": "#/$defs/Case"
         },
         "context": {
-          "$ref": "#/$defs/CaseContext"
+          "$ref": "#/$defs/IterationContext"
         },
         "iteration": {
           "$ref": "#/$defs/Iteration"
@@ -1169,13 +1154,13 @@
       "type": "object"
     },
     "FMURealization": {
-      "description": "The ``fmu`` block contains all attributes specific to FMU. The idea is that the FMU\nresults data model can be applied to data from *other* sources - in which the\nfmu-specific stuff may not make sense or be applicable.\nThis is a specialization of the FMU block for Realization objects.",
+      "description": "The ``fmu`` block contains all attributes specific to FMU. The idea is that the FMU\nresults data model can be applied to data from *other* sources - in which the\nfmu-specific stuff may not make sense or be applicable.\nThis is a specialization of the FMU block for ``realization`` objects.",
       "properties": {
         "case": {
           "$ref": "#/$defs/Case"
         },
         "context": {
-          "$ref": "#/$defs/IterationContext"
+          "$ref": "#/$defs/RealizationContext"
         },
         "iteration": {
           "$ref": "#/$defs/Iteration"
@@ -3356,6 +3341,7 @@
       "type": "object"
     },
     "IterationContext": {
+      "description": "The ``fmu.context`` block contains the FMU context in which this data object\nwas produced. Here ``stage`` is required to be ``iteration``.",
       "properties": {
         "stage": {
           "const": "iteration",
@@ -3374,7 +3360,7 @@
       "description": "The FMU metadata model for an FMU Iteration.\n\nAn object representing a single Iteration of a specific case.",
       "properties": {
         "access": {
-          "$ref": "#/$defs/SsdlAccess"
+          "$ref": "#/$defs/Access"
         },
         "class": {
           "const": "iteration",
@@ -6195,11 +6181,27 @@
       "title": "Realization",
       "type": "object"
     },
+    "RealizationContext": {
+      "description": "The ``fmu.context`` block contains the FMU context in which this data object\nwas produced. Here ``stage`` is required to be ``realization``.",
+      "properties": {
+        "stage": {
+          "const": "realization",
+          "default": "realization",
+          "enum": [
+            "realization"
+          ],
+          "title": "Stage",
+          "type": "string"
+        }
+      },
+      "title": "RealizationContext",
+      "type": "object"
+    },
     "RealizationMetadata": {
       "description": "The FMU metadata model for an FMU Realization.\n\nAn object representing a single Realization of a specific Iteration.",
       "properties": {
         "access": {
-          "$ref": "#/$defs/SsdlAccess"
+          "$ref": "#/$defs/Access"
         },
         "class": {
           "const": "realization",

diff --git a/src/fmu/dataio/_model/root.py b/src/fmu/dataio/_model/root.py
@@ -87,9 +87,9 @@ class IterationMetadata(MetadataBase):
     """The ``fmu`` block contains all attributes specific to FMU.
     See :class:`FMU`."""
 
-    access: SsdlAccess
+    access: Access
     """The ``access`` block contains information related to access control for
-    this data object. See :class:`SsdlAccess`."""
+    this data object. See :class:`Access`."""
 
 
 class RealizationMetadata(MetadataBase):
@@ -105,9 +105,9 @@ class RealizationMetadata(MetadataBase):
     """The ``fmu`` block contains all attributes specific to FMU.
     See :class:`FMU`."""
 
-    access: SsdlAccess
+    access: Access
     """The ``access`` block contains information related to access control for
-    this data object. See :class:`SsdlAccess`."""
+    this data object. See :class:`Access`."""
 
 
 class ObjectMetadata(MetadataBase):