Skip to content

Commit

Permalink
Revert "ENH: Validate uuids against pydantic.UUID4 (#759)"
Browse files Browse the repository at this point in the history
This reverts commit 835dea3.
  • Loading branch information
mferrera committed Sep 13, 2024
1 parent 835dea3 commit 53fcc5e
Show file tree
Hide file tree
Showing 30 changed files with 162 additions and 162 deletions.
10 changes: 5 additions & 5 deletions docs/src/example_surface.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,16 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
coordinate_system: # changing from "coordinates" to clarify this is not content
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889310
10 changes: 5 additions & 5 deletions docs/src/example_surface_v070.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,16 +215,16 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
coordinate_system: # changing from "coordinates" to clarify this is not content
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889310
10 changes: 5 additions & 5 deletions docs/src/preparations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@ This is an example of ``_masterdata.yml`` from Drogon. Adjust to your needs:
smda:
country:
- identifier: Westeros
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
coordinate_system:
identifier: ST_WGS84_UTM37N_P12345
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
stratigraphic_column:
identifier: DROGON_2008
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
Note that ``country``, ``discovery`` and ``field`` are lists (can have more than one),
while ``coordinate_system`` and ``stratigraphic_column`` are not.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889310
access:
asset:
name: Drogon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889310
access:
asset:
name: Drogon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889310
access:
asset:
name: Drogon
Expand Down
10 changes: 5 additions & 5 deletions examples/s/d/nn/xcase/share/metadata/fmu_case.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 576790fe-d5a9-428a-8303-4013f4d440fa
uuid: bd214d85-8a1d-19da-e053-c918a4889309
field:
- identifier: DROGON
uuid: dbb55b20-7ac5-4704-a6e7-3a9fe43cb213
uuid: cd214d85-8a1d-19da-e053-c918a4889409
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: b2fa2a32-f9e1-4c11-adbe-254bbc4a863e
uuid: ed214d85-dac7-19da-e053-c918a4889509
stratigraphic_column:
identifier: DROGON_2020
uuid: dbb55b20-7ac5-4704-a6e7-3a9fe43cb213
uuid: fd214d85-8a1d-19da-e053-c918a4889609
tracklog:
- datetime: '2021-06-08T13:17:06.489681'
event: created
Expand Down
10 changes: 5 additions & 5 deletions schema/definitions/0.8.0/examples/aggregated_surface_depth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,17 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon

10 changes: 5 additions & 5 deletions schema/definitions/0.8.0/examples/case.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
14 changes: 7 additions & 7 deletions schema/definitions/0.8.0/examples/dictionary_parameters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ fmu:
id: "adnj"
iteration:
id: 0
uuid: "8d328a0c-a16f-4158-b9a3-a94d0c69d182"
uuid: "dad9a25a-3ad0-0f0a-08f2-c6fe8aae4c45"
name: "iter-0"
realization:
id: 0
uuid: "78e0b69b-4e50-4773-b72f-72579e23a764"
uuid: "28274007-fd40-29c4-c6ef-10e2414ccdcd"
name: "realization-0"
file:
relative_path: "realization-0/iter-0/share/results/dictionaries/parameters.json"
Expand Down Expand Up @@ -56,16 +56,16 @@ masterdata:
smda:
country:
- identifier: "Norway"
uuid: "2951acd3-28da-4d87-a067-f760a5802ee5"
uuid: "ad214d85-8a1d-19da-e053-c918a4889309"
discovery:
- short_identifier: "DROGON"
uuid: "2951acd3-28da-4d87-a067-f760a5802ee5"
uuid: "ad214d85-8a1d-19da-e053-c918a4889309"
field:
- identifier: "DROGON"
uuid: "ff30bd79-2185-400d-af91-4a9b72f61bf6"
uuid: "00000000-0000-0000-0000-000000000000"
coordinate_system:
identifier: "ST_WGS84_UTM37N_P32637"
uuid: "c5d1511a-98f5-4343-9335-613e1842fa15"
uuid: "ad214d85-dac7-19da-e053-c918a4889309"
stratigraphic_column:
identifier: "DROGON_HAS_NO_STRATCOLUMN"
uuid: "34211f05-7883-41eb-9271-3dc5a848b4d5"
uuid: "00000000-0000-0000-0000-000000000000"
10 changes: 5 additions & 5 deletions schema/definitions/0.8.0/examples/polygons_field_outline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,17 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon

10 changes: 5 additions & 5 deletions schema/definitions/0.8.0/examples/polygons_field_region.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,17 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon

10 changes: 5 additions & 5 deletions schema/definitions/0.8.0/examples/preprocessed_surface_depth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,17 +151,17 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon

14 changes: 7 additions & 7 deletions schema/definitions/0.8.0/examples/summary_table.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ fmu:
id: dbs
iteration:
id: 0
uuid: 3b121a35-1019-4160-afb2-d5e1917bf9d7
uuid: b6a6507f-0789-d899-7b68-a2e6a7f1f2c4
name: iter-0
realization:
id: 0
uuid: a74e320e-aea5-4364-a542-c3105c4645bd
uuid: 318edd40-7e59-4a41-dbcc-a2f1aafd814d
name: realization-0
parameters:
GLOBVAR:
Expand Down Expand Up @@ -86,16 +86,16 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_HAS_NO_STRATCOLUMN
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: 00000000-0000-0000-0000-000000000000
10 changes: 5 additions & 5 deletions schema/definitions/0.8.0/examples/surface_depth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,17 @@ masterdata:
smda:
country:
- identifier: Norway
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5
uuid: ad214d85-8a1d-19da-e053-c918a4889309
discovery:
- short_identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
field:
- identifier: DROGON
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon
coordinate_system:
identifier: ST_WGS84_UTM37N_P32637
uuid: c5d1511a-98f5-4343-9335-613e1842fa15
uuid: ad214d85-dac7-19da-e053-c918a4889309
stratigraphic_column:
identifier: DROGON_2020
uuid: 2951acd3-28da-4d87-a067-f760a5802ee5 # mock uuid for Drogon
uuid: 00000000-0000-0000-0000-000000000000 # mock uuid for Drogon

Loading

0 comments on commit 53fcc5e

Please sign in to comment.