[DLMED] update id

Signed-off-by: Nic Ma <nma@nvidia.com>

Author: Nic-Ma

monai/apps/manifest/config_item.py

@@ -120,11 +120,11 @@ class ConfigItem:
     Args:
         config: content of a config item, can be objects of any types,
             a configuration resolver may interpret the content to generate a configuration object.
-        id: optional name of the current config item, defaults to `None`.
+        id: name of the current config item, defaults to empty string.
 
     """
 
-    def __init__(self, config: Any, id: Optional[str] = None) -> None:
+    def __init__(self, config: Any, id: str = "") -> None:
         self.config = config
         self.id = id
 
@@ -183,7 +183,7 @@ class ConfigComponent(ConfigItem, Instantiable):
 
     Args:
         config: content of a config item.
-        id: optional name of the current config item, defaults to `None`.
+        id: name of the current config item, defaults to empty string.
         locator: a ``ComponentLocator`` to convert a module name string into the actual python module.
             if `None`, a ``ComponentLocator(excludes=excludes)`` will be used.
         excludes: if ``locator`` is None, create a new ``ComponentLocator`` with ``excludes``.
@@ -194,7 +194,7 @@ class ConfigComponent(ConfigItem, Instantiable):
     def __init__(
         self,
         config: Any,
-        id: Optional[str] = None,
+        id: str = "",
         locator: Optional[ComponentLocator] = None,
         excludes: Optional[Union[Sequence[str], str]] = None,
     ) -> None:
@@ -299,12 +299,12 @@ class ConfigExpression(ConfigItem):
 
     Args:
         config: content of a config item.
-        id: optional name of current config item, defaults to `None`.
+        id: name of current config item, defaults to empty string.
         globals: additional global context to evaluate the string.
 
     """
 
-    def __init__(self, config: Any, id: Optional[str] = None, globals: Optional[Dict] = None) -> None:
+    def __init__(self, config: Any, id: str = "", globals: Optional[Dict] = None) -> None:
         super().__init__(config=config, id=id)
         self.globals = globals
 

monai/apps/manifest/reference_resolver.py

@@ -124,14 +124,6 @@ def _resolve_one_item(self, id: str, waiting_list: Optional[Set[str]] = None):
         else:
             self.resolved_content[id] = new_config
 
-    def resolve_all(self):
-        """
-        Resolve the references for all the config items.
-
-        """
-        for k in self.items:
-            self._resolve_one_item(id=k)
-
     def get_resolved_content(self, id: str):
         """
         Get the resolved content with specified id name.
@@ -194,9 +186,7 @@ def update_refs_pattern(value: str, refs: Dict) -> str:
         return value
 
     @staticmethod
-    def find_refs_in_config(
-        config: Union[Dict, List, str], id: Optional[str] = None, refs: Optional[List[str]] = None
-    ) -> List[str]:
+    def find_refs_in_config(config: Union[Dict, List, str], id: str, refs: Optional[List[str]] = None) -> List[str]:
         """
         Recursively search all the content of input config item to get the ids of references.
         References mean: the IDs of other config items used as "@XXX" in this config item, or the
@@ -205,7 +195,7 @@ def find_refs_in_config(
 
         Args:
             config: input config content to search.
-            id: ID name for the input config item, default to `None`.
+            id: ID name for the input config item.
             refs: list of the ID name of found references, default to `None`.
 
         """
@@ -216,21 +206,21 @@ def find_refs_in_config(
         if isinstance(config, (list, dict)):
             subs = enumerate(config) if isinstance(config, list) else config.items()
             for k, v in subs:
-                sub_id = f"{id}#{k}" if id is not None else f"{k}"
+                sub_id = f"{id}#{k}" if len(id) > 0 else f"{k}"
                 if ConfigComponent.is_instantiable(v) or ConfigExpression.is_expression(v):
                     refs_.append(sub_id)
                 refs_ = ReferenceResolver.find_refs_in_config(v, sub_id, refs_)
         return refs_
 
     @staticmethod
-    def update_config_with_refs(config: Union[Dict, List, str], id: Optional[str] = None, refs: Optional[Dict] = None):
+    def update_config_with_refs(config: Union[Dict, List, str], id: str, refs: Optional[Dict] = None):
         """
         With all the references in `refs`, update the input config content with references
         and return the new config.
 
         Args:
             config: input config content to update.
-            id: ID name for the input config, default to `None`.
+            id: ID name for the input config.
             refs: all the referring content with ids, default to `None`.
 
         """
@@ -241,7 +231,7 @@ def update_config_with_refs(config: Union[Dict, List, str], id: Optional[str] =
             # all the items in the list should be replaced with the references
             ret_list: List = []
             for i, v in enumerate(config):
-                sub_id = f"{id}#{i}" if id is not None else f"{i}"
+                sub_id = f"{id}#{i}" if len(id) > 0 else f"{i}"
                 if ConfigComponent.is_instantiable(v) or ConfigExpression.is_expression(v):
                     ret_list.append(refs_[sub_id])
                 else:
@@ -251,7 +241,7 @@ def update_config_with_refs(config: Union[Dict, List, str], id: Optional[str] =
             # all the items in the dict should be replaced with the references
             ret_dict: Dict = {}
             for k, v in config.items():
-                sub_id = f"{id}#{k}" if id is not None else f"{k}"
+                sub_id = f"{id}#{k}" if len(id) > 0 else f"{k}"
                 if ConfigComponent.is_instantiable(v) or ConfigExpression.is_expression(v):
                     ret_dict[k] = refs_[sub_id]
                 else:

tests/test_reference_resolver.py

@@ -91,13 +91,7 @@ def test_resolve(self, configs, expected_id, output_type):
             else:
                 resolver.add_item(ConfigItem(config=v, id=k))
 
-        result = resolver.get_resolved_content(expected_id)
-        self.assertTrue(isinstance(result, output_type))
-
-        # test resolve all
-        resolver.resolved_content = {}  # clear content
-        resolver.resolve_all()
-        result = resolver.get_resolved_content(expected_id)
+        result = resolver.get_resolved_content(expected_id)  # the root id is `expected_id` here
         self.assertTrue(isinstance(result, output_type))
 
         # test lazy instantiation