Skip to content

Commit 8919900

Browse files
committed
Apllies black
1 parent 73f4dba commit 8919900

File tree

2 files changed

+45
-16
lines changed

2 files changed

+45
-16
lines changed

bioimageio/core/proc_ops.py

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from dataclasses import InitVar, dataclass, field
44
from typing import (
55
Collection,
6-
List,
76
Literal,
87
Mapping,
98
Optional,
@@ -19,6 +18,9 @@
1918

2019
from bioimageio.spec.model import v0_4, v0_5
2120
from bioimageio.spec.model.v0_5 import TensorId
21+
from bioimageio.spec.model.v0_5 import (
22+
_convert_proc, # pyright: ignore [reportPrivateUsage]
23+
)
2224

2325
from ._op_base import BlockedOperator, Operator
2426
from .axis import AxisId, PerAxis
@@ -691,8 +693,11 @@ def get_proc_class(proc_spec: ProcDescr):
691693
else:
692694
assert_never(proc_spec)
693695

694-
def preproc_v4_to_processing(inp: v0_4.InputTensorDescr, proc_spec: v0_4.PreprocessingDescr,) -> Processing:
695-
from bioimageio.spec.model.v0_5 import _convert_proc # pyright: ignore [reportPrivateUsage]
696+
697+
def preproc_v4_to_processing(
698+
inp: v0_4.InputTensorDescr,
699+
proc_spec: v0_4.PreprocessingDescr,
700+
) -> Processing:
696701
member_id = TensorId(str(inp.name))
697702
if isinstance(proc_spec, v0_4.BinarizeDescr):
698703
return Binarize.from_proc_descr(proc_spec, member_id)
@@ -708,15 +713,20 @@ def preproc_v4_to_processing(inp: v0_4.InputTensorDescr, proc_spec: v0_4.Preproc
708713
if proc_spec.kwargs.mode == "fixed":
709714
axes = inp.axes
710715
v5_proc_spec = _convert_proc(proc_spec, axes)
711-
assert isinstance(v5_proc_spec, v0_5.FixedZeroMeanUnitVarianceDescr) #FIXME
716+
assert isinstance(
717+
v5_proc_spec, v0_5.FixedZeroMeanUnitVarianceDescr
718+
) # FIXME
712719
return FixedZeroMeanUnitVariance.from_proc_descr(v5_proc_spec, member_id)
713720
else:
714721
return ZeroMeanUnitVariance.from_proc_descr(proc_spec, member_id)
715722
else:
716723
assert_never(proc_spec)
717724

718-
def postproc_v4_to_processing(inp: v0_4.OutputTensorDescr, proc_spec: v0_4.PostprocessingDescr,) -> Processing:
719-
from bioimageio.spec.model.v0_5 import _convert_proc # pyright: ignore [reportPrivateUsage]
725+
726+
def postproc_v4_to_processing(
727+
inp: v0_4.OutputTensorDescr,
728+
proc_spec: v0_4.PostprocessingDescr,
729+
) -> Processing:
720730
member_id = TensorId(str(inp.name))
721731
if isinstance(proc_spec, v0_4.BinarizeDescr):
722732
return Binarize.from_proc_descr(proc_spec, member_id)
@@ -734,14 +744,20 @@ def postproc_v4_to_processing(inp: v0_4.OutputTensorDescr, proc_spec: v0_4.Postp
734744
if proc_spec.kwargs.mode == "fixed":
735745
axes = inp.axes
736746
v5_proc_spec = _convert_proc(proc_spec, axes)
737-
assert isinstance(v5_proc_spec, v0_5.FixedZeroMeanUnitVarianceDescr) #FIXME
747+
assert isinstance(
748+
v5_proc_spec, v0_5.FixedZeroMeanUnitVarianceDescr
749+
) # FIXME
738750
return FixedZeroMeanUnitVariance.from_proc_descr(v5_proc_spec, member_id)
739751
else:
740752
return ZeroMeanUnitVariance.from_proc_descr(proc_spec, member_id)
741753
else:
742754
assert_never(proc_spec)
743755

744-
def preproc_v5_to_processing(inp: v0_5.InputTensorDescr, proc_spec: v0_5.PreprocessingDescr,) -> Processing:
756+
757+
def preproc_v5_to_processing(
758+
inp: v0_5.InputTensorDescr,
759+
proc_spec: v0_5.PreprocessingDescr,
760+
) -> Processing:
745761
if isinstance(proc_spec, v0_5.BinarizeDescr):
746762
return Binarize.from_proc_descr(proc_spec, inp.id)
747763
elif isinstance(proc_spec, v0_5.ClipDescr):
@@ -761,7 +777,11 @@ def preproc_v5_to_processing(inp: v0_5.InputTensorDescr, proc_spec: v0_5.Preproc
761777
else:
762778
assert_never(proc_spec)
763779

764-
def postproc_v5_to_processing(inp: v0_5.OutputTensorDescr, proc_spec: v0_5.PostprocessingDescr,) -> Processing:
780+
781+
def postproc_v5_to_processing(
782+
inp: v0_5.OutputTensorDescr,
783+
proc_spec: v0_5.PostprocessingDescr,
784+
) -> Processing:
765785
if isinstance(proc_spec, v0_5.BinarizeDescr):
766786
return Binarize.from_proc_descr(proc_spec, inp.id)
767787
if isinstance(proc_spec, v0_5.ScaleMeanVarianceDescr):

bioimageio/core/proc_setup.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
Optional,
77
Sequence,
88
Set,
9-
Tuple,
109
Union,
1110
)
1211

@@ -15,13 +14,11 @@
1514
from bioimageio.spec.model import AnyModelDescr, v0_4, v0_5
1615
from bioimageio.spec.model.v0_5 import TensorId
1716

18-
from .digest_spec import get_member_ids
1917
from .proc_ops import (
2018
AddKnownDatasetStats,
2119
EnsureDtype,
2220
Processing,
2321
UpdateStats,
24-
get_proc_class,
2522
postproc_v4_to_processing,
2623
postproc_v5_to_processing,
2724
preproc_v4_to_processing,
@@ -141,7 +138,10 @@ def get_requried_sample_measures(model: AnyModelDescr) -> RequiredSampleMeasures
141138
{m for m in s.post_measures if isinstance(m, SampleMeasureBase)},
142139
)
143140

144-
def _prepare_v4_preprocs(tensor_descrs: Sequence[v0_4.InputTensorDescr]) -> List[Processing]:
141+
142+
def _prepare_v4_preprocs(
143+
tensor_descrs: Sequence[v0_4.InputTensorDescr],
144+
) -> List[Processing]:
145145
procs: List[Processing] = []
146146
for t_descr in tensor_descrs:
147147
member_id = TensorId(str(t_descr.name))
@@ -152,7 +152,10 @@ def _prepare_v4_preprocs(tensor_descrs: Sequence[v0_4.InputTensorDescr]) -> List
152152
procs.append(preproc_v4_to_processing(t_descr, proc_d))
153153
return procs
154154

155-
def _prepare_v4_postprocs(tensor_descrs: Sequence[v0_4.OutputTensorDescr]) -> List[Processing]:
155+
156+
def _prepare_v4_postprocs(
157+
tensor_descrs: Sequence[v0_4.OutputTensorDescr],
158+
) -> List[Processing]:
156159
procs: List[Processing] = []
157160
for t_descr in tensor_descrs:
158161
member_id = TensorId(str(t_descr.name))
@@ -163,14 +166,20 @@ def _prepare_v4_postprocs(tensor_descrs: Sequence[v0_4.OutputTensorDescr]) -> Li
163166
procs.append(postproc_v4_to_processing(t_descr, proc_d))
164167
return procs
165168

166-
def _prepare_v5_preprocs(tensor_descrs: Sequence[v0_5.InputTensorDescr]) -> List[Processing]:
169+
170+
def _prepare_v5_preprocs(
171+
tensor_descrs: Sequence[v0_5.InputTensorDescr],
172+
) -> List[Processing]:
167173
procs: List[Processing] = []
168174
for t_descr in tensor_descrs:
169175
for proc_d in t_descr.preprocessing:
170176
procs.append(preproc_v5_to_processing(t_descr, proc_d))
171177
return procs
172178

173-
def _prepare_v5_postprocs(tensor_descrs: Sequence[v0_5.OutputTensorDescr]) -> List[Processing]:
179+
180+
def _prepare_v5_postprocs(
181+
tensor_descrs: Sequence[v0_5.OutputTensorDescr],
182+
) -> List[Processing]:
174183
procs: List[Processing] = []
175184
for t_descr in tensor_descrs:
176185
for proc_d in t_descr.postprocessing:

0 commit comments

Comments
 (0)