better structure

Author: manibox

labelbox/client.py

@@ -906,27 +906,3 @@ def create_feature_schema(self, normalized):
         # But the features are the same so we just grab the feature schema id
         res['id'] = res['normalized']['featureSchemaId']
         return Entity.FeatureSchema(self, res)
-
-    def create_resource_tag(self, tag=None):
-        """
-        Creates a resource tag.
-            >>> tag = {'text': 'tag-1',  'color': 'ffffff'}
-
-        Args:
-            tag (dict): A resource tag {'text': 'tag-1', 'color': 'fffff'}
-        Returns:
-            The created resource tag.
-        """
-        tag_text_param = "text"
-        tag_color_param = "color"
-
-        query_str = """mutation CreateResourceTagPyApi($text:String!,$color:String!) {
-                createResourceTag(input:{text:$%s,color:$%s}) {id,text,color}}
-        """ % (tag_text_param, tag_color_param)
-
-        params = {
-            tag_text_param: tag.get("text", ""),
-            tag_color_param: tag.get("color", "")
-        }
-        res = self.execute(query_str, params)
-        return Entity.ResourceTag(self, res['createResourceTag'])

labelbox/schema/organization.py

@@ -6,6 +6,7 @@
 from labelbox.orm.db_object import DbObject, query, Entity
 from labelbox.orm.model import Field, Relationship
 from labelbox.schema.invite import InviteLimit
+from labelbox.schema.resource_tag import ResourceTag
 
 if TYPE_CHECKING:
     from labelbox import Role, User, ProjectRole, Invite, InviteLimit, IAMIntegration
@@ -43,6 +44,7 @@ def __init__(self, *args, **kwargs):
     users = Relationship.ToMany("User", False)
     projects = Relationship.ToMany("Project", True)
     webhooks = Relationship.ToMany("Webhook", False)
+    resourceTags = Relationship.ToMany("ResourceTag", False)
 
     def invite_user(
             self,
@@ -127,13 +129,42 @@ 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 get_resource_tags(self) -> List["ResourceTag"]:
+    def create_resource_tag(self, tag=None) -> ResourceTag:
+        """
+        Creates a resource tag.
+            >>> tag = {'text': 'tag-1',  'color': 'ffffff'}
+
+        Args:
+            tag (dict): A resource tag {'text': 'tag-1', 'color': 'fffff'}
+        Returns:
+            The created resource tag.
+        """
+        tag_text_param = "text"
+        tag_color_param = "color"
+
+        query_str = """mutation CreateResourceTagPyApi($text:String!,$color:String!) {
+                createResourceTag(input:{text:$%s,color:$%s}) {%s}}
+        """ % (tag_text_param, tag_color_param,
+               query.results_query_part(ResourceTag))
+
+        params = {
+            tag_text_param: tag.get("text", ""),
+            tag_color_param: tag.get("color", "")
+        }
+        res = self.client.execute(query_str, params)
+        return ResourceTag(self.client, res['createResourceTag'])
+
+    def get_resource_tags(self) -> List[ResourceTag]:
         """
         Returns all resource tags for an organization
         """
-        res = self.client.execute("""query GetOrganizationResourceTagsPyApi{organization{resourceTag{id,text,color}}}""")
+        query_str = """query GetOrganizationResourceTagsPyApi{organization{resourceTag{%s}}}""" % (
+            query.results_query_part(ResourceTag))
 
-        return res['organization']['resourceTag']
+        return [
+            ResourceTag(self.client, resourceTag)
+            for resourceTag in res['createResourceTag']
+        ]
 
     def get_iam_integrations(self) -> List["IAMIntegration"]:
         """

labelbox/schema/project.py

@@ -18,6 +18,7 @@
 from labelbox.orm.db_object import DbObject, Updateable, Deletable
 from labelbox.orm.model import Entity, Field, Relationship
 from labelbox.pagination import PaginatedCollection
+from labelbox.schema.resource_tag import ResourceTag
 
 if TYPE_CHECKING:
     from labelbox import BulkImportRequest
@@ -121,7 +122,8 @@ def members(self) -> PaginatedCollection:
                                    {id_param: str(self.uid)},
                                    ["project", "members"], ProjectMember)
 
-    def create_project_resource_tags(self, resource_tag_ids: List[str]) -> List[str]:
+    def update_project_resource_tags(
+            self, resource_tag_ids: List[str]) -> List[ResourceTag]:
         """ Creates project resource tags
 
         Args:
@@ -132,20 +134,15 @@ def create_project_resource_tags(self, resource_tag_ids: List[str]) -> List[str]
         project_id_param = "projectId"
         tag_ids_param = "resourceTagIds"
 
-        query_str = """mutation AttatchProjectResourceTagsPyApi($%s:ID!,$%s:[String!]) {
-            project(where:{id:$%s}){updateProjectResourceTags(input:{%s:$%s}){id}}}""" % (
-            project_id_param,
-            tag_ids_param,
-            project_id_param,
-            tag_ids_param,
-            tag_ids_param
-        )
-
-        res = self.client.execute(
-            query_str, {
-                project_id_param: self.uid,
-                tag_ids_param: resource_tag_ids
-            })
+        query_str = """mutation CreateProjectResourceTagsPyApi($%s:ID!,$%s:[String!]) {
+            project(where:{id:$%s}){updateProjectResourceTags(input:{%s:$%s}){%s}}}""" % (
+            project_id_param, tag_ids_param, project_id_param, tag_ids_param,
+            tag_ids_param, query.results_query_part(ResourceTag))
+
+        res = self.client.execute(query_str, {
+            project_id_param: self.uid,
+            tag_ids_param: resource_tag_ids
+        })
 
         return res["project"]["updateProjectResourceTags"]
 

labelbox/schema/project_resource_tag.py

@@ -1,6 +1,7 @@
 from labelbox.orm.db_object import DbObject, Updateable
 from labelbox.orm.model import Field, Relationship
 
+
 class ProjectResourceTag(DbObject, Updateable):
     """ Project resource tag to associate ProjectResourceTag to Project.
 

labelbox/schema/resource_tag.py

@@ -1,6 +1,7 @@
 from labelbox.orm.db_object import DbObject, Updateable
 from labelbox.orm.model import Field, Relationship
 
+
 class ResourceTag(DbObject, Updateable):
     """ Resource tag to label and identify your labelbox resources easier.
 

tests/integration/test_project.py

@@ -42,11 +42,19 @@ def test_project(client, rand_gen):
     assert project not in final
     assert set(final) == set(before)
 
-def test_create_project_resource_tags(client, rand_gen):
+
+def test_update_project_resource_tags(client, rand_gen):
     before = list(client.get_projects())
     for o in before:
         assert isinstance(o, Project)
 
+    org = client.get_organization()
+    assert org.uid is not None
+
+    project_name = rand_gen(str)
+    p1 = client.create_project(name=project_name)
+    assert p1.uid is not None
+
     colorA = "#ffffff"
     textA = rand_gen(str)
     tag = {"text": textA, "color": colorA}
@@ -55,35 +63,31 @@ def test_create_project_resource_tags(client, rand_gen):
     textB = rand_gen(str)
     tagB = {"text": textB, "color": colorB}
 
-    project_name = rand_gen(str)
-
-    tagA = client.create_resource_tag(tag)
+    tagA = client.get_organization().create_resource_tag(tag)
     assert tagA.text == textA
     assert '#' + tagA.color == colorA
     assert tagA.uid is not None
 
-    org = client.get_organization()
     tags = org.get_resource_tags()
     lenA = len(tags)
     assert lenA > 0
 
-    tagB = client.create_resource_tag(tagB)
+    tagB = client.get_organization().create_resource_tag(tagB)
     assert tagB.text == textB
     assert '#' + tagB.color == colorB
     assert tagB.uid is not None
 
-    tags = org.get_resource_tags()
+    tags = client.get_organization().get_resource_tags()
     lenB = len(tags)
     assert lenB > 0
     assert lenB > lenA
 
-    p1 = client.create_project(name=project_name)
-    assert p1.uid is not None
-
-    project_resource_tag = p1.create_project_resource_tags([tagA.uid])
+    project_resource_tag = client.get_project(
+        p1.uid).update_project_resource_tags([str(tagA.uid)])
     assert len(project_resource_tag) == 1
     assert project_resource_tag[0].get("id") == tagA.uid
 
+
 def test_project_filtering(client, rand_gen):
     name_1 = rand_gen(str)
     name_2 = rand_gen(str)