Remove dataformat enum. (#933)

* Remove dataformat enum.

* Use .value to access str value of enum DistributionStrategy.

---------

Co-authored-by: Norman Rzepka <[email protected]>

Author: markbader

webknossos/webknossos/cli/_utils.py

@@ -26,7 +26,7 @@ class DistributionStrategy(str, Enum):
     SLURM = "slurm"
     KUBERNETES = "kubernetes"
     MULTIPROCESSING = "multiprocessing"
-    DEBUGS_SEQUENTIAL = "debug_sequential"
+    DEBUG_SEQUENTIAL = "debug_sequential"
 
 
 class LayerCategory(str, Enum):
@@ -41,13 +41,6 @@ class LayerCategory(str, Enum):
     SEGMENTATION = "segmentation"
 
 
-class DataFormat(str, Enum):
-    """Enum of available data formats."""
-
-    WKW = "wkw"
-    ZARR = "zarr"
-
-
 class SamplingMode(str, Enum):
     """Enum of available sampling modes."""
 

webknossos/webknossos/cli/check_equality.py

@@ -67,7 +67,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

webknossos/webknossos/cli/compress.py

@@ -49,7 +49,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

webknossos/webknossos/cli/convert.py

@@ -94,7 +94,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

webknossos/webknossos/cli/convert_knossos.py

@@ -325,7 +325,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

webknossos/webknossos/cli/convert_raw.py

@@ -263,7 +263,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

webknossos/webknossos/cli/convert_zarr.py

@@ -246,7 +246,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

webknossos/webknossos/cli/downsample.py

@@ -58,7 +58,7 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
 

webknossos/webknossos/cli/export_wkw_as_tiff.py

@@ -269,7 +269,7 @@ def main(
     logging.info("Starting tiff export for bounding box: %s", bbox)
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
     used_tile_size = None

webknossos/webknossos/cli/upsample.py

@@ -72,16 +72,16 @@ def main(
 
     executor_args = Namespace(
         jobs=jobs,
-        distribution_strategy=distribution_strategy,
+        distribution_strategy=distribution_strategy.value,
         job_resources=job_resources,
     )
     dataset = Dataset.open(source)
     mode = SamplingModes.parse(sampling_mode.value)
 
-    with get_executor_for_args(args=executor_args) as executor:
-        if layer_name is None:
-            upsample_all_layers(dataset, mode, from_mag, executor_args)
-        else:
+    if layer_name is None:
+        upsample_all_layers(dataset, mode, from_mag, executor_args)
+    else:
+        with get_executor_for_args(args=executor_args) as executor:
             layer = dataset.get_layer(layer_name)
             layer.upsample(from_mag=from_mag, sampling_mode=mode, executor=executor)