hydra-core 1.4.0.dev4__tar.gz → 1.4.0.dev6__tar.gz

{hydra_core-1.4.0.dev4/hydra_core.egg-info → hydra_core-1.4.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydra-core
-Version: 1.4.0.dev4
+Version: 1.4.0.dev6
 Summary: A framework for elegantly configuring complex applications
 Home-page: https://github.com/facebookresearch/hydra
 Author: Omry Yadan
@@ -19,8 +19,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omegaconf>=2.4.0.dev11
-Requires-Dist: packaging
+Requires-Dist: omegaconf>=2.4.0.dev13
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -46,18 +45,14 @@ Dynamic: summary
 <p align="center">
   <a href="https://github.com/facebookresearch/hydra/blob/main/LICENSE"><img src="https://img.shields.io/pypi/l/hydra-core" alt="PyPI - License" /></a>
   <a href="https://hydra-framework.zulipchat.com/"><img src="https://img.shields.io/badge/zulip-join_chat-brightgreen.svg" alt="Zulip chat" /></a>
-  <a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code style: black" /></a>
+  <a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/badge/code%20style-ruff-261230.svg" alt="Code style: Ruff" /></a>
 </p>
 
 <p align="center">
   <i>A framework for elegantly configuring complex applications.</i>
 </p>
 <p align="center">
-  <i>Check the <a href="https://hydra.cc/">website</a> for more information,<br>
-  or click the thumbnail below for a one-minute video introduction to Hydra.</i>
-</p>
-<p align="center">
-  <a href="https://www.youtube.com/watch?v=Slc3gRQpnBI" target="_blank"><img src="https://raw.githubusercontent.com/facebookresearch/hydra/main/website/static/img/Hydra-Readme-video-thumbnail.jpg" alt="1 minute overview" width="240" height="180" border="10" /></a>
+  <i>Check the <a href="https://hydra.cc/">website</a> for more information.</i>
 </p>
 
 ----------------------
@@ -67,8 +62,10 @@ Dynamic: summary
 #### Development
 
 **Hydra 1.4** is the current development version of Hydra.
+- Hydra 1.4 is coming soon. Until the stable release is available, you can
+  install Hydra from development releases on PyPI.
 - [Documentation](https://hydra.cc/docs/intro/)
-- Installation from source : `pip install git+https://github.com/facebookresearch/hydra.git`
+- Installation: `pip install --pre --upgrade hydra-core`
 - Supported Python versions: 3.10 through 3.14.
 
 #### Stable

{hydra_core-1.4.0.dev4 → hydra_core-1.4.0.dev6}/README.md

@@ -10,18 +10,14 @@
 <p align="center">
   <a href="https://github.com/facebookresearch/hydra/blob/main/LICENSE"><img src="https://img.shields.io/pypi/l/hydra-core" alt="PyPI - License" /></a>
   <a href="https://hydra-framework.zulipchat.com/"><img src="https://img.shields.io/badge/zulip-join_chat-brightgreen.svg" alt="Zulip chat" /></a>
-  <a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code style: black" /></a>
+  <a href="https://github.com/astral-sh/ruff"><img src="https://img.shields.io/badge/code%20style-ruff-261230.svg" alt="Code style: Ruff" /></a>
 </p>
 
 <p align="center">
   <i>A framework for elegantly configuring complex applications.</i>
 </p>
 <p align="center">
-  <i>Check the <a href="https://hydra.cc/">website</a> for more information,<br>
-  or click the thumbnail below for a one-minute video introduction to Hydra.</i>
-</p>
-<p align="center">
-  <a href="https://www.youtube.com/watch?v=Slc3gRQpnBI" target="_blank"><img src="https://raw.githubusercontent.com/facebookresearch/hydra/main/website/static/img/Hydra-Readme-video-thumbnail.jpg" alt="1 minute overview" width="240" height="180" border="10" /></a>
+  <i>Check the <a href="https://hydra.cc/">website</a> for more information.</i>
 </p>
 
 ----------------------
@@ -31,8 +27,10 @@
 #### Development
 
 **Hydra 1.4** is the current development version of Hydra.
+- Hydra 1.4 is coming soon. Until the stable release is available, you can
+  install Hydra from development releases on PyPI.
 - [Documentation](https://hydra.cc/docs/intro/)
-- Installation from source : `pip install git+https://github.com/facebookresearch/hydra.git`
+- Installation: `pip install --pre --upgrade hydra-core`
 - Supported Python versions: 3.10 through 3.14.
 
 #### Stable

{hydra_core-1.4.0.dev4 → hydra_core-1.4.0.dev6}/hydra/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
 # Source of truth for Hydra's version
-__version__ = "1.4.0.dev4"
+__version__ = "1.4.0.dev6"
 from hydra import utils
 from hydra.errors import MissingConfigException
 from hydra.main import main

{hydra_core-1.4.0.dev4 → hydra_core-1.4.0.dev6}/hydra/_internal/config_loader_impl.py

@@ -1,7 +1,6 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 import copy
 import os
-import re
 import sys
 import warnings
 from textwrap import dedent
@@ -18,6 +17,7 @@ from omegaconf import (
 from omegaconf.errors import (
     ConfigAttributeError,
     ConfigKeyError,
+    MissingMandatoryValue,
     OmegaConfBaseException,
 )
 
@@ -53,6 +53,7 @@ class ConfigLoaderImpl(ConfigLoader):
     ) -> None:
         self.config_search_path = config_search_path
         self.repository = ConfigRepository(config_search_path=config_search_path)
+        self._active_repository: Optional[IConfigRepository] = None
 
     @staticmethod
     def validate_sweep_overrides_legal(
@@ -142,6 +143,41 @@ class ConfigLoaderImpl(ConfigLoader):
         run_mode: RunMode,
         from_shell: bool = True,
         validate_sweep_overrides: bool = True,
+    ) -> DictConfig:
+        return self._load_configuration(
+            config_name=config_name,
+            overrides=overrides,
+            run_mode=run_mode,
+            from_shell=from_shell,
+            validate_sweep_overrides=validate_sweep_overrides,
+            activate_config_repository=False,
+        )
+
+    def _load_configuration_with_active_repository(
+        self,
+        config_name: Optional[str],
+        overrides: List[str],
+        run_mode: RunMode,
+        from_shell: bool = True,
+        validate_sweep_overrides: bool = True,
+    ) -> DictConfig:
+        return self._load_configuration(
+            config_name=config_name,
+            overrides=overrides,
+            run_mode=run_mode,
+            from_shell=from_shell,
+            validate_sweep_overrides=validate_sweep_overrides,
+            activate_config_repository=True,
+        )
+
+    def _load_configuration(
+        self,
+        config_name: Optional[str],
+        overrides: List[str],
+        run_mode: RunMode,
+        from_shell: bool,
+        validate_sweep_overrides: bool,
+        activate_config_repository: bool,
     ) -> DictConfig:
         try:
             return self._load_configuration_impl(
@@ -150,6 +186,7 @@ class ConfigLoaderImpl(ConfigLoader):
                 run_mode=run_mode,
                 from_shell=from_shell,
                 validate_sweep_overrides=validate_sweep_overrides,
+                activate_config_repository=activate_config_repository,
             )
         except OmegaConfBaseException as e:
             raise ConfigCompositionException().with_traceback(sys.exc_info()[2]) from e
@@ -242,6 +279,7 @@ class ConfigLoaderImpl(ConfigLoader):
         run_mode: RunMode,
         from_shell: bool = True,
         validate_sweep_overrides: bool = True,
+        activate_config_repository: bool = False,
     ) -> DictConfig:
         from hydra import __version__, version
 
@@ -279,13 +317,11 @@ class ConfigLoaderImpl(ConfigLoader):
 
         # Apply command line overrides after enabling strict flag
         ConfigLoaderImpl._apply_overrides_to_config(config_overrides, cfg)
-        app_overrides = []
         for override in parsed_overrides:
             if override.is_hydra_override():
                 cfg.hydra.overrides.hydra.append(override.input_line)
             else:
                 cfg.hydra.overrides.task.append(override.input_line)
-                app_overrides.append(override)
 
         with open_dict(cfg.hydra):
             cfg.hydra.runtime.choices.update(defaults_list.overrides.known_choices)
@@ -304,14 +340,11 @@ class ConfigLoaderImpl(ConfigLoader):
         if "name" not in cfg.hydra.job:
             cfg.hydra.job.name = JobRuntime().get("name")
 
-        cfg.hydra.job.override_dirname = get_overrides_dirname(
-            overrides=app_overrides,
-            kv_sep=cfg.hydra.job.config.override_dirname.kv_sep,
-            item_sep=cfg.hydra.job.config.override_dirname.item_sep,
-            exclude_keys=cfg.hydra.job.config.override_dirname.exclude_keys,
-        )
         cfg.hydra.job.config_name = config_name
 
+        if activate_config_repository:
+            self._active_repository = caching_repo
+
         return cfg
 
     def load_sweep_config(
@@ -326,6 +359,10 @@ class ConfigLoaderImpl(ConfigLoader):
             overrides=overrides,
             run_mode=RunMode.RUN,
         )
+        ConfigLoaderImpl._ensure_sweep_config_controller_unchanged(
+            master_config=master_config,
+            sweep_config=sweep_config,
+        )
 
         # Copy old config cache to ensure we get the same resolved values (for things
         # like timestamps etc). Since `oc.env` does not cache environment variables
@@ -334,6 +371,36 @@ class ConfigLoaderImpl(ConfigLoader):
 
         return sweep_config
 
+    @staticmethod
+    def _ensure_sweep_config_controller_unchanged(
+        master_config: DictConfig, sweep_config: DictConfig
+    ) -> None:
+        controller_groups = (
+            ("hydra/launcher", "launcher"),
+            ("hydra/sweeper", "sweeper"),
+        )
+        master_choices = master_config.hydra.runtime.choices
+        sweep_choices = sweep_config.hydra.runtime.choices
+        for group, node in controller_groups:
+            master_choice = master_choices.get(group)
+            sweep_choice = sweep_choices.get(group)
+            if master_choice != sweep_choice:
+                # Bandit mistakes this user-facing message for a SQL snippet.
+                raise ConfigCompositionException(
+                    f"'{group}' must be selected before the sweep starts, "  # nosec B608
+                    f"but a swept job config changed it from "
+                    f"'{master_choice}' to '{sweep_choice}'. Select it in "
+                    "the primary config or from the command line."
+                )
+            if not OmegaConf.structural_equality(
+                master_config.hydra[node], sweep_config.hydra[node]
+            ):
+                raise ConfigCompositionException(
+                    f"'hydra.{node}' must be configured before the sweep starts, "
+                    "but a swept job config changed it. Configure it in the "
+                    "primary config or from the command line."
+                )
+
     def get_search_path(self) -> ConfigSearchPath:
         return self.config_search_path
 
@@ -351,29 +418,62 @@ class ConfigLoaderImpl(ConfigLoader):
             value = override.value()
             try:
                 if override.is_delete():
-                    config_val = OmegaConf.select(cfg, key, throw_on_missing=False)
-                    if config_val is None:
+                    config_val_not_found = object()
+                    config_val_missing = object()
+                    last_dot = key.rfind(".")
+                    parent: Container = cfg
+                    parent_missing = False
+                    if last_dot != -1:
+                        parent_key = key[0:last_dot]
+                        selected_parent = OmegaConf.select(
+                            cfg,
+                            parent_key,
+                            default=config_val_not_found,
+                            throw_on_missing=False,
+                        )
+                        if isinstance(selected_parent, Container):
+                            parent = selected_parent
+                        else:
+                            parent_missing = True
+
+                    try:
+                        config_val = OmegaConf.select(
+                            cfg,
+                            key,
+                            default=config_val_not_found,
+                            throw_on_missing=True,
+                        )
+                    except MissingMandatoryValue:
+                        config_val = config_val_missing
+
+                    if parent_missing or config_val is config_val_not_found:
+                        # Bandit mistakes this user-facing message for a SQL snippet.
                         raise ConfigCompositionException(
-                            f"Could not delete from config. '{override.key_or_group}'"
+                            f"Could not delete from config. '{override.key_or_group}'"  # nosec B608
                             " does not exist."
                         )
-                    elif value is not None and value != config_val:
+                    config_val_for_match = (
+                        "???" if config_val is config_val_missing else config_val
+                    )
+                    if (
+                        override.value_type is not None
+                        and value != config_val_for_match
+                    ):
+                        # Bandit mistakes this user-facing message for a SQL snippet.
                         raise ConfigCompositionException(
-                            "Could not delete from config. The value of"
-                            f" '{override.key_or_group}' is {config_val} and not"
+                            "Could not delete from config. The value of"  # nosec B608
+                            f" '{override.key_or_group}' is {config_val_for_match} and not"
                             f" {value}."
                         )
 
-                    last_dot = key.rfind(".")
                     with open_dict(cfg):
                         if last_dot == -1:
                             del cfg[key]
                         else:
-                            node = OmegaConf.select(cfg, key[0:last_dot])
                             node_key: Union[str, int] = key[last_dot + 1 :]
-                            if isinstance(node, ListConfig):
+                            if isinstance(parent, ListConfig):
                                 node_key = int(node_key)
-                            del node[node_key]
+                            del parent[node_key]
 
                 elif override.is_add():
                     if OmegaConf.select(
@@ -382,11 +482,13 @@ class ConfigLoaderImpl(ConfigLoader):
                         OmegaConf.update(cfg, key, value, merge=True, force_add=True)
                     else:
                         assert override.input_line is not None
-                        raise ConfigCompositionException(dedent(f"""\
+                        raise ConfigCompositionException(
+                            dedent(f"""\
                         Could not append to config. An item is already at '{override.key_or_group}'.
                         Either remove + prefix: '{override.input_line[1:]}'
                         Or add a second + to add or override '{override.key_or_group}': '+{override.input_line}'
-                        """))
+                        """)
+                        )
                 elif override.is_force_add():
                     OmegaConf.update(cfg, key, value, merge=True, force_add=True)
                 elif override.is_list_extend():
@@ -440,12 +542,14 @@ class ConfigLoaderImpl(ConfigLoader):
                 try:
                     url = "https://hydra.cc/docs/1.2/upgrades/1.0_to_1.1/automatic_schema_matching"
                     if "defaults" in schema.config:
-                        raise ConfigCompositionException(dedent(f"""\
+                        raise ConfigCompositionException(
+                            dedent(f"""\
                             '{config_path}' is validated against ConfigStore schema with the same name.
                             This behavior is deprecated in Hydra 1.1 and will be removed in Hydra 1.2.
                             In addition, the automatically matched schema contains a defaults list.
                             This combination is no longer supported.
-                            See {url} for migration instructions."""))
+                            See {url} for migration instructions.""")
+                        )
                     else:
                         deprecation_warning(
                             dedent(f"""\
@@ -529,6 +633,12 @@ class ConfigLoaderImpl(ConfigLoader):
         config_name: Optional[str] = None,
         overrides: Optional[List[str]] = None,
     ) -> List[str]:
+        if (
+            config_name is None
+            and overrides is None
+            and self._active_repository is not None
+        ):
+            return self._active_repository.get_group_options(group_name, results_filter)
         if overrides is None:
             overrides = []
         _, caching_repo = self._parse_overrides_and_create_caching_repo(
@@ -571,6 +681,8 @@ class ConfigLoaderImpl(ConfigLoader):
         return cfg
 
     def get_sources(self) -> List[ConfigSource]:
+        if self._active_repository is not None:
+            return self._active_repository.get_sources()
         return self.repository.get_sources()
 
     def compute_defaults_list(
@@ -590,18 +702,3 @@ class ConfigLoaderImpl(ConfigLoader):
             skip_missing=run_mode == RunMode.MULTIRUN,
         )
         return defaults_list
-
-
-def get_overrides_dirname(
-    overrides: List[Override], exclude_keys: List[str], item_sep: str, kv_sep: str
-) -> str:
-    lines = []
-    for override in overrides:
-        if override.key_or_group not in exclude_keys:
-            line = override.input_line
-            assert line is not None
-            lines.append(line)
-
-    lines.sort()
-    ret = re.sub(pattern="[=]", repl=kv_sep, string=item_sep.join(lines))
-    return ret

{hydra_core-1.4.0.dev4 → hydra_core-1.4.0.dev6}/hydra/_internal/config_repository.py

@@ -51,6 +51,8 @@ class IConfigRepository(ABC):
 
 
 class ConfigRepository(IConfigRepository):
+    _KNOWN_DEFAULTS_LIST_KEYWORDS = ("optional", "override")
+
     config_search_path: ConfigSearchPath
     sources: List[ConfigSource]
 
@@ -199,7 +201,9 @@ class ConfigRepository(IConfigRepository):
                 assert isinstance(key, str)
                 config_group, package, _package2 = self._split_group(key)
                 keywords = ConfigRepository.Keywords()
-                self._extract_keywords_from_config_group(config_group, keywords)
+                self._extract_keywords_from_config_group(
+                    config_path, config_group, keywords
+                )
 
                 if not version.base_at_least("1.2"):
                     if not keywords.optional and old_optional is not None:
@@ -301,18 +305,22 @@ class ConfigRepository(IConfigRepository):
 
     @staticmethod
     def _extract_keywords_from_config_group(
-        group: str, keywords: "ConfigRepository.Keywords"
+        config_path: str, group: str, keywords: "ConfigRepository.Keywords"
     ) -> None:
-        elements = group.split(" ")
+        elements = group.split()
+        if not elements:
+            raise ValueError(f"In {config_path}: Missing group name in defaults list")
         group = elements[-1]
         elements = elements[0:-1]
-        for idx, e in enumerate(elements):
-            if e == "optional":
+        for keyword in elements:
+            if keyword not in ConfigRepository._KNOWN_DEFAULTS_LIST_KEYWORDS:
+                raise ValueError(
+                    f"In {config_path}: Unsupported keyword '{keyword}' in defaults list"
+                )
+            if keyword == "optional":
                 keywords.optional = True
-            elif e == "override":
+            elif keyword == "override":
                 keywords.override = True
-            else:
-                break
         keywords.group = group
 
 

{hydra_core-1.4.0.dev4 → hydra_core-1.4.0.dev6}/hydra/_internal/core_plugins/bash_completion.py

@@ -22,11 +22,16 @@ class BashCompletion(CompletionPlugin):
         if (( ${#words[@]} < 2 )); then
             return
         fi
+        if [[ "${words[1]}" == -* ]]; then
+            return
+        fi
         file_path=$(pwd)/${words[1]}
         if [ ! -f "$file_path" ]; then
             return
         fi
-        grep "@hydra.main" $file_path -q
+        if ! grep -Fq -- "@hydra.main" "$file_path"; then
+            return
+        fi
         helper="${words[0]} ${words[1]}"
     else
         helper="${words[0]}"

{hydra_core-1.4.0.dev4 → hydra_core-1.4.0.dev6}/hydra/_internal/core_plugins/structured_config_source.py

@@ -9,7 +9,6 @@ from hydra.plugins.config_source import ConfigResult, ConfigSource
 
 
 class StructuredConfigSource(ConfigSource):
-
     def __init__(self, provider: str, path: str) -> None:
         super().__init__(provider=provider, path=path)
         # Import the module, the __init__ there is expected to register the configs.

{hydra_core-1.4.0.dev4 → hydra_core-1.4.0.dev6}/hydra/_internal/defaults_list.py

@@ -72,25 +72,30 @@ class Overrides:
             if override.is_sweep_override():
                 continue
             is_group = repo.group_exists(override.key_or_group)
+            is_config = repo.config_exists(override.key_or_group)
             value = override.value()
             is_dict = isinstance(override.value(), dict)
-            if is_dict or not is_group:
+            if override.is_delete() and (is_group or is_config):
+                key = override.get_key_element()[1:]
+                if is_group:
+                    if value is not None and not isinstance(value, str):
+                        raise ValueError(
+                            f"Config group override deletion value must be a string : {override}"
+                        )
+                    self.deletions[key] = Deletion(name=value)
+                else:
+                    if value is not None:
+                        raise ValueError(
+                            f"Config path deletion does not support a value : {override}"
+                        )
+                    self.deletions[key] = Deletion(name=None)
+            elif is_dict or not is_group:
                 self.config_overrides.append(override)
             elif override.is_force_add():
                 # This could probably be made to work if there is a compelling use case.
                 raise ConfigCompositionException(
                     f"force-add of config groups is not supported: '{override.input_line}'"
                 )
-            elif override.is_delete():
-                key = override.get_key_element()[1:]
-                value = override.value()
-                if value is not None and not isinstance(value, str):
-                    raise ValueError(
-                        f"Config group override deletion value must be a string : {override}"
-                    )
-
-                self.deletions[key] = Deletion(name=value)
-
             elif not isinstance(value, (str, list)):
                 raise ValueError(
                     f"Config group override must be a string or a list. Got {type(value).__name__}"
@@ -193,22 +198,28 @@ class Overrides:
             self.known_choices_per_group[group].add(key)
 
     def is_deleted(self, default: InputDefault) -> bool:
-        if not isinstance(default, GroupDefault):
-            return False
-        key = default.get_override_key()
-        if key in self.deletions:
-            deletion = self.deletions[key]
-            if deletion.name is None:
-                return True
-            else:
-                return deletion.name == default.get_name()
+        if isinstance(default, GroupDefault):
+            key = default.get_override_key()
+            if key in self.deletions:
+                deletion = self.deletions[key]
+                if deletion.name is None:
+                    return True
+                else:
+                    return deletion.name == default.get_name()
+        elif isinstance(default, ConfigDefault):
+            key = default.get_config_path()
+            if key in self.deletions:
+                return self.deletions[key].name is None
         return False
 
     def delete(self, default: InputDefault) -> None:
-        assert isinstance(default, GroupDefault)
-        default.deleted = True
-
-        key = default.get_override_key()
+        if isinstance(default, GroupDefault):
+            default.deleted = True
+            key = default.get_override_key()
+        else:
+            assert isinstance(default, ConfigDefault)
+            default.deleted = True
+            key = default.get_config_path()
         self.deletions[key].used = True
 
 
@@ -326,7 +337,7 @@ def _check_not_missing(
     return False
 
 
-def _create_interpolation_map(
+def _create_legacy_interpolation_map(
     overrides: Overrides,
     defaults_list: List[InputDefault],
     self_added: bool,
@@ -391,9 +402,11 @@ def _update_overrides(
             pcp = parent.get_config_path()
             okey = last_override_seen.get_override_key()
             oval = last_override_seen.get_name()
-            raise ConfigCompositionException(dedent(f"""\
+            raise ConfigCompositionException(
+                dedent(f"""\
                     In {pcp}: Override '{okey} : {oval}' is defined before '{d.get_override_key()}: {d.get_name()}'.
-                    Overrides must be at the end of the defaults list"""))
+                    Overrides must be at the end of the defaults list""")
+            )
 
         if isinstance(d, GroupDefault):
             if legacy_hydra_override:
@@ -413,10 +426,12 @@ def _update_overrides(
                 if interpolated_subtree:
                     # Since interpolations are deferred for until all the config groups are already set,
                     # Their subtree may not contain config group overrides
-                    raise ConfigCompositionException(dedent(f"""\
+                    raise ConfigCompositionException(
+                        dedent(f"""\
                             {parent.get_config_path()}: Default List Overrides are not allowed in the subtree
                             of an in interpolated config group (override {d.get_override_key()}={d.get_name()}).
-                            """))
+                            """)
+                    )
                 overrides.add_override(parent.get_config_path(), d)
 
 
@@ -541,14 +556,23 @@ def _create_defaults_tree_impl(
                         )
 
                     assert d.group is not None
-                    node = ConfigDefault(
-                        path=d.group + "/" + item,
-                        package=d.package,
-                        optional=d.is_optional(),
-                    )
-                    node.update_parent(
-                        parent.get_group_path(), parent.get_final_package()
-                    )
+                    if d.is_external_append():
+                        node = ConfigDefault(
+                            path=f"{d.get_group_path()}/{item}",
+                            package=d.package,
+                            optional=d.is_optional(),
+                        )
+                        # External appends are already absolute in Hydra's config namespace.
+                        node.update_parent("", "")
+                    else:
+                        node = ConfigDefault(
+                            path=f"{d.group}/{item}",
+                            package=d.package,
+                            optional=d.is_optional(),
+                        )
+                        node.update_parent(
+                            parent.get_group_path(), parent.get_final_package()
+                        )
                     new_root = DefaultsTreeNode(node=node, parent=root)
                     add_child(children, new_root)
 
@@ -561,7 +585,13 @@ def _create_defaults_tree_impl(
                 add_child(children, new_root)
 
     # processed deferred interpolations
-    known_choices = _create_interpolation_map(overrides, defaults_list, self_added)
+    known_choices = OmegaConf.create(overrides.known_choices)
+    # TODO: Remove Hydra 1.1 compatibility in
+    # https://github.com/facebookresearch/hydra/issues/3221.
+    if not version.base_at_least("1.2"):
+        known_choices = _create_legacy_interpolation_map(
+            overrides, defaults_list, self_added
+        )
 
     for idx, dd in enumerate(children):
         if isinstance(dd, InputDefault) and dd.is_interpolation():

{hydra_core-1.4.0.dev4 → hydra_core-1.4.0.dev6}/hydra/_internal/grammar/grammar_functions.py

@@ -204,7 +204,7 @@ def cast_bool(*args: CastType, value: Optional[CastType] = None) -> Any:
 
 
 def choice(
-    *args: Union[str, int, float, bool, Dict[Any, Any], List[Any], ChoiceSweep]
+    *args: Union[str, int, float, bool, Dict[Any, Any], List[Any], ChoiceSweep],
 ) -> ChoiceSweep:
     """
     A choice sweep over the specified values