move HydraContext to hydra.types

examples/plugins/example_launcher_plugin/hydra_plugins/example_launcher_plugin/example_launcher.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 from typing import Optional, Sequence
 
-from hydra.core.utils import HydraContext
+from hydra.types import HydraContext
 from hydra.core.config_store import ConfigStore
 from hydra.core.singleton import Singleton
 from hydra.core.utils import (

examples/plugins/example_sweeper_plugin/hydra_plugins/example_sweeper_plugin/example_sweeper.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 from typing import Any, Iterable, List, Optional, Sequence
 
-from hydra.core.utils import HydraContext
+from hydra.types import HydraContext
 from hydra.core.config_store import ConfigStore
 from hydra.core.override_parser.overrides_parser import OverridesParser
 from hydra.core.plugins import Plugins

hydra/_internal/core_plugins/basic_launcher.py

@@ -8,15 +8,14 @@
 
 from hydra.core.config_store import ConfigStore
 from hydra.core.utils import (
-    HydraContext,
     JobReturn,
     configure_log,
     filter_overrides,
     run_job,
     setup_globals,
 )
 from hydra.plugins.launcher import Launcher
-from hydra.types import TaskFunction
+from hydra.types import HydraContext, TaskFunction
 
 log = logging.getLogger(__name__)
 

hydra/_internal/core_plugins/basic_sweeper.py

@@ -28,11 +28,11 @@
 from hydra.core.config_store import ConfigStore
 from hydra.core.override_parser.overrides_parser import OverridesParser
 from hydra.core.override_parser.types import Override
-from hydra.core.utils import HydraContext, JobReturn
+from hydra.core.utils import JobReturn
 from hydra.errors import HydraException
 from hydra.plugins.launcher import Launcher
 from hydra.plugins.sweeper import Sweeper
-from hydra.types import TaskFunction
+from hydra.types import HydraContext, TaskFunction
 
 
 @dataclass

hydra/_internal/hydra.py

@@ -14,7 +14,6 @@
 from hydra.core.config_search_path import ConfigSearchPath
 from hydra.core.plugins import Plugins
 from hydra.core.utils import (
-    HydraContext,
     JobReturn,
     JobRuntime,
     configure_log,
@@ -27,7 +26,7 @@
 from hydra.plugins.launcher import Launcher
 from hydra.plugins.search_path_plugin import SearchPathPlugin
 from hydra.plugins.sweeper import Sweeper
-from hydra.types import RunMode, TaskFunction
+from hydra.types import HydraContext, RunMode, TaskFunction
 
 from ..core.default_element import DefaultsTreeNode, InputDefault
 from .callbacks import Callbacks

hydra/core/plugins.py

@@ -13,14 +13,13 @@
 
 from hydra._internal.sources_registry import SourcesRegistry
 from hydra.core.singleton import Singleton
-from hydra.core.utils import HydraContext
 from hydra.plugins.completion_plugin import CompletionPlugin
 from hydra.plugins.config_source import ConfigSource
 from hydra.plugins.launcher import Launcher
 from hydra.plugins.plugin import Plugin
 from hydra.plugins.search_path_plugin import SearchPathPlugin
 from hydra.plugins.sweeper import Sweeper
-from hydra.types import TaskFunction
+from hydra.types import HydraContext, TaskFunction
 from hydra.utils import instantiate
 
 

hydra/core/utils.py

@@ -19,20 +19,11 @@
 from hydra.core.hydra_config import HydraConfig
 from hydra.core.singleton import Singleton
 from hydra.errors import HydraJobException
-from hydra.types import TaskFunction
-
-if TYPE_CHECKING:
-    from hydra._internal.callbacks import Callbacks
+from hydra.types import HydraContext, TaskFunction
 
 log = logging.getLogger(__name__)
 
 
-@dataclass
-class HydraContext:
-    config_loader: ConfigLoader
-    callbacks: "Callbacks"
-
-
 def simple_stdout_log_config(level: int = logging.INFO) -> None:
     root = logging.getLogger()
     root.setLevel(level)

hydra/plugins/launcher.py

@@ -7,8 +7,9 @@
 
 from omegaconf import DictConfig
 
-from hydra.core.utils import JobReturn, HydraContext
-from hydra.types import TaskFunction
+from hydra.core.utils import JobReturn
+
+from hydra.types import TaskFunction, HydraContext
 
 from .plugin import Plugin
 

hydra/plugins/sweeper.py

@@ -10,7 +10,7 @@
 from .launcher import Launcher
 
 from .plugin import Plugin
-from hydra.core.utils import HydraContext
+from hydra.types import HydraContext
 
 
 class Sweeper(Plugin):

hydra/types.py

@@ -2,13 +2,24 @@
 import warnings
 from dataclasses import dataclass
 from enum import Enum
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any, Callable
 
 from omegaconf import MISSING
 
 TaskFunction = Callable[[Any], Any]
 
 
+if TYPE_CHECKING:
+    from hydra._internal.callbacks import Callbacks
+    from hydra.core.config_loader import ConfigLoader
+
+
+@dataclass
+class HydraContext:
+    config_loader: "ConfigLoader"
+    callbacks: "Callbacks"
+
+
 @dataclass
 class TargetConf:
     """

plugins/hydra_ax_sweeper/hydra_plugins/hydra_ax_sweeper/_core.py

@@ -9,7 +9,7 @@
 from hydra.core.override_parser.overrides_parser import OverridesParser
 from hydra.core.override_parser.types import IntervalSweep, Override, Transformer
 from hydra.core.plugins import Plugins
-from hydra.core.utils import HydraContext
+from hydra.types import HydraContext
 from hydra.plugins.launcher import Launcher
 from hydra.plugins.sweeper import Sweeper
 from hydra.types import TaskFunction

plugins/hydra_ax_sweeper/hydra_plugins/hydra_ax_sweeper/ax_sweeper.py

@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 from typing import List, Optional
 
-from hydra.core.utils import HydraContext
+from hydra.types import HydraContext
 from hydra.plugins.sweeper import Sweeper
 from hydra.types import TaskFunction
 from omegaconf import DictConfig

plugins/hydra_joblib_launcher/hydra_plugins/hydra_joblib_launcher/joblib_launcher.py

@@ -2,7 +2,8 @@
 import logging
 from typing import Any, Optional, Sequence
 
-from hydra.core.utils import HydraContext, JobReturn
+from hydra.core.utils import JobReturn
+from hydra.types import HydraContext
 from hydra.plugins.launcher import Launcher
 from hydra.types import TaskFunction
 from omegaconf import DictConfig

plugins/hydra_nevergrad_sweeper/hydra_plugins/hydra_nevergrad_sweeper/_impl.py

@@ -20,7 +20,7 @@
     Transformer,
 )
 from hydra.core.plugins import Plugins
-from hydra.core.utils import HydraContext
+from hydra.types import HydraContext
 from hydra.plugins.launcher import Launcher
 from hydra.plugins.sweeper import Sweeper
 from hydra.types import TaskFunction

plugins/hydra_nevergrad_sweeper/hydra_plugins/hydra_nevergrad_sweeper/nevergrad_sweeper.py

@@ -2,7 +2,7 @@
 from typing import List, Optional
 
 from hydra import TaskFunction
-from hydra.core.utils import HydraContext
+from hydra.types import HydraContext
 from hydra.plugins.sweeper import Sweeper
 from omegaconf import DictConfig
 

plugins/hydra_optuna_sweeper/hydra_plugins/hydra_optuna_sweeper/_impl.py

@@ -13,7 +13,7 @@
     Transformer,
 )
 from hydra.core.plugins import Plugins
-from hydra.core.utils import HydraContext
+from hydra.types import HydraContext
 from hydra.plugins.sweeper import Sweeper
 from hydra.types import TaskFunction
 from omegaconf import DictConfig, OmegaConf

plugins/hydra_optuna_sweeper/hydra_plugins/hydra_optuna_sweeper/optuna_sweeper.py

@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 from typing import Any, List, Optional
 
-from hydra.core.utils import HydraContext
+from hydra.types import HydraContext
 from hydra.plugins.sweeper import Sweeper
 from hydra.types import TaskFunction
 from omegaconf import DictConfig

plugins/hydra_ray_launcher/hydra_plugins/hydra_ray_launcher/_launcher_util.py

@@ -8,7 +8,9 @@
 import ray
 from hydra.core.hydra_config import HydraConfig
 from hydra.core.singleton import Singleton
-from hydra.core.utils import HydraContext, JobReturn, run_job, setup_globals
+from hydra.core.utils import JobReturn, run_job, setup_globals
+from hydra.types import HydraContext
+
 from hydra.types import TaskFunction
 from omegaconf import DictConfig, OmegaConf
 

plugins/hydra_ray_launcher/hydra_plugins/hydra_ray_launcher/ray_aws_launcher.py

@@ -2,7 +2,8 @@
 import logging
 from typing import Optional, Sequence
 
-from hydra.core.utils import HydraContext, JobReturn
+from hydra.core.utils import JobReturn
+from hydra.types import HydraContext
 from hydra.plugins.launcher import Launcher
 from hydra.types import TaskFunction
 from omegaconf import DictConfig

plugins/hydra_ray_launcher/hydra_plugins/hydra_ray_launcher/ray_launcher.py

@@ -1,7 +1,8 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 from typing import Optional, Sequence
 
-from hydra.core.utils import HydraContext, JobReturn
+from hydra.core.utils import JobReturn
+from hydra.types import HydraContext
 from hydra.plugins.launcher import Launcher
 from hydra.types import TaskFunction
 from omegaconf import DictConfig

plugins/hydra_rq_launcher/hydra_plugins/hydra_rq_launcher/rq_launcher.py

@@ -2,7 +2,8 @@
 import logging
 from typing import Any, Optional, Sequence
 
-from hydra.core.utils import HydraContext, JobReturn
+from hydra.core.utils import JobReturn
+from hydra.types import HydraContext
 from hydra.plugins.launcher import Launcher
 from hydra.types import TaskFunction
 from omegaconf import DictConfig, OmegaConf