:: and #

Signed-off-by: Wenqi Li <wenqil@nvidia.com>

Author: wyli

monai/bundle/config_parser.py

@@ -150,6 +150,7 @@ def __getitem__(self, id: str | int) -> Any:
         if id == "":
             return self.config
         config = self.config
+        id = str(id).replace("#", ID_SEP_KEY)
         for k in str(id).split(ID_SEP_KEY):
             if not isinstance(config, (dict, list)):
                 raise ValueError(f"config must be dict or list for key `{k}`, but got {type(config)}: {config}.")
@@ -178,7 +179,8 @@ def __setitem__(self, id: str | int, config: Any) -> None:
             self.config = config
             self.ref_resolver.reset()
             return
-        keys = str(id).split(ID_SEP_KEY)
+        id = str(id).replace("#", ID_SEP_KEY)
+        keys = id.split(ID_SEP_KEY)
         # get the last parent level config item and replace it
         last_id = ID_SEP_KEY.join(keys[:-1])
         conf_ = self[last_id]
@@ -213,7 +215,8 @@ def set(self, config: Any, id: str = "", recursive: bool = True) -> None:
                 default to `True`. for the nested id, only support `dict` for the missing section.
 
         """
-        keys = str(id).split(ID_SEP_KEY)
+        id = str(id).replace("#", ID_SEP_KEY)
+        keys = id.split(ID_SEP_KEY)
         conf_ = self.get()
         if recursive:
             if conf_ is None:
@@ -458,6 +461,7 @@ def split_path_id(cls, src: str) -> tuple[str, str]:
             src: source string to split.
 
         """
+        src = str(src).replace("#", ID_SEP_KEY)
         result = re.compile(rf"({cls.suffix_match}(?=(?:{ID_SEP_KEY}.*)|$))", re.IGNORECASE).findall(src)
         if not result:
             return "", src  # the src is a pure id
@@ -488,6 +492,7 @@ def resolve_relative_ids(cls, id: str, value: str) -> str:
 
         """
         # get the prefixes like: "@####", "%###", "@#"
+        value = str(value).replace("#", ID_SEP_KEY)
         prefixes = sorted(set().union(cls.relative_id_prefix.findall(value)), reverse=True)
         current_id = id.split(ID_SEP_KEY)
 

monai/bundle/reference_resolver.py

@@ -101,6 +101,7 @@ def get_item(self, id: str, resolve: bool = False, **kwargs: Any) -> ConfigItem
         """
         if resolve and id not in self.resolved_content:
             self._resolve_one_item(id=id, **kwargs)
+        id = str(id).replace("#", self.sep)
         return self.items.get(id)
 
     def _resolve_one_item(
@@ -121,6 +122,7 @@ def _resolve_one_item(
                 if the `id` is not in the config content, must be a `ConfigItem` object.
 
         """
+        id = str(id).replace("#", self.sep)
         if id in self.resolved_content:
             return self.resolved_content[id]
         try:
@@ -202,6 +204,7 @@ def match_refs_pattern(cls, value: str) -> dict[str, int]:
         """
         refs: dict[str, int] = {}
         # regular expression pattern to match "@XXX" or "@XXX#YYY"
+        value = str(value).replace("#", cls.sep)
         result = cls.id_matcher.findall(value)
         value_is_expr = ConfigExpression.is_expression(value)
         for item in result:
@@ -224,6 +227,7 @@ def update_refs_pattern(cls, value: str, refs: dict) -> str:
 
         """
         # regular expression pattern to match "@XXX" or "@XXX#YYY"
+        value = str(value).replace("#", cls.sep)
         result = cls.id_matcher.findall(value)
         # reversely sort the matched references by length
         # and handle the longer first in case a reference item is substring of another longer item

monai/bundle/utils.py

@@ -24,7 +24,7 @@
 __all__ = ["ID_REF_KEY", "ID_SEP_KEY", "EXPR_KEY", "MACRO_KEY", "DEFAULT_MLFLOW_SETTINGS", "DEFAULT_EXP_MGMT_SETTINGS"]
 
 ID_REF_KEY = "@"  # start of a reference to a ConfigItem
-ID_SEP_KEY = "#"  # separator for the ID of a ConfigItem
+ID_SEP_KEY = "::"  # separator for the ID of a ConfigItem
 EXPR_KEY = "$"  # start of a ConfigExpression
 MACRO_KEY = "%"  # start of a macro of a config
 

tests/test_reference_resolver.py

@@ -76,6 +76,7 @@ def test_resolve(self, configs, expected_id, output_type):
         resolver = ReferenceResolver()
         # add items to resolver
         for k, v in configs.items():
+            k = k.replace("#", "::")
             if ConfigComponent.is_instantiable(v):
                 resolver.add_item(ConfigComponent(config=v, id=k, locator=locator))
             elif ConfigExpression.is_expression(v):