Merge pull request #1899 from materialsproject/fix-init-columns

Fix init columns

Author: tschaume

mpcontribs-client/mpcontribs/client/__init__.py

@@ -115,6 +115,7 @@
 ureg.define("atom = 1")
 ureg.define("bohr_magneton = e * hbar / (2 * m_e) = µᵇ = µ_B = mu_B")
 ureg.define("electron_mass = 9.1093837015e-31 kg = mₑ = m_e")
+ureg.define("sccm = cm³/min")
 
 LOG_LEVEL = os.environ.get("MPCONTRIBS_CLIENT_LOG_LEVEL", "INFO")
 log_level = getattr(logging, LOG_LEVEL.upper())
@@ -1402,7 +1403,7 @@ def get_attachment(self, aid_or_md5: str) -> Type[Attachment]:
             self.attachments.getAttachmentById(pk=aid, _fields=["_all"]).result()
         )
 
-    def init_columns(self, columns: dict = None) -> dict:
+    def init_columns(self, columns: dict = None, name: str = None) -> dict:
         """initialize columns for a project to set their order and desired units
 
         The `columns` field of a project tracks the minima and maxima of each `data` field
@@ -1435,8 +1436,11 @@ def init_columns(self, columns: dict = None) -> dict:
         Args:
             columns (dict): dictionary mapping data column to its unit
         """
-        if not self.project:
-            raise MPContribsClientError("initialize client with project argument!")
+        name = self.project or name
+        if not name:
+            raise MPContribsClientError(
+                "initialize client with project or set `name` argument!"
+            )
 
         columns = flatten(columns or {}, reducer="dot")
 
@@ -1497,9 +1501,7 @@ def init_columns(self, columns: dict = None) -> dict:
 
             # TODO catch unsupported column renaming or implement solution
             # reconcile with existing columns
-            resp = self.projects.getProjectByName(
-                pk=self.project, _fields=["columns"]
-            ).result()
+            resp = self.projects.getProjectByName(pk=name, _fields=["columns"]).result()
             existing_columns = {}
 
             for col in resp["columns"]:
@@ -1556,9 +1558,7 @@ def init_columns(self, columns: dict = None) -> dict:
         if not valid:
             raise MPContribsClientError(error)
 
-        return self.projects.updateProjectByName(
-            pk=self.project, project=payload
-        ).result()
+        return self.projects.updateProjectByName(pk=name, project=payload).result()
 
     def delete_contributions(self, query: dict = None, timeout: int = -1):
         """Remove all contributions for a query