get scene tests passing

Author: Drew Kaul

nucleus/scene.py

@@ -1,7 +1,7 @@
 import json
 from abc import ABC
 from dataclasses import dataclass, field
-from typing import Optional, Union, Any, Dict, List, Set
+from typing import Optional, Union, Any, Dict, List
 from enum import Enum
 from nucleus.constants import (
     CAMERA_PARAMS_KEY,
@@ -11,8 +11,6 @@
     FX_KEY,
     FY_KEY,
     HEADING_KEY,
-    INDEX_KEY,
-    ITEMS_KEY,
     METADATA_KEY,
     POSITION_KEY,
     REFERENCE_ID_KEY,
@@ -145,13 +143,18 @@ def __post_init__(self):
     def add_item(self, item: SceneDatasetItem, sensor_name: str):
         self.items[sensor_name] = item
 
+    @classmethod
+    def from_json(cls, payload: dict):
+        items = {
+            sensor: SceneDatasetItem.from_json(item)
+            for sensor, item in payload.items()
+        }
+        return cls(items=items)
+
     def to_payload(self) -> dict:
         return {
-            INDEX_KEY: self.index,
-            ITEMS_KEY: {
-                sensor: scene_dataset_item.to_payload()
-                for sensor, scene_dataset_item in self.items.items()
-            },
+            sensor: scene_dataset_item.to_payload()
+            for sensor, scene_dataset_item in self.items.items()
         }
 
 
@@ -210,7 +213,26 @@ def add_frame(self, frame: Frame, update: bool = False):
         ):
             self.frames_dict[frame.index] = frame
 
+    def validate_frames_dict(self):
+        is_continuous = set(list(range(len(self.frames_dict)))) == set(
+            self.frames_dict.keys()
+        )
+        assert (
+            is_continuous
+        ), "frames must be 0-indexed and continuous (no missing frames)"
+
+    @classmethod
+    def from_json(cls, payload: dict):
+        frames_payload = payload.get(FRAMES_KEY, [])
+        frames = [Frame.from_json(frame) for frame in frames_payload]
+        return cls(
+            reference_id=payload[REFERENCE_ID_KEY],
+            frames=frames,
+            metadata=payload.get(METADATA_KEY, None),
+        )
+
     def to_payload(self) -> dict:
+        self.validate_frames_dict()
         ordered_frames = [
             frame
             for _, frame in sorted(
@@ -244,7 +266,7 @@ def validate(self):
             ]
         )
         assert (
-            len(Set(lidar_sources)) == 1
+            len(set(lidar_sources)) == 1
         ), "Each lidar scene must have exactly one lidar source"
 
         for frame in self.frames_dict.values():

tests/helpers.py

@@ -32,14 +32,11 @@
             "reference_id": "scene_1",
             "frames": [
                 {
-                    "index": 0,
-                    "items": {
-                        "lidar": {
-                            "url": TEST_POINTCLOUD_URLS[0],
-                            "type": "pointcloud",
-                            "reference_id": "lidar_frame_1",
-                            "metadata": {},
-                        },
+                    "lidar": {
+                        "url": TEST_POINTCLOUD_URLS[0],
+                        "type": "pointcloud",
+                        "reference_id": "lidar_frame_1",
+                        "metadata": {},
                     },
                 }
             ],

tests/test_scene.py

@@ -1,4 +1,4 @@
-from nucleus.constants import SCENES_KEY
+from nucleus.constants import SCENES_KEY, UPDATE_KEY
 import pytest
 
 from .helpers import (
@@ -10,6 +10,7 @@
 
 from nucleus import (
     CuboidAnnotation,
+    LidarScene,
 )
 
 
@@ -24,19 +25,29 @@ def dataset(CLIENT):
 
 def test_scene_upload_sync(dataset):
     payload = TEST_LIDAR_SCENES
-    response = dataset.upload_scenes(payload)
+    scenes = [
+        LidarScene.from_json(scene_json) for scene_json in payload[SCENES_KEY]
+    ]
+    update = payload[UPDATE_KEY]
+
+    response = dataset.append(scenes, update=update)
 
     assert response["dataset_id"] == dataset.id
-    assert response["new_scenes"] == len(TEST_LIDAR_SCENES[SCENES_KEY])
+    assert response["new_scenes"] == len(scenes)
 
 
 @pytest.mark.integration
 def test_scene_and_cuboid_upload_sync(dataset):
     payload = TEST_LIDAR_SCENES
-    response = dataset.upload_scenes(payload)
+    scenes = [
+        LidarScene.from_json(scene_json) for scene_json in payload[SCENES_KEY]
+    ]
+    update = payload[UPDATE_KEY]
+
+    response = dataset.append(scenes, update=update)
 
     assert response["dataset_id"] == dataset.id
-    assert response["new_scenes"] == len(TEST_LIDAR_SCENES[SCENES_KEY])
+    assert response["new_scenes"] == len(scenes)
 
     TEST_CUBOID_ANNOTATIONS[0]["dataset_item_id"] = dataset.items[0].item_id
     annotations = [CuboidAnnotation.from_json(TEST_CUBOID_ANNOTATIONS[0])]