Revert "Merge remote-tracking branch 'yliu/bundle' into bundle"

This reverts commit e941dde, reversing
changes made to 5aa4f38.

monai/bundle/workflows.py

@@ -21,11 +21,11 @@
 from pathlib import Path
 from typing import Any, Sequence
 
+from monai.config import PathLike
 from monai.apps.utils import get_logger
 from monai.bundle.config_parser import ConfigParser
 from monai.bundle.properties import InferProperties, MetaProperties, TrainProperties
 from monai.bundle.utils import DEFAULT_EXP_MGMT_SETTINGS, EXPR_KEY, ID_REF_KEY, ID_SEP_KEY
-from monai.config import PathLike
 from monai.utils import BundleProperty, BundlePropertyConfig, deprecated_arg, deprecated_arg_default, ensure_tuple
 
 __all__ = ["BundleWorkflow", "ConfigWorkflow"]
@@ -62,9 +62,7 @@ class BundleWorkflow(ABC):
         new_name="workflow_type",
         msg_suffix="please use `workflow_type` instead.",
     )
-    def __init__(
-        self, workflow_type: str | None = None, workflow: str | None = None, properties_path: PathLike | None = None
-    ):
+    def __init__(self, workflow_type: str | None = None, workflow: str | None = None, properties_path: PathLike | None = None):
         workflow_type = workflow if workflow is not None else workflow_type
         if workflow_type is None and properties_path is None:
             self.properties = copy(MetaProperties)
@@ -78,10 +76,10 @@ def __init__(
                 self.properties = json.load(json_file)
             self.workflow_type = None
             return
-        if workflow_type.lower() in self.supported_train_type:  # type: ignore[union-attr]
+        if workflow_type.lower() in self.supported_train_type:
             self.properties = {**TrainProperties, **MetaProperties}
             self.workflow_type = "train"
-        elif workflow_type.lower() in self.supported_infer_type:  # type: ignore[union-attr]
+        elif workflow_type.lower() in self.supported_infer_type:
             self.properties = {**InferProperties, **MetaProperties}
             self.workflow_type = "infer"
         else:

tests/test_bundle_workflow.py

@@ -33,10 +33,7 @@
 
 TEST_CASE_2 = [os.path.join(os.path.dirname(__file__), "testing_data", "inference.yaml")]
 
-TEST_CASE_3 = [
-    os.path.join(os.path.dirname(__file__), "testing_data", "config_fl_train.json"),
-    os.path.join(os.path.dirname(__file__), "testing_data", "fl_train_properties.json"),
-]
+TEST_CASE_3 = [os.path.join(os.path.dirname(__file__), "testing_data", "config_fl_train.json")]
 
 
 class TestBundleWorkflow(unittest.TestCase):
@@ -104,11 +101,10 @@ def test_inference_config(self, config_file):
             logging_file=os.path.join(os.path.dirname(__file__), "testing_data", "logging.conf"),
             **override,
         )
-        inferer.add_property(name="inferer", required=True, config_id="inferer")
         self._test_inferer(inferer)
 
     @parameterized.expand([TEST_CASE_3])
-    def test_train_config(self, config_file, properties_path):
+    def test_train_config(self, config_file):
         # test standard MONAI model-zoo config workflow
         trainer = ConfigWorkflow(
             workflow_type="train",
@@ -117,7 +113,6 @@ def test_train_config(self, config_file, properties_path):
             init_id="initialize",
             run_id="run",
             final_id="finalize",
-            properties_path=properties_path,
         )
         # should initialize before parsing any bundle content
         trainer.initialize()
@@ -149,7 +144,6 @@ def test_train_config(self, config_file, properties_path):
     def test_non_config(self):
         # test user defined python style workflow
         inferer = NonConfigWorkflow(self.filename, self.data_dir)
-        inferer.add_property(name="inferer", required=True)
         self._test_inferer(inferer)