Fixed tests made improvements

Author: Gabefire

libs/labelbox/src/labelbox/schema/member.py

@@ -4,7 +4,7 @@
     ResourceNotFoundError,
     UnprocessableEntityError,
 )
-from typing import Set, Iterator, Any
+from typing import Set, Iterator, Any, List
 from pydantic import (
     Field,
     field_validator,
@@ -25,7 +25,7 @@ class ProjectMembership(_CamelCaseMixin):
     """
 
     project_id: str
-    role: Optional[Role] = None
+    role: Optional[Role] = Field(default=None)
 
     def __hash__(self) -> int:
         return self.project_id.__hash__()
@@ -34,7 +34,7 @@ def __hash__(self) -> int:
     def serialize_model(self):
         return {
             "projectId": self.project_id,
-            "roleId": None if self.role is None else self.role.id,
+            "roleId": None if self.role is None else self.role.uid,
         }
 
 
@@ -214,6 +214,7 @@ def update(self) -> "Member":
         Raises:
             ResourceNotFoundError: If the update fails due to unknown member
             UnprocessableEntityError: If the update fails due to a malformed input
+            ValueError: If the member id is current member id.
         """
         query = """
             mutation SetUserAccessPyApi($id: ID!, $roleId: ID!, $canAccessAllProjects: Boolean!, $groupIds: [String!], $projectMemberships: [ProjectMembershipsInput!]) {
@@ -230,13 +231,16 @@ def update(self) -> "Member":
             "id": self.id,
             "roleId": self.default_role.uid if self.default_role else None,
             "canAccessAllProjects": self.can_access_all_projects,
-            "groupIds": self.user_group_ids,
+            "groupIds": list(self.user_group_ids),
             "projectMemberships": [
                 project_membership.model_dump()
                 for project_membership in self.project_memberships
             ],
         }
 
+        if self.id == self._current_user_id:
+            raise ValueError("Unable to update self")
+
         try:
             result = self.client.execute(query, params, experimental=True)
             if not result:
@@ -282,7 +286,7 @@ def delete(self) -> bool:
             raise ResourceNotFoundError(
                 message="Failed to delete member as member does not exist"
             )
-        return result["data"]["updateUser"]["deleted"]
+        return result["updateUser"]["deleted"]
 
     def _get_project_memberships(self, user_id: str) -> Set[ProjectMembership]:
         """
@@ -331,8 +335,8 @@ def _get_project_memberships(self, user_id: str) -> Set[ProjectMembership]:
     def get_members(
         self,
         search: str = "",
-        roles: Optional[list[Role]] = None,
-        group_ids: Optional[list[str]] = None,
+        roles: Optional[List[Role]] = None,
+        group_ids: Optional[List[str]] = None,
     ) -> Iterator["Member"]:
         """
         Gets all members in Labelbox.

libs/labelbox/tests/integration/schema/test_members.py

@@ -1,9 +1,6 @@
-from uuid import uuid4
-
 import faker
 from labelbox.schema.member import Member, ProjectMembership
 import pytest
-
 from labelbox.exceptions import (
     ResourceNotFoundError,
 )
@@ -18,8 +15,8 @@ def current_member(client):
 
 
 @pytest.fixture
-def member(client, current_member):
-    members = list(Member(client).get_members())
+def test_member(client, current_member):
+    members = list(Member(client=client).get_members())
     test_member = None
     for member in members:
         if member.id != current_member.id:
@@ -30,7 +27,7 @@ def member(client, current_member):
 @pytest.fixture
 def user_group(client):
     group_name = data.name()
-    user_group = UserGroup(client)
+    user_group = UserGroup(client=client)
     user_group.name = group_name
     user_group.color = UserGroupColor.BLUE
 
@@ -40,18 +37,11 @@ def user_group(client):
 
 
 def test_get_member(current_member, client):
-    current_member_eq = Member(client)
-    current_member_eq.get()
+    current_member_eq = Member(client=client).get()
     assert current_member_eq.id == current_member.id
     assert current_member_eq.email == current_member.email
 
 
-def test_throw_error_cannot_get_user_group_with_invalid_id(client):
-    Member = UserGroup(Member=client, id=str(uuid4()))
-    with pytest.raises(ResourceNotFoundError):
-        Member.get()
-
-
 def test_throw_error_when_deleting_self(current_member, client):
     with pytest.raises(ValueError):
         current_member.delete()
@@ -93,15 +83,17 @@ def test_update_member(client, test_member, project_pack, user_group):
 
 
 def test_get_members(test_member, current_member, client):
-    members = list(Member(client).get_members(search=current_member.email))
-    assert current_member in members
     members = list(
-        Member(client).get_members(roles=[current_member.default_role])
+        Member(client=client).get_members(search=current_member.email)
     )
     assert current_member in members
-    members = list(Member(client).get_members())
-    assert test_member in members
+    members = list(
+        Member(client=client).get_members(roles=[current_member.default_role])
+    )
     assert current_member in members
+    member_ids = [member.id for member in Member(client=client).get_members()]
+    assert test_member.id in member_ids
+    assert current_member.id in member_ids
 
 
 if __name__ == "__main__":