..

Author: dweindl

petab/v2/core.py

@@ -194,10 +194,10 @@ def to_df(self) -> pd.DataFrame:
     @classmethod
     def from_tsv(cls, file_path: str | Path) -> ObservablesTable:
         df = pd.read_csv(file_path, sep="\t")
-        return cls.from_dataframe(df)
+        return cls.from_df(df)
 
     def to_tsv(self, file_path: str | Path) -> None:
-        df = self.to_dataframe()
+        df = self.to_df()
         df.to_csv(file_path, sep="\t", index=False)
 
     def __add__(self, other: Observable) -> ObservablesTable:
@@ -313,7 +313,7 @@ def __getitem__(self, condition_id: str) -> ChangeSet:
         raise KeyError(f"Condition ID {condition_id} not found")
 
     @classmethod
-    def from_dataframe(cls, df: pd.DataFrame) -> ConditionsTable:
+    def from_df(cls, df: pd.DataFrame) -> ConditionsTable:
         if df is None:
             return cls(conditions=[])
 
@@ -324,7 +324,7 @@ def from_dataframe(cls, df: pd.DataFrame) -> ConditionsTable:
 
         return cls(conditions=conditions)
 
-    def to_dataframe(self) -> pd.DataFrame:
+    def to_df(self) -> pd.DataFrame:
         records = [
             {C.CONDITION_ID: condition.id, **change.model_dump()}
             for condition in self.conditions
@@ -335,10 +335,10 @@ def to_dataframe(self) -> pd.DataFrame:
     @classmethod
     def from_tsv(cls, file_path: str | Path) -> ConditionsTable:
         df = pd.read_csv(file_path, sep="\t")
-        return cls.from_dataframe(df)
+        return cls.from_df(df)
 
     def to_tsv(self, file_path: str | Path) -> None:
-        df = self.to_dataframe()
+        df = self.to_df()
         df.to_csv(file_path, sep="\t", index=False)
 
     def __add__(self, other: ChangeSet) -> ConditionsTable:
@@ -421,7 +421,7 @@ class ExperimentsTable(BaseModel):
     experiments: list[Experiment]
 
     @classmethod
-    def from_dataframe(cls, df: pd.DataFrame) -> ExperimentsTable:
+    def from_df(cls, df: pd.DataFrame) -> ExperimentsTable:
         if df is None:
             return cls(experiments=[])
 
@@ -437,16 +437,16 @@ def from_dataframe(cls, df: pd.DataFrame) -> ExperimentsTable:
 
         return cls(experiments=experiments)
 
-    def to_dataframe(self) -> pd.DataFrame:
+    def to_df(self) -> pd.DataFrame:
         return pd.DataFrame(self.model_dump()["experiments"])
 
     @classmethod
     def from_tsv(cls, file_path: str | Path) -> ExperimentsTable:
         df = pd.read_csv(file_path, sep="\t")
-        return cls.from_dataframe(df)
+        return cls.from_df(df)
 
     def to_tsv(self, file_path: str | Path) -> None:
-        df = self.to_dataframe()
+        df = self.to_df()
         df.to_csv(file_path, sep="\t", index=False)
 
     def __add__(self, other: Experiment) -> ExperimentsTable:
@@ -528,7 +528,7 @@ class MeasurementTable(BaseModel):
     measurements: list[Measurement]
 
     @classmethod
-    def from_dataframe(
+    def from_df(
         cls,
         df: pd.DataFrame,
     ) -> MeasurementTable:
@@ -544,16 +544,16 @@ def from_dataframe(
 
         return cls(measurements=measurements)
 
-    def to_dataframe(self) -> pd.DataFrame:
+    def to_df(self) -> pd.DataFrame:
         return pd.DataFrame(self.model_dump()["measurements"])
 
     @classmethod
     def from_tsv(cls, file_path: str | Path) -> MeasurementTable:
         df = pd.read_csv(file_path, sep="\t")
-        return cls.from_dataframe(df)
+        return cls.from_df(df)
 
     def to_tsv(self, file_path: str | Path) -> None:
-        df = self.to_dataframe()
+        df = self.to_df()
         df.to_csv(file_path, sep="\t", index=False)
 
     def __add__(self, other: Measurement) -> MeasurementTable:
@@ -597,7 +597,7 @@ class MappingTable(BaseModel):
     mappings: list[Mapping]
 
     @classmethod
-    def from_dataframe(cls, df: pd.DataFrame) -> MappingTable:
+    def from_df(cls, df: pd.DataFrame) -> MappingTable:
         if df is None:
             return cls(mappings=[])
 
@@ -607,16 +607,16 @@ def from_dataframe(cls, df: pd.DataFrame) -> MappingTable:
 
         return cls(mappings=mappings)
 
-    def to_dataframe(self) -> pd.DataFrame:
+    def to_df(self) -> pd.DataFrame:
         return pd.DataFrame(self.model_dump()["mappings"])
 
     @classmethod
     def from_tsv(cls, file_path: str | Path) -> MappingTable:
         df = pd.read_csv(file_path, sep="\t")
-        return cls.from_dataframe(df)
+        return cls.from_df(df)
 
     def to_tsv(self, file_path: str | Path) -> None:
-        df = self.to_dataframe()
+        df = self.to_df()
         df.to_csv(file_path, sep="\t", index=False)
 
     def __add__(self, other: Mapping) -> MappingTable:
@@ -674,7 +674,7 @@ class ParameterTable(BaseModel):
     parameters: list[Parameter]
 
     @classmethod
-    def from_dataframe(cls, df: pd.DataFrame) -> ParameterTable:
+    def from_df(cls, df: pd.DataFrame) -> ParameterTable:
         if df is None:
             return cls(parameters=[])
 
@@ -685,16 +685,16 @@ def from_dataframe(cls, df: pd.DataFrame) -> ParameterTable:
 
         return cls(parameters=parameters)
 
-    def to_dataframe(self) -> pd.DataFrame:
+    def to_df(self) -> pd.DataFrame:
         return pd.DataFrame(self.model_dump()["parameters"])
 
     @classmethod
     def from_tsv(cls, file_path: str | Path) -> ParameterTable:
         df = pd.read_csv(file_path, sep="\t")
-        return cls.from_dataframe(df)
+        return cls.from_df(df)
 
     def to_tsv(self, file_path: str | Path) -> None:
-        df = self.to_dataframe()
+        df = self.to_df()
         df.to_csv(file_path, sep="\t", index=False)
 
     def __add__(self, other: Parameter) -> ParameterTable:

petab/v2/problem.py

@@ -104,31 +104,29 @@ def __init__(
             ParameterTable,
         )
 
-        self.observables_table: ObservablesTable = (
-            ObservablesTable.from_dataframe(self.observable_df)
+        self.observables_table: ObservablesTable = ObservablesTable.from_df(
+            self.observable_df
         )
         self.observables: list[Observable] = self.observables_table.observables
 
-        self.conditions_table: ConditionsTable = (
-            ConditionsTable.from_dataframe(self.condition_df)
+        self.conditions_table: ConditionsTable = ConditionsTable.from_df(
+            self.condition_df
         )
         self.conditions: list[ChangeSet] = self.conditions_table.conditions
 
-        self.experiments_table: ExperimentsTable = (
-            ExperimentsTable.from_dataframe(self.experiment_df)
+        self.experiments_table: ExperimentsTable = ExperimentsTable.from_df(
+            self.experiment_df
         )
         self.experiments: list[Experiment] = self.experiments_table.experiments
 
-        self.measurement_table: MeasurementTable = (
-            MeasurementTable.from_dataframe(
-                self.measurement_df,
-            )
+        self.measurement_table: MeasurementTable = MeasurementTable.from_df(
+            self.measurement_df,
         )
 
-        self.mapping_table: MappingTable = MappingTable.from_dataframe(
+        self.mapping_table: MappingTable = MappingTable.from_df(
             self.mapping_df
         )
-        self.parameter_table: ParameterTable = ParameterTable.from_dataframe(
+        self.parameter_table: ParameterTable = ParameterTable.from_df(
             self.parameter_df
         )
         # TODO: visualization table

tests/v2/test_core.py

@@ -15,10 +15,8 @@
 example_dir_fujita = Path(__file__).parents[2] / "doc/example/example_Fujita"
 
 
-def test_observables_table():
+def test_observables_table_round_trip():
     file = example_dir_fujita / "Fujita_observables.tsv"
-
-    # read-write-read round trip
     observables = ObservablesTable.from_tsv(file)
 
     with tempfile.TemporaryDirectory() as tmp_dir:
@@ -28,11 +26,10 @@ def test_observables_table():
         assert observables == observables2
 
 
-def test_conditions_table():
+def test_conditions_table_round_trip():
     with tempfile.TemporaryDirectory() as tmp_dir:
         petab1to2(example_dir_fujita / "Fujita.yaml", tmp_dir)
         file = Path(tmp_dir, "Fujita_experimentalCondition.tsv")
-        # read-write-read round trip
         conditions = ConditionsTable.from_tsv(file)
         tmp_file = Path(tmp_dir) / "conditions.tsv"
         conditions.to_tsv(tmp_file)