Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion coderdata/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion coderdata/dataset/__init__.py
Original file line number Diff line number Diff line change
@@ -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
8 changes: 5 additions & 3 deletions coderdata/dataset/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion coderdata/split/__init__.py

This file was deleted.

Loading