ENH: Validate uuids against pydantic.UUID4 (#759)

equinor · Sep 12, 2024 · 835dea3 · 835dea3
1 parent 2ced335
commit 835dea3
Show file tree

Hide file tree

Showing 30 changed files with 162 additions and 162 deletions.
diff --git a/docs/src/example_surface.yml b/docs/src/example_surface.yml
@@ -157,16 +157,16 @@ masterdata:
   smda:
     country:
       - identifier: Norway
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
       - short_identifier: DROGON
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     field:
       - identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     coordinate_system: # changing from "coordinates" to clarify this is not content
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: ad214d85-8a1d-19da-e053-c918a4889310
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
diff --git a/docs/src/example_surface_v070.yml b/docs/src/example_surface_v070.yml
@@ -215,16 +215,16 @@ masterdata:
   smda:
     country:
       - identifier: Norway
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
       - short_identifier: DROGON
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     field:
       - identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     coordinate_system: # changing from "coordinates" to clarify this is not content
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: ad214d85-8a1d-19da-e053-c918a4889310
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
diff --git a/docs/src/preparations.rst b/docs/src/preparations.rst
@@ -46,19 +46,19 @@ This is an example of ``_masterdata.yml`` from Drogon. Adjust to your needs:
     smda:
       country:
         - identifier: Westeros
-          uuid: 00000000-0000-0000-0000-000000000000
+          uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
       discovery:
         - short_identifier: DROGON
-          uuid: 00000000-0000-0000-0000-000000000000
+          uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
       field:
         - identifier: DROGON
-          uuid: 00000000-0000-0000-0000-000000000000
+          uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
       coordinate_system:
         identifier: ST_WGS84_UTM37N_P12345
-        uuid: 00000000-0000-0000-0000-000000000000
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
       stratigraphic_column:
         identifier: DROGON_2008
-        uuid: 00000000-0000-0000-0000-000000000000
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
 
 Note that ``country``, ``discovery`` and ``field`` are lists (can have more than one),
 while ``coordinate_system`` and ``stratigraphic_column`` are not.

diff --git a/examples/s/d/nn/xcase/realization-0/iter-0/fmuconfig/output/global_variables.yml b/examples/s/d/nn/xcase/realization-0/iter-0/fmuconfig/output/global_variables.yml
@@ -5,19 +5,19 @@ masterdata:
   smda:
     country:
     - identifier: Norway
-      uuid: ad214d85-8a1d-19da-e053-c918a4889309
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
     - short_identifier: DROGON
-      uuid: ad214d85-8a1d-19da-e053-c918a4889309
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     field:
     - identifier: DROGON
-      uuid: 00000000-0000-0000-0000-000000000000
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: ad214d85-8a1d-19da-e053-c918a4889310
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
 access:
   asset:
     name: Drogon

diff --git a/examples/s/d/nn/xcase/realization-1/iter-0/fmuconfig/output/global_variables.yml b/examples/s/d/nn/xcase/realization-1/iter-0/fmuconfig/output/global_variables.yml
@@ -5,19 +5,19 @@ masterdata:
   smda:
     country:
     - identifier: Norway
-      uuid: ad214d85-8a1d-19da-e053-c918a4889309
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
     - short_identifier: DROGON
-      uuid: ad214d85-8a1d-19da-e053-c918a4889309
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     field:
     - identifier: DROGON
-      uuid: 00000000-0000-0000-0000-000000000000
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: ad214d85-8a1d-19da-e053-c918a4889310
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
 access:
   asset:
     name: Drogon

diff --git a/examples/s/d/nn/xcase/realization-9/iter-0/fmuconfig/output/global_variables.yml b/examples/s/d/nn/xcase/realization-9/iter-0/fmuconfig/output/global_variables.yml
@@ -5,19 +5,19 @@ masterdata:
   smda:
     country:
     - identifier: Norway
-      uuid: ad214d85-8a1d-19da-e053-c918a4889309
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
     - short_identifier: DROGON
-      uuid: ad214d85-8a1d-19da-e053-c918a4889309
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     field:
     - identifier: DROGON
-      uuid: 00000000-0000-0000-0000-000000000000
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: ad214d85-8a1d-19da-e053-c918a4889310
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
 access:
   asset:
     name: Drogon

diff --git a/examples/s/d/nn/xcase/share/metadata/fmu_case.yml b/examples/s/d/nn/xcase/share/metadata/fmu_case.yml
@@ -20,19 +20,19 @@ masterdata:
   smda:
     country:
     - identifier: Norway
-      uuid: ad214d85-8a1d-19da-e053-c918a4889309
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
     - short_identifier: DROGON
-      uuid: bd214d85-8a1d-19da-e053-c918a4889309
+      uuid: 576790fe-d5a9-428a-8303-4013f4d440fa
     field:
     - identifier: DROGON
-      uuid: cd214d85-8a1d-19da-e053-c918a4889409
+      uuid: dbb55b20-7ac5-4704-a6e7-3a9fe43cb213
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ed214d85-dac7-19da-e053-c918a4889509
+      uuid: b2fa2a32-f9e1-4c11-adbe-254bbc4a863e
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: fd214d85-8a1d-19da-e053-c918a4889609
+      uuid: dbb55b20-7ac5-4704-a6e7-3a9fe43cb213
 tracklog:
 - datetime: '2021-06-08T13:17:06.489681'
   event: created

diff --git a/schema/definitions/0.8.0/examples/aggregated_surface_depth.yml b/schema/definitions/0.8.0/examples/aggregated_surface_depth.yml
@@ -176,17 +176,17 @@ masterdata:
   smda:
     country:
       - identifier: Norway
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
       - short_identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     field:
       - identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
 
diff --git a/schema/definitions/0.8.0/examples/case.yml b/schema/definitions/0.8.0/examples/case.yml
@@ -43,16 +43,16 @@ masterdata:
   smda:
     country:
       - identifier: Norway
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
       - short_identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     field:
       - identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
diff --git a/schema/definitions/0.8.0/examples/dictionary_parameters.yml b/schema/definitions/0.8.0/examples/dictionary_parameters.yml
@@ -20,11 +20,11 @@ fmu:
       id: "adnj"
   iteration:
     id: 0
-    uuid: "dad9a25a-3ad0-0f0a-08f2-c6fe8aae4c45"
+    uuid: "8d328a0c-a16f-4158-b9a3-a94d0c69d182"
     name: "iter-0"
   realization:
     id: 0
-    uuid: "28274007-fd40-29c4-c6ef-10e2414ccdcd"
+    uuid: "78e0b69b-4e50-4773-b72f-72579e23a764"
     name: "realization-0"
 file:
   relative_path: "realization-0/iter-0/share/results/dictionaries/parameters.json"
@@ -56,16 +56,16 @@ masterdata:
   smda:
     country:
       - identifier: "Norway"
-        uuid: "ad214d85-8a1d-19da-e053-c918a4889309"
+        uuid: "2951acd3-28da-4d87-a067-f760a5802ee5"
     discovery:
       - short_identifier: "DROGON"
-        uuid: "ad214d85-8a1d-19da-e053-c918a4889309"
+        uuid: "2951acd3-28da-4d87-a067-f760a5802ee5"
     field:
       - identifier: "DROGON"
-        uuid: "00000000-0000-0000-0000-000000000000"
+        uuid: "ff30bd79-2185-400d-af91-4a9b72f61bf6"
     coordinate_system:
       identifier: "ST_WGS84_UTM37N_P32637"
-      uuid: "ad214d85-dac7-19da-e053-c918a4889309"
+      uuid: "c5d1511a-98f5-4343-9335-613e1842fa15"
     stratigraphic_column:
       identifier: "DROGON_HAS_NO_STRATCOLUMN"
-      uuid: "00000000-0000-0000-0000-000000000000"
+      uuid: "34211f05-7883-41eb-9271-3dc5a848b4d5"
diff --git a/schema/definitions/0.8.0/examples/polygons_field_outline.yml b/schema/definitions/0.8.0/examples/polygons_field_outline.yml
@@ -129,17 +129,17 @@ masterdata:
   smda:
     country:
       - identifier: Norway
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
       - short_identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     field:
       - identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
 
diff --git a/schema/definitions/0.8.0/examples/polygons_field_region.yml b/schema/definitions/0.8.0/examples/polygons_field_region.yml
@@ -106,17 +106,17 @@ masterdata:
   smda:
     country:
       - identifier: Norway
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
       - short_identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     field:
       - identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
 
diff --git a/schema/definitions/0.8.0/examples/preprocessed_surface_depth.yml b/schema/definitions/0.8.0/examples/preprocessed_surface_depth.yml
@@ -151,17 +151,17 @@ masterdata:
   smda:
     country:
       - identifier: Norway
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
       - short_identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     field:
       - identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
 
diff --git a/schema/definitions/0.8.0/examples/summary_table.yml b/schema/definitions/0.8.0/examples/summary_table.yml
@@ -20,11 +20,11 @@ fmu:
       id: dbs
   iteration:
     id: 0
-    uuid: b6a6507f-0789-d899-7b68-a2e6a7f1f2c4
+    uuid: 3b121a35-1019-4160-afb2-d5e1917bf9d7
     name: iter-0
   realization:
     id: 0
-    uuid: 318edd40-7e59-4a41-dbcc-a2f1aafd814d
+    uuid: a74e320e-aea5-4364-a542-c3105c4645bd
     name: realization-0
     parameters:
       GLOBVAR:
@@ -86,16 +86,16 @@ masterdata:
   smda:
     country:
       - identifier: Norway
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
       - short_identifier: DROGON
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     field:
       - identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_HAS_NO_STRATCOLUMN
-      uuid: 00000000-0000-0000-0000-000000000000
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
diff --git a/schema/definitions/0.8.0/examples/surface_depth.yml b/schema/definitions/0.8.0/examples/surface_depth.yml
@@ -172,17 +172,17 @@ masterdata:
   smda:
     country:
       - identifier: Norway
-        uuid: ad214d85-8a1d-19da-e053-c918a4889309
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
     discovery:
       - short_identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     field:
       - identifier: DROGON
-        uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+        uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
     coordinate_system:
       identifier: ST_WGS84_UTM37N_P32637
-      uuid: ad214d85-dac7-19da-e053-c918a4889309
+      uuid: c5d1511a-98f5-4343-9335-613e1842fa15
     stratigraphic_column:
       identifier: DROGON_2020
-      uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
+      uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon