From 22ddf3ca33a2d3e2488b23fe574f504994938683 Mon Sep 17 00:00:00 2001
From: Christopher Rhodes <christopher.rhodes@embl.de>
Date: Mon, 23 Sep 2024 16:23:13 +0200
Subject: [PATCH] RoiSet test was calling a method that was dropped during
merge; re-inserted it
---
model_server/base/roiset.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/model_server/base/roiset.py b/model_server/base/roiset.py
index 582c517a..a429b61f 100644
--- a/model_server/base/roiset.py
+++ b/model_server/base/roiset.py
@@ -672,12 +672,14 @@ class RoiSet(object):
return InMemoryDataAccessor(om)
+ def get_serializable_dataframe(self) -> pd.DataFrame:
+ return self._df.drop(['expanded_slice', 'slice', 'relative_slice', 'binary_mask'], axis=1)
+
def export_dataframe(self, csv_path: Path) -> str:
csv_path.parent.mkdir(parents=True, exist_ok=True)
- self._df.drop(['expanded_slice', 'slice', 'relative_slice', 'binary_mask'], axis=1).to_csv(csv_path, index=False)
+ self.get_serializable_dataframe().to_csv(csv_path, index=False)
return csv_path.name
-
def export_patch_masks(self, where: Path, pad_to: int = None, prefix='mask', expanded=False) -> pd.DataFrame:
patches_df = self.get_patch_masks(pad_to=pad_to, expanded=expanded).copy()
@@ -994,10 +996,7 @@ class RoiSet(object):
csv_path = where / 'dataframe' / (prefix + '.csv')
csv_path.parent.mkdir(parents=True, exist_ok=True)
- self._df.drop(
- ['expanded_slice', 'slice', 'relative_slice', 'binary_mask'],
- axis=1
- ).to_csv(csv_path, index=False)
+ self.export_dataframe(csv_path)
record['dataframe'] = str(Path('dataframe') / csv_path.name)
--
GitLab