Merge branch 'develop' into jt/al-1921

Author: jtsodapop

labelbox/schema/organization.py

@@ -1,5 +1,5 @@
 import json
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, List, Optional, Dict
 
 from labelbox.exceptions import LabelboxError
 from labelbox import utils
@@ -129,7 +129,7 @@ def remove_user(self, user: "User") -> None:
             updateUser(where: {id: $%s}, data: {deleted: true}) { id deleted }
         }""" % (user_id_param, user_id_param), {user_id_param: user.uid})
 
-    def create_resource_tag(self, tag=None) -> ResourceTag:
+    def create_resource_tag(self, tag: Dict[str, str]) -> ResourceTag:
         """
         Creates a resource tag.
             >>> tag = {'text': 'tag-1',  'color': 'ffffff'}
@@ -148,9 +148,13 @@ def create_resource_tag(self, tag=None) -> ResourceTag:
                query.results_query_part(ResourceTag))
 
         params = {
-            tag_text_param: tag.get("text", ""),
-            tag_color_param: tag.get("color", "")
+            tag_text_param: tag.get("text", None),
+            tag_color_param: tag.get("color", None)
         }
+        if not all(params.values()):
+            raise ValueError(
+                f"tag must contain 'text' and 'color' keys. received: {tag}")
+
         res = self.client.execute(query_str, params)
         return ResourceTag(self.client, res['createResourceTag'])
 

tests/integration/test_batch.py

@@ -16,7 +16,6 @@ def big_dataset(dataset: Dataset):
     task.wait_till_done()
 
     yield dataset
-    dataset.delete()
 
 
 def test_create_batch(configured_project: Project, big_dataset: Dataset):

tests/integration/test_data_row_metadata.py

@@ -46,7 +46,6 @@ def big_dataset(dataset: Dataset, image_url):
     task.wait_till_done()
 
     yield dataset
-    dataset.delete()
 
 
 def make_metadata(dr_id) -> DataRowMetadata:

tests/integration/test_project.py

@@ -1,4 +1,3 @@
-import json
 import time
 import os
 
@@ -44,11 +43,19 @@ def test_project(client, rand_gen):
     assert set(final) == set(before)
 
 
-@pytest.mark.skip(
-    reason="this will fail if run multiple times, limit is defaulted to 3 per org"
-    "add this back in when either all test orgs have unlimited, or we delete all tags befoer running"
-)
 def test_update_project_resource_tags(client, rand_gen):
+
+    def delete_tag(tag_id: str):
+        """Deletes a tag given the tag uid. Currently internal use only so this is not public"""
+        res = client.execute(
+            """mutation deleteResourceTagPyApi($tag_id: String!) {
+        deleteResourceTag(input: {id: $tag_id}) {
+            id
+        }
+        }
+        """, {"tag_id": tag_id})
+        return res
+
     before = list(client.get_projects())
     for o in before:
         assert isinstance(o, Project)
@@ -92,6 +99,9 @@ def test_update_project_resource_tags(client, rand_gen):
     assert len(project_resource_tag) == 1
     assert project_resource_tag[0].uid == tagA.uid
 
+    delete_tag(tagA.uid)
+    delete_tag(tagB.uid)
+
 
 def test_project_filtering(client, rand_gen):
     name_1 = rand_gen(str)