feat: remove DatasetAttachedType

README.md

@@ -7,7 +7,6 @@ dataset and state tables used by `comet` to track metadata.
 
 The table classes provided in `chimedb.dataset` are:
 * Dataset
-* DatasetAttachedType
 * DatasetCurrentState
 * DatasetState
 * DatasetStateType

chimedb/dataset/__init__.py

@@ -1,13 +1,7 @@
 """comet (datasets and states) table definitions."""
 
-from .orm import (
-    DatasetState,
-    Dataset,
-    DatasetCurrentState,
-    DatasetStateType,
-    DatasetAttachedType,
-)
-from .get import get_dataset, get_state, get_types
+from .orm import DatasetState, Dataset, DatasetCurrentState, DatasetStateType
+from .get import get_dataset, get_state
 from .insert import insert_dataset, insert_state
 
 __version__ = "0.0.1"

chimedb/dataset/get.py

@@ -10,7 +10,7 @@
 # Imports
 # =======
 
-from .orm import Dataset, DatasetState, DatasetAttachedType
+from .orm import Dataset, DatasetState
 
 # Logging
 # =======
@@ -60,32 +60,3 @@ def get_state(id):
     except DatasetState.DoesNotExist:
         _logger.warning("Could not find state {}.".format(id))
         return None
-
-
-def get_types(dataset_id):
-    """
-    Get state types of the given dataset.
-
-    Parameters
-    ----------
-    dataset_id : int
-        ID of the dataset to find attached state types for.
-
-    Returns
-    -------
-    list of str
-        The state types attached to the dataset. Returns `None` if dataset or types not found.
-    """
-    try:
-        result = DatasetAttachedType.select().where(
-            DatasetAttachedType.dataset_id == dataset_id
-        )
-    except DatasetAttachedType.DoesNotExist:
-        _logger.warning(
-            "Could not find any types attached to dataset {}.".format(dataset_id)
-        )
-        return None
-    types = list()
-    for t in result:
-        types.append(t.type.name)
-    return types

chimedb/dataset/insert.py

@@ -13,13 +13,7 @@
 import datetime
 
 from comet.manager import TIMESTAMP_FORMAT
-from .orm import (
-    DatasetStateType,
-    DatasetCurrentState,
-    DatasetState,
-    Dataset,
-    DatasetAttachedType,
-)
+from .orm import DatasetStateType, DatasetCurrentState, DatasetState, Dataset
 
 # Logging
 # =======
@@ -88,4 +82,3 @@ def insert_dataset(entry):
 
     for state_type in entry["ds"]["types"]:
         state_type_id, _ = DatasetStateType.get_or_create(name=state_type)
-        DatasetAttachedType.get_or_create(dataset_id=dataset, type=state_type_id)

chimedb/dataset/orm.py

@@ -8,7 +8,6 @@
 
 from chimedb.core.orm import base_model, JSONDictField
 
-import orjson as json
 import peewee
 
 # Logging
@@ -48,18 +47,6 @@ class Dataset(base_model):
     base_dset = peewee.ForeignKeyField("self", null=True)
 
 
-class DatasetAttachedType(base_model):
-    """
-    Model for datasettypes table.
-
-    Lists which state types are attached to which datasets
-    """
-
-    id = peewee.AutoField(primary_key=True)
-    dataset_id = peewee.ForeignKeyField(Dataset)
-    type = peewee.ForeignKeyField(DatasetStateType)
-
-
 class DatasetCurrentState(base_model):
     """Model for datasetcurrentstate table."""