From 88a00c97d5cf07fb7bfa60eaac2345e2a3a37030 Mon Sep 17 00:00:00 2001
From: Christopher Rhodes <christopher.rhodes@embl.de>
Date: Wed, 27 Nov 2024 09:24:01 +0100
Subject: [PATCH] Parameterized option to create unique subdirectory for each
RoiSet, but this still isn't propagating to dataframe called in .serialize
---
model_server/base/roiset.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/model_server/base/roiset.py b/model_server/base/roiset.py
index 962d9f8e..9b5a0360 100644
--- a/model_server/base/roiset.py
+++ b/model_server/base/roiset.py
@@ -79,6 +79,7 @@ class RoiSetExportParams(BaseModel):
object_classes: bool = False
labels_overlay: Union[RoiSetLabelsOverlayParams, None] = None
derived_channels: bool = False
+ make_unique_subdirectory: bool = False
def get_label_ids(acc_seg_mask: GenericImageDataAccessor, allow_3d=False, connect_3d=True) -> InMemoryDataAccessor:
@@ -771,9 +772,9 @@ class RoiSet(object):
if patch.dtype == 'uint16':
resampled = patch.to_8bit()
- write_accessor_data_to_file(where / prefix / fname, resampled)
+ write_accessor_data_to_file(where / fname, resampled)
else:
- write_accessor_data_to_file(where / prefix / fname, patch)
+ write_accessor_data_to_file(where / fname, patch)
return fname
patches_df['patch_path'] = patches_df.apply(_export_patch, axis=1)
@@ -961,8 +962,10 @@ class RoiSet(object):
return
for k in params.dict().keys():
- subdir = where / k
pr = prefix
+ subdir = where / k
+ if params.make_unique_subdirectory:
+ subdir = subdir / pr
kp = params.dict()[k]
if kp is None:
continue
--
GitLab