hydra-core 1.4.0.dev1__tar.gz → 1.4.0.dev3__tar.gz

{hydra_core-1.4.0.dev1/hydra_core.egg-info → hydra_core-1.4.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hydra-core
-Version: 1.4.0.dev1
+Version: 1.4.0.dev3
 Summary: A framework for elegantly configuring complex applications
 Home-page: https://github.com/facebookresearch/hydra
 Author: Omry Yadan
@@ -9,65 +9,69 @@ License: MIT
 Keywords: command-line configuration yaml tab-completion
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omegaconf>=2.4.0.dev2
-Requires-Dist: importlib-resources; python_version < "3.9"
+Requires-Dist: omegaconf>=2.4.0.dev11
 Requires-Dist: packaging
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <p align="center"><img src="https://raw.githubusercontent.com/facebookresearch/hydra/main/website/static/img/Hydra-Readme-logo2.svg" alt="logo" width="70%" /></p>
 
 <p align="center">
-  <a href="https://pypi.org/project/hydra-core/">
-    <img src="https://img.shields.io/pypi/v/hydra-core" alt="PyPI" />
-  </a>
-  <a href="https://circleci.com/gh/facebookresearch/hydra">
-    <img src="https://img.shields.io/circleci/build/github/facebookresearch/hydra?token=af199cd2deca9e70e53776f9ded96284b10687e9" alt="CircleCI" />
-  </a>
-  <a href="#">
-    <img src="https://img.shields.io/pypi/l/hydra-core" alt="PyPI - License" />
-  </a>
-  <a href="#">
-    <img src="https://img.shields.io/pypi/pyversions/hydra-core" alt="PyPI - Python Version" />
-  </a>
-  <a href="https://pepy.tech/project/hydra-core?versions=0.11.*&versions=1.0.*&versions=1.1.*">
-    <img src="https://pepy.tech/badge/hydra-core/month" alt="Downloads" />
-  </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://lgtm.com/projects/g/facebookresearch/hydra/alerts/">
-    <img src="https://img.shields.io/lgtm/alerts/g/facebookresearch/hydra.svg?logo=lgtm&logoWidth=18" alt="Total alerts" />
-  </a>
-  <a href="https://lgtm.com/projects/g/facebookresearch/hydra/context:python">
-    <img src="https://img.shields.io/lgtm/grade/python/g/facebookresearch/hydra.svg?logo=lgtm&logoWidth=18" alt="Language grade: Python" />
-  </a>
-  <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="http://www.youtube.com/watch?feature=player_embedded&v=Slc3gRQpnBI" target="_blank">
-     <img src="http://img.youtube.com/vi/Slc3gRQpnBI/hqdefault.jpg" alt="1 minute overview" width="240" height="180" border="10" />
-   </a>
-  </p>
+  <a href="https://pypi.org/project/hydra-core/"><img src="https://img.shields.io/pypi/v/hydra-core" alt="PyPI" /></a>
+  <a href="#"><img src="https://img.shields.io/pypi/pyversions/hydra-core" alt="PyPI - Python Version" /></a>
+  <a href="https://github.com/facebookresearch/hydra/actions/workflows/core_tests.yml"><img src="https://github.com/facebookresearch/hydra/actions/workflows/core_tests.yml/badge.svg?branch=main" alt="GitHub Actions build" /></a>
+  <a href="https://www.pepy.tech/projects/hydra-core?versions=0.11.*&versions=1.0.*&versions=1.1.*&versions=1.2.*&versions=1.3.*&versions=1.4.*"><img src="https://pepy.tech/badge/hydra-core/month" alt="Downloads" /></a>
 </p>
 
-----------------------
+<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>
+</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>
+</p>
 
+----------------------
 
 ### Releases
 
+#### Development
+
+**Hydra 1.4** is the current development version of Hydra.
+- [Documentation](https://hydra.cc/docs/intro/)
+- Installation from source : `pip install git+https://github.com/facebookresearch/hydra.git`
+- Supported Python versions: 3.10 through 3.14.
+
 #### Stable
 
 **Hydra 1.3** is the stable version of Hydra.
@@ -90,7 +94,7 @@ Hydra is licensed under [MIT License](LICENSE).
 #### Ask questions in Github Discussions or StackOverflow (Use the tag #fb-hydra or #omegaconf):
 * [Github Discussions](https://github.com/facebookresearch/hydra/discussions)
 * [StackOverflow](https://stackexchange.com/filters/391828/hydra-questions)
-* [Twitter](https://twitter.com/Hydra_Framework)
+* [X](https://twitter.com/Hydra_Framework)
 
 Check out the Meta AI [blog post](https://ai.facebook.com/blog/reengineering-facebook-ais-deep-learning-platforms-for-interoperability/) to learn about how Hydra fits into Meta's efforts to reengineer deep learning platforms for interoperability.
 
@@ -105,4 +109,3 @@ If you use Hydra in your research please use the following BibTeX entry:
   url =          {https://github.com/facebookresearch/hydra}
 }
 ```
-

{hydra_core-1.4.0.dev1 → hydra_core-1.4.0.dev3}/README.md

@@ -1,49 +1,40 @@
 <p align="center"><img src="https://raw.githubusercontent.com/facebookresearch/hydra/main/website/static/img/Hydra-Readme-logo2.svg" alt="logo" width="70%" /></p>
 
 <p align="center">
-  <a href="https://pypi.org/project/hydra-core/">
-    <img src="https://img.shields.io/pypi/v/hydra-core" alt="PyPI" />
-  </a>
-  <a href="https://circleci.com/gh/facebookresearch/hydra">
-    <img src="https://img.shields.io/circleci/build/github/facebookresearch/hydra?token=af199cd2deca9e70e53776f9ded96284b10687e9" alt="CircleCI" />
-  </a>
-  <a href="#">
-    <img src="https://img.shields.io/pypi/l/hydra-core" alt="PyPI - License" />
-  </a>
-  <a href="#">
-    <img src="https://img.shields.io/pypi/pyversions/hydra-core" alt="PyPI - Python Version" />
-  </a>
-  <a href="https://pepy.tech/project/hydra-core?versions=0.11.*&versions=1.0.*&versions=1.1.*">
-    <img src="https://pepy.tech/badge/hydra-core/month" alt="Downloads" />
-  </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://lgtm.com/projects/g/facebookresearch/hydra/alerts/">
-    <img src="https://img.shields.io/lgtm/alerts/g/facebookresearch/hydra.svg?logo=lgtm&logoWidth=18" alt="Total alerts" />
-  </a>
-  <a href="https://lgtm.com/projects/g/facebookresearch/hydra/context:python">
-    <img src="https://img.shields.io/lgtm/grade/python/g/facebookresearch/hydra.svg?logo=lgtm&logoWidth=18" alt="Language grade: Python" />
-  </a>
-  <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="http://www.youtube.com/watch?feature=player_embedded&v=Slc3gRQpnBI" target="_blank">
-     <img src="http://img.youtube.com/vi/Slc3gRQpnBI/hqdefault.jpg" alt="1 minute overview" width="240" height="180" border="10" />
-   </a>
-  </p>
+  <a href="https://pypi.org/project/hydra-core/"><img src="https://img.shields.io/pypi/v/hydra-core" alt="PyPI" /></a>
+  <a href="#"><img src="https://img.shields.io/pypi/pyversions/hydra-core" alt="PyPI - Python Version" /></a>
+  <a href="https://github.com/facebookresearch/hydra/actions/workflows/core_tests.yml"><img src="https://github.com/facebookresearch/hydra/actions/workflows/core_tests.yml/badge.svg?branch=main" alt="GitHub Actions build" /></a>
+  <a href="https://www.pepy.tech/projects/hydra-core?versions=0.11.*&versions=1.0.*&versions=1.1.*&versions=1.2.*&versions=1.3.*&versions=1.4.*"><img src="https://pepy.tech/badge/hydra-core/month" alt="Downloads" /></a>
 </p>
 
-----------------------
+<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>
+</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>
+</p>
 
+----------------------
 
 ### Releases
 
+#### Development
+
+**Hydra 1.4** is the current development version of Hydra.
+- [Documentation](https://hydra.cc/docs/intro/)
+- Installation from source : `pip install git+https://github.com/facebookresearch/hydra.git`
+- Supported Python versions: 3.10 through 3.14.
+
 #### Stable
 
 **Hydra 1.3** is the stable version of Hydra.
@@ -66,7 +57,7 @@ Hydra is licensed under [MIT License](LICENSE).
 #### Ask questions in Github Discussions or StackOverflow (Use the tag #fb-hydra or #omegaconf):
 * [Github Discussions](https://github.com/facebookresearch/hydra/discussions)
 * [StackOverflow](https://stackexchange.com/filters/391828/hydra-questions)
-* [Twitter](https://twitter.com/Hydra_Framework)
+* [X](https://twitter.com/Hydra_Framework)
 
 Check out the Meta AI [blog post](https://ai.facebook.com/blog/reengineering-facebook-ais-deep-learning-platforms-for-interoperability/) to learn about how Hydra fits into Meta's efforts to reengineer deep learning platforms for interoperability.
 
@@ -81,4 +72,3 @@ If you use Hydra in your research please use the following BibTeX entry:
   url =          {https://github.com/facebookresearch/hydra}
 }
 ```
-

{hydra_core-1.4.0.dev1 → hydra_core-1.4.0.dev3}/build_helpers/build_helpers.py

@@ -156,15 +156,17 @@ class BuildPyCommand(build_py.build_py):
 
 
 class Develop(develop.develop):
-    def run(self) -> None:  # type: ignore
+    def run(self) -> None:
         if not self.dry_run:
             run_antlr(self)
         develop.develop.run(self)
 
 
 class SDistCommand(sdist.sdist):
+    dry_run: bool
+
     def run(self) -> None:
-        if not self.dry_run:  # type: ignore
+        if not self.dry_run:
             self.run_command("clean")
             run_antlr(self)
         sdist.sdist.run(self)
@@ -214,23 +216,23 @@ class ANTLRCommand(Command):  # type: ignore
         build_dir = Path(__file__).parent.absolute()
         project_root = build_dir.parent
         lib = "antlr4"
-        pkgname = 'omegaconf.vendor'
+        pkgname = "omegaconf.vendor"
 
         replacements = [
             partial(  # import antlr4 -> import omegaconf.vendor.antlr4
-                re.compile(r'(^\s*)import {}\n'.format(lib), flags=re.M).sub,
-                r'\1from {} import {}\n'.format(pkgname, lib)
+                re.compile(r"(^\s*)import {}\n".format(lib), flags=re.M).sub,
+                r"\1from {} import {}\n".format(pkgname, lib),
             ),
             partial(  # from antlr4 -> from fomegaconf.vendor.antlr4
-                re.compile(r'(^\s*)from {}(\.|\s+)'.format(lib), flags=re.M).sub,
-                r'\1from {}.{}\2'.format(pkgname, lib)
+                re.compile(r"(^\s*)from {}(\.|\s+)".format(lib), flags=re.M).sub,
+                r"\1from {}.{}\2".format(pkgname, lib),
             ),
         ]
 
         path = project_root / "hydra" / "grammar" / "gen"
         for item in path.iterdir():
             if item.is_file() and item.name.endswith(".py"):
-                text = item.read_text('utf8')
+                text = item.read_text("utf8")
                 for replacement in replacements:
                     text = replacement(text)
-                item.write_text(text, 'utf8')
+                item.write_text(text, "utf8")

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

{hydra_core-1.4.0.dev1 → hydra_core-1.4.0.dev3}/hydra/_internal/callbacks.py

@@ -1,23 +1,54 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 import warnings
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any, Dict, List, 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:
-    def __init__(self, config: Optional[DictConfig] = None) -> None:
+    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
+
         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
@@ -63,3 +94,16 @@ 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.dev1 → hydra_core-1.4.0.dev3}/hydra/_internal/config_loader_impl.py

@@ -5,9 +5,16 @@ import re
 import sys
 import warnings
 from textwrap import dedent
-from typing import Any, List, MutableSequence, Optional, Tuple
-
-from omegaconf import Container, DictConfig, OmegaConf, flag_override, open_dict
+from typing import Any, List, MutableSequence, Optional, Tuple, Union
+
+from omegaconf import (
+    Container,
+    DictConfig,
+    ListConfig,
+    OmegaConf,
+    flag_override,
+    open_dict,
+)
 from omegaconf.errors import (
     ConfigAttributeError,
     ConfigKeyError,
@@ -69,13 +76,11 @@ class ConfigLoaderImpl(ConfigLoader):
                         else:
                             example_override = f"key='{vals}'"
 
-                        msg = dedent(
-                            f"""\
+                        msg = dedent(f"""\
                             Ambiguous value for argument '{x.input_line}'
                             1. To use it as a list, use key=[value1,value2]
                             2. To use it as string, quote the value: {example_override}
-                            3. To sweep over it, add --multirun to your command line"""
-                        )
+                            3. To sweep over it, add --multirun to your command line""")
                         raise ConfigCompositionException(msg)
                     else:
                         raise ConfigCompositionException(
@@ -365,7 +370,10 @@ class ConfigLoaderImpl(ConfigLoader):
                             del cfg[key]
                         else:
                             node = OmegaConf.select(cfg, key[0:last_dot])
-                            del node[key[last_dot + 1 :]]
+                            node_key: Union[str, int] = key[last_dot + 1 :]
+                            if isinstance(node, ListConfig):
+                                node_key = int(node_key)
+                            del node[node_key]
 
                 elif override.is_add():
                     if OmegaConf.select(
@@ -374,17 +382,22 @@ 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():
+                    config_val = OmegaConf.select(cfg, key, throw_on_missing=True)
+                    if not OmegaConf.is_list(config_val):
+                        raise ConfigCompositionException(
+                            "Could not append to config list. The existing value of"
+                            f" '{override.key_or_group}' is {config_val} which is not"
+                            f" a list."
+                        )
+                    config_val.extend(value)
                 else:
                     try:
                         OmegaConf.update(cfg, key, value, merge=True)
@@ -427,25 +440,19 @@ 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"""\
+                            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."""
-                            ),
+                                See {url} for migration instructions."""),
                             stacklevel=11,
                         )
 

{hydra_core-1.4.0.dev1 → hydra_core-1.4.0.dev3}/hydra/_internal/config_repository.py

@@ -172,19 +172,17 @@ class ConfigRepository(IConfigRepository):
             # 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"""\
+                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"):
-                    old_optional = None
                     if len(item) > 1:
                         if "optional" in item:
                             old_optional = item.pop("optional")

{hydra_core-1.4.0.dev1 → hydra_core-1.4.0.dev3}/hydra/_internal/core_plugins/basic_sweeper.py

@@ -16,6 +16,7 @@ Basic Sweeper would generate 6 jobs:
 The Basic Sweeper also support, the following is equivalent to the above.
 python foo.py a=range(1,4) b=10,20
 """
+
 import itertools
 import logging
 import time
@@ -172,7 +173,8 @@ class BasicSweeper(Sweeper):
             self.validate_batch_is_legal(batch)
             elapsed = time.perf_counter() - tic
             log.debug(
-                f"Validated configs of {len(batch)} jobs in {elapsed:0.2f} seconds, {len(batch)/elapsed:.2f} / second)"
+                f"Validated configs of {len(batch)} jobs in {elapsed:0.2f} seconds, "
+                f"{len(batch) / elapsed:.2f} / second)"
             )
             results = self.launcher.launch(batch, initial_job_idx=initial_job_idx)
 

{hydra_core-1.4.0.dev1 → hydra_core-1.4.0.dev3}/hydra/_internal/core_plugins/importlib_resources_config_source.py

@@ -1,22 +1,14 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 import os
-import sys
 import zipfile
-from typing import TYPE_CHECKING, Any, List, Optional
+from importlib import resources
+from typing import Any, List, Optional
 
 from omegaconf import OmegaConf
 
 from hydra.core.object_type import ObjectType
 from hydra.plugins.config_source import ConfigLoadError, ConfigResult, ConfigSource
 
-if TYPE_CHECKING or (sys.version_info < (3, 9)):
-    import importlib_resources as resources
-else:
-    from importlib import resources
-
-    # Relevant issue: https://github.com/python/mypy/issues/1153
-    # Use importlib backport for Python older than 3.9
-
 
 class ImportlibResourcesConfigSource(ConfigSource):
     def __init__(self, provider: str, path: str) -> None:
@@ -56,7 +48,7 @@ class ImportlibResourcesConfigSource(ConfigSource):
     def load_config(self, config_path: str) -> ConfigResult:
         normalized_config_path = self._normalize_file_name(config_path)
         res = resources.files(self.path).joinpath(normalized_config_path)
-        if not res.exists():
+        if not (res.is_file() or res.is_dir()):
             raise ConfigLoadError(f"Config not found : {normalized_config_path}")
 
         return self._read_config(res)
@@ -75,7 +67,7 @@ class ImportlibResourcesConfigSource(ConfigSource):
             return False
 
         res = files.joinpath(config_path)
-        ret = res.exists() and res.is_dir()
+        ret = res.is_dir()
         assert isinstance(ret, bool)
         return ret
 
@@ -86,7 +78,7 @@ class ImportlibResourcesConfigSource(ConfigSource):
         except (ValueError, ModuleNotFoundError, TypeError):
             return False
         res = files.joinpath(config_path)
-        ret = res.exists() and res.is_file()
+        ret = res.is_file()
         assert isinstance(ret, bool)
         return ret
 

{hydra_core-1.4.0.dev1 → hydra_core-1.4.0.dev3}/hydra/_internal/core_plugins/structured_config_source.py

@@ -9,12 +9,10 @@ from hydra.plugins.config_source import ConfigResult, ConfigSource
 
 
 class StructuredConfigSource(ConfigSource):
-    store: ConfigStore
 
     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.
-        self.store = ConfigStore.instance()
         if self.path != "":
             try:
                 importlib.import_module(self.path)
@@ -30,7 +28,7 @@ class StructuredConfigSource(ConfigSource):
 
     def load_config(self, config_path: str) -> ConfigResult:
         normalized_config_path = self._normalize_file_name(config_path)
-        ret = self.store.load(config_path=normalized_config_path)
+        ret = ConfigStore.instance().load(config_path=normalized_config_path)
         provider = ret.provider if ret.provider is not None else self.provider
         header = {"package": ret.package}
         return ConfigResult(
@@ -44,17 +42,17 @@ class StructuredConfigSource(ConfigSource):
         return True
 
     def is_group(self, config_path: str) -> bool:
-        type_ = self.store.get_type(config_path.rstrip("/"))
+        type_ = ConfigStore.instance().get_type(config_path.rstrip("/"))
         return type_ == ObjectType.GROUP
 
     def is_config(self, config_path: str) -> bool:
         filename = self._normalize_file_name(config_path.rstrip("/"))
-        type_ = self.store.get_type(filename)
+        type_ = ConfigStore.instance().get_type(filename)
         return type_ == ObjectType.CONFIG
 
     def list(self, config_path: str, results_filter: Optional[ObjectType]) -> List[str]:
         ret: List[str] = []
-        files = self.store.list(config_path)
+        files = ConfigStore.instance().list(config_path)
 
         for file in files:
             self._list_add_result(