Merge pull request #463 from Labelbox/jt/remvidgen

[AL-1283] Merge Label Generator and Video Label Generator

Author: jtsodapop

examples/annotation_types/basics.ipynb

@@ -140,7 +140,6 @@
                 "    - Covered in this notebook\n",
                 "2. Export labels to an annotation generator\n",
                 "    - `project.label_generator()`\n",
-                "    - `project.video_label_generator()`\n",
                 "3. Use a converter to load from another format\n",
                 "    - Covered in the converters.ipynb notebook."
             ]

examples/annotation_types/converters.ipynb

@@ -35,7 +35,6 @@
                 "* The goal is to create a set of converts that convert to and from labelbox annotation types.\n",
                 "* This is automatically used when exporting labels from labelbox with:\n",
                 "    1. `label.label_generator()`\n",
-                "    2. `label.video_label_generator()`\n",
                 "* Currently we support:\n",
                 "    1. NDJson Converter\n",
                 "        - Convert to and from the prediction import format (mea, mal)\n",
@@ -363,7 +362,7 @@
             ],
             "source": [
                 "project = client.get_project(\"ckqcx1d58068c0y619qv7hzgu\")\n",
-                "labels = project.video_label_generator()\n",
+                "labels = project.label_generator()\n",
                 "\n",
                 "for label in labels:\n",
                 "    annotation_lookup = label.frame_annotations()\n",

labelbox/schema/project.py

@@ -228,6 +228,9 @@ def video_label_generator(self, timeout_seconds=600, **kwargs):
         Returns:
             LabelGenerator for accessing labels for each video
         """
+        warnings.warn(
+            "video_label_generator will be deprecated in a future release. "
+            "Use label_generator for video or text/image labels.")
         _check_converter_import()
         json_data = self.export_labels(download=True,
                                        timeout_seconds=timeout_seconds,
@@ -252,10 +255,12 @@ def video_label_generator(self, timeout_seconds=600, **kwargs):
 
     def label_generator(self, timeout_seconds=600, **kwargs):
         """
-        Download text and image annotations
+        Download text and image annotations, or video annotations.
+
+        For a mixture of text/image and video, use project.export_labels()
 
         Returns:
-            LabelGenerator for accessing labels for each text or image
+            LabelGenerator for accessing labels
         """
         _check_converter_import()
         json_data = self.export_labels(download=True,
@@ -272,11 +277,14 @@ def label_generator(self, timeout_seconds=600, **kwargs):
         is_video = [
             'frames' in row['Label'] for row in json_data if row['Label']
         ]
-        if len(is_video) and any(is_video):
+
+        if len(is_video) and not all(is_video) and any(is_video):
             raise ValueError(
-                "Found video data rows in export. "
+                "Found mixed data types of video and text/image. "
                 "Use project.export_labels() to export projects with mixed data types. "
-                "Or use project.video_label_generator() for video data.")
+            )
+        if len(is_video) and all(is_video):
+            return LBV1Converter.deserialize_video(json_data, self.client)
         return LBV1Converter.deserialize(json_data)
 
     def export_labels(self,