[IO-1046][IO-1035] Team method upates and lazy loading

darwin/future/data_objects/team.py

@@ -1,7 +1,11 @@
-from typing import List, Optional
+from __future__ import annotations
+
+from typing import List, Optional, Tuple
 
 from pydantic import validator
 
+# from darwin.future.core.backend import get_team
+from darwin.future.core.client import Client
 from darwin.future.data_objects.dataset import DatasetList
 from darwin.future.data_objects.team_member_role import TeamMemberRole
 from darwin.future.data_objects.validators import parse_name
@@ -51,5 +55,32 @@ class Team(DefaultDarwin):
     # Data Validation
     _slug_validator = validator("slug", allow_reuse=True)(parse_name)
 
+    @staticmethod
+    def from_client(client: Client, team_slug: Optional[str] = None) -> Team:
+        """Returns the team with the given slug"""
+        if not team_slug:
+            team_slug = client.config.default_team
+        return get_team(client, team_slug)
+
 
 TeamList = List[Team]
+
+
+def get_team(client: Client, team_slug: Optional[str] = None) -> Team:
+    """Returns the team with the given slug"""
+    if not team_slug:
+        team_slug = client.config.default_team
+    response = client.get(f"/teams/{team_slug}/")
+    return Team.parse_obj(response)
+
+
+def get_team_members(client: Client) -> Tuple[List[TeamMember], List[Exception]]:
+    response = client.get(f"/memberships")
+    members = []
+    errors = []
+    for item in response:
+        try:
+            members.append(TeamMember.parse_obj(item))
+        except Exception as e:
+            errors.append(e)
+    return (members, errors)

darwin/future/meta/queries/team_member.py

@@ -2,10 +2,9 @@
 
 from typing import Any, Dict, List
 
-from darwin.future.core.backend import get_team_members
 from darwin.future.core.client import Client
 from darwin.future.core.types.query import Query, QueryFilter
-from darwin.future.data_objects.team import TeamMember
+from darwin.future.data_objects.team import TeamMember, get_team_members
 
 Param = Dict[str, Any]  # type: ignore
 

darwin/future/tests/core/fixtures.py

@@ -3,7 +3,8 @@
 import pytest
 
 from darwin.future.core.client import Client, DarwinConfig
-from darwin.future.data_objects.team import Team, TeamMember, TeamMemberRole
+from darwin.future.data_objects.team import Team, TeamMember
+from darwin.future.data_objects.team_member_role import TeamMemberRole
 
 
 @pytest.fixture

darwin/future/tests/data_objects/fixtures.py

@@ -0,0 +1,30 @@
+import pytest
+
+
+@pytest.fixture
+def basic_team() -> dict:
+    return {"slug": "test-team", "id": 0}
+
+
+@pytest.fixture
+def basic_dataset() -> dict:
+    return {"name": "test-dataset", "slug": "test-dataset"}
+
+
+@pytest.fixture
+def basic_release() -> dict:
+    return {"name": "test-release"}
+
+
+@pytest.fixture
+def basic_combined(basic_team: dict, basic_dataset: dict, basic_release: dict) -> dict:
+    combined = basic_team
+    combined["datasets"] = [basic_dataset]
+    combined["datasets"][0]["releases"] = [basic_release]
+    return combined
+
+
+@pytest.fixture
+def broken_combined(basic_combined: dict) -> dict:
+    del basic_combined["datasets"][0]["name"]
+    return basic_combined

darwin/future/tests/data_objects/test_darwin_meta.py → darwin/future/tests/data_objects/test_general_darwin_objects.py

@@ -6,35 +6,7 @@
 from darwin.future.data_objects.dataset import Dataset
 from darwin.future.data_objects.release import Release
 from darwin.future.data_objects.team import Team
-
-
-@pytest.fixture
-def basic_team() -> dict:
-    return {"slug": "test-team", "id": 0}
-
-
-@pytest.fixture
-def basic_dataset() -> dict:
-    return {"name": "test-dataset", "slug": "test-dataset"}
-
-
-@pytest.fixture
-def basic_release() -> dict:
-    return {"name": "test-release"}
-
-
-@pytest.fixture
-def basic_combined(basic_team: dict, basic_dataset: dict, basic_release: dict) -> dict:
-    combined = basic_team
-    combined["datasets"] = [basic_dataset]
-    combined["datasets"][0]["releases"] = [basic_release]
-    return combined
-
-
-@pytest.fixture
-def broken_combined(basic_combined: dict) -> dict:
-    del basic_combined["datasets"][0]["name"]
-    return basic_combined
+from darwin.future.tests.data_objects.fixtures import *
 
 
 def test_integrated_parsing_works_with_raw(basic_combined: dict) -> None:

darwin/future/tests/core/test_backend.py → darwin/future/tests/data_objects/test_team.py

@@ -4,9 +4,8 @@
 import responses
 from pydantic import ValidationError
 
-from darwin.future.core import backend as be
 from darwin.future.core.client import Client
-from darwin.future.data_objects.team import Team, TeamMember
+from darwin.future.data_objects.team import Team, TeamMember, get_team, get_team_members
 from darwin.future.tests.core.fixtures import *
 from darwin.future.tests.fixtures import *
 
@@ -17,7 +16,7 @@ def test_get_team_returns_valid_team(base_client: Client, base_team_json: dict,
     with responses.RequestsMock() as rsps:
         rsps.add(responses.GET, endpoint, json=base_team_json)
 
-        team = be.get_team(base_client, slug)
+        team = get_team(base_client, slug)
         assert team == base_team
 
 
@@ -28,7 +27,7 @@ def test_get_team_fails_on_incorrect_input(base_client: Client, base_team: Team)
         rsps.add(responses.GET, endpoint, json={})
 
         with pytest.raises(ValidationError):
-            team = be.get_team(base_client, slug)
+            team = get_team(base_client, slug)
 
 
 def test_get_team_members_returns_valid_list(base_client: Client, base_team_member_json: dict) -> None:
@@ -37,7 +36,7 @@ def test_get_team_members_returns_valid_list(base_client: Client, base_team_memb
     with responses.RequestsMock() as rsps:
         rsps.add(responses.GET, endpoint, json=[base_team_member_json, base_team_member_json])
 
-        members, errors = be.get_team_members(base_client)
+        members, errors = get_team_members(base_client)
         assert len(members) == 2
         assert len(errors) == 0
         assert members == synthetic_list
@@ -48,8 +47,20 @@ def test_get_team_members_fails_on_incorrect_input(base_client: Client, base_tea
     with responses.RequestsMock() as rsps:
         rsps.add(responses.GET, endpoint, json=[base_team_member_json, {}])
 
-        members, errors = be.get_team_members(base_client)
+        members, errors = get_team_members(base_client)
         assert len(members) == 1
         assert len(errors) == 1
         assert isinstance(errors[0], ValidationError)
         assert isinstance(members[0], TeamMember)
+
+
+def test_team_from_client(base_client: Client, base_team_json: dict, base_team: Team) -> None:
+    with responses.RequestsMock() as rsps:
+        rsps.add(
+            responses.GET,
+            base_client.config.api_endpoint + f"teams/{base_client.config.default_team}",
+            json=base_team_json,
+        )
+
+        team = Team.from_client(base_client)
+        assert team == base_team