Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
benpankow committed Feb 21, 2025
1 parent 2ac626b commit 1b4b751
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
9 changes: 4 additions & 5 deletions python_modules/libraries/dagster-dg/dagster_dg/cli/check.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from yaml.scanner import ScannerError

from dagster_dg.cli.check_utils import error_dict_to_formatted_error
from dagster_dg.cli.dev import format_forwarded_option, temp_workspace_file
from dagster_dg.cli.global_options import dg_global_options
from dagster_dg.component import RemoteComponentRegistry
from dagster_dg.component_key import ComponentKey, LocalComponentKey
Expand All @@ -23,8 +24,6 @@
ValueAndSourcePositionTree,
)

from .dev import _format_forwarded_option, _temp_workspace_file


@click.group(name="check", cls=DgClickGroup)
def check_group():
Expand Down Expand Up @@ -208,8 +207,8 @@ def check_definitions_command(
dg_context = DgContext.for_deployment_or_code_location_environment(Path.cwd(), cli_config)

forward_options = [
*_format_forwarded_option("--log-level", log_level),
*_format_forwarded_option("--log-format", log_format),
*format_forwarded_option("--log-level", log_level),
*format_forwarded_option("--log-format", log_format),
]

# In a code location context, we can just run `dagster definitions validate` directly, using `dagster` from the
Expand All @@ -234,7 +233,7 @@ def check_definitions_command(
*forward_options,
]
cmd_location = "ephemeral dagster definitions validate"
temp_workspace_file_cm = _temp_workspace_file(dg_context)
temp_workspace_file_cm = temp_workspace_file(dg_context)
else:
exit_with_error("This command must be run inside a code location or deployment directory.")

Expand Down
18 changes: 9 additions & 9 deletions python_modules/libraries/dagster-dg/dagster_dg/cli/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ def dev_command(
dg_context = DgContext.for_deployment_or_code_location_environment(Path.cwd(), cli_config)

forward_options = [
*_format_forwarded_option("--code-server-log-level", code_server_log_level),
*_format_forwarded_option("--log-level", log_level),
*_format_forwarded_option("--log-format", log_format),
*_format_forwarded_option("--port", port),
*_format_forwarded_option("--host", host),
*_format_forwarded_option("--live-data-poll-rate", live_data_poll_rate),
*format_forwarded_option("--code-server-log-level", code_server_log_level),
*format_forwarded_option("--log-level", log_level),
*format_forwarded_option("--log-format", log_format),
*format_forwarded_option("--port", port),
*format_forwarded_option("--host", host),
*format_forwarded_option("--live-data-poll-rate", live_data_poll_rate),
]

# In a code location context, we can just run `dagster dev` directly, using `dagster` from the
Expand Down Expand Up @@ -130,7 +130,7 @@ def dev_command(
*forward_options,
]
cmd_location = "ephemeral dagster dev"
temp_workspace_file_cm = _temp_workspace_file(dg_context)
temp_workspace_file_cm = temp_workspace_file(dg_context)
else:
exit_with_error("This command must be run inside a code location or deployment directory.")

Expand Down Expand Up @@ -167,7 +167,7 @@ def dev_command(


@contextmanager
def _temp_workspace_file(dg_context: DgContext) -> Iterator[str]:
def temp_workspace_file(dg_context: DgContext) -> Iterator[str]:
with NamedTemporaryFile(mode="w+", delete=True) as temp_workspace_file:
entries = []
for location in dg_context.get_code_location_names():
Expand All @@ -186,7 +186,7 @@ def _temp_workspace_file(dg_context: DgContext) -> Iterator[str]:
yield temp_workspace_file.name


def _format_forwarded_option(option: str, value: object) -> list[str]:
def format_forwarded_option(option: str, value: object) -> list[str]:
return [] if value is None else [option, str(value)]


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def to_cli_args(self) -> tuple[str, ...]:

DEPLOYMENT_OR_CODE_LOCATION_CONTEXT_COMMANDS = [
CommandSpec(("dev",)),
CommandSpec(("check", "definitions")),
]

# ########################
Expand Down

0 comments on commit 1b4b751

Please sign in to comment.