update imports

Author: Matt Sokoloff

labelbox/__init__.py

@@ -16,3 +16,5 @@
 from labelbox.schema.webhook import Webhook
 from labelbox.schema.prediction import Prediction, PredictionModel
 from labelbox.schema.ontology import Ontology
+from labelbox.schema.role import Role, ProjectRole
+from labelbox.schema.invite import Invite, InviteLimit, UserLimit

labelbox/client.py

@@ -1,6 +1,5 @@
 from datetime import datetime, timezone
 import json
-from labelbox.schema.role import Role, Roles
 import logging
 import mimetypes
 import os
@@ -20,6 +19,7 @@
 from labelbox.schema.user import User
 from labelbox.schema.organization import Organization
 from labelbox.schema.labeling_frontend import LabelingFrontend
+from labelbox.schema.role import Roles
 from labelbox import __version__ as SDK_VERSION
 
 logger = logging.getLogger(__name__)

labelbox/schema/__init__.py

@@ -13,3 +13,5 @@
 import labelbox.schema.webhook
 import labelbox.schema.prediction
 import labelbox.schema.ontology
+import labelbox.schema.invite
+import labelbox.schema.role

labelbox/schema/organization.py

@@ -1,14 +1,13 @@
 from typing import Any, Dict, List
 
-from labelbox.schema.invite import Invite, InviteLimit, UserLimit
-from labelbox.schema.role import Role
 from labelbox.exceptions import LabelboxError
 from labelbox import utils
 from labelbox.pagination import PaginatedCollection
 from labelbox.orm.db_object import DbObject
 from labelbox.orm.model import Field, Relationship
+from labelbox.schema.invite import Invite, InviteLimit, UserLimit, ProjectRole
 from labelbox.schema.user import User
-from labelbox.schema.role import Role, ProjectRole
+from labelbox.schema.role import Role
 
 
 class Organization(DbObject):
@@ -76,18 +75,19 @@ def _assign_user_role(self, email: str, role: Role,
         query_str = """mutation createInvitesPyApi($data: [CreateInviteInput!]){
                     createInvites(data: $data){  invite { id createdAt organizationRoleName inviteeEmail}}}"""
 
-        project_roles = [{
+        projects = [{
             "projectId": x.project.uid,
             "projectRoleId": x.role.uid
         } for x in project_roles]
+
         res = self.client.execute(
             query_str, {
                 'data': [{
                     "inviterId": self.client.get_user().uid,
                     "inviteeEmail": email,
                     "organizationId": self.uid,
                     "organizationRoleId": role.uid,
-                    "projects": project_roles
+                    "projects": projects
                 }]
             },
             experimental=True)  # We prob want to return an invite

labelbox/schema/project.py

@@ -8,10 +8,10 @@
 from urllib.parse import urlparse
 
 from labelbox import utils
-from labelbox.orm import query
-from labelbox.schema.bulk_import_request import BulkImportRequest
 from labelbox.schema.data_row import DataRow
 from labelbox.schema.invite import Invite
+from labelbox.orm import query
+from labelbox.schema.bulk_import_request import BulkImportRequest
 from labelbox.exceptions import InvalidQueryError
 from labelbox.orm.db_object import DbObject, Updateable, Deletable
 from labelbox.orm.model import Entity, Field, Relationship

labelbox/schema/role.py

@@ -1,8 +1,12 @@
-from pydantic import BaseModel
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
+
 from labelbox.orm.model import Field
 from labelbox.orm.db_object import DbObject
 
+if TYPE_CHECKING:
+    from labelbox.schema.project import Project
+
 
 class Roles:
     """
@@ -64,5 +68,5 @@ class UserRole(Role):
 
 @dataclass
 class ProjectRole:
-    project: "Project"
+    project: Project
     role: Role

tests/integration/test_user_management.py

@@ -1,6 +1,6 @@
 import pytest
 
-from labelbox.schema.organization import ProjectRole
+from labelbox import ProjectRole
 
 
 def test_org_invite(client, organization, environ):