diff --git a/src/AuDaGe/audage_frame.py b/src/AuDaGe/audage_frame.py index 8ab2e6e..9a1d3f3 100644 --- a/src/AuDaGe/audage_frame.py +++ b/src/AuDaGe/audage_frame.py @@ -10,9 +10,11 @@ desc: Extensions to DataFrame for AuDaGe purposes. from enum import StrEnum, auto -import pandas as pd from pandas import DataFrame +type Frame = list[dict[str, any]] +"""A mutable data structure for importing from and exporting to DataFrames.""" + class MandatoryColumns(StrEnum): """Enum of columns that are mandatory for a valid AuDaGe DataFrame.""" @@ -23,21 +25,14 @@ class MandatoryColumns(StrEnum): COMMENT = auto() -class AuDaGeFrame: +class AuDaGeFrame(DataFrame): """DataFrame wrapped for AuDaGe purposes.""" - def __init__(self, *args, **kwargs): - self.dataframe = DataFrame(*args, **kwargs) - def missing_columns(self) -> list[MandatoryColumns]: """Return a list of mandatory columns that are missing from this DataFrame. """ - return [ - label - for label in MandatoryColumns - if not label in self.dataframe.columns - ] + return [label for label in MandatoryColumns if not label in self.columns] def is_valid(self) -> bool: """Check whether the DataFrame contains all mandatory columns."""