Merge pull request #956 from CitrineInformatics/feature/PNE-241-use-team-version-of-tb

PNE-241: Build tables in the team scope

Author: pacdaemon

src/citrine/__version__.py

@@ -1 +1 @@
-__version__ = "3.4.5"
+__version__ = "3.4.6"

src/citrine/resources/gemtables.py

@@ -224,10 +224,13 @@ def initiate_build(self, config: Union[TableConfig, str, UUID], *,
                 raise ValueError('Version must be specified when building by config uid.')
             uid = config
         logger.info(f'Submitting table build for config {uid} version {version}...')
-        path = format_escaped_url('projects/{}/ara-definitions/{}/versions/{}/build',
-                                  self.project_id,
-                                  uid,
-                                  version)
+        path = format_escaped_url(
+            "teams/{}/projects/{}/table-configs/{}/versions/{}/build",
+            self.team_id,
+            self.project_id,
+            uid,
+            version,
+        )
         response = self.session.post_resource(path=path, json={})
         submission = JobSubmissionResponse.build(response)
         logger.info(

src/citrine/resources/table_config.py

@@ -421,6 +421,10 @@ def __init__(self, *args, team_id: UUID, project_id: UUID = None, session: Sessi
         self.project_id = project_id or args[0]
         self.session: Session = session or args[1]
         self.team_id = team_id
+        if self.project_id is None:
+            raise TypeError("Missing one required argument: project_id.")
+        if self.session is None:
+            raise TypeError("Missing one required argument: session.")
 
     def get(self, uid: Union[UUID, str], *, version: Optional[int] = None):
         """Get a table config.
@@ -527,7 +531,7 @@ def default_for_material(
             else:  # Not per spec, but be forgiving
                 params['algorithm'] = str(algorithm)
         data = self.session.get_resource(
-            format_escaped_url('projects/{}/table-configs/default', self.project_id),
+            format_escaped_url('teams/{}/table-configs/default', self.team_id),
             params=params,
         )
         config = TableConfig.build(data['config'])
@@ -548,7 +552,10 @@ def preview(self, *,
             List of links to the material runs to use as terminal materials in the preview
 
         """
-        path = self._get_path(action="preview")
+        path = path = format_escaped_url(
+            "teams/{}/ara-definitions/preview",
+            self.team_id
+        )
         body = {
             "definition": table_config.dump(),
             "rows": [x.as_dict() for x in preview_materials]

tests/resources/test_table_config.py

@@ -63,6 +63,27 @@ def empty_defn() -> TableConfig:
     return TableConfig(name="empty", description="empty", datasets=[], rows=[], variables=[], columns=[])
 
 
+def test_deprecation_of_positional_arguments(session):
+    with pytest.deprecated_call():
+        TableConfigCollection(
+            UUID('6b608f78-e341-422c-8076-35adc8828545'),
+            session,
+            team_id=UUID('6b608f78-e341-422c-8076-35adc8828545'),
+        )
+
+    with pytest.raises(TypeError):
+        TableConfigCollection(
+            team_id=UUID('6b608f78-e341-422c-8076-35adc8828545'),
+            session=session
+        )
+
+    with pytest.raises(TypeError):
+        TableConfigCollection(
+            team_id=UUID('6b608f78-e341-422c-8076-35adc8828545'),
+            project_id=UUID('6b608f78-e341-422c-8076-35adc8828545')
+        )
+
+
 def test_get_table_config(collection, session):
     """Get table config, with or without version"""
 
@@ -221,7 +242,7 @@ def test_preview(collection, session):
     assert 1 == session.num_calls
     expect_call = FakeCall(
         method="POST",
-        path=f"projects/{collection.project_id}/ara-definitions/preview",
+        path=f"teams/{collection.team_id}/ara-definitions/preview",
         json={"definition": empty_defn().dump(), "rows": []}
     )
     assert session.last_call == expect_call
@@ -257,7 +278,7 @@ def test_default_for_material(collection: TableConfigCollection, session):
     assert 1 == session.num_calls
     assert session.last_call == FakeCall(
         method="GET",
-        path=f"projects/{collection.project_id}/table-configs/default",
+        path=f"teams/{collection.team_id}/table-configs/default",
         params={
             'id': 'my_id',
             'scope': CITRINE_SCOPE,
@@ -279,7 +300,7 @@ def test_default_for_material(collection: TableConfigCollection, session):
     assert 1 == session.num_calls
     assert session.last_call == FakeCall(
         method="GET",
-        path=f"projects/{collection.project_id}/table-configs/default",
+        path=f"teams/{collection.team_id}/table-configs/default",
         params={
             'id': 'id',
             'scope': 'scope',