Address some more PR comments.

Mostly formatting things (and one time bomb of a bug).

Author: anoto-moniz

src/citrine/resources/material_run.py

@@ -139,11 +139,13 @@ def get_history(self, id: Union[str, UUID, LinkByUID, MaterialRun]) -> MaterialR
             ]
         }
         data = self.session.post_resource(path, json=query)
-        if data and data[0]["roots"]:
+        if data and data[0].get("roots"):
             # Since the above query presents a single dataset to the endpoint, the response will be
             # a list of length one, with a single route.
+            # Note that "object" is used to match gemd-python expectations, although that library
+            # can handle different names.
             history_data = data[0]
-            history_data["roots"] = history_data["roots"][0]
+            history_data["object"] = history_data.pop("roots")[0]
             return MaterialRun.build(history_data)
         else:
             return None

src/citrine/resources/project.py

@@ -117,9 +117,8 @@ def team_id(self, value: Optional[UUID]):
     @classmethod
     def get_team_id_from_project_id(cls, session: Session, project_id: UUID):
         """Returns the UUID of the Team that owns the project with the provided project_id."""
-        return session.get_resource(
-            path=f'projects/{project_id}',
-            version="v3")['project']['team']['id']
+        response = session.get_resource(path=f'projects/{project_id}', version="v3")
+        return response['project']['team']['id']
 
     @property
     def branches(self) -> BranchCollection:
@@ -318,12 +317,10 @@ def ingredient_specs(self) -> IngredientSpecCollection:
                 details="Please use 'Team.gemd' instead.'")
     def gemd(self) -> GEMDResourceCollection:
         """Return a resource representing all GEMD objects/templates in this dataset."""
-        return GEMDResourceCollection(
-            project_id=self.uid,
-            dataset_id=None,
-            session=self.session,
-            team_id=self.team_id
-        )
+        return GEMDResourceCollection(project_id=self.uid,
+                                      dataset_id=None,
+                                      session=self.session,
+                                      team_id=self.team_id)
 
     @property
     def table_configs(self) -> TableConfigCollection:
@@ -360,7 +357,8 @@ def publish(self, *, resource: Resource):
         else:
             self.session.checked_post(
                 f"{self._path()}/published-resources/{resource_type}/batch-publish",
-                version='v3', json={'ids': [resource_access["id"]]})
+                version='v3',
+                json={'ids': [resource_access["id"]]})
         return True
 
     def un_publish(self, *, resource: Resource):
@@ -387,7 +385,8 @@ def un_publish(self, *, resource: Resource):
         else:
             self.session.checked_post(
                 f"{self._path()}/published-resources/{resource_type}/batch-un-publish",
-                version='v3', json={'ids': [resource_access["id"]]})
+                version='v3',
+                json={'ids': [resource_access["id"]]})
         return True
 
     def pull_in_resource(self, *, resource: Resource):
@@ -415,7 +414,8 @@ def pull_in_resource(self, *, resource: Resource):
             base_url = f'/teams/{self.team_id}{self._path()}'
             self.session.checked_post(
                 f'{base_url}/outside-resources/{resource_type}/batch-pull-in',
-                version='v3', json={'ids': [resource_access["id"]]})
+                version='v3',
+                json={'ids': [resource_access["id"]]})
         return True
 
     def owned_dataset_ids(self) -> List[str]:
@@ -434,9 +434,10 @@ def owned_dataset_ids(self) -> List[str]:
             DeprecationWarning
         )
         query_params = {"userId": "", "domain": self._path(), "action": "WRITE"}
-        return self.session.get_resource("/DATASET/authorized-ids",
-                                         params=query_params,
-                                         version="v3")['ids']
+        response = self.session.get_resource("/DATASET/authorized-ids",
+                                             params=query_params,
+                                             version="v3")
+        return response['ids']
 
     def list_members(self) -> Union[List[ProjectMember], List["TeamMember"]]:  # noqa: F821
         """
@@ -449,6 +450,7 @@ def list_members(self) -> Union[List[ProjectMember], List["TeamMember"]]:  # noq
             containing the project if teams have been released.
 
         """
+        # Preventing a cyclical import.
         from citrine.resources.team import TeamCollection
 
         team_collection = TeamCollection(self.session)
@@ -457,13 +459,11 @@ def list_members(self) -> Union[List[ProjectMember], List["TeamMember"]]:  # noq
 
     @deprecated(deprecated_in="3.4.0", removed_in="4.0.0",
                 details="Please use 'Team.gemd_batch_delete' instead.'")
-    def gemd_batch_delete(
-            self,
-            id_list: List[Union[LinkByUID, UUID, str, BaseEntity]],
-            *,
-            timeout: float = 2 * 60,
-            polling_delay: float = 1.0
-    ) -> List[Tuple[LinkByUID, ApiError]]:
+    def gemd_batch_delete(self,
+                          id_list: List[Union[LinkByUID, UUID, str, BaseEntity]],
+                          *,
+                          timeout: float = 2 * 60,
+                          polling_delay: float = 1.0) -> List[Tuple[LinkByUID, ApiError]]:
         """
         Remove a set of GEMD objects.
 
@@ -550,7 +550,7 @@ def build(self, data) -> Project:
             project.team_id = self.team_id
         return project
 
-    def register(self, name: str, *, description: Optional[str] = None):
+    def register(self, name: str, *, description: Optional[str] = None) -> Project:
         """
         Create and upload new project.
 
@@ -659,7 +659,9 @@ def search_all(self, search_params: Optional[Dict]) -> Iterable[Dict]:
 
         return collections
 
-    def search(self, *, search_params: Optional[dict] = None,
+    def search(self,
+               *,
+               search_params: Optional[dict] = None,
                per_page: int = 1000) -> Iterable[Project]:
         """
         Search for projects matching the desired name or description.

src/citrine/resources/team.py

@@ -186,8 +186,8 @@ def list_members(self) -> List[TeamMember]:
             The members of the current team
 
         """
-        members = self.session.get_resource(self._path() + "/users",
-                                            version=self._api_version)["users"]
+        response = self.session.get_resource(self._path() + "/users", version=self._api_version)
+        members = response["users"]
         return [TeamMember(user=User.build(m), team=self, actions=m["actions"]) for m in members]
 
     def get_member(self, user_id: Union[str, UUID, User]) -> TeamMember:
@@ -387,9 +387,10 @@ def owned_dataset_ids(self) -> List[str]:
 
         """
         query_params = {"userId": "", "domain": self._path(), "action": "WRITE"}
-        return self.session.get_resource("/DATASET/authorized-ids",
-                                         params=query_params,
-                                         version="v3")['ids']
+        response = self.session.get_resource("/DATASET/authorized-ids",
+                                             params=query_params,
+                                             version="v3")
+        return response['ids']
 
     @property
     def projects(self) -> ProjectCollection:
@@ -457,10 +458,9 @@ def material_templates(self) -> MaterialTemplateCollection:
     @property
     def measurement_templates(self) -> MeasurementTemplateCollection:
         """Return a resource representing all measurement templates in this dataset."""
-        return MeasurementTemplateCollection(
-            team_id=self.uid,
-            dataset_id=None,
-            session=self.session)
+        return MeasurementTemplateCollection(team_id=self.uid,
+                                             dataset_id=None,
+                                             session=self.session)
 
     @property
     def process_templates(self) -> ProcessTemplateCollection:
@@ -512,13 +512,11 @@ def gemd(self) -> GEMDResourceCollection:
         """Return a resource representing all GEMD objects/templates in this dataset."""
         return GEMDResourceCollection(team_id=self.uid, dataset_id=None, session=self.session)
 
-    def gemd_batch_delete(
-            self,
-            id_list: List[Union[LinkByUID, UUID, str, BaseEntity]],
-            *,
-            timeout: float = 2 * 60,
-            polling_delay: float = 1.0
-    ) -> List[Tuple[LinkByUID, ApiError]]:
+    def gemd_batch_delete(self,
+                          id_list: List[Union[LinkByUID, UUID, str, BaseEntity]],
+                          *,
+                          timeout: float = 2 * 60,
+                          polling_delay: float = 1.0) -> List[Tuple[LinkByUID, ApiError]]:
         """
         Remove a set of GEMD objects.