FIX: docs and reserved by name construction

Author: gdj0nes

examples/basics/data_row_metadata.ipynb

@@ -374,8 +374,8 @@
     "                    value=dt,\n",
     "                ),\n",
     "                DataRowMetadataField(\n",
-    "                    schema_id=mdo.reserved_by_name[\"split\"].uid,\n",
-    "                    value=split\n",
+    "                    schema_id=split.parent,\n",
+    "                    value=split.uid\n",
     "                ),\n",
     "                DataRowMetadataField(\n",
     "                    schema_id=mdo.reserved_by_name[\"tag\"].uid,\n",

labelbox/schema/data_row_metadata.py

@@ -1,6 +1,7 @@
 # type: ignore
 import datetime
 import warnings
+from copy import deepcopy
 from enum import Enum
 from itertools import chain
 from typing import List, Optional, Dict, Union, Callable, Type, Any, Generator
@@ -150,7 +151,7 @@ def _make_name_index(fields: List[DataRowMetadataSchema]):
             if f.options:
                 index[f.name] = {}
                 for o in f.options:
-                    index[o.name] = o
+                    index[f.name][o.name] = o
             else:
                 index[f.name] = f
         return index
@@ -187,13 +188,14 @@ def _get_ontology(self) -> List[Dict[str, Any]]:
     @staticmethod
     def _parse_ontology(raw_ontology) -> List[DataRowMetadataSchema]:
         fields = []
-        for schema in raw_ontology:
-            schema["uid"] = schema.pop("id")
+        copy = deepcopy(raw_ontology)
+        for schema in copy:
+            schema["uid"] = schema["id"]
             options = None
             if schema.get("options"):
                 options = []
                 for option in schema["options"]:
-                    option["uid"] = option.pop("id")
+                    option["uid"] = option["id"]
                     options.append(
                         DataRowMetadataSchema(**{
                             **option,

tests/integration/test_data_row_metadata.py

@@ -8,6 +8,7 @@
     DataRowMetadataOntology
 
 FAKE_SCHEMA_ID = "0" * 25
+FAKE_DATAROW_ID = "D" * 25
 SPLIT_SCHEMA_ID = "cko8sbczn0002h2dkdaxb5kal"
 TRAIN_SPLIT_ID = "cko8sbscr0003h2dk04w86hof"
 TEST_SPLIT_ID = "cko8scbz70005h2dkastwhgqt"
@@ -22,24 +23,11 @@
     "reserved": False
 }
 
-"""
-customMetadataOntology {
-                id
-                name
-                kind
-                reserved
-                options {
-                    id
-                    kind
-                    name
-                    reserved
-                }
-        }}"""
-
 
 @pytest.fixture
 def mdo(client):
     mdo = client.get_data_row_metadata_ontology()
+    mdo._raw_ontology = mdo._get_ontology()
     mdo._raw_ontology.append(FAKE_NUMBER_FIELD)
     mdo._build_ontology()
     yield mdo
@@ -91,7 +79,27 @@ def make_metadata(dr_id) -> DataRowMetadata:
 def test_get_datarow_metadata_ontology(mdo):
     assert len(mdo.fields)
     assert len(mdo.reserved_fields)
-    assert len(mdo.custom_fields) == 0
+    assert len(mdo.custom_fields) == 1
+
+    split = mdo.reserved_by_name["split"]["train"]
+
+    assert DataRowMetadata(
+        data_row_id=FAKE_DATAROW_ID,
+        fields=[
+            DataRowMetadataField(
+                schema_id=mdo.reserved_by_name["captureDateTime"].uid,
+                value=datetime.utcnow(),
+            ),
+            DataRowMetadataField(
+                schema_id=split.parent,
+                value=split.uid
+            ),
+            DataRowMetadataField(
+                schema_id=mdo.reserved_by_name["tag"].uid,
+                value="hello-world"
+            ),
+        ]
+    )
 
 
 def test_bulk_upsert_datarow_metadata(datarow, mdo: DataRowMetadataOntology):
@@ -267,4 +275,4 @@ def test_parse_raw_metadata(mdo):
 
     for row in parsed:
         for field in row.fields:
-            assert mdo._parse_upsert(field)
+            assert mdo._parse_upsert(field)