Fix NDVideoText dataRow and schema serialization edge cases

Author: cursoragent

libs/labelbox/src/labelbox/data/serialization/ndjson/classification.py

@@ -223,9 +223,20 @@ class NDVideoText(BaseModel):
       {"name": "...", "answer": [{"value": "text", "frames": [{"start": 1, "end": 5}]}], ...}
     """
 
-    name: str
+    name: Optional[str] = None
+    schema_id: Optional[Cuid] = Field(
+        default=None, serialization_alias="schemaId"
+    )
     answer: List[NDVideoTextAnswer]
-    dataRow: Dict[str, str]
+    data_row: DataRow = Field(serialization_alias="dataRow")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+    @model_validator(mode="after")
+    def must_set_one(self):
+        if self.schema_id is None and self.name is None:
+            raise ValueError("Schema id or name are not set. Set either one.")
+        return self
 
     @classmethod
     def from_video_text_group(
@@ -235,14 +246,10 @@ def from_video_text_group(
         data: "GenericDataRowData",
     ) -> "NDVideoText":
         first = annotation_group[0]
-        data_row = {}
-        if data.global_key:
-            data_row["globalKey"] = data.global_key
-        elif data.uid:
-            data_row["id"] = data.uid
         return cls(
             name=first.name,
-            dataRow=data_row,
+            schema_id=first.feature_schema_id,
+            data_row=DataRow(id=data.uid, global_key=data.global_key),
             answer=[
                 NDVideoTextAnswer(value=text_val, frames=ranges)
                 for text_val, ranges in frame_ranges_by_text.items()

libs/labelbox/tests/data/serialization/ndjson/test_video.py

@@ -1,4 +1,5 @@
 import json
+import pytest
 from labelbox.data.annotation_types.classification.classification import (
     Checklist,
     ClassificationAnnotation,
@@ -722,6 +723,59 @@ def test_video_classification_text_single_text_across_frames():
     assert answer[0]["frames"] == [{"start": 9, "end": 15}]
 
 
+def test_video_classification_text_with_external_id_raises():
+    label = Label(
+        data=GenericDataRowData(external_id="sample-video-external-id"),
+        annotations=[
+            VideoClassificationAnnotation(
+                name="free_text",
+                frame=9,
+                segment_index=0,
+                value=Text(answer="sample text"),
+            )
+        ],
+    )
+
+    with pytest.raises(ValueError, match="Must set either id or global_key"):
+        list(NDJsonConverter.serialize([label]))
+
+
+def test_video_classification_text_with_feature_schema_id_only():
+    label = Label(
+        data=GenericDataRowData(global_key="sample-video-schema-id-only"),
+        annotations=[
+            VideoClassificationAnnotation(
+                feature_schema_id="ckrb1sfjx099a0y914hl319ie",
+                frame=9,
+                segment_index=0,
+                value=Text(answer="sample text"),
+            ),
+            VideoClassificationAnnotation(
+                feature_schema_id="ckrb1sfjx099a0y914hl319ie",
+                frame=15,
+                segment_index=0,
+                value=Text(answer="sample text"),
+            ),
+        ],
+    )
+
+    serialized = list(NDJsonConverter.serialize([label]))
+    free_text_rows = [
+        r
+        for r in serialized
+        if r.get("schemaId") == "ckrb1sfjx099a0y914hl319ie"
+    ]
+    assert len(free_text_rows) == 1
+
+    row = free_text_rows[0]
+    assert row["schemaId"] == "ckrb1sfjx099a0y914hl319ie"
+    assert "name" not in row
+    assert row["dataRow"] == {"globalKey": "sample-video-schema-id-only"}
+    assert row["answer"] == [
+        {"value": "sample text", "frames": [{"start": 9, "end": 15}]}
+    ]
+
+
 def test_video_classification_nesting_bbox():
     bbox_annotation = [
         VideoObjectAnnotation(