Merge pull request #272 from PNNL-CompBio/271-missing-imports-bug-in-cddataset

271 missing imports bug in cddataset

Author: sgosline

coderdata/__init__.py

@@ -1,8 +1,9 @@
 from .download.downloader import download
-from .split.splitter import train_test_validate
 from .dataset.dataset import (
     Dataset,
     load,
+    format,
+    train_test_validate
 )
 
 # '_version.py' will be generated by hatchling once the switch away from

coderdata/dataset/__init__.py

@@ -1,2 +1,4 @@
 from .dataset import Dataset
-from .dataset import load
+from .dataset import load
+from .dataset import format
+from .dataset import train_test_validate

coderdata/dataset/dataset.py

@@ -602,14 +602,16 @@ def format(
             raise ValueError(
                 f"'shape' has to be one of '{legal_shapes}'"
             )
-        type = kwargs.get('type', None)
+        drug_descriptor_type = kwargs.get('drug_descriptor_type', None)
 
-        if type is None:
+        if drug_descriptor_type is None:
             tmp = data.drug_descriptors
         else:
             # TODO: potentially allow for list of columns to retain
             tmp = data.drug_descriptors[
-                data.drug_descriptors['structural_descriptor'] == type
+                data.drug_descriptors[
+                    'structural_descriptor'
+                    ] == drug_descriptor_type
                 ]
         if shape == 'long':
             ret = tmp