Skip to content

Commit 6441466

Browse files
committed
fix format
Signed-off-by: YunLiu <[email protected]>
1 parent f99763d commit 6441466

File tree

2 files changed

+27
-19
lines changed

2 files changed

+27
-19
lines changed

monai/bundle/workflows.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ def __init__(
118118
self.properties = properties[workflow_type]
119119
if "meta" in properties:
120120
self.properties.update(properties["meta"])
121-
except:
122-
raise ValueError(f"{self.workflow_type} not find in property file {properties_path}")
121+
except KeyError:
122+
raise ValueError(f"{workflow_type} not found in property file {properties_path}")
123+
except json.JSONDecodeError:
124+
raise ValueError(f"Error decoding JSON from property file {properties_path}")
123125
else:
124126
if workflow_type == "train":
125127
self.properties = {**TrainProperties, **MetaProperties}
@@ -278,10 +280,16 @@ def __init__(
278280
config_file: str | Sequence[str] | None = None,
279281
meta_file: str | Sequence[str] | None = None,
280282
logging_file: str | None = None,
281-
**override: Any
283+
**override: Any,
282284
):
283285
meta_file = str(Path(os.getcwd()) / "metadata.json") if meta_file is None else meta_file
284-
super().__init__(workflow_type=workflow_type, workflow=workflow, properties_path=properties_path, meta_file=meta_file, logging_file=logging_file)
286+
super().__init__(
287+
workflow_type=workflow_type,
288+
workflow=workflow,
289+
properties_path=properties_path,
290+
meta_file=meta_file,
291+
logging_file=logging_file,
292+
)
285293
self._props = {}
286294
self._set_props = {}
287295
self.parser = ConfigParser()
@@ -328,7 +336,7 @@ def _get_property(self, name: str, property: dict) -> Any:
328336
"""
329337
value = None
330338
id = self.properties.get(name, None).get(BundlePropertyConfig.ID, None)
331-
print(self.parser.config.keys(), self.parser.config["_meta_"], '*********')
339+
print(self.parser.config.keys(), self.parser.config["_meta_"], "*********")
332340
if name in self._set_props:
333341
value = self._set_props[name]
334342
self._props[name] = value

tests/nonconfig_workflow.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ScaleIntensityd,
2929
ScaleIntensityRanged,
3030
)
31-
from monai.utils import BundleProperty, set_determinism, CommonKeys
31+
from monai.utils import BundleProperty, CommonKeys, set_determinism
3232

3333

3434
class NonConfigWorkflow(BundleWorkflow):
@@ -184,8 +184,16 @@ class PythonicWorkflowImpl(PythonicWorkflow):
184184
Test class simulates the bundle workflow defined by Python script directly.
185185
"""
186186

187-
def __init__(self, workflow_type: str = "inference", config_file: str | None = None, properties_path: str | None = None, meta_file: str | None = None):
188-
super().__init__(workflow_type=workflow_type, properties_path=properties_path, config_file=config_file, meta_file=meta_file)
187+
def __init__(
188+
self,
189+
workflow_type: str = "inference",
190+
config_file: str | None = None,
191+
properties_path: str | None = None,
192+
meta_file: str | None = None,
193+
):
194+
super().__init__(
195+
workflow_type=workflow_type, properties_path=properties_path, config_file=config_file, meta_file=meta_file
196+
)
189197
self.dataflow = {}
190198

191199
def initialize(self):
@@ -204,16 +212,8 @@ def initialize(self):
204212
ScaleIntensityRanged(keys="image", a_min=-57, a_max=164, b_min=0.0, b_max=1.0, clip=True),
205213
]
206214
)
207-
self.dataset = Dataset(
208-
data=[self.dataflow],
209-
transform=preprocessing,
210-
)
211-
self.postprocessing = Compose(
212-
[
213-
Activationsd(keys="pred", softmax=True),
214-
AsDiscreted(keys="pred", argmax=True),
215-
]
216-
)
215+
self.dataset = Dataset(data=[self.dataflow], transform=preprocessing)
216+
self.postprocessing = Compose([Activationsd(keys="pred", softmax=True), AsDiscreted(keys="pred", argmax=True)])
217217
self.inferer = SlidingWindowInferer(roi_size=self.parser.roi_size, sw_batch_size=1, overlap=0)
218218

219219
def run(self):
@@ -232,6 +232,6 @@ def get_bundle_root(self):
232232

233233
def get_device(self):
234234
return torch.device("cuda" if torch.cuda.is_available() else "cpu")
235-
235+
236236
def get_inferer(self):
237237
return self.inferer

0 commit comments

Comments
 (0)