Merged changes from main, fixed __version__.py conflict.

Author: crleblanc

src/citrine/resources/team.py

@@ -162,6 +162,8 @@ def list_members(self) -> List[TeamMember]:
         """
         List all of the members in the current team.
 
+        Requires admin privileges.
+
         Returns
         -------
         List[TeamMember]
@@ -172,37 +174,81 @@ def list_members(self) -> List[TeamMember]:
                                             version=self._api_version)["users"]
         return [TeamMember(user=User.build(m), team=self, actions=m["actions"]) for m in members]
 
-    def remove_user(self, user_id: Union[str, UUID]) -> bool:
+    def get_member(self, user_id: Union[str, UUID, User]) -> TeamMember:
         """
-        Remove a User from a Team.
+        Get a particular member in the current team.
+
+        May require admin privileges depending on which user is being requested.
 
         Parameters
         ----------
         user_id: str or uuid
             The id of the user to remove from the team
 
+        Returns
+        -------
+        TeamMember
+            The requested team member
+
+        """
+        if isinstance(user_id, User):
+            user_id = user_id.uid
+        path = self._path() + format_escaped_url('/users/{user_id}', user_id=user_id)
+        member = self.session.get_resource(path=path, version=self._api_version)["user"]
+        return TeamMember(user=User.build(member), team=self, actions=member["actions"])
+
+    def me(self) -> TeamMember:
+        """
+        Get the member for the current user.
+
+        Returns
+        -------
+        TeamMember
+            The TeamMember object representing the current user
+
+        """
+        me = UserCollection(self.session).me()
+        return self.get_member(me)
+
+    def remove_user(self, user_id: Union[str, UUID, User]) -> bool:
+        """
+        Remove a User from a Team.
+
+        Requires admin privileges.
+
+        Parameters
+        ----------
+        user_id: User, str or uuid
+            The id of the user to remove from the team
+
         Returns
         -------
         bool
             Returns ``True`` if user successfully removed
 
         """
+        if isinstance(user_id, User):
+            user_id = user_id.uid
         self.session.checked_post(self._path() + "/users/batch-remove",
                                   json={"ids": [str(user_id)]}, version=self._api_version)
         return True  # note: only get here if checked_post doesn't raise error
 
-    def add_user(self, user_id: Union[str, UUID], *,
+    def add_user(self,
+                 user_id: Union[str, UUID, User],
+                 *,
                  actions: Optional[List[TEAM_ACTIONS]] = None) -> bool:
         """
         Add a User to a Team.
 
+        Requires admin privileges.
+
         If no actions are specified, adds User with ``READ`` action to the Team.
 
         Use the `update_user_action` method to change a User's actions.
 
         Parameters
         ----------
-        user_id: str or uuid
+        user_id: User, str or uuid
             The id of the user to add to the team
         actions: list of TEAM_ACTIONS
             The actions to give the new user in this team
@@ -215,18 +261,24 @@ def add_user(self, user_id: Union[str, UUID], *,
             Returns ``True`` if user successfully added
 
         """
+        if isinstance(user_id, User):
+            user_id = user_id.uid
         if actions is None:
             actions = [READ]
         return self.update_user_action(user_id, actions=actions)
 
-    def update_user_action(self, user_id: Union[str, UUID], *,
+    def update_user_action(self,
+                           user_id: Union[str, UUID, User],
+                           *,
                            actions: List[TEAM_ACTIONS]) -> bool:
         """
         Overwrites a User's action permissions in the Team.
 
+        Requires admin privileges.
+
         Parameters
         ----------
-        user_id: str or uuid
+        user_id: User, str or uuid
             The id of the user to add to the team
         actions: list of TEAM_ACTIONS
             The actions to give the new user in this team
@@ -238,21 +290,26 @@ def update_user_action(self, user_id: Union[str, UUID], *,
             Returns ``True`` if user successfully added
 
         """
+        if isinstance(user_id, User):
+            user_id = user_id.uid
         self.session.checked_put(self._path() + "/users", version=self._api_version,
                                  json={'id': str(user_id), "actions": actions})
         return True
 
-    def share(self, *,
+    def share(self,
+              *,
               resource: Resource,
-              target_team_id: Union[str, UUID]) -> bool:
+              target_team_id: Union[str, UUID, "Team"]) -> bool:
         """
         Share a resource with another team.
 
+        Requires SHARE action.
+
         Parameters
         ----------
         resource: Resource
             The resource owned by this team, which will be shared
-        target_team_id: Union[str, UUID]
+        target_team_id: Union[str, UUID, Team]
             The id of the team with which to share the resource
 
         Returns
@@ -261,6 +318,8 @@ def share(self, *,
             Returns ``True`` if resource successfully shared
 
         """
+        if isinstance(target_team_id, Team):
+            target_team_id = target_team_id.uid
         resource_access = resource.access_control_dict()
         payload = {
             "resource_type": resource_access["type"],
@@ -271,15 +330,17 @@ def share(self, *,
                                   version=self._api_version, json=payload)
         return True
 
-    def un_share(self, *, resource: Resource, target_team_id: Union[str, UUID]) -> bool:
+    def un_share(self, *, resource: Resource, target_team_id: Union[str, UUID, "Team"]) -> bool:
         """
         Revoke the share of a particular resource to a secondary team.
 
+        Requires SHARE action.
+
         Parameters
         ----------
         resource: Resource
             The resource owned by this team, which will be un-shared
-        target_team_id: Union[str, UUID]
+        target_team_id: Union[str, UUID, Team]
             The id of the team which should not have access to the resource
 
         Returns
@@ -288,6 +349,8 @@ def un_share(self, *, resource: Resource, target_team_id: Union[str, UUID]) -> b
             Returns ``True`` if resource successfully un-shared
 
         """
+        if isinstance(target_team_id, Team):
+            target_team_id = target_team_id.uid
         resource_type = resource.access_control_dict()["type"]
         resource_id = resource.access_control_dict()["id"]
         self.session.checked_delete(

tests/resources/test_team.py

@@ -36,6 +36,16 @@ def team(session) -> Team:
     return team
 
 
+@pytest.fixture
+def other_team(session) -> Team:
+    team = Team(
+        name='Test Team',
+        session=session
+    )
+    team.uid = uuid.uuid4()
+    return team
+
+
 @pytest.fixture
 def collection(session) -> TeamCollection:
     return TeamCollection(session)
@@ -162,13 +172,31 @@ def test_list_members(team, session):
     assert isinstance(members[0], TeamMember)
 
 
+def test_me(team, session):
+    # Given
+    user = UserDataFactory()
+    member = user.copy()
+    member["actions"] = [READ]
+    member.pop("position")
+    session.set_responses({**user}, {'user': member})
+
+    # When
+    member = team.me()
+
+    # Then
+    assert 2 == session.num_calls
+    member_call = FakeCall(method='GET', path='/teams/{}/users/{}'.format(team.uid, user["id"]))
+    assert member_call == session.last_call
+    assert isinstance(member, TeamMember)
+
+
 def test_update_user_actions(team, session):
     # Given
     user = UserDataFactory()
     session.set_response({'id': user['id'], 'actions': ['READ']})
 
     # When
-    update_user_role_response = team.update_user_action(user_id=user["id"], actions=[WRITE, SHARE])
+    update_user_role_response = team.update_user_action(user_id=User.build(user), actions=[WRITE, SHARE])
 
     # Then
     assert 1 == session.num_calls
@@ -184,7 +212,7 @@ def test_add_user(team, session):
     session.set_response({'id': user["id"], 'actions': ['READ']})
 
     # When
-    add_user_response = team.add_user(user["id"])
+    add_user_response = team.add_user(User.build(user))
 
     # Then
     assert 1 == session.num_calls
@@ -220,7 +248,7 @@ def test_remove_user(team, session):
     session.set_response({'ids': [user["id"]]})
 
     # When
-    remove_user_response = team.remove_user(user["id"])
+    remove_user_response = team.remove_user(User.build(user))
 
     # Then
     assert 1 == session.num_calls
@@ -233,14 +261,13 @@ def test_remove_user(team, session):
     assert remove_user_response is True
 
 
-def test_share(team, session):
+def test_share(team, other_team, session):
     # Given
-    target_team_id = uuid.uuid4()
     dataset = Dataset(name="foo", summary="", description="")
     dataset.uid = str(uuid.uuid4())
 
     # When
-    share_response = team.share(resource=dataset, target_team_id=target_team_id)
+    share_response = team.share(resource=dataset, target_team_id=other_team)
 
     # Then
     assert 1 == session.num_calls
@@ -250,29 +277,28 @@ def test_share(team, session):
         json={
             "resource_type": "DATASET",
             "resource_id": str(dataset.uid),
-            "target_team_id": str(target_team_id)
+            "target_team_id": str(other_team.uid)
         }
     )
     assert expect_call == session.last_call
     assert share_response is True
 
 
-def test_un_share(team, session):
+def test_un_share(team, other_team, session):
     # Given
-    target_team_id = uuid.uuid4()
     dataset = Dataset(name="foo", summary="", description="")
     dataset.uid = str(uuid.uuid4())
 
     # When
-    share_response = team.un_share(resource=dataset, target_team_id=target_team_id)
+    share_response = team.un_share(resource=dataset, target_team_id=other_team)
 
     # Then
     assert 1 == session.num_calls
     expect_call = FakeCall(
         method="DELETE",
         path="/teams/{}/shared-resources/{}/{}".format(team.uid, "DATASET", str(dataset.uid)),
         json={
-            "target_team_id": str(target_team_id)
+            "target_team_id": str(other_team.uid)
         }
     )
     assert expect_call == session.last_call

tests/resources/test_user.py

@@ -127,8 +127,6 @@ def test_delete_user(collection, session):
 def test_get_me(collection, session):
     # Given
     user = UserDataFactory()
-    user["id"] = user["id"]
-    del user["id"]
     session.set_response(user)
 
     # When