Merge pull request #45 from scaleapi/slice-changes

GET a slice and all the data of each dataset item

Author: srikanth-scale-2

nucleus/__init__.py

@@ -920,7 +920,7 @@ def get_slice(self, slice_id: str) -> Slice:
         return Slice(slice_id, self)
 
     def slice_info(
-        self, slice_id: str, id_type: str = DATASET_ITEM_ID_KEY
+        self, slice_id: str
     ) -> dict:
         """
         This endpoint provides information about specified slice.
@@ -939,7 +939,7 @@ def slice_info(
         """
         response = self._make_request(
             {},
-            f"slice/{slice_id}?idType={id_type}",
+            f"slice/{slice_id}",
             requests_command=requests.get,
         )
         return response

nucleus/slice.py

@@ -15,22 +15,18 @@ def __init__(self, slice_id: str, client):
         self.slice_id = slice_id
         self._client = client
 
-    def info(self, id_type: str = DATASET_ITEM_ID_KEY) -> dict:
+    def info(self) -> dict:
         """
         This endpoint provides information about specified slice.
 
-        :param
-        id_type: the type of IDs you want in response (either "reference_id" or "dataset_item_id")
-        to identify the DatasetItems
-
         :return:
         {
             "name": str,
             "dataset_id": str,
-            "dataset_item_ids" or "reference_ids": List[str],
+            "dataset_items",
         }
         """
-        return self._client.slice_info(self.slice_id, id_type)
+        return self._client.slice_info(self.slice_id)
 
     def append(
         self,

tests/__init__.py

@@ -91,7 +91,7 @@ def test_dataset_list_autotags(CLIENT, dataset):
     assert autotag_response == []
 
 
-def test_slice_create_and_delete(dataset):
+def test_slice_create_and_delete_and_list(dataset):
     # Dataset upload
     ds_items = []
     for url in TEST_IMG_URLS:
@@ -114,12 +114,12 @@ def test_slice_create_and_delete(dataset):
     assert len(dataset_slices) == 1
     assert slc.slice_id == dataset_slices[0]
 
-    response = slc.info(id_type="reference_id")
+    response = slc.info()
     assert response["name"] == TEST_SLICE_NAME
     assert response["dataset_id"] == dataset.id
-    assert len(response["reference_ids"]) == 2
+    assert len(response["dataset_items"]) == 2
     for item in ds_items[:2]:
-        assert item.reference_id in response["reference_ids"]
+        assert item.reference_id == response["dataset_items"][0]["reference_id"] or item.reference_id == response["dataset_items"][1]["reference_id"]
 
 
 def test_slice_append(dataset):
@@ -144,7 +144,7 @@ def test_slice_append(dataset):
     # Insert duplicate first item
     slc.append(reference_ids=[item.reference_id for item in ds_items[:3]])
 
-    response = slc.info(id_type="reference_ids")
-    assert len(response["reference_ids"]) == 3
+    response = slc.info()
+    assert len(response["dataset_items"]) == 3
     for item in ds_items[:3]:
-        assert item.reference_id in response["reference_ids"]
+        assert item.reference_id == response["dataset_items"][0]["reference_id"] or item.reference_id == response["dataset_items"][1]["reference_id"] or item.reference_id == response["dataset_items"][2]["reference_id"]