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

{hydra_core-1.4.0.dev6/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.dev6
+Version: 1.4.0.dev8
 Summary: A framework for elegantly configuring complex applications
 Home-page: https://github.com/facebookresearch/hydra
 Author: Omry Yadan

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

{hydra_core-1.4.0.dev6 → 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.dev6 → 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):
     """
@@ -315,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():
@@ -528,69 +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

{hydra_core-1.4.0.dev6 → 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
 
 
@@ -170,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:
@@ -205,25 +188,10 @@ class ConfigRepository(IConfigRepository):
                     config_path, 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
-
                 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)
                 ):
@@ -244,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,
@@ -258,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(