Tests pass locally

Author: Diego Ardila

nucleus/__init__.py

@@ -181,11 +181,13 @@ def list_models(self) -> List[Model]:
 
         return [
             Model(
-                model["id"],
-                model["name"],
-                model["ref_id"],
-                model["metadata"],
-                self,
+                model_id=model["id"],
+                name=model["name"],
+                reference_id=model["ref_id"],
+                metadata=None
+                if model["metadata"] == {}
+                else model["metadata"],
+                client=self,
             )
             for model in model_objects["models"]
         ]
@@ -231,6 +233,19 @@ def get_dataset(self, dataset_id: str) -> Dataset:
         """
         return Dataset(dataset_id, self)
 
+    def get_model(self, model_id: str) -> Model:
+        """
+        Fetched a model for a given id
+        :param model_id: internally controlled dataset_id
+        :return: model
+        """
+        payload = self.make_request(
+            payload={},
+            route=f"model/{model_id}",
+            requests_command=requests.get,
+        )
+        return Model.from_json(payload=payload, client=self)
+
     def get_model_run(self, model_run_id: str, dataset_id: str) -> ModelRun:
         """
         Fetches a model_run for given id

nucleus/annotation.py

@@ -314,5 +314,5 @@ def check_all_annotation_paths_remote(
         if hasattr(annotation, MASK_URL_KEY):
             if is_local_path(getattr(annotation, MASK_URL_KEY)):
                 raise ValueError(
-                    f"Found an annotation with a local path, which cannot be uploaded asynchronously. Use a remote path instead. {annotation}"
+                    f"Found an annotation with a local path, which is not currently supported. Use a remote path instead. {annotation}"
                 )

nucleus/dataset.py

@@ -171,9 +171,9 @@ def annotate(
         if any((isinstance(ann, CuboidAnnotation) for ann in annotations)):
             raise NotImplementedError("Cuboid annotations not yet supported")
 
-        if asynchronous:
-            check_all_annotation_paths_remote(annotations)
+        check_all_annotation_paths_remote(annotations)
 
+        if asynchronous:
             request_id = serialize_and_write_to_presigned_url(
                 annotations, self.id, self._client
             )

nucleus/model.py

@@ -32,11 +32,28 @@ def __repr__(self):
         return f"Model(model_id='{self.id}', name='{self.name}', reference_id='{self.reference_id}', metadata={self.metadata}, client={self._client})"
 
     def __eq__(self, other):
-        return self.id == other.id
+        return (
+            (self.id == other.id)
+            and (self.name == other.name)
+            and (self.metadata == other.metadata)
+            and (self._client == other._client)
+        )
 
     def __hash__(self):
         return hash(self.id)
 
+    @classmethod
+    def from_json(cls, payload: dict, client):
+        return cls(
+            model_id=payload["id"],
+            name=payload["name"],
+            reference_id=payload["ref_id"],
+            metadata=None
+            if payload["metadata"] == {}
+            else payload["metadata"],
+            client=client,
+        )
+
     def create_run(
         self,
         name: str,

tests/test_dataset.py

@@ -76,6 +76,13 @@ def dataset(CLIENT):
     assert response == {"message": "Beginning dataset deletion..."}
 
 
+def test_upload_nonsense(dataset):
+    response = dataset.append(
+        [DatasetItem(image_location="https://fake.com/image.jpeg")]
+    )
+    print(response)
+
+
 def make_dataset_items():
     ds_items_with_metadata = []
     for i, url in enumerate(TEST_IMG_URLS):

tests/test_models.py

@@ -64,6 +64,10 @@ def test_model_creation_and_listing(CLIENT, dataset):
     # List the models
     ms = CLIENT.list_models()
 
+    # Get a model
+    m = CLIENT.get_model(model.id)
+    assert m == model
+
     assert model in ms
     assert list(set(ms) - set(models_before))[0] == model