Skip to content

Commit

Permalink
Feat: add [WARNING] to console warning messages (#3826)
Browse files Browse the repository at this point in the history
  • Loading branch information
treysp authored Feb 14, 2025
1 parent e33b65b commit f24f04f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
17 changes: 12 additions & 5 deletions sqlmesh/core/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
SnapshotChangeCategory.METADATA: "Metadata",
}

PROGRESS_BAR_WIDTH = 40
LINE_WRAP_WIDTH = 100


class Console(abc.ABC):
"""Abstract base class for defining classes used for displaying information to the user and also interact
Expand Down Expand Up @@ -463,7 +466,7 @@ def show_row_diff(
def make_progress_bar(message: str, console: t.Optional[RichConsole] = None) -> Progress:
return Progress(
TextColumn(f"[bold blue]{message}", justify="right"),
BarColumn(bar_width=40),
BarColumn(bar_width=PROGRESS_BAR_WIDTH),
"[progress.percentage]{task.percentage:>3.1f}%",
"•",
srich.BatchColumn(),
Expand Down Expand Up @@ -695,7 +698,7 @@ def start_promotion_progress(
f"[bold blue]Virtually Updating '{environment_naming_info.name}'",
justify="right",
),
BarColumn(bar_width=40),
BarColumn(bar_width=PROGRESS_BAR_WIDTH),
"[progress.percentage]{task.percentage:>3.1f}%",
"•",
TimeElapsedColumn(),
Expand Down Expand Up @@ -1241,7 +1244,10 @@ def log_error(self, message: str) -> None:
def log_warning(self, message: str) -> None:
logger.warning(message)
if not self.ignore_warnings:
self._print(f"[yellow]{message}[/yellow]")
message_lstrip = message.lstrip()
leading_ws = message[: -len(message_lstrip)]
message_formatted = f"{leading_ws}[yellow]\\[WARNING] {message_lstrip}[/yellow]"
self._print(message_formatted)

def log_success(self, message: str) -> None:
self._print(f"\n[green]{message}[/green]\n")
Expand Down Expand Up @@ -2073,7 +2079,8 @@ def log_error(self, message: str) -> None:
super().log_error(f"```\n\\[ERROR] {message}```\n\n")

def log_warning(self, message: str) -> None:
super().log_warning(f"```\n\\[WARNING] {message}```\n\n")
logger.warning(message)
self._print(f"```\n\\[WARNING] {message}```\n\n")


class DatabricksMagicConsole(CaptureTerminalConsole):
Expand Down Expand Up @@ -2499,7 +2506,7 @@ def _format_audits_errors(error: NodeAuditsErrors) -> str:

err_msg = f"'{err.audit_name}' audit error: {err.count} {'row' if err.count == 1 else 'rows'} failed"

query = "\n ".join(textwrap.wrap(err.sql(err.adapter_dialect), width=100))
query = "\n ".join(textwrap.wrap(err.sql(err.adapter_dialect), width=LINE_WRAP_WIDTH))
msg = f"{err_msg}\n\nAudit arguments\n {audit_args_sql_msg}Audit query\n {query}\n\n"
msg = msg.replace("\n", "\n ")
error_messages.append(msg)
Expand Down
2 changes: 1 addition & 1 deletion tests/cli/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ def test_plan_dev_bad_create_from(runner, tmp_path):
assert result.exit_code == 0
assert_new_env(result, "dev2", "dev")
assert (
"The environment name 'dev3' was passed to the `plan` command's `--create-from` argument, but 'dev3' does not exist. Initializing new environment 'dev2' from scratch."
"[WARNING] The environment name 'dev3' was passed to the `plan` command's `--create-from` argument, but 'dev3' does not exist. Initializing new environment 'dev2' from scratch."
in result.output.replace("\n", "")
)

Expand Down

0 comments on commit f24f04f

Please sign in to comment.