Skip to content

Commit 094f228

Browse files
authored
Chore: In GenericContext make the config type a class member (#2216)
1 parent 6217a61 commit 094f228

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

sqlmesh/cli/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from sqlmesh.cli import error_handler
1212
from sqlmesh.cli import options as opt
1313
from sqlmesh.cli.example_project import ProjectTemplate, init_example_project
14-
from sqlmesh.core.config import Config, load_configs
14+
from sqlmesh.core.config import load_configs
1515
from sqlmesh.core.context import Context
1616
from sqlmesh.utils.date import TimeLike
1717
from sqlmesh.utils.errors import MissingDependencyError
@@ -77,7 +77,7 @@ def cli(
7777
elif ctx.invoked_subcommand in ("create_external_models", "migrate", "rollback", "ui"):
7878
load = False
7979

80-
configs = load_configs(config, Config, paths)
80+
configs = load_configs(config, Context.CONFIG_TYPE, paths)
8181
log_limit = list(configs.values())[0].log_limit
8282
configure_logging(debug, ignore_warnings, log_to_stdout, log_limit=log_limit)
8383

sqlmesh/core/context.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,10 @@ class GenericContext(BaseContext, t.Generic[C]):
254254
config_type: The type of config object to use (default Config).
255255
"""
256256

257+
CONFIG_TYPE: t.Type[C]
258+
257259
def __init__(
258260
self,
259-
config_type: t.Type[C],
260261
engine_adapter: t.Optional[EngineAdapter] = None,
261262
notification_targets: t.Optional[t.List[NotificationTarget]] = None,
262263
state_sync: t.Optional[StateSync] = None,
@@ -271,7 +272,7 @@ def __init__(
271272
):
272273
self.console = console or get_console()
273274
self.configs = (
274-
config if isinstance(config, dict) else load_configs(config, config_type, paths)
275+
config if isinstance(config, dict) else load_configs(config, self.CONFIG_TYPE, paths)
275276
)
276277
self.dag: DAG[str] = DAG()
277278
self._models: UniqueKeyDict[str, Model] = UniqueKeyDict("models")
@@ -1762,5 +1763,4 @@ def _register_notification_targets(self) -> None:
17621763

17631764

17641765
class Context(GenericContext[Config]):
1765-
def __init__(self, *args: t.Any, **kwargs: t.Any):
1766-
super().__init__(Config, *args, **kwargs)
1766+
CONFIG_TYPE = Config

sqlmesh/magics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from sqlmesh.cli.example_project import ProjectTemplate, init_example_project
2121
from sqlmesh.core import constants as c
22-
from sqlmesh.core.config import Config, load_configs
22+
from sqlmesh.core.config import load_configs
2323
from sqlmesh.core.console import get_console
2424
from sqlmesh.core.context import Context
2525
from sqlmesh.core.dialect import format_model_expressions, parse
@@ -97,7 +97,7 @@ def context(self, line: str) -> None:
9797
from sqlmesh import configure_logging
9898

9999
args = parse_argstring(self.context, line)
100-
configs = load_configs(args.config, Config, args.paths)
100+
configs = load_configs(args.config, Context.CONFIG_TYPE, args.paths)
101101
log_limit = list(configs.values())[0].log_limit
102102
configure_logging(args.debug, args.ignore_warnings, log_limit=log_limit)
103103
try:

0 commit comments

Comments
 (0)