scale-nucleus 0.15.10b0__py3-none-any.whl → 0.16.2__py3-none-any.whl

nucleus/__init__.py

@@ -2,6 +2,7 @@
 
 __all__ = [
     "AsyncJob",
+    "EmbeddingsExportJob",
     "BoxAnnotation",
     "BoxPrediction",
     "CameraParams",
@@ -68,7 +69,7 @@ from .annotation import (
     Segment,
     SegmentationAnnotation,
 )
-from .async_job import AsyncJob
+from .async_job import AsyncJob, EmbeddingsExportJob
 from .camera_params import CameraParams
 from .connection import Connection
 from .constants import (
@@ -170,7 +171,7 @@ class NucleusClient:
         self,
         api_key: Optional[str] = None,
         use_notebook: bool = False,
-        endpoint: str = None,
+        endpoint: Optional[str] = None,
     ):
         self.api_key = self._set_api_key(api_key)
         self.tqdm_bar = tqdm.tqdm
@@ -236,7 +237,7 @@ class NucleusClient:
     def jobs(
         self,
     ) -> List[AsyncJob]:
-        """Lists all jobs, see NucleusClinet.list_jobs(...) for advanced options
+        """Lists all jobs, see NucleusClient.list_jobs(...) for advanced options
 
         Returns:
             List of all AsyncJobs
@@ -343,7 +344,9 @@ class NucleusClient:
         return AsyncJob.from_json(payload=payload, client=self)
 
     def get_model(
-        self, model_id: str = None, model_run_id: str = None
+        self,
+        model_id: Optional[str] = None,
+        model_run_id: Optional[str] = None,
     ) -> Model:
         """Fetches a model by its ID.
 
@@ -388,7 +391,10 @@ class NucleusClient:
         )
 
     def create_dataset_from_project(
-        self, project_id: str, last_n_tasks: int = None, name: str = None
+        self,
+        project_id: str,
+        last_n_tasks: Optional[int] = None,
+        name: Optional[str] = None,
     ) -> Dataset:
         """Create a new dataset from an existing Scale or Rapid project.
 
@@ -922,7 +928,10 @@ class NucleusClient:
 
     @deprecated("Prefer calling Dataset.delete_annotations instead.")
     def delete_annotations(
-        self, dataset_id: str, reference_ids: list = None, keep_history=True
+        self,
+        dataset_id: str,
+        reference_ids: Optional[list] = None,
+        keep_history=True,
     ) -> AsyncJob:
         dataset = self.get_dataset(dataset_id)
         return dataset.delete_annotations(reference_ids, keep_history)

nucleus/async_job.py

@@ -1,6 +1,7 @@
 import time
 from dataclasses import dataclass
-from typing import Dict, List
+from enum import Enum
+from typing import Dict, List, Set
 
 import requests
 
@@ -16,6 +17,29 @@ from nucleus.utils import replace_double_slashes
 JOB_POLLING_INTERVAL = 5
 
 
+class JobStatus(str, Enum):
+    QUEUED = "Queued"
+    RUNNING = "Running"
+    COMPLETED = "Completed"
+    ERRORED_DEPRECATED = "Errored"
+    ERRORED_SERVER = "Errored_Server"  # Server Error
+    ERRORED_USER = "Errored_User"  # User Error
+    ERRORED_PARTIAL = "Errored_Partial"  # Partially Completed
+    ERRORED_HANGING = "Errored_Hanging"  # Hanging
+    CANCELLED = "Cancelled"
+    RETRIED = "Retried"
+
+
+JOB_ERROR_PREFIX = JobStatus.ERRORED_DEPRECATED
+JOB_ERROR_STATES: Set[JobStatus] = {
+    JobStatus.ERRORED_DEPRECATED,
+    JobStatus.ERRORED_SERVER,
+    JobStatus.ERRORED_USER,
+    JobStatus.ERRORED_PARTIAL,
+    JobStatus.ERRORED_HANGING,
+}
+
+
 @dataclass
 class AsyncJob:
     """Object used to check the status or errors of a long running asynchronous operation.
@@ -116,9 +140,25 @@ class AsyncJob:
                 f"Finished at {time.perf_counter() - start_time} s: {status}"
             )
         final_status = status
-        if final_status["status"] == "Errored":
+        if final_status["status"] in JOB_ERROR_STATES or final_status[
+            "status"
+        ].startswith(JOB_ERROR_PREFIX):
             raise JobError(final_status, self)
 
+    @classmethod
+    def from_id(cls, job_id: str, client: "NucleusClient"):  # type: ignore # noqa: F821
+        """Creates a job instance from a specific job Id.
+
+        Parameters:
+            job_id: Defines the job Id
+            client: The client to use for the request.
+
+        Returns:
+            The specific AsyncMethod (or inherited) instance.
+        """
+        job = client.get_job(job_id)
+        return cls.from_json(job.__dict__, client)
+
     @classmethod
     def from_json(cls, payload: dict, client):
         # TODO: make private
@@ -131,6 +171,34 @@ class AsyncJob:
         )
 
 
+class EmbeddingsExportJob(AsyncJob):
+    def result_urls(self, wait_for_completion=True) -> List[str]:
+        """Gets a list of signed Scale URLs for each embedding batch.
+
+        Parameters:
+            wait_for_completion: Defines whether the call shall wait for
+            the job to complete. Defaults to True
+
+        Returns:
+            A list of signed Scale URLs which contain batches of embeddings.
+
+            The files contain a JSON array of embedding records with the following schema:
+                [{
+                    "reference_id": str,
+                    "embedding_vector": List[float]
+                }]
+        """
+        if wait_for_completion:
+            self.sleep_until_complete(verbose_std_out=False)
+
+        status = self.status()
+
+        if status["status"] != "Completed":
+            raise JobError(status, self)
+
+        return status["message"]["result"]  # type: ignore
+
+
 class JobError(Exception):
     def __init__(self, job_status: Dict[str, str], job: AsyncJob):
         final_status_message = job_status["message"]

nucleus/connection.py

@@ -1,4 +1,5 @@
 import time
+from typing import Optional
 
 import requests
 
@@ -11,7 +12,7 @@ from .retry_strategy import RetryStrategy
 class Connection:
     """Wrapper of HTTP requests to the Nucleus endpoint."""
 
-    def __init__(self, api_key: str, endpoint: str = None):
+    def __init__(self, api_key: str, endpoint: Optional[str] = None):
         self.api_key = api_key
         self.endpoint = endpoint
 

nucleus/dataset.py

@@ -15,7 +15,7 @@ from typing import (
 import requests
 
 from nucleus.annotation_uploader import AnnotationUploader, PredictionUploader
-from nucleus.async_job import AsyncJob
+from nucleus.async_job import AsyncJob, EmbeddingsExportJob
 from nucleus.prediction import Prediction, from_json
 from nucleus.track import Track
 from nucleus.url_utils import sanitize_string_args
@@ -1230,7 +1230,9 @@ class Dataset:
         return AsyncJob.from_json(response, self._client)
 
     def create_object_index(
-        self, model_run_id: str = None, gt_only: bool = None
+        self,
+        model_run_id: Optional[str] = None,
+        gt_only: Optional[bool] = None,
     ):
         """Creates or updates object index by generating embeddings for objects that do not already have embeddings.
 
@@ -1419,18 +1421,34 @@ class Dataset:
 
     def export_embeddings(
         self,
-    ) -> List[Dict[str, Union[str, List[float]]]]:
+        asynchronous: bool = True,
+    ) -> Union[List[Dict[str, Union[str, List[float]]]], EmbeddingsExportJob]:
         """Fetches a pd.DataFrame-ready list of dataset embeddings.
 
+        Parameters:
+            asynchronous: Whether or not to process the export asynchronously (and
+                return an :class:`EmbeddingsExportJob` object). Default is True.
+
         Returns:
-            A list, where each item is a dict with two keys representing a row
+            If synchronous, a list where each item is a dict with two keys representing a row
             in the dataset::
 
                 List[{
                     "reference_id": str,
                     "embedding_vector": List[float]
                 }]
+
+            Otherwise, returns an :class:`EmbeddingsExportJob` object.
         """
+        if asynchronous:
+            api_payload = self._client.make_request(
+                payload=None,
+                route=f"dataset/{self.id}/async_export_embeddings",
+                requests_command=requests.post,
+            )
+
+            return EmbeddingsExportJob.from_json(api_payload, self._client)
+
         api_payload = self._client.make_request(
             payload=None,
             route=f"dataset/{self.id}/embeddings",
@@ -1439,7 +1457,7 @@ class Dataset:
         return api_payload  # type: ignore
 
     def delete_annotations(
-        self, reference_ids: list = None, keep_history: bool = True
+        self, reference_ids: Optional[list] = None, keep_history: bool = True
     ) -> AsyncJob:
         """Deletes all annotations associated with the specified item reference IDs.
 
@@ -1555,7 +1573,9 @@ class Dataset:
         )
         return format_scale_task_info_response(response)
 
-    def calculate_evaluation_metrics(self, model, options: dict = None):
+    def calculate_evaluation_metrics(
+        self, model, options: Optional[dict] = None
+    ):
         """Starts computation of evaluation metrics for a model on the dataset.
 
         To update matches and metrics calculated for a model on a given dataset you

nucleus/dataset_item.py

@@ -1,5 +1,5 @@
 import json
-import os.path
+import os
 from collections import Counter
 from dataclasses import dataclass
 from enum import Enum

nucleus/job.py

@@ -27,6 +27,7 @@ class CustomerJobTypes(str, Enum):
     CLONE_DATASET = "cloneDataset"
     METADATA_UPDATE = "metadataUpdate"
     TRIGGER_EVALUATE = "triggerEvaluate"
+    EXPORT_EMBEDDINGS = "exportEmbeddings"
 
     def __contains__(self, item):
         try:

nucleus/logger.py

@@ -5,5 +5,5 @@ import requests
 logger = logging.getLogger(__name__)
 logging.basicConfig()
 logging.getLogger(
-    requests.packages.urllib3.__package__  # pylint: disable=no-member
+    requests.packages.urllib3.__package__  # type: ignore # pylint: disable=no-member
 ).setLevel(logging.ERROR)

nucleus/metrics/cuboid_metrics.py

@@ -174,7 +174,6 @@ class CuboidPrecision(CuboidMetric):
         prediction_filters: Optional[
             Union[ListOfOrAndFilters, ListOfAndFilters]
         ] = None,
-        use_2d_iou: bool = False,
     ):
         """Initializes CuboidIOU object.
 
@@ -192,13 +191,11 @@ class CuboidPrecision(CuboidMetric):
                 predicates. The innermost structures each describe a single column predicate. The list of inner predicates is
                 interpreted as a conjunction (AND), forming a more selective and multiple column predicate.
                 Finally, the most outer list combines these filters as a disjunction (OR).
-            use_2d_iou: whether to use 2D or 3D IOU for precision calculation.
         """
         assert (
             0 <= iou_threshold <= 1
         ), "IoU threshold must be between 0 and 1."
         self.iou_threshold = iou_threshold
-        self.use_2d_iou = use_2d_iou
         super().__init__(
             enforce_label_match=enforce_label_match,
             confidence_threshold=confidence_threshold,
@@ -215,7 +212,6 @@ class CuboidPrecision(CuboidMetric):
             predictions,
             annotations,
             threshold_in_overlap_ratio=self.iou_threshold,
-            use_2d=self.use_2d_iou,
         )
         weight = stats["tp_sum"] + stats["fp_sum"]
         precision = stats["tp_sum"] / max(weight, sys.float_info.epsilon)
@@ -237,7 +233,6 @@ class CuboidRecall(CuboidMetric):
         prediction_filters: Optional[
             Union[ListOfOrAndFilters, ListOfAndFilters]
         ] = None,
-        use_2d_iou: bool = False,
     ):
         """Initializes CuboidIOU object.
 
@@ -245,13 +240,11 @@ class CuboidRecall(CuboidMetric):
             enforce_label_match: whether to enforce that annotation and prediction labels must match. Defaults to True
             iou_threshold: IOU threshold to consider detection as valid. Must be in [0, 1]. Default 0.0
             confidence_threshold: minimum confidence threshold for predictions. Must be in [0, 1]. Default 0.0
-            use_2d_iou: whether to use 2D or 3D IOU for calculation.
         """
         assert (
             0 <= iou_threshold <= 1
         ), "IoU threshold must be between 0 and 1."
         self.iou_threshold = iou_threshold
-        self.use_2d_iou = use_2d_iou
         super().__init__(
             enforce_label_match=enforce_label_match,
             confidence_threshold=confidence_threshold,
@@ -268,7 +261,6 @@ class CuboidRecall(CuboidMetric):
             predictions,
             annotations,
             threshold_in_overlap_ratio=self.iou_threshold,
-            use_2d_iou=self.use_2d_iou
         )
         weight = stats["tp_sum"] + stats["fn_sum"]
         recall = stats["tp_sum"] / max(weight, sys.float_info.epsilon)

nucleus/metrics/cuboid_utils.py

@@ -1,5 +1,5 @@
 from functools import wraps
-from typing import Dict, List, Tuple
+from typing import Dict, List, Optional, Tuple
 
 import numpy as np
 
@@ -176,8 +176,8 @@ def get_batch_cuboid_corners(
     xyz: "np.ndarray",
     wlh: "np.ndarray",
     yaw: "np.ndarray",
-    pitch: "np.ndarray" = None,
-    roll: "np.ndarray" = None,
+    pitch: Optional["np.ndarray"] = None,
+    roll: Optional["np.ndarray"] = None,
     scale_convention: bool = True,
 ) -> "np.ndarray":
     """
@@ -211,7 +211,9 @@ def get_batch_cuboid_corners(
 
 
 def get_batch_rotation_matrices(
-    yaw: "np.ndarray", pitch: "np.ndarray" = None, roll: "np.ndarray" = None
+    yaw: "np.ndarray",
+    pitch: Optional["np.ndarray"] = None,
+    roll: Optional["np.ndarray"] = None,
 ) -> "np.ndarray":
     if pitch is None:
         pitch = np.zeros_like(yaw)
@@ -245,16 +247,14 @@ def associate_cuboids_on_iou(
     wlh_1: "np.ndarray",
     yaw_1: "np.ndarray",
     threshold_in_overlap_ratio: float = 0.1,
-    use_2d_iou: bool = False,
 ) -> List[Tuple[int, int]]:
     if xyz_0.shape[0] < 1 or xyz_1.shape[0] < 1:
         return []
-    iou_3d, iou_2d = compute_outer_iou(xyz_0, wlh_0, yaw_0, xyz_1, wlh_1, yaw_1)
-    iou = iou_2d if use_2d_iou else iou_3d
+    iou_matrix, _ = compute_outer_iou(xyz_0, wlh_0, yaw_0, xyz_1, wlh_1, yaw_1)
     mapping = []
-    for i, m in enumerate(iou.max(axis=1)):
+    for i, m in enumerate(iou_matrix.max(axis=1)):
         if m >= threshold_in_overlap_ratio:
-            mapping.append((i, iou[i].argmax()))
+            mapping.append((i, iou_matrix[i].argmax()))
     return mapping
 
 
@@ -262,7 +262,6 @@ def recall_precision(
     prediction: List[CuboidPrediction],
     groundtruth: List[CuboidAnnotation],
     threshold_in_overlap_ratio: float,
-    use_2d_iou: bool = False,
 ) -> Dict[str, float]:
     """
     Calculates the precision and recall of each lidar frame.
@@ -271,7 +270,6 @@ def recall_precision(
         :param predictions: list of cuboid annotation predictions.
         :param ground_truth: list of cuboid annotation groundtruths.
         :param threshold: IOU threshold to consider detection as valid. Must be in [0, 1].
-        :param use_2d_iou: flag whether to use 2d or 3d iou for evaluation.
     """
 
     tp_sum = 0
@@ -298,7 +296,6 @@ def recall_precision(
         gt_items["wlh"],
         gt_items["yaw"] + np.pi / 2,
         threshold_in_overlap_ratio=threshold_in_overlap_ratio,
-        use_2d_iou=use_2d_iou,
     )
 
     for pred_id, gt_id in mapping:

nucleus/metrics/segmentation_loader.py

@@ -25,6 +25,7 @@ class InMemoryLoader(SegmentationMaskLoader):
 
     def __init__(self, url_to_array: Dict[str, "np.ndarray"]):
         self.url_to_array = url_to_array
+        super().__init__()
 
     def fetch(self, url: str):
         array = self.url_to_array[url]

nucleus/metrics/segmentation_to_poly_metrics.py

@@ -115,7 +115,7 @@ class SegmentationMaskToPolyMetric(Metric):
         if prediction:
             if self.mode == SegToPolyMode.GENERATE_GT_FROM_POLY:
                 pred_img = self.loader.fetch(prediction.mask_url)
-                ann_img, segments = rasterize_polygons_to_segmentation_mask(
+                ann_img, segments = rasterize_polygons_to_segmentation_mask(  # type: ignore
                     annotations.polygon_annotations
                     + annotations.box_annotations,  # type:ignore
                     pred_img.shape,

nucleus/metrics/segmentation_utils.py

@@ -103,7 +103,7 @@ def fast_confusion_matrix(
     mask = (label_true >= 0) & (label_true < n_class)
     hist = np.bincount(
         n_class * label_true[mask].astype(int) + label_pred[mask],
-        minlength=n_class ** 2,
+        minlength=n_class**2,
     ).reshape(n_class, n_class)
     return hist
 

nucleus/scene.py

@@ -596,7 +596,10 @@ class VideoScene(ABC):
             ), "No list of items is accepted when uploading a video_location unless you are using privacy mode"
 
     def add_item(
-        self, item: DatasetItem, index: int = None, update: bool = False
+        self,
+        item: DatasetItem,
+        index: Optional[int] = None,
+        update: bool = False,
     ) -> None:
         """Adds DatasetItem to the specified index for videos uploaded as an array of images.
 

nucleus/slice.py

@@ -7,10 +7,11 @@ from typing import Dict, Iterable, List, Optional, Set, Tuple, Union
 import requests
 
 from nucleus.annotation import Annotation
-from nucleus.async_job import AsyncJob
+from nucleus.async_job import AsyncJob, EmbeddingsExportJob
 from nucleus.constants import EXPORT_FOR_TRAINING_KEY, EXPORTED_ROWS, ITEMS_KEY
 from nucleus.dataset_item import DatasetItem
 from nucleus.errors import NucleusAPIError
+from nucleus.prediction import Prediction
 from nucleus.prediction import from_json as prediction_from_json
 from nucleus.scene import Scene
 from nucleus.utils import (
@@ -335,7 +336,7 @@ class Slice:
 
     def append(
         self,
-        reference_ids: List[str] = None,
+        reference_ids: Optional[List[str]] = None,
     ) -> dict:
         """Appends existing DatasetItems from a Dataset to a Slice.
 
@@ -458,6 +459,35 @@ class Slice:
         )
         return convert_export_payload(api_payload[EXPORTED_ROWS], True)
 
+    def export_raw_json(
+        self,
+    ) -> List[Union[DatasetItem, Annotation, Prediction, Scene]]:
+        """Exports object slices in a raw JSON format. Note that it currently does not support item-level slices.
+
+        For each object or match in an object slice, this method exports the following information:
+        - The item that contains the object.
+        - The prediction and/or annotation (both, if the slice is based on IOU matches).
+        - If the object is part of a scene, it includes scene-level attributes in the export.
+
+        Returns:
+            An iterable where each element is a dictionary containing JSON-formatted data.
+            ::
+
+                List[{
+                    "item": DatasetItem (as JSON),
+                    "annotation": BoxAnnotation/CuboidAnnotation (as JSON)
+                    "prediction": BoxPrediction/CuboidPrediction (as JSON)
+                    "scene": Scene (as JSON)
+                    }
+                }]
+        """
+        api_payload = self._client.make_request(
+            payload=None,
+            route=f"slice/{self.id}/export_raw_json",
+            requests_command=requests.get,
+        )
+        return api_payload
+
     def export_predictions_generator(
         self, model
     ) -> Iterable[Dict[str, Union[DatasetItem, Dict[str, List[Annotation]]]]]:
@@ -570,17 +600,33 @@ class Slice:
 
     def export_embeddings(
         self,
-    ) -> List[Dict[str, Union[str, List[float]]]]:
+        asynchronous: bool = True,
+    ) -> Union[List[Dict[str, Union[str, List[float]]]], EmbeddingsExportJob]:
         """Fetches a pd.DataFrame-ready list of slice embeddings.
 
+        Parameters:
+            asynchronous: Whether or not to process the export asynchronously (and
+                return an :class:`EmbeddingsExportJob` object). Default is True.
+
         Returns:
-            A list where each element is a columnar mapping::
+            If synchronous, a list where each element is a columnar mapping::
 
                 List[{
                     "reference_id": str,
                     "embedding_vector": List[float]
                 }]
+
+            Otherwise, returns an :class:`EmbeddingsExportJob` object.
         """
+        if asynchronous:
+            api_payload = self._client.make_request(
+                payload=None,
+                route=f"dataset/{self.id}/async_export_embeddings",
+                requests_command=requests.post,
+            )
+
+            return EmbeddingsExportJob.from_json(api_payload, self._client)
+
         api_payload = self._client.make_request(
             payload=None,
             route=f"slice/{self.id}/embeddings",

nucleus/test_launch_integration.py

@@ -144,8 +144,8 @@ _OUTLINE_COLOR = (0, 255, 0, 255)
 def visualize_box_launch_bundle(
     img_file: str,
     load_predict_fn: Callable,
-    load_model_fn: Callable = None,
-    model: Any = None,
+    load_model_fn: Optional[Callable] = None,
+    model: Optional[Any] = None,
     show_image: bool = False,
     max_annotations: int = 5,
 ) -> Image:
@@ -194,8 +194,8 @@ def visualize_box_launch_bundle(
 def run_category_launch_bundle(
     img_file: str,
     load_predict_fn: Callable,
-    load_model_fn: Callable = None,
-    model: Any = None,
+    load_model_fn: Optional[Callable] = None,
+    model: Optional[Any] = None,
 ):
     """
     Run this function locally to test if your image categorization model returns a format consumable by Launch + Nucleus
@@ -218,8 +218,8 @@ def run_category_launch_bundle(
 def visualize_line_launch_bundle(
     img_file: str,
     load_predict_fn: Callable,
-    load_model_fn: Callable = None,
-    model: Any = None,
+    load_model_fn: Optional[Callable] = None,
+    model: Optional[Any] = None,
     show_image: bool = False,
     max_annotations: int = 5,
 ) -> Image:
@@ -266,8 +266,8 @@ def visualize_line_launch_bundle(
 def visualize_polygon_launch_bundle(
     img_file: str,
     load_predict_fn: Callable,
-    load_model_fn: Callable = None,
-    model: Any = None,
+    load_model_fn: Optional[Callable] = None,
+    model: Optional[Any] = None,
     show_image: bool = False,
     max_annotations: int = 5,
 ) -> Image:

nucleus/utils.py

@@ -221,6 +221,7 @@ def format_scale_task_info_response(response: dict) -> Union[Dict, List[Dict]]:
     return ret
 
 
+# pylint: disable=too-many-branches
 def convert_export_payload(api_payload, has_predictions: bool = False):
     """Helper function to convert raw JSON to API objects
 
@@ -239,33 +240,66 @@ def convert_export_payload(api_payload, has_predictions: bool = False):
         if row.get(SEGMENTATION_TYPE) is not None:
             segmentation = row[SEGMENTATION_TYPE]
             segmentation[REFERENCE_ID_KEY] = row[ITEM_KEY][REFERENCE_ID_KEY]
-            annotations[SEGMENTATION_TYPE] = SegmentationAnnotation.from_json(
-                segmentation
-            )
+            if not has_predictions:
+                annotations[
+                    SEGMENTATION_TYPE
+                ] = SegmentationAnnotation.from_json(segmentation)
+            else:
+                annotations[
+                    SEGMENTATION_TYPE
+                ] = SegmentationPrediction.from_json(segmentation)
         for polygon in row[POLYGON_TYPE]:
             polygon[REFERENCE_ID_KEY] = row[ITEM_KEY][REFERENCE_ID_KEY]
-            annotations[POLYGON_TYPE].append(
-                PolygonAnnotation.from_json(polygon)
-            )
+            if not has_predictions:
+                annotations[POLYGON_TYPE].append(
+                    PolygonAnnotation.from_json(polygon)
+                )
+            else:
+                annotations[POLYGON_TYPE].append(
+                    PolygonPrediction.from_json(polygon)
+                )
         for line in row[LINE_TYPE]:
             line[REFERENCE_ID_KEY] = row[ITEM_KEY][REFERENCE_ID_KEY]
-            annotations[LINE_TYPE].append(LineAnnotation.from_json(line))
+            if not has_predictions:
+                annotations[LINE_TYPE].append(LineAnnotation.from_json(line))
+            else:
+                annotations[LINE_TYPE].append(LinePrediction.from_json(line))
         for keypoints in row[KEYPOINTS_TYPE]:
             keypoints[REFERENCE_ID_KEY] = row[ITEM_KEY][REFERENCE_ID_KEY]
-            annotations[KEYPOINTS_TYPE].append(
-                KeypointsAnnotation.from_json(keypoints)
-            )
+            if not has_predictions:
+                annotations[KEYPOINTS_TYPE].append(
+                    KeypointsAnnotation.from_json(keypoints)
+                )
+            else:
+                annotations[KEYPOINTS_TYPE].append(
+                    KeypointsPrediction.from_json(keypoints)
+                )
         for box in row[BOX_TYPE]:
             box[REFERENCE_ID_KEY] = row[ITEM_KEY][REFERENCE_ID_KEY]
-            annotations[BOX_TYPE].append(BoxAnnotation.from_json(box))
+            if not has_predictions:
+                annotations[BOX_TYPE].append(BoxAnnotation.from_json(box))
+            else:
+                annotations[BOX_TYPE].append(BoxPrediction.from_json(box))
         for cuboid in row[CUBOID_TYPE]:
             cuboid[REFERENCE_ID_KEY] = row[ITEM_KEY][REFERENCE_ID_KEY]
-            annotations[CUBOID_TYPE].append(CuboidAnnotation.from_json(cuboid))
+            if not has_predictions:
+                annotations[CUBOID_TYPE].append(
+                    CuboidAnnotation.from_json(cuboid)
+                )
+            else:
+                annotations[CUBOID_TYPE].append(
+                    CuboidPrediction.from_json(cuboid)
+                )
         for category in row[CATEGORY_TYPE]:
             category[REFERENCE_ID_KEY] = row[ITEM_KEY][REFERENCE_ID_KEY]
-            annotations[CATEGORY_TYPE].append(
-                CategoryAnnotation.from_json(category)
-            )
+            if not has_predictions:
+                annotations[CATEGORY_TYPE].append(
+                    CategoryAnnotation.from_json(category)
+                )
+            else:
+                annotations[CATEGORY_TYPE].append(
+                    CategoryPrediction.from_json(category)
+                )
         for multicategory in row[MULTICATEGORY_TYPE]:
             multicategory[REFERENCE_ID_KEY] = row[ITEM_KEY][REFERENCE_ID_KEY]
             annotations[MULTICATEGORY_TYPE].append(

{scale_nucleus-0.15.10b0.dist-info → scale_nucleus-0.16.2.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: scale-nucleus
-Version: 0.15.10b0
+Version: 0.16.2
 Summary: The official Python client library for Nucleus, the Data Platform for AI
 Home-page: https://scale.com/nucleus
 License: MIT
 Author: Scale AI Nucleus Team
 Author-email: nucleusapi@scaleapi.com
-Requires-Python: >=3.6.2,<4.0
+Requires-Python: >=3.7,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.7
@@ -19,11 +19,8 @@ Provides-Extra: metrics
 Requires-Dist: Pillow (>=7.1.2)
 Requires-Dist: Shapely (>=1.8.0) ; extra == "metrics"
 Requires-Dist: aiohttp (>=3.7.4,<4.0.0)
-Requires-Dist: astroid (<=2.12) ; python_full_version <= "3.7.0"
 Requires-Dist: click (>=7.1.2,<9.0)
-Requires-Dist: dataclasses (>=0.7,<0.8) ; python_full_version >= "3.6.1" and python_version < "3.7"
 Requires-Dist: nest-asyncio (>=1.5.1,<2.0.0)
-Requires-Dist: numpy (>=1.19.5) ; python_version >= "3.6" and python_version < "4.0"
 Requires-Dist: numpy (>=1.19.5) ; python_version >= "3.7" and python_version < "3.10"
 Requires-Dist: numpy (>=1.22.0) ; python_version >= "3.10"
 Requires-Dist: pydantic (>=1.8.2,<2.0.0)
@@ -33,8 +30,8 @@ Requires-Dist: rasterio (>=1.2.0) ; extra == "metrics"
 Requires-Dist: requests (>=2.23.0,<3.0.0)
 Requires-Dist: rich (>=10.15.2)
 Requires-Dist: scale-launch (>=0.1.0) ; (python_version >= "3.7" and python_version < "4.0") and (extra == "launch")
-Requires-Dist: scikit-learn (>=0.24.0)
-Requires-Dist: scipy (>=1.4.1)
+Requires-Dist: scikit-learn (>=0.24.0) ; extra == "metrics"
+Requires-Dist: scipy (>=1.4.1) ; extra == "metrics"
 Requires-Dist: shellingham (>=1.4.0,<2.0.0)
 Requires-Dist: tqdm (>=4.41.0,<5.0.0)
 Project-URL: Documentation, https://dashboard.scale.com/nucleus/docs/api

{scale_nucleus-0.15.10b0.dist-info → scale_nucleus-0.16.2.dist-info}/RECORD

@@ -10,14 +10,14 @@ cli/nu.py,sha256=0f71zPq4fe3I1ghhiSRQi39ENhAzoLPdhz_vh8vxSI8,2074
 cli/reference.py,sha256=RuHVhmGTZNe0MfwpL96YjJdaH0OJzg98rz4xeIu4hJU,256
 cli/slices.py,sha256=nxq_Zg1m5oXuhz0ibyHkElvyVWt1AcE9tG-fN4CQxF8,1397
 cli/tests.py,sha256=NiwEVGuF08_jlCiKEIjKhwq55NvyU4xvPEJW5MJmdZg,4590
-nucleus/__init__.py,sha256=OOEIVY83YFAlgez7L2QfZqSnv7aLLraxI7OD9nu8Rf0,44176
+nucleus/__init__.py,sha256=JkJfKvNJbv-uK1wJTcgHrdsk5kroIrL_D3BCWs5gnSE,44351
 nucleus/annotation.py,sha256=hEA6nbVrKaR3ZuJpbVzdNy0bWzbzD9snjc6D_hEVtjo,42673
 nucleus/annotation_uploader.py,sha256=hv2Qr5WzwFohlWAnFG9nJ9uFHGhm4sFDl09oPssgVs0,9248
-nucleus/async_job.py,sha256=juxzn3xB8HwGDxolANX8Ryo4xM5QCOCaOembCdxyFaQ,4745
+nucleus/async_job.py,sha256=QX8ZAm5Q5uZsfBqZvLLRj32mW7otwJZteYGktvtSwEI,6886
 nucleus/async_utils.py,sha256=ZUlhjhxdNVZ842TJl32hRcXDkS09vR8S6jwvroZBhsA,6373
 nucleus/autocurate.py,sha256=kI0vRqad_An8SN5JX6sSdGP_vNHJI2Pq4NINHuhNf2U,1080
 nucleus/camera_params.py,sha256=fl17aaSAZDAJIWo6F2HFvM6HKGcQh9fXvo4t3RzGMc4,3726
-nucleus/connection.py,sha256=xl6Dz8io57GOn02Fbg5btnlMslEgNbijpht7JekZoD4,2862
+nucleus/connection.py,sha256=U7G7h_ufcTYBwqehhKWk899-TTvbRNFzXo7khtb5fy0,2900
 nucleus/constants.py,sha256=kU_Gkw-91O_NFNEqtkD-1UTbkyZiTGGZcJNe84fH26Y,4582
 nucleus/data_transfer_object/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucleus/data_transfer_object/dataset_details.py,sha256=1YGvfKkPSqDrXK_y5mBXyRThY07tU-nwOCYTkYCSl6k,214
@@ -25,19 +25,19 @@ nucleus/data_transfer_object/dataset_info.py,sha256=5P_gpvAyaqXxj2ZQuzLkGN2XROaN
 nucleus/data_transfer_object/dataset_size.py,sha256=oe-dXaMLpsQRDcJQRZ9Ja8JTagYz4dviZuTognEylp0,111
 nucleus/data_transfer_object/job_status.py,sha256=BbIo22-27Ue2-pEeVUvb-M7e-FyDw6rshkeJ6YRZ6VA,1665
 nucleus/data_transfer_object/scenes_list.py,sha256=iTHE6vA47bRB6ciyEU4LArUXEXco4ArnGvZTGTeK8xs,432
-nucleus/dataset.py,sha256=lT7ZGqTvt_PtSvt5eshuCrwtY29OYH2A7Jze6PaAA8o,78756
-nucleus/dataset_item.py,sha256=nfLbfcjnf3_8BS300h3Ss6P8vYSa9Yvx59kp9mcT12Q,9622
+nucleus/dataset.py,sha256=rkgPmQJOpPi8fu6e3bD4Jhqftj3Qm9y6tQegEmr_uq4,79499
+nucleus/dataset_item.py,sha256=_ZsTBJ9I7IN5YTos1TVs8R_vMoiXgRFCNiNNQevKvvE,9617
 nucleus/dataset_item_uploader.py,sha256=oT1HRFPu9J3iu0raKdtLS4fz7q1pO3fttjabgFGBuxc,6696
 nucleus/deprecation_warning.py,sha256=5C9dVusR5UkUQnW2MrRkIXCfbc8ULc7xOaB134agNKk,976
 nucleus/errors.py,sha256=xzJ3TBMee1SHbo1PY1z4B63Z_m8S3yHttrHZ9-Ry8Fk,2902
-nucleus/job.py,sha256=dJQz7LuBK7epc1COFI183UyC6X98l7HHCSPuqwKtcGA,1732
-nucleus/logger.py,sha256=acoFtszu4T-fj_Op4rwlXNNaLPrQ8Kw2ofaYusBHO8I,208
+nucleus/job.py,sha256=aZ0hBHDbwmDxgk3Um3oP2S01vX5fgRtbsuY2421SB_w,1775
+nucleus/logger.py,sha256=jmOMr32JfJyue3ZTdHScx-WG3WIf8pPOndlz9n4jQLA,223
 nucleus/metadata_manager.py,sha256=dWii8BPNNgpC3rRhJ3UmbgrmeDJm1zC_-8Oh6vGP8g4,2808
 nucleus/metrics/__init__.py,sha256=bve48T1quN_vh3zhpW1nbv8ZfFBBiT9k6d8cipu-1k0,894
 nucleus/metrics/base.py,sha256=cwBE1xm-2SN6ULfRwajLwNrC8oaLU4cGxP686EP4KE8,7757
 nucleus/metrics/categorization_metrics.py,sha256=sGM7Zyz1DLSUEFbaqBFEf4oNXlWvc465dMCFVI5LhcI,11934
-nucleus/metrics/cuboid_metrics.py,sha256=pZyNqvcNK8jG0sxxsZr1nKpOGiQtiuvR9nRay-gAoKo,12826
-nucleus/metrics/cuboid_utils.py,sha256=-cOfKS85_izR_OS3j3ON-kh3uRF6Bk2ySfUXFsUFpeg,11439
+nucleus/metrics/cuboid_metrics.py,sha256=ZjlFNa8kknx2mJzEiJ8ZvTlvOSW0BjZzzfJiv3WHm-g,12461
+nucleus/metrics/cuboid_utils.py,sha256=ZiQhlrCCsnWIu03X2xG-OaVTIKjmoyQfH5yUBPE0P80,11301
 nucleus/metrics/custom_types.py,sha256=6oWmlajz229crwEm2ImvC5vOhBXjt-HhVqj41D5uSwk,485
 nucleus/metrics/errors.py,sha256=Cu2W5tSsIHpazryd-9FXzu46OLC12Wk6gQT66hxQDis,304
 nucleus/metrics/filtering.py,sha256=X1y8JGKIKYUEVnoIKELuMJJTv6kcN_ZF4BPMCLIIVus,25502
@@ -45,10 +45,10 @@ nucleus/metrics/filters.py,sha256=SegJ2UdYSSnRJpoiqguVpGrDSGfyCK7OiREziunZw54,11
 nucleus/metrics/metric_utils.py,sha256=1EJf3ezTQAzh4mgECrxWyiUHzUjDqA_5hV9eqZISxRU,971
 nucleus/metrics/polygon_metrics.py,sha256=mrsGc7714B944NDhLZ6pa0FbyWltuJEkd6ZVccLibdU,29277
 nucleus/metrics/polygon_utils.py,sha256=olAwKQhkBjVpEWCqvC7sEvXBzYQ44v9SYp9nlPBKgeY,12931
-nucleus/metrics/segmentation_loader.py,sha256=u0u8KpYlOzbxKKz-dkboj3g7crpa0pY6MISbNH9t2-A,833
+nucleus/metrics/segmentation_loader.py,sha256=SdEhEYB5azCWp3iR8UaW-MXB23O-NQSTkEzGIJKNeCg,860
 nucleus/metrics/segmentation_metrics.py,sha256=rvjfFeyK-4ZEIgxl6nelYyDkAr767WjNTnVFkcQHDh8,29556
-nucleus/metrics/segmentation_to_poly_metrics.py,sha256=ChN1g8FJwBvhVUt9TStL07ccSGIibPgWMS02Zcg3djw,29091
-nucleus/metrics/segmentation_utils.py,sha256=hNv4M_ajoiPpvVmG9hisfz4qcH-cOMseFTWQz03KBdc,10370
+nucleus/metrics/segmentation_to_poly_metrics.py,sha256=92SuotttylxsTgebm3476wN21EJM19MT4rnjmiOlb68,29107
+nucleus/metrics/segmentation_utils.py,sha256=AkqCbyim67K9DA0VQYOUpYHe8vOwSvanFqWB1oOz1sU,10368
 nucleus/model.py,sha256=4J9MH_byHVEi8XlAZ6qFYHj_N7xc6wySs__KUwjq9og,8744
 nucleus/model_run.py,sha256=WtGy8cD86M_6aVNAp0ELZgunwbztNeOO8nv8ZSpbwhY,9280
 nucleus/package_not_installed.py,sha256=1ae0aqKAM3KrB0C-5MuPPXoz9tLWJUKtP1UZ-vw9Zik,1117
@@ -57,13 +57,13 @@ nucleus/prediction.py,sha256=vLI0_ExaazVTrVhFru4mIWS_rX1xRFkg_El-5EAoaOQ,31092
 nucleus/pydantic_base.py,sha256=EQER8_XqG4B-RC4aggUfukJa6f5OZ7ej92AsDWWIWPc,682
 nucleus/quaternion.py,sha256=TAnwj4arQXoTeofFgZMdZsCyxAMnu23N6to0F1WFNwk,1111
 nucleus/retry_strategy.py,sha256=daKZqjZYCh87WtXoVUuR9BZu2TTE-CtOFEYZ-d6xVMY,312
-nucleus/scene.py,sha256=yCAhsLZ83IfrLYkPbE8anYGMtIR68ZN_A97aqSN8J0g,28541
-nucleus/slice.py,sha256=sQhBm9peXlYAvRIE-nCupcDqWcX4jB2CR8_PxepUKj8,24871
-nucleus/test_launch_integration.py,sha256=ywJajyUSrgoRyDxryQOJAxPWgOnBbrAlaWUm9hcUaPo,9875
+nucleus/scene.py,sha256=uNafI3aCs7vhszMEOvu7kruX6oqhBJ_cKe0KNC0QUN8,28576
+nucleus/slice.py,sha256=KAtcWcRM2sb86gvGCe9wP4OMh7-nGfYyrw8VFrIMyuQ,26801
+nucleus/test_launch_integration.py,sha256=MVGuKc0Hp8KVlE-5JNaPrFDeZWQaVEnvyr314IwsX80,9955
 nucleus/track.py,sha256=ROmOyzYZKrHVTnLBhnk-qEBtklD_EDsSnRcGYE8xG4E,3247
 nucleus/upload_response.py,sha256=wR_pfZCBju1vGiGqbVgk8zhM6GhD3ebYxyGBm8y0GvY,3287
 nucleus/url_utils.py,sha256=EZ3vy1FYTGvXRVNyq43Wif-ypS8LFoDrYMYJre_DVuQ,790
-nucleus/utils.py,sha256=5xO3uSg-pXdu4xYc8Wjkb9PgRsGciiDea6T7G6vfCXg,12762
+nucleus/utils.py,sha256=-9f0URffHYZDvCB_Gh2ghVMPs8l-oE_xnmjOZf-IrQw,14067
 nucleus/validate/__init__.py,sha256=UZx1tJHCRCosPXKdjFGaeifHOIf9R6ncYMcq77Gom54,786
 nucleus/validate/client.py,sha256=c8iF-fi7CEyKSoutzwJD0rhE6DwDDKFF-xC0wITCTjE,8219
 nucleus/validate/constants.py,sha256=EoR0BLKqQroyVx6TpirbcMKunOnREdtqL9OUvpejgAk,1089
@@ -82,8 +82,8 @@ nucleus/validate/scenario_test.py,sha256=pCmM157dblSciZCDTw-f47Fpy3OUZFgXmokdhIL
 nucleus/validate/scenario_test_evaluation.py,sha256=Q0WzaEE9uUbPVc4EHlCoKjhJcqMNt4QbyiiJx12VOR0,4075
 nucleus/validate/scenario_test_metric.py,sha256=AhVFOB1ULwBqlZ2X_Au1TXy4iQELljtzR4ZpeLB35So,1209
 nucleus/validate/utils.py,sha256=VjdIJj9Pii4z4L6xbvClAc7ra_J7cX0vWB_J2X6yrGE,185
-scale_nucleus-0.15.10b0.dist-info/LICENSE,sha256=jaTGyQSQIZeWMo5iyYqgbAYHR9Bdy7nOzgE-Up3m_-g,1075
-scale_nucleus-0.15.10b0.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-scale_nucleus-0.15.10b0.dist-info/entry_points.txt,sha256=fmqEzh6NZQyg9eFMILnWabKT8OWQTMSCdDzMiVq2zYs,32
-scale_nucleus-0.15.10b0.dist-info/METADATA,sha256=fnDzV4eF98NVeekA32DoDTPZkFwu-uETE-cj32Q4eBk,8035
-scale_nucleus-0.15.10b0.dist-info/RECORD,,
+scale_nucleus-0.16.2.dist-info/LICENSE,sha256=jaTGyQSQIZeWMo5iyYqgbAYHR9Bdy7nOzgE-Up3m_-g,1075
+scale_nucleus-0.16.2.dist-info/METADATA,sha256=oQtA3lLS6aXVH3B9Jg9yzQxGF1gbPE421LNWh9S0Keo,7822
+scale_nucleus-0.16.2.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+scale_nucleus-0.16.2.dist-info/entry_points.txt,sha256=fmqEzh6NZQyg9eFMILnWabKT8OWQTMSCdDzMiVq2zYs,32
+scale_nucleus-0.16.2.dist-info/RECORD,,

{scale_nucleus-0.15.10b0.dist-info → scale_nucleus-0.16.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.4.0
+Generator: poetry-core 1.6.1
 Root-Is-Purelib: true
 Tag: py3-none-any