Skip to content

Commit

Permalink
use dictreader csv
Browse files Browse the repository at this point in the history
  • Loading branch information
yrkim98 committed Feb 19, 2024
1 parent eee7d14 commit 6e3919f
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
1 change: 0 additions & 1 deletion src/allencell_ml_segmenter/main/i_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ def get_paths_of_image_layers(self):
@abstractmethod
def subscribe_layers_change_event(self, function):
pass

2 changes: 1 addition & 1 deletion src/allencell_ml_segmenter/main/viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ def subscribe_layers_change_event(self, function: Callable):

def get_image_dims(self) -> Tuple:
# just return x_y dims
return self.viewer.layers[0].data.shape
return self.viewer.layers[0].data.shape
3 changes: 2 additions & 1 deletion src/allencell_ml_segmenter/prediction/file_input_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ def _set_selected_image_paths_from_napari(
if self._model.is_prediction_running():
selected_indices: List[int] = self._image_list.get_checked_rows()
selected_paths: List[Path] = [
self._viewer.get_layers()[i].source.path for i in selected_indices
self._viewer.get_layers()[i].source.path
for i in selected_indices
]
self._model.set_selected_paths(selected_paths)

Expand Down
1 change: 0 additions & 1 deletion src/allencell_ml_segmenter/prediction/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,3 @@ def set_max_channels(self, max: int) -> None:

def get_max_channels(self) -> int:
return self._max_channels

4 changes: 2 additions & 2 deletions src/allencell_ml_segmenter/prediction/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ def extract_num_channels_in_folder(self, path: Path) -> int:

def extract_num_channels_from_csv(self, path: Path):
with open(path) as file:
reader: csv.reader = csv.reader(file)
reader: csv.reader = csv.DictReader(file)
# skip heading
next(reader)
# first column contrains files of interest (zeroth column is index)
line_data_path: str = next(reader)[1]
line_data_path: str = next(reader)["raw"]
return extract_num_channels_from_image(line_data_path)

def _determine_input_selection_type(self, path: Path):
Expand Down
6 changes: 4 additions & 2 deletions src/allencell_ml_segmenter/services/prediction_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ def _predict_model(self, _: Event) -> None:
"""
Predict segmentations using model according to spec
"""
if self._prediction_model.is_prediction_running() and self._able_to_continue_prediction():
if (
self._prediction_model.is_prediction_running()
and self._able_to_continue_prediction()
):
cyto_api: CytoDLModel = CytoDLModel()
cyto_api.load_config_from_file(
self._experiments_model.get_train_config_path
Expand Down Expand Up @@ -182,4 +185,3 @@ def _setup_inputs_from_napari(self) -> bool:
self._prediction_model.get_selected_paths()
)
return True

0 comments on commit 6e3919f

Please sign in to comment.