hydra-core 1.4.0.dev5__tar.gz → 1.4.0.dev8__tar.gz

{hydra_core-1.4.0.dev5/hydra_core.egg-info → hydra_core-1.4.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydra-core
-Version: 1.4.0.dev5
+Version: 1.4.0.dev8
 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.dev12
-Requires-Dist: packaging
+Requires-Dist: omegaconf>=2.4.0.dev13
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -46,7 +45,7 @@ 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">

{hydra_core-1.4.0.dev5 → hydra_core-1.4.0.dev8}/README.md

@@ -10,7 +10,7 @@
 <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">

{hydra_core-1.4.0.dev5 → hydra_core-1.4.0.dev8}/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.dev5"
+__version__ = "1.4.0.dev8"
 from hydra import utils
 from hydra.errors import MissingConfigException
 from hydra.main import main

{hydra_core-1.4.0.dev5 → hydra_core-1.4.0.dev8}/hydra/_internal/callbacks.py

@@ -1,54 +1,23 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 import warnings
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Optional
 
 from omegaconf import DictConfig, OmegaConf
 
-from hydra.core.singleton import Singleton
 from hydra.types import TaskFunction
 
 if TYPE_CHECKING:
     from hydra.core.utils import JobReturn
 
 
-class CallbacksCache(metaclass=Singleton):
-    """
-    A singleton class to cache callbacks so they are not reinstantiated during
-    compose config and start run.
-    """
-
-    @staticmethod
-    def instance() -> "CallbacksCache":
-        return Singleton.instance(CallbacksCache)  # type: ignore
-
-    cache: Dict[int, "Callbacks"]
-
-    def __init__(self) -> None:
-        self.cache = {}
-
-
 class Callbacks:
-    callbacks: List[Any]
-
-    def __init__(
-        self, config: Optional[DictConfig] = None, check_cache: bool = True
-    ) -> None:
-        if config is None:
-            return
-        cache = CallbacksCache.instance().cache
-        if check_cache:
-            cached_callback = cache.get(id(config))
-            if cached_callback is not None:
-                self.callbacks = cached_callback.callbacks
-                return
-
+    def __init__(self, config: Optional[DictConfig] = None) -> None:
         self.callbacks = []
         from hydra.utils import instantiate
 
         if config is not None and OmegaConf.select(config, "hydra.callbacks"):
             for params in config.hydra.callbacks.values():
                 self.callbacks.append(instantiate(params))
-        cache[id(config)] = self
 
     def _notify(self, function_name: str, reverse: bool = False, **kwargs: Any) -> None:
         callbacks = reversed(self.callbacks) if reverse else self.callbacks
@@ -94,16 +63,3 @@ class Callbacks:
             reverse=True,
             **kwargs,
         )
-
-    def on_compose_config(
-        self,
-        config: DictConfig,
-        config_name: Optional[str],
-        overrides: List[str],
-    ) -> None:
-        self._notify(
-            function_name="on_compose_config",
-            config=config,
-            config_name=config_name,
-            overrides=overrides,
-        )

{hydra_core-1.4.0.dev5 → hydra_core-1.4.0.dev8}/hydra/_internal/config_loader_impl.py

@@ -36,11 +36,9 @@ from hydra.core.override_parser.overrides_parser import OverridesParser
 from hydra.core.override_parser.types import Override, ValueType
 from hydra.core.utils import JobRuntime
 from hydra.errors import ConfigCompositionException, MissingConfigException
-from hydra.plugins.config_source import ConfigLoadError, ConfigResult, ConfigSource
+from hydra.plugins.config_source import ConfigResult, ConfigSource
 from hydra.types import RunMode
 
-from .deprecation_warning import deprecation_warning
-
 
 class ConfigLoaderImpl(ConfigLoader):
     """
@@ -53,6 +51,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 +141,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 +184,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 +277,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
 
@@ -277,7 +313,7 @@ class ConfigLoaderImpl(ConfigLoader):
         # The Hydra node should not be read-only even if the root config is read-only.
         OmegaConf.set_readonly(cfg.hydra, False)
 
-        # Apply command line overrides after enabling strict flag
+        # Apply command line overrides after enabling struct mode
         ConfigLoaderImpl._apply_overrides_to_config(config_overrides, cfg)
         for override in parsed_overrides:
             if override.is_hydra_override():
@@ -304,6 +340,9 @@ class ConfigLoaderImpl(ConfigLoader):
 
         cfg.hydra.job.config_name = config_name
 
+        if activate_config_repository:
+            self._active_repository = caching_repo
+
         return cfg
 
     def load_sweep_config(
@@ -441,11 +480,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():
@@ -485,67 +526,6 @@ class ConfigLoaderImpl(ConfigLoader):
                 f" {type(ret.config).__name__}"
             )
 
-        if not ret.is_schema_source:
-            schema = None
-            try:
-                schema_source = repo.get_schema_source()
-                cname = ConfigSource._normalize_file_name(filename=config_path)
-                schema = schema_source.load_config(cname)
-            except ConfigLoadError:
-                # schema not found, ignore
-                pass
-
-            if schema is not None:
-                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"""\
-                            '{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."""))
-                    else:
-                        deprecation_warning(
-                            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.
-                                See {url} for migration instructions."""),
-                            stacklevel=11,
-                        )
-
-                    # if primary config has a hydra node, remove it during validation and add it back.
-                    # This allows overriding Hydra's configuration without declaring it's node
-                    # in the schema of every primary config
-                    hydra = None
-                    hydra_config_group = (
-                        default.config_path is not None
-                        and default.config_path.startswith("hydra/")
-                    )
-                    config = ret.config
-                    if (
-                        default.primary
-                        and isinstance(config, DictConfig)
-                        and "hydra" in config
-                        and not hydra_config_group
-                    ):
-                        hydra = config.pop("hydra")
-
-                    merged = OmegaConf.merge(schema.config, config)
-                    assert isinstance(merged, DictConfig)
-
-                    if hydra is not None:
-                        with open_dict(merged):
-                            merged.hydra = hydra
-                    ret.config = merged
-                except OmegaConfBaseException as e:
-                    raise ConfigCompositionException(
-                        f"Error merging '{config_path}' with schema"
-                    ) from e
-
-                assert isinstance(merged, DictConfig)
-
         res = self._embed_result_config(ret, default.package)
         if (
             not default.primary
@@ -588,6 +568,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(
@@ -630,6 +616,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(

{hydra_core-1.4.0.dev5 → hydra_core-1.4.0.dev8}/hydra/_internal/config_repository.py

@@ -2,7 +2,6 @@
 import copy
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from textwrap import dedent
 from typing import Dict, List, Optional, Tuple
 
 from omegaconf import (
@@ -15,13 +14,11 @@ from omegaconf import (
     read_write,
 )
 
-from hydra import version
 from hydra.core.config_search_path import ConfigSearchPath
 from hydra.core.object_type import ObjectType
 from hydra.plugins.config_source import ConfigResult, ConfigSource
 
 from ..core.default_element import ConfigDefault, GroupDefault, InputDefault
-from .deprecation_warning import deprecation_warning
 from .sources_registry import SourcesRegistry
 
 
@@ -51,6 +48,8 @@ class IConfigRepository(ABC):
 
 
 class ConfigRepository(IConfigRepository):
+    _KNOWN_DEFAULTS_LIST_KEYWORDS = ("optional", "override")
+
     config_search_path: ConfigSearchPath
     sources: List[ConfigSource]
 
@@ -168,24 +167,10 @@ class ConfigRepository(IConfigRepository):
         config_path: str,
         defaults: ListConfig,
     ) -> List[InputDefault]:
-        def issue_deprecated_name_warning() -> None:
-            # DEPRECATED: remove in 1.2
-            url = "https://hydra.cc/docs/1.2/upgrades/1.0_to_1.1/changes_to_package_header"
-            deprecation_warning(
-                message=dedent(f"""\
-                    In {config_path}: Defaults List contains deprecated keyword _name_, see {url}
-                    """),
-            )
-
         res: List[InputDefault] = []
         for item in defaults._iter_ex(resolve=False):
             default: InputDefault
             if isinstance(item, DictConfig):
-                old_optional = None
-                if not version.base_at_least("1.2"):
-                    if len(item) > 1:
-                        if "optional" in item:
-                            old_optional = item.pop("optional")
                 keys = list(item.keys())
 
                 if len(keys) > 1:
@@ -199,27 +184,14 @@ 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)
-
-                if not version.base_at_least("1.2"):
-                    if not keywords.optional and old_optional is not None:
-                        keywords.optional = old_optional
+                self._extract_keywords_from_config_group(
+                    config_path, config_group, keywords
+                )
 
                 node = item._get_node(key)
                 assert node is not None and isinstance(node, Node)
                 config_value = node._value()
 
-                if not version.base_at_least("1.2"):
-                    if old_optional is not None:
-                        msg = dedent(
-                            f"""
-                            In {config_path}: 'optional: true' is deprecated.
-                            Use 'optional {key}: {config_value}' instead.
-                            Support for the old style is removed for Hydra version_base >= 1.2"""
-                        )
-
-                        deprecation_warning(msg)
-
                 if config_value is not None and not isinstance(
                     config_value, (str, list)
                 ):
@@ -240,10 +212,6 @@ class ConfigRepository(IConfigRepository):
                         options.append(vv)
                     config_value = options
 
-                if not version.base_at_least("1.2"):
-                    if package is not None and "_name_" in package:
-                        issue_deprecated_name_warning()
-
                 default = GroupDefault(
                     group=keywords.group,
                     value=config_value,
@@ -254,10 +222,6 @@ class ConfigRepository(IConfigRepository):
 
             elif isinstance(item, str):
                 path, package, _package2 = self._split_group(item)
-                if not version.base_at_least("1.2"):
-                    if package is not None and "_name_" in package:
-                        issue_deprecated_name_warning()
-
                 default = ConfigDefault(path=path, package=package)
             else:
                 raise ValueError(
@@ -301,18 +265,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.dev5 → hydra_core-1.4.0.dev8}/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.dev5 → hydra_core-1.4.0.dev8}/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.