Add second level of verbosity

Author: treysp

sqlmesh/cli/main.py

@@ -13,6 +13,7 @@
 from sqlmesh.cli.example_project import ProjectTemplate, init_example_project
 from sqlmesh.core.analytics import cli_analytics
 from sqlmesh.core.console import configure_console, get_console
+from sqlmesh.core.constants import Verbosity
 from sqlmesh.core.config import load_configs
 from sqlmesh.core.context import Context
 from sqlmesh.utils.date import TimeLike
@@ -438,19 +439,27 @@ def diff(ctx: click.Context, environment: t.Optional[str] = None) -> None:
     help="Output text differences for the rendered versions of the models and standalone audits",
 )
 @opt.verbose
+@opt.very_verbose
 @click.pass_context
 @error_handler
 @cli_analytics
 def plan(
-    ctx: click.Context, verbose: bool, environment: t.Optional[str] = None, **kwargs: t.Any
+    ctx: click.Context,
+    verbose: bool,
+    very_verbose: bool,
+    environment: t.Optional[str] = None,
+    **kwargs: t.Any,
 ) -> None:
     """Apply local changes to the target environment."""
     context = ctx.obj
     restate_models = kwargs.pop("restate_model") or None
     select_models = kwargs.pop("select_model") or None
     allow_destructive_models = kwargs.pop("allow_destructive_model") or None
     backfill_models = kwargs.pop("backfill_model") or None
-    setattr(get_console(), "verbose", verbose)
+
+    verbosity = Verbosity.VERBOSE if verbose else Verbosity.DEFAULT
+    verbosity = Verbosity.VERY_VERBOSE if very_verbose else verbosity
+    setattr(get_console(), "verbosity", verbosity)
     context.plan(
         environment,
         restate_models=restate_models,
@@ -630,6 +639,7 @@ def create_test(
 @cli.command("test")
 @opt.match_pattern
 @opt.verbose
+@opt.very_verbose
 @click.option(
     "--preserve-fixtures",
     is_flag=True,
@@ -644,14 +654,18 @@ def test(
     obj: Context,
     k: t.List[str],
     verbose: bool,
+    very_verbose: bool,
     preserve_fixtures: bool,
     tests: t.List[str],
 ) -> None:
     """Run model unit tests."""
+    verbosity = Verbosity.VERBOSE if verbose else Verbosity.DEFAULT
+    verbosity = Verbosity.VERY_VERBOSE if very_verbose else verbosity
+
     result = obj.test(
         match_patterns=k,
         tests=tests,
-        verbose=verbose,
+        verbosity=verbosity,
         preserve_fixtures=preserve_fixtures,
     )
     if not result.wasSuccessful():
@@ -700,16 +714,20 @@ def fetchdf(ctx: click.Context, sql: str) -> None:
     help="Skip the connection test.",
 )
 @opt.verbose
+@opt.very_verbose
 @click.pass_obj
 @error_handler
 @cli_analytics
-def info(obj: Context, skip_connection: bool, verbose: bool) -> None:
+def info(obj: Context, skip_connection: bool, verbose: bool, very_verbose: bool) -> None:
     """
     Print information about a SQLMesh project.
 
     Includes counts of project models and macros and connection tests for the data warehouse.
     """
-    obj.print_info(skip_connection=skip_connection, verbose=verbose)
+    verbosity = Verbosity.VERBOSE if verbose else Verbosity.DEFAULT
+    verbosity = Verbosity.VERY_VERBOSE if very_verbose else verbosity
+
+    obj.print_info(skip_connection=skip_connection, verbosity=verbosity)
 
 
 @cli.command("ui")
@@ -900,22 +918,31 @@ def rewrite(obj: Context, sql: str, read: str = "", write: str = "") -> None:
     default=0.7,
 )
 @opt.verbose
+@opt.very_verbose
 @click.pass_context
 @error_handler
 @cli_analytics
 def prompt(
-    ctx: click.Context, prompt: str, evaluate: bool, temperature: float, verbose: bool
+    ctx: click.Context,
+    prompt: str,
+    evaluate: bool,
+    temperature: float,
+    verbose: bool,
+    very_verbose: bool,
 ) -> None:
     """Uses LLM to generate a SQL query from a prompt."""
     from sqlmesh.integrations.llm import LLMIntegration
 
+    verbosity = Verbosity.VERBOSE if verbose else Verbosity.DEFAULT
+    verbosity = Verbosity.VERY_VERBOSE if very_verbose else verbosity
+
     context = ctx.obj
 
     llm_integration = LLMIntegration(
         context.models.values(),
         context.engine_adapter.dialect,
         temperature=temperature,
-        verbose=verbose,
+        verbosity=verbosity,
     )
     query = llm_integration.query(prompt)
 

sqlmesh/cli/options.py

@@ -54,3 +54,10 @@
     is_flag=True,
     help="Verbose output.",
 )
+
+very_verbose = click.option(
+    "-vv",
+    "--very-verbose",
+    is_flag=True,
+    help="Very verbose output.",
+)

sqlmesh/core/console.py

@@ -24,7 +24,7 @@
 from rich.syntax import Syntax
 from rich.table import Table
 from rich.tree import Tree
-
+from sqlmesh.core.constants import Verbosity
 from sqlmesh.core.environment import EnvironmentNamingInfo
 from sqlmesh.core.linter.rule import RuleViolation
 from sqlmesh.core.model import Model
@@ -310,10 +310,13 @@ def show_row_diff(
     def print_environments(self, environments_summary: t.Dict[str, int]) -> None:
         """Prints all environment names along with expiry datetime."""
 
-    def _limit_model_names(self, tree: Tree, verbose: bool = False) -> Tree:
+    def _limit_model_names(self, tree: Tree, verbosity: Verbosity = Verbosity.DEFAULT) -> Tree:
         """Trim long indirectly modified model lists below threshold."""
         modified_length = len(tree.children)
-        if not verbose and modified_length > self.INDIRECTLY_MODIFIED_DISPLAY_THRESHOLD:
+        if (
+            verbosity < Verbosity.VERY_VERBOSE
+            and modified_length > self.INDIRECTLY_MODIFIED_DISPLAY_THRESHOLD
+        ):
             tree.children = [
                 tree.children[0],
                 Tree(f".... {modified_length-2} more ...."),
@@ -516,7 +519,7 @@ class TerminalConsole(Console):
     def __init__(
         self,
         console: t.Optional[RichConsole] = None,
-        verbose: bool = False,
+        verbosity: Verbosity = Verbosity.DEFAULT,
         dialect: DialectType = None,
         ignore_warnings: bool = False,
         **kwargs: t.Any,
@@ -548,7 +551,7 @@ def __init__(
 
         self.loading_status: t.Dict[uuid.UUID, Status] = {}
 
-        self.verbose = verbose
+        self.verbosity = verbosity
         self.dialect = dialect
         self.ignore_warnings = ignore_warnings
 
@@ -673,7 +676,7 @@ def start_creation_progress(
     def update_creation_progress(self, snapshot: SnapshotInfoLike) -> None:
         """Update the snapshot creation progress."""
         if self.creation_progress is not None and self.creation_task is not None:
-            if self.verbose:
+            if self.verbosity >= Verbosity.VERBOSE:
                 self.creation_progress.live.console.print(
                     f"{snapshot.display_name(self.environment_naming_info, self.default_catalog, dialect=self.dialect)} [green]created[/green]"
                 )
@@ -749,7 +752,7 @@ def start_promotion_progress(
     def update_promotion_progress(self, snapshot: SnapshotInfoLike, promoted: bool) -> None:
         """Update the snapshot promotion progress."""
         if self.promotion_progress is not None and self.promotion_task is not None:
-            if self.verbose:
+            if self.verbosity >= Verbosity.VERBOSE:
                 action_str = "[green]promoted[/green]" if promoted else "[yellow]demoted[/yellow]"
                 self.promotion_progress.live.console.print(
                     f"{snapshot.display_name(self.environment_naming_info, self.default_catalog, dialect=self.dialect)} {action_str}"
@@ -971,15 +974,15 @@ def _show_summary_tree_for(
                 added_tree.add(
                     f"[added]{snapshot.display_name(environment_naming_info, default_catalog, dialect=self.dialect)}"
                 )
-            tree.add(self._limit_model_names(added_tree, self.verbose))
+            tree.add(self._limit_model_names(added_tree, self.verbosity))
         if removed_snapshot_ids:
             removed_tree = Tree("[bold][removed]Removed:")
             for s_id in sorted(removed_snapshot_ids):
                 snapshot_table_info = context_diff.removed_snapshots[s_id]
                 removed_tree.add(
                     f"[removed]{snapshot_table_info.display_name(environment_naming_info, default_catalog, dialect=self.dialect)}"
                 )
-            tree.add(self._limit_model_names(removed_tree, self.verbose))
+            tree.add(self._limit_model_names(removed_tree, self.verbosity))
         if modified_snapshot_ids:
             direct = Tree("[bold][direct]Directly Modified:")
             indirect = Tree("[bold][indirect]Indirectly Modified:")
@@ -1007,7 +1010,7 @@ def _show_summary_tree_for(
             if direct.children:
                 tree.add(direct)
             if indirect.children:
-                tree.add(self._limit_model_names(indirect, self.verbose))
+                tree.add(self._limit_model_names(indirect, self.verbosity))
             if metadata.children:
                 tree.add(metadata)
         self._print(tree)
@@ -1077,7 +1080,7 @@ def _prompt_categorize(
                     f"[indirect]{child_snapshot.display_name(plan.environment_naming_info, default_catalog, dialect=self.dialect)}"
                 )
             if indirect_tree:
-                indirect_tree = self._limit_model_names(indirect_tree, self.verbose)
+                indirect_tree = self._limit_model_names(indirect_tree, self.verbosity)
 
             self._print(tree)
             if not no_prompts:
@@ -1107,7 +1110,7 @@ def _show_categorized_snapshots(self, plan: Plan, default_catalog: t.Optional[st
                         f"[indirect]{child_snapshot.display_name(plan.environment_naming_info, default_catalog, dialect=self.dialect)} ({child_category_str})"
                     )
                 if indirect_tree:
-                    indirect_tree = self._limit_model_names(indirect_tree, self.verbose)
+                    indirect_tree = self._limit_model_names(indirect_tree, self.verbosity)
             elif context_diff.metadata_updated(snapshot.name):
                 tree = Tree(
                     f"\n[bold][metadata]Metadata Updated: {snapshot.display_name(plan.environment_naming_info, default_catalog, dialect=self.dialect)}"
@@ -1144,7 +1147,7 @@ def _show_missing_dates(self, plan: Plan, default_catalog: t.Optional[str]) -> N
             )
 
         if backfill:
-            backfill = self._limit_model_names(backfill, self.verbose)
+            backfill = self._limit_model_names(backfill, self.verbosity)
         self._print(backfill)
 
     def _prompt_effective_from(
@@ -1993,7 +1996,10 @@ def show_model_difference_summary(
             self._print("\n**Added Models:**")
             added_models = sorted(added_snapshot_models)
             list_length = len(added_models)
-            if not self.verbose and list_length > self.INDIRECTLY_MODIFIED_DISPLAY_THRESHOLD:
+            if (
+                self.verbosity < Verbosity.VERY_VERBOSE
+                and list_length > self.INDIRECTLY_MODIFIED_DISPLAY_THRESHOLD
+            ):
                 self._print(added_models[0])
                 self._print(f"- `.... {list_length-2} more ....`\n")
                 self._print(added_models[-1])
@@ -2017,7 +2023,10 @@ def show_model_difference_summary(
             self._print("\n**Removed Models:**")
             removed_models = sorted(removed_model_snapshot_table_infos)
             list_length = len(removed_models)
-            if not self.verbose and list_length > self.INDIRECTLY_MODIFIED_DISPLAY_THRESHOLD:
+            if (
+                self.verbosity < Verbosity.VERY_VERBOSE
+                and list_length > self.INDIRECTLY_MODIFIED_DISPLAY_THRESHOLD
+            ):
                 self._print(removed_models[0])
                 self._print(f"- `.... {list_length-2} more ....`\n")
                 self._print(removed_models[-1])
@@ -2062,7 +2071,7 @@ def show_model_difference_summary(
                 indirectly_modified = sorted(indirectly_modified)
                 modified_length = len(indirectly_modified)
                 if (
-                    not self.verbose
+                    self.verbosity < Verbosity.VERY_VERBOSE
                     and modified_length > self.INDIRECTLY_MODIFIED_DISPLAY_THRESHOLD
                 ):
                     self._print(
@@ -2106,7 +2115,10 @@ def _show_missing_dates(self, plan: Plan, default_catalog: t.Optional[str]) -> N
             )
 
         length = len(snapshots)
-        if not self.verbose and length > self.INDIRECTLY_MODIFIED_DISPLAY_THRESHOLD:
+        if (
+            self.verbosity < Verbosity.VERY_VERBOSE
+            and length > self.INDIRECTLY_MODIFIED_DISPLAY_THRESHOLD
+        ):
             self._print(snapshots[0])
             self._print(f"- `.... {length-2} more ....`\n")
             self._print(snapshots[-1])
@@ -2135,7 +2147,7 @@ def _show_categorized_snapshots(self, plan: Plan, default_catalog: t.Optional[st
                         f"[indirect]{child_snapshot.display_name(plan.environment_naming_info, default_catalog, dialect=self.dialect)} ({child_category_str})"
                     )
                 if indirect_tree:
-                    indirect_tree = self._limit_model_names(indirect_tree, self.verbose)
+                    indirect_tree = self._limit_model_names(indirect_tree, self.verbosity)
             elif context_diff.metadata_updated(snapshot.name):
                 tree = Tree(
                     f"[bold][metadata]Metadata Updated: {snapshot.display_name(plan.environment_naming_info, default_catalog, dialect=self.dialect)}"
@@ -2364,7 +2376,7 @@ def __init__(
     ) -> None:
         self.console: RichConsole = console or srich.console
         self.dialect = dialect
-        self.verbose = False
+        self.verbosity = Verbosity.DEFAULT
         self.ignore_warnings = ignore_warnings
 
     def _write(self, msg: t.Any, *args: t.Any, **kwargs: t.Any) -> None:

sqlmesh/core/constants.py

@@ -5,6 +5,7 @@
 import os
 import typing as t
 from pathlib import Path
+from enum import IntEnum
 
 SQLMESH = "sqlmesh"
 SQLMESH_PATH = Path.home() / ".sqlmesh"
@@ -91,3 +92,9 @@
 HYBRID = "hybrid"
 
 DISABLE_SQLMESH_STATE_MIGRATION = "SQLMESH__AIRFLOW__DISABLE_STATE_MIGRATION"
+
+
+class Verbosity(IntEnum):
+    DEFAULT = 1
+    VERBOSE = 2
+    VERY_VERBOSE = 3

sqlmesh/core/context.py

@@ -51,7 +51,7 @@
 from sqlglot import Dialect, exp
 from sqlglot.helper import first
 from sqlglot.lineage import GraphHTML
-
+from sqlmesh.core.constants import Verbosity
 from sqlmesh.core import analytics
 from sqlmesh.core import constants as c
 from sqlmesh.core.analytics import python_api_analytics
@@ -1741,16 +1741,13 @@ def test(
         self,
         match_patterns: t.Optional[t.List[str]] = None,
         tests: t.Optional[t.List[str]] = None,
-        verbose: bool = False,
+        verbosity: Verbosity = Verbosity.DEFAULT,
         preserve_fixtures: bool = False,
         stream: t.Optional[t.TextIO] = None,
     ) -> ModelTextTestResult:
         """Discover and run model tests"""
-        if verbose:
+        if verbosity >= Verbosity.VERBOSE:
             pd.set_option("display.max_columns", None)
-            verbosity = 2
-        else:
-            verbosity = 1
 
         if tests:
             result = run_model_tests(
@@ -1954,15 +1951,17 @@ def create_external_models(self, strict: bool = False) -> None:
             )
 
     @python_api_analytics
-    def print_info(self, skip_connection: bool = False, verbose: bool = False) -> None:
+    def print_info(
+        self, skip_connection: bool = False, verbosity: Verbosity = Verbosity.DEFAULT
+    ) -> None:
         """Prints information about connections, models, macros, etc. to the console."""
         self.console.log_status_update(f"Models: {len(self.models)}")
         self.console.log_status_update(f"Macros: {len(self._macros) - len(macro.get_registry())}")
 
         if skip_connection:
             return
 
-        if verbose:
+        if verbosity >= Verbosity.VERBOSE:
             self.console.log_status_update("")
             print_config(self.config.get_connection(self.gateway), self.console, "Connection")
             print_config(
@@ -2072,9 +2071,11 @@ def clear_caches(self) -> None:
         for path in self.configs:
             rmtree(path / c.CACHE)
 
-    def _run_tests(self, verbose: bool = False) -> t.Tuple[unittest.result.TestResult, str]:
+    def _run_tests(
+        self, verbosity: Verbosity = Verbosity.DEFAULT
+    ) -> t.Tuple[unittest.result.TestResult, str]:
         test_output_io = StringIO()
-        result = self.test(stream=test_output_io, verbose=verbose)
+        result = self.test(stream=test_output_io, verbosity=verbosity)
         return result, test_output_io.getvalue()
 
     def _run_plan_tests(