Merge pull request #46 from scaleapi/sasha/force_fix

Sasha/force fix

Author: sasha-scale

README.md

@@ -156,3 +156,24 @@ A response code of 200 indicates successful deletion.
 ```python
 client.delete_model_run("model_run_id")
 ```
+
+## For Developers
+
+Please install the pre-commit hooks by running the following commands:
+```python
+pip install pre-commit
+pre-commit install
+```
+
+**Best practices for testing:**
+(1). Before running pytest, please make sure to authenticate into AWS, since some of the unit tests rely on AWs resources:
+```
+gimme_okta_aws_creds
+```
+
+(2). Please run pytest from the root directory of the repo, i.e.
+```
+pytest tests/test_dataset.py
+```
+
+

nucleus/__init__.py

@@ -374,6 +374,7 @@ def _process_append_requests_local(
         self,
         dataset_id: str,
         payload: dict,
+        update: bool,
         local_batch_size: int = 10,
         size: int = 10,
     ):
@@ -920,9 +921,7 @@ def get_slice(self, slice_id: str) -> Slice:
         """
         return Slice(slice_id, self)
 
-    def slice_info(
-        self, slice_id: str
-    ) -> dict:
+    def slice_info(self, slice_id: str) -> dict:
         """
         This endpoint provides information about specified slice.
 

nucleus/prediction.py

@@ -37,6 +37,7 @@ def from_json(cls, payload: dict):
             ],
             reference_id=payload.get(REFERENCE_ID_KEY, None),
             item_id=payload.get(ITEM_ID_KEY, None),
+            annotation_id=payload.get(ANNOTATION_ID_KEY, None),
         )
 
 

tests/__init__.py

@@ -29,6 +29,8 @@
     DatasetItem(TEST_IMG_URLS[2], "3"),
     DatasetItem(TEST_IMG_URLS[3], "4"),
 ]
+
+LOCAL_FILENAME = "tests/test_img.jpg"
 TEST_PREDS = [
     BoxPrediction("[Pytest Box Prediction 1]", 0, 0, 100, 100, "1"),
     BoxPrediction("[Pytest Box Prediction 2]", 0, 0, 100, 100, "2"),
@@ -60,7 +62,6 @@ def s3_sign(bucket, key):
         ExpiresIn=PRESIGN_EXPIRY_SECONDS,
     )
 
-
 def reference_id_from_url(url):
     return Path(url).name
 

tests/helpers.py

@@ -4,6 +4,7 @@
     TEST_SLICE_NAME,
     TEST_DATASET_NAME,
     TEST_IMG_URLS,
+    LOCAL_FILENAME,
     reference_id_from_url,
 )
 
@@ -84,6 +85,19 @@ def check_is_expected_response(response):
     check_is_expected_response(response)
 
 
+def test_dataset_append_local(CLIENT, dataset):
+    ds_items_local = [DatasetItem(image_location=LOCAL_FILENAME)]
+    response = dataset.append(ds_items_local)
+    assert isinstance(response, UploadResponse)
+    resp_json = response.json()
+    assert resp_json[DATASET_ID_KEY] == dataset.id
+    assert resp_json[NEW_ITEMS] == 1
+    assert resp_json[UPDATED_ITEMS] == 0
+    assert resp_json[IGNORED_ITEMS] == 0
+    assert resp_json[ERROR_ITEMS] == 0
+    assert ERROR_PAYLOAD not in resp_json
+
+
 def test_dataset_list_autotags(CLIENT, dataset):
     # Creation
     # List of Autotags should be empty
@@ -119,7 +133,10 @@ def test_slice_create_and_delete_and_list(dataset):
     assert response["dataset_id"] == dataset.id
     assert len(response["dataset_items"]) == 2
     for item in ds_items[:2]:
-        assert item.reference_id == response["dataset_items"][0]["reference_id"] or item.reference_id == response["dataset_items"][1]["reference_id"]
+        assert (
+            item.reference_id == response["dataset_items"][0]["ref_id"]
+            or item.reference_id == response["dataset_items"][1]["ref_id"]
+        )
 
 
 def test_slice_append(dataset):
@@ -147,4 +164,8 @@ def test_slice_append(dataset):
     response = slc.info()
     assert len(response["dataset_items"]) == 3
     for item in ds_items[:3]:
-        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"]
+        assert (
+            item.reference_id == response["dataset_items"][0]["ref_id"]
+            or item.reference_id == response["dataset_items"][1]["ref_id"]
+            or item.reference_id == response["dataset_items"][2]["ref_id"]
+        )