Skip to content

Commit c133004

Browse files
committed
fix: rename translator and restore test resource naming
1 parent 99f7e6b commit c133004

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

dagster_sqlmesh/asset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ def sqlmesh_to_multi_asset_options(
2626
controller = DagsterSQLMeshController.setup_with_config(
2727
config=config, context_factory=context_factory
2828
)
29-
dagster_sqlmesh_translator = config.get_translator()
29+
translator = config.get_translator()
3030

3131
conversion = controller.to_asset_outs(
3232
environment,
33-
dagster_sqlmesh_translator=dagster_sqlmesh_translator,
33+
translator=translator,
3434
)
3535
return conversion
3636

dagster_sqlmesh/config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import inspect
2+
import typing as t
23
from dataclasses import dataclass
34
from pathlib import Path
4-
from typing import TYPE_CHECKING, Any
55

66
from dagster import Config
77
from pydantic import Field
88
from sqlmesh.core.config import Config as MeshConfig
99
from sqlmesh.core.config.loader import load_configs
1010

11-
if TYPE_CHECKING:
11+
if t.TYPE_CHECKING:
1212
from dagster_sqlmesh.translator import SQLMeshDagsterTranslator
1313

1414

1515
@dataclass
1616
class ConfigOverride:
17-
config_as_dict: dict[str, Any]
17+
config_as_dict: dict[str, t.Any]
1818

19-
def dict(self) -> dict[str, Any]:
19+
def dict(self) -> dict[str, t.Any]:
2020
return self.config_as_dict
2121

2222

@@ -34,7 +34,7 @@ class SQLMeshContextConfig(Config):
3434

3535
path: str
3636
gateway: str
37-
config_override: dict[str, Any] | None = Field(default_factory=lambda: None)
37+
config_override: dict[str, t.Any] | None = Field(default_factory=lambda: None)
3838
translator_class_name: str = Field(
3939
default="dagster_sqlmesh.translator.SQLMeshDagsterTranslator",
4040
description="Fully qualified class name of the SQLMesh Dagster translator to use"

dagster_sqlmesh/controller/dagster.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DagsterSQLMeshController(SQLMeshController[ContextCls]):
2222
def to_asset_outs(
2323
self,
2424
environment: str,
25-
dagster_sqlmesh_translator: SQLMeshDagsterTranslator,
25+
translator: SQLMeshDagsterTranslator,
2626
) -> SQLMeshMultiAssetOptions:
2727
"""Loads all the asset outs of the current sqlmesh environment. If a
2828
cache is provided, it will be tried first to load the asset outs."""
@@ -35,42 +35,42 @@ def to_asset_outs(
3535
context = instance.context
3636

3737
for model, deps in instance.non_external_models_dag():
38-
asset_key = dagster_sqlmesh_translator.get_asset_key(context=context, fqn=model.fqn)
38+
asset_key = translator.get_asset_key(context=context, fqn=model.fqn)
3939
asset_key_str = asset_key.to_user_string()
4040
model_deps = [
4141
SQLMeshModelDep(fqn=dep, model=context.get_model(dep))
4242
for dep in deps
4343
]
4444
internal_asset_deps: set[str] = set()
45-
asset_tags = dagster_sqlmesh_translator.get_tags(context, model)
45+
asset_tags = translator.get_tags(context, model)
4646

4747
for dep in model_deps:
4848
if dep.model:
49-
dep_asset_key_str = dagster_sqlmesh_translator.get_asset_key(
49+
dep_asset_key_str = translator.get_asset_key(
5050
context, dep.model.fqn
5151
).to_user_string()
5252

5353
internal_asset_deps.add(dep_asset_key_str)
5454
else:
55-
table = dagster_sqlmesh_translator.get_asset_key_str(dep.fqn)
56-
key = dagster_sqlmesh_translator.get_asset_key(
55+
table = translator.get_asset_key_str(dep.fqn)
56+
key = translator.get_asset_key(
5757
context, dep.fqn
5858
).to_user_string()
5959
internal_asset_deps.add(key)
6060

6161
# create an external dep
62-
deps_map[table] = dagster_sqlmesh_translator.create_asset_dep(key=key)
62+
deps_map[table] = translator.create_asset_dep(key=key)
6363

64-
model_key = dagster_sqlmesh_translator.get_asset_key_str(model.fqn)
65-
asset_outs[model_key] = dagster_sqlmesh_translator.create_asset_out(
64+
model_key = translator.get_asset_key_str(model.fqn)
65+
asset_outs[model_key] = translator.create_asset_out(
6666
model_key=model_key,
6767
asset_key=asset_key_str,
6868
tags=asset_tags,
6969
is_required=False,
70-
group_name=dagster_sqlmesh_translator.get_group_name(context, model),
70+
group_name=translator.get_group_name(context, model),
7171
kinds={
7272
"sqlmesh",
73-
dagster_sqlmesh_translator.get_context_dialect(context).lower(),
73+
translator.get_context_dialect(context).lower(),
7474
},
7575
)
7676
internal_asset_deps_map[model_key] = internal_asset_deps

dagster_sqlmesh/resource.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ def __init__(
331331
models_map: dict[str, Model],
332332
dag: DAG[t.Any],
333333
prefix: str,
334-
dagster_sqlmesh_translator: "SQLMeshDagsterTranslator",
334+
translator: "SQLMeshDagsterTranslator",
335335
is_testing: bool = False,
336336
materializations_enabled: bool = True,
337337
) -> None:
@@ -344,7 +344,7 @@ def __init__(
344344
models_map: A mapping of model names to their SQLMesh model instances.
345345
dag: The directed acyclic graph representing the SQLMesh models.
346346
prefix: A prefix to use for all asset keys generated by this handler.
347-
dagster_sqlmesh_translator: The SQLMesh Dagster translator instance.
347+
translator: The SQLMesh Dagster translator instance.
348348
is_testing: Whether the handler is being used in a testing context.
349349
materializations_enabled: Whether the handler is to generate
350350
materializations, this should be disabled if you with to run a
@@ -355,7 +355,7 @@ def __init__(
355355
self._prefix = prefix
356356
self._context = context
357357
self._logger = context.log
358-
self._translator = dagster_sqlmesh_translator
358+
self._translator = translator
359359
self._tracker = MaterializationTracker(
360360
sorted_dag=dag.sorted[:], logger=self._logger
361361
)
@@ -698,7 +698,7 @@ def create_event_handler(
698698
dag=dag,
699699
models_map=models_map,
700700
prefix=prefix,
701-
dagster_sqlmesh_translator=translator,
701+
translator=translator,
702702
is_testing=is_testing,
703703
materializations_enabled=materializations_enabled,
704704
)

dagster_sqlmesh/test_asset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
def test_sqlmesh_context_to_asset_outs(sample_sqlmesh_test_context: SQLMeshTestContext):
55
controller = sample_sqlmesh_test_context.create_controller()
66
translator = sample_sqlmesh_test_context.context_config.get_translator()
7-
outs = controller.to_asset_outs("dev", dagster_sqlmesh_translator=translator)
7+
outs = controller.to_asset_outs("dev", translator=translator)
88
assert len(list(outs.deps)) == 1
99
assert len(outs.outs) == 10

dagster_sqlmesh/test_resource.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
PlanOrRunFailedError,
1111
)
1212
from dagster_sqlmesh.testing import setup_testing_sqlmesh_test_context
13-
from dagster_sqlmesh.testing.context import SQLMeshTestContext, SQLMeshTestResource
13+
from dagster_sqlmesh.testing.context import SQLMeshTestContext, TestSQLMeshResource
1414

1515

1616
@dataclass(kw_only=True)
1717
class SQLMeshResourceInitialization:
1818
dagster_instance: dg.DagsterInstance
1919
dagster_context: dg.AssetExecutionContext
2020
test_context: SQLMeshTestContext
21-
resource: SQLMeshTestResource
21+
resource: TestSQLMeshResource
2222

2323

2424
def setup_sqlmesh_resource(

0 commit comments

Comments
 (0)