re-remove boto, remove type annotations impossible in 3.6

Author: Diego Ardila

.circleci/config.yml

@@ -33,12 +33,19 @@ jobs:
       - run:
           name: Pytest Test Cases
           command: | # Run test suite, uses NUCLEUS_TEST_API_KEY env variable
-            poetry run coverage run -m pytest
+            mkdir test_results
+            poetry run coverage run --include=nucleus/* -m pytest --junitxml=test_results/junit.xml
             poetry run coverage report
             poetry run coverage html
 
       - store_test_results:
           path: htmlcov
+
+      - store_test_results:
+          path: test_results
+      
+      - store_artifacts:
+          path: test_results
   pypi_publish:
     docker:
       - image: cimg/python:3.6

README.md

@@ -169,14 +169,9 @@ 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:
+(1). Please run pytest from the root directory of the repo, i.e.
 ```
-gimme_okta_aws_creds
-```
-
-(2). Please run pytest from the root directory of the repo, i.e.
-```
-pytest tests/test_dataset.py
+poetry pytest tests/test_dataset.py
 ```
 
 

nucleus/annotation.py

@@ -120,10 +120,10 @@ class BoxAnnotation(Annotation):  # pylint: disable=R0902
     y: Union[float, int]
     width: Union[float, int]
     height: Union[float, int]
-    annotation_id: Optional[str] = None
-    metadata: Optional[Dict] = None
     reference_id: Optional[str] = None
     item_id: Optional[str] = None
+    annotation_id: Optional[str] = None
+    metadata: Optional[Dict] = None
 
     def __post_init__(self):
         self._check_ids()
@@ -165,10 +165,10 @@ def to_payload(self) -> dict:
 class PolygonAnnotation(Annotation):
     label: str
     vertices: List[Any]
-    annotation_id: Optional[str] = None
-    metadata: Optional[Dict] = None
     reference_id: Optional[str] = None
     item_id: Optional[str] = None
+    annotation_id: Optional[str] = None
+    metadata: Optional[Dict] = None
 
     def __post_init__(self):
         self._check_ids()

nucleus/prediction.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import Dict, Optional, List, Any
 from .annotation import (
     BoxAnnotation,
@@ -30,7 +28,7 @@ class SegmentationPrediction(SegmentationAnnotation):
     # No need to define init or to_payload methods because
     # we default to functions defined in the parent class
     @classmethod
-    def from_json(cls, payload: dict) -> SegmentationPrediction:
+    def from_json(cls, payload: dict):
         return cls(
             mask_url=payload[MASK_URL_KEY],
             annotations=[
@@ -78,7 +76,7 @@ def to_payload(self) -> dict:
         return payload
 
     @classmethod
-    def from_json(cls, payload: dict) -> BoxPrediction:
+    def from_json(cls, payload: dict):
         geometry = payload.get(GEOMETRY_KEY, {})
         return cls(
             label=payload.get(LABEL_KEY, 0),
@@ -123,7 +121,7 @@ def to_payload(self) -> dict:
         return payload
 
     @classmethod
-    def from_json(cls, payload: dict) -> PolygonPrediction:
+    def from_json(cls, payload: dict):
         geometry = payload.get(GEOMETRY_KEY, {})
         return cls(
             label=payload.get(LABEL_KEY, 0),

pyproject.toml

@@ -47,7 +47,8 @@ pytest = "^6.2.3"
 pylint = "^2.7.4"
 black = "^20.8b1"
 flake8 = "^3.9.1"
-boto3 = "^1.17.51"
+mypy = "^0.812"
+coverage = "^5.5"
 
 
 [build-system]

tests/helpers.py

@@ -1,13 +1,12 @@
 from pathlib import Path
+import time
 from urllib.parse import urlparse
-import boto3
+
 from nucleus import DatasetItem, BoxPrediction
-import time
 
 PRESIGN_EXPIRY_SECONDS = 60 * 60 * 24 * 2  # 2 days
 
 TEST_MODEL_NAME = "[PyTest] Test Model"
-TEST_MODEL_REFERENCE = "[PyTest] Test Model Reference" + str(time.time())
 TEST_MODEL_RUN = "[PyTest] Test Model Run"
 TEST_DATASET_NAME = "[PyTest] Test Dataset"
 TEST_SLICE_NAME = "[PyTest] Test Slice"
@@ -37,30 +36,6 @@
 ]
 
 
-def get_signed_url(url):
-    bucket, key = get_s3_details(url)
-    return s3_sign(bucket, key)
-
-
-def get_s3_details(url):
-    # Expects S3 URL format to be https://<BUCKET>.s3.amazonaws.com/<KEY>
-    parsed = urlparse(url)
-    bucket = parsed.netloc[: parsed.netloc.find(".")]
-    return bucket, parsed.path[1:]
-
-
-def s3_sign(bucket, key):
-    s3 = boto3.client("s3")
-    return s3.generate_presigned_url(
-        ClientMethod="get_object",
-        Params={
-            "Bucket": bucket,
-            "Key": key,
-        },
-        ExpiresIn=PRESIGN_EXPIRY_SECONDS,
-    )
-
-
 def reference_id_from_url(url):
     return Path(url).name
 

tests/test_annotation.py

@@ -209,6 +209,9 @@ def test_box_gt_upload_update(dataset):
 
 def test_box_gt_upload_ignore(dataset):
     annotation = BoxAnnotation(**TEST_BOX_ANNOTATIONS[0])
+
+    print(annotation)
+
     response = dataset.annotate(annotations=[annotation])
 
     assert response["annotations_processed"] == 1
@@ -222,10 +225,11 @@ def test_box_gt_upload_ignore(dataset):
         "reference_id"
     ]
     annotation_update = BoxAnnotation(**annotation_update_params)
+
     # Default behavior is ignore.
     response = dataset.annotate(annotations=[annotation_update])
 
-    assert response["annotations_processed"] == 1
+    assert response["annotations_processed"] == 0
     assert response["annotations_ignored"] == 1
 
     response = dataset.refloc(annotation.reference_id)["annotations"]["box"]
@@ -286,7 +290,7 @@ def test_polygon_gt_upload_ignore(dataset):
     # Default behavior is ignore.
     response = dataset.annotate(annotations=[annotation_update])
 
-    assert response["annotations_processed"] == 1
+    assert response["annotations_processed"] == 0
     assert response["annotations_ignored"] == 1
 
     response = dataset.refloc(annotation.reference_id)["annotations"][

tests/test_indexing.py

@@ -1,7 +1,6 @@
 import pytest
 
 from helpers import (
-    get_signed_url,
     TEST_INDEX_EMBEDDINGS_FILE,
     TEST_IMG_URLS,
     TEST_DATASET_NAME,

tests/test_models.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+import time
 import pytest
 from nucleus import (
     Dataset,
@@ -19,7 +20,6 @@
 )
 from helpers import (
     TEST_MODEL_NAME,
-    TEST_MODEL_REFERENCE,
     TEST_MODEL_RUN,
     TEST_PREDS,
 )
@@ -46,8 +46,9 @@ def test_repr(test_object: any):
 def test_model_creation_and_listing(CLIENT, dataset):
     models_before = CLIENT.list_models()
 
+    model_reference = "model_" + str(time.time())
     # Creation
-    model = CLIENT.add_model(TEST_MODEL_NAME, TEST_MODEL_REFERENCE)
+    model = CLIENT.add_model(TEST_MODEL_NAME, model_reference)
     m_run = model.create_run(TEST_MODEL_RUN, dataset, TEST_PREDS)
     m_run.commit()
 

tests/test_prediction.py

@@ -1,9 +1,8 @@
 import pytest
-
+import time
 from helpers import (
     TEST_DATASET_NAME,
     TEST_MODEL_NAME,
-    TEST_MODEL_REFERENCE,
     TEST_MODEL_RUN,
     TEST_IMG_URLS,
     TEST_BOX_PREDICTIONS,
@@ -58,7 +57,7 @@ def model_run(CLIENT):
     assert ERROR_PAYLOAD not in response.json()
 
     model = CLIENT.add_model(
-        name=TEST_MODEL_NAME, reference_id=TEST_MODEL_REFERENCE
+        name=TEST_MODEL_NAME, reference_id="model_" + str(time.time())
     )
 
     run = model.create_run(name=TEST_MODEL_RUN, dataset=ds, predictions=[])
@@ -176,7 +175,7 @@ def test_box_pred_upload_ignore(model_run):
     # Default behavior is ignore.
     response = model_run.predict(annotations=[prediction_update])
 
-    assert response["predictions_processed"] == 1
+    assert response["predictions_processed"] == 0
     assert response["predictions_ignored"] == 1
 
     response = model_run.refloc(prediction.reference_id)["box"]
@@ -231,7 +230,7 @@ def test_polygon_pred_upload_ignore(model_run):
     # Default behavior is ignore.
     response = model_run.predict(annotations=[prediction_update])
 
-    assert response["predictions_processed"] == 1
+    assert response["predictions_processed"] == 0
     assert response["predictions_ignored"] == 1
 
     response = model_run.refloc(prediction.reference_id)["polygon"]