Merge pull request #269 from PNNL-CompBio/246-update-python-functions-to-adhere-to-simpler-standards-and-pre-format-data

246 update python functions to adhere to simpler standards and pre format data

Author: sgosline

coderdata/__init__.py

@@ -1,3 +1,20 @@
-from .download.downloader import download_data_by_prefix
-from .load.loader import DatasetLoader, join_datasets
+from .download.downloader import download
 from .split.splitter import train_test_validate
+from .dataset.dataset import (
+    Dataset,
+    load,
+)
+
+# '_version.py' will be generated by hatchling once the switch away from
+# setuptools.py is finished
+try:
+    from ._version import __version__
+except ImportError:
+    __version__ = '0.1.40'
+try:
+    from ._version import __version_tuple__
+except ImportError:
+    __version_tuple__ = (0, 1, 40)
+
+from .utils.utils import version
+from .utils.utils import list_datasets

coderdata/cli.py

@@ -1,5 +1,5 @@
 import argparse
-from .download.downloader import download_data_by_prefix
+from .download.downloader import download
 
 def main():
     parser = argparse.ArgumentParser(prog='coderdata')
@@ -9,7 +9,7 @@ def main():
     parser_download = subparsers.add_parser('download', help='Download datasets')
     parser_download.add_argument('--prefix', type=str, default=None,
                                  help='Prefix of the dataset to download (e.g., "hcmi"), "all", or leave empty for all files.')
-    parser_download.set_defaults(func=download_data_by_prefix)
+    parser_download.set_defaults(func=download)
 
     args = parser.parse_args()
     if hasattr(args, 'func'):

coderdata/dataset/__init__.py

@@ -0,0 +1,2 @@
+from .dataset import Dataset
+from .dataset import load