Skip to content

Commit ac8a453

Browse files
fix pre-commit
1 parent 5c152a8 commit ac8a453

File tree

1 file changed

+37
-11
lines changed

1 file changed

+37
-11
lines changed

fractal_tasks_core/tasks/cellpose_utils.py

+37-11
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,25 @@ def validate_conditions(cls, values):
8282
# Verify that custom parameters are only provided when type="custom"
8383
if type != "custom":
8484
if lower_percentile is not None:
85-
raise ValueError(f"Type='{type}' but {lower_percentile=}. " "Hint: set type='custom'.")
85+
raise ValueError(
86+
f"Type='{type}' but {lower_percentile=}. "
87+
"Hint: set type='custom'."
88+
)
8689
if upper_percentile is not None:
87-
raise ValueError(f"Type='{type}' but {upper_percentile=}. " "Hint: set type='custom'.")
90+
raise ValueError(
91+
f"Type='{type}' but {upper_percentile=}. "
92+
"Hint: set type='custom'."
93+
)
8894
if lower_bound is not None:
89-
raise ValueError(f"Type='{type}' but {lower_bound=}. " "Hint: set type='custom'.")
95+
raise ValueError(
96+
f"Type='{type}' but {lower_bound=}. "
97+
"Hint: set type='custom'."
98+
)
9099
if upper_bound is not None:
91-
raise ValueError(f"Type='{type}' but {upper_bound=}. " "Hint: set type='custom'.")
100+
raise ValueError(
101+
f"Type='{type}' but {upper_bound=}. "
102+
"Hint: set type='custom'."
103+
)
92104

93105
# The only valid options are:
94106
# 1. Both percentiles are set and both bounds are unset
@@ -102,9 +114,14 @@ def validate_conditions(cls, values):
102114
upper_bound is not None,
103115
)
104116
if len(set(are_percentiles_set)) != 1:
105-
raise ValueError("Both lower_percentile and upper_percentile must be set " "together.")
117+
raise ValueError(
118+
"Both lower_percentile and upper_percentile must be set "
119+
"together."
120+
)
106121
if len(set(are_bounds_set)) != 1:
107-
raise ValueError("Both lower_bound and upper_bound must be set together")
122+
raise ValueError(
123+
"Both lower_bound and upper_bound must be set together"
124+
)
108125
if lower_percentile is not None and lower_bound is not None:
109126
raise ValueError(
110127
"You cannot set both explicit bounds and percentile bounds "
@@ -196,7 +213,9 @@ class CellposeChannel1InputModel(ChannelInputModel):
196213
Cellpose models
197214
"""
198215

199-
normalize: CellposeCustomNormalizer = Field(default_factory=CellposeCustomNormalizer)
216+
normalize: CellposeCustomNormalizer = Field(
217+
default_factory=CellposeCustomNormalizer
218+
)
200219

201220
def get_omero_channel(self, zarr_url) -> OmeroChannel:
202221
try:
@@ -233,7 +252,9 @@ class CellposeChannel2InputModel(BaseModel):
233252

234253
wavelength_id: Optional[str] = None
235254
label: Optional[str] = None
236-
normalize: CellposeCustomNormalizer = Field(default_factory=CellposeCustomNormalizer)
255+
normalize: CellposeCustomNormalizer = Field(
256+
default_factory=CellposeCustomNormalizer
257+
)
237258

238259
@validator("label", always=True)
239260
def mutually_exclusive_channel_attributes(cls, v, values):
@@ -244,7 +265,8 @@ def mutually_exclusive_channel_attributes(cls, v, values):
244265
label = v
245266
if wavelength_id and v:
246267
raise ValueError(
247-
"`wavelength_id` and `label` cannot be both set " f"(given {wavelength_id=} and {label=})."
268+
"`wavelength_id` and `label` cannot be both set "
269+
f"(given {wavelength_id=} and {label=})."
248270
)
249271
return v
250272

@@ -393,14 +415,18 @@ def normalized_img(
393415
i99 = np.percentile(img[k], upper_p)
394416
i1 = np.percentile(img[k], lower_p)
395417
if i99 - i1 > +1e-3: # np.ptp(img[k]) > 1e-3:
396-
img[k] = normalize_percentile(img[k], lower=lower_p, upper=upper_p)
418+
img[k] = normalize_percentile(
419+
img[k], lower=lower_p, upper=upper_p
420+
)
397421
if invert:
398422
img[k] = -1 * img[k] + 1
399423
else:
400424
img[k] = 0
401425
elif lower_bound is not None:
402426
if upper_bound - lower_bound > +1e-3:
403-
img[k] = normalize_bounds(img[k], lower=lower_bound, upper=upper_bound)
427+
img[k] = normalize_bounds(
428+
img[k], lower=lower_bound, upper=upper_bound
429+
)
404430
if invert:
405431
img[k] = -1 * img[k] + 1
406432
else:

0 commit comments

Comments
 (0)