Use -v count instead of second argument

Author: treysp

sqlmesh/cli/main.py

@@ -13,7 +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.utils import Verbosity
 from sqlmesh.core.config import load_configs
 from sqlmesh.core.context import Context
 from sqlmesh.utils.date import TimeLike
@@ -439,14 +439,12 @@ 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,
-    very_verbose: bool,
+    verbose: int,
     environment: t.Optional[str] = None,
     **kwargs: t.Any,
 ) -> None:
@@ -456,10 +454,8 @@ def plan(
     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(), "verbosity", Verbosity(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,
@@ -639,7 +635,6 @@ def create_test(
 @cli.command("test")
 @opt.match_pattern
 @opt.verbose
-@opt.very_verbose
 @click.option(
     "--preserve-fixtures",
     is_flag=True,
@@ -653,19 +648,15 @@ def create_test(
 def test(
     obj: Context,
     k: t.List[str],
-    verbose: bool,
-    very_verbose: bool,
+    verbose: int,
     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,
-        verbosity=verbosity,
+        verbosity=Verbosity(verbose),
         preserve_fixtures=preserve_fixtures,
     )
     if not result.wasSuccessful():
@@ -714,20 +705,16 @@ 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, very_verbose: bool) -> None:
+def info(obj: Context, skip_connection: bool, verbose: int) -> None:
     """
     Print information about a SQLMesh project.
 
     Includes counts of project models and macros and connection tests for the data warehouse.
     """
-    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)
+    obj.print_info(skip_connection=skip_connection, verbosity=Verbosity(verbose))
 
 
 @cli.command("ui")
@@ -918,7 +905,6 @@ 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
@@ -927,22 +913,18 @@ def prompt(
     prompt: str,
     evaluate: bool,
     temperature: float,
-    verbose: bool,
-    very_verbose: bool,
+    verbose: int,
 ) -> 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,
-        verbosity=verbosity,
+        verbosity=Verbosity(verbose),
     )
     query = llm_integration.query(prompt)
 

sqlmesh/cli/options.py

@@ -51,13 +51,6 @@
 verbose = click.option(
     "-v",
     "--verbose",
-    is_flag=True,
-    help="Verbose output.",
-)
-
-very_verbose = click.option(
-    "-vv",
-    "--very-verbose",
-    is_flag=True,
-    help="Very verbose output.",
+    count=True,
+    help="Verbose output. Use -vv for 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
@@ -36,6 +36,7 @@
 )
 from sqlmesh.core.test import ModelTest
 from sqlmesh.utils import rich as srich
+from sqlmesh.utils import Verbosity
 from sqlmesh.utils.concurrency import NodeExecutionFailedError
 from sqlmesh.utils.date import time_like_to_str, to_date, yesterday_ds
 from sqlmesh.utils.errors import (

sqlmesh/core/constants.py

@@ -5,7 +5,6 @@
 import os
 import typing as t
 from pathlib import Path
-from enum import IntEnum
 
 SQLMESH = "sqlmesh"
 SQLMESH_PATH = Path.home() / ".sqlmesh"
@@ -92,9 +91,3 @@
 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
@@ -114,7 +114,7 @@
     run_tests,
 )
 from sqlmesh.core.user import User
-from sqlmesh.utils import UniqueKeyDict
+from sqlmesh.utils import UniqueKeyDict, Verbosity
 from sqlmesh.utils.dag import DAG
 from sqlmesh.utils.date import TimeLike, now_ds, to_timestamp, format_tz_datetime
 from sqlmesh.utils.errors import (

sqlmesh/core/test/__init__.py

@@ -3,7 +3,7 @@
 import pathlib
 import typing as t
 import unittest
-from sqlmesh.core.constants import Verbosity
+
 from sqlmesh.core.engine_adapter import EngineAdapter
 from sqlmesh.core.model import Model
 from sqlmesh.core.test.definition import ModelTest as ModelTest, generate_test as generate_test
@@ -14,7 +14,7 @@
     load_model_test_file as load_model_test_file,
 )
 from sqlmesh.core.test.result import ModelTextTestResult as ModelTextTestResult
-from sqlmesh.utils import UniqueKeyDict
+from sqlmesh.utils import UniqueKeyDict, Verbosity
 
 if t.TYPE_CHECKING:
     from sqlmesh.core.config.loader import C

sqlmesh/integrations/github/cicd/controller.py

@@ -15,10 +15,9 @@
 import requests
 from hyperscript import Element, h
 from sqlglot.helper import seq_get
-from sqlmesh.core.constants import Verbosity
+
 from sqlmesh.core import constants as c
 from sqlmesh.core.console import SNAPSHOT_CHANGE_CATEGORY_STR, get_console, MarkdownConsole
-
 from sqlmesh.core.context import Context
 from sqlmesh.core.environment import Environment
 from sqlmesh.core.plan import Plan, PlanBuilder
@@ -31,7 +30,7 @@
 )
 from sqlmesh.core.user import User
 from sqlmesh.integrations.github.cicd.config import GithubCICDBotConfig
-from sqlmesh.utils import word_characters_only
+from sqlmesh.utils import word_characters_only, Verbosity
 from sqlmesh.utils.concurrency import NodeExecutionFailedError
 from sqlmesh.utils.date import now
 from sqlmesh.utils.errors import (

sqlmesh/integrations/llm.py

@@ -5,7 +5,7 @@
 from langchain import LLMChain, PromptTemplate
 from langchain.chat_models import ChatOpenAI
 
-from sqlmesh.core.constants import Verbosity
+from sqlmesh.utils import Verbosity
 from sqlmesh.core.model import Model
 
 _QUERY_PROMPT_TEMPLATE = """Given an input request, create a syntactically correct {dialect} SQL query.

sqlmesh/magics.py

@@ -24,7 +24,6 @@
 from IPython.core.magic_arguments import argument, magic_arguments, parse_argstring
 from IPython.utils.process import arg_split
 from rich.jupyter import JupyterRenderable
-from sqlmesh.core.constants import Verbosity
 from sqlmesh.cli.example_project import ProjectTemplate, init_example_project
 from sqlmesh.core import analytics
 from sqlmesh.core import constants as c
@@ -34,7 +33,7 @@
 from sqlmesh.core.dialect import format_model_expressions, parse
 from sqlmesh.core.model import load_sql_based_model
 from sqlmesh.core.test import ModelTestMetadata, get_all_model_tests
-from sqlmesh.utils import sqlglot_dialects, yaml
+from sqlmesh.utils import sqlglot_dialects, yaml, Verbosity
 from sqlmesh.utils.errors import MagicError, MissingContextException, SQLMeshError
 
 logger = logging.getLogger(__name__)
@@ -437,17 +436,20 @@ def test(self, context: Context, line: str, test_def_raw: t.Optional[str] = None
         action="store_true",
         help="Output text differences for the rendered versions of the models and standalone audits",
     )
-    @argument("--verbose", "-v", action="store_true", help="Verbose output.")
-    @argument("--very-verbose", "-vv", action="store_true", help="Very verbose output.")
+    @argument(
+        "--verbose",
+        "-v",
+        action="count",
+        default=0,
+        help="Verbose output. Use -vv for very verbose.",
+    )
     @line_magic
     @pass_sqlmesh_context
     def plan(self, context: Context, line: str) -> None:
         """Goes through a set of prompts to both establish a plan and apply it"""
         args = parse_argstring(self.plan, line)
 
-        verbosity = Verbosity.VERBOSE if args.verbose else Verbosity.DEFAULT
-        verbosity = Verbosity.VERY_VERBOSE if args.very_verbose else verbosity
-        setattr(context.console, "verbosity", verbosity)
+        setattr(context.console, "verbosity", Verbosity(args.verbose))
 
         context.plan(
             args.environment,
@@ -968,8 +970,13 @@ def create_test(self, context: Context, line: str) -> None:
         type=str,
         help="Only run tests that match the pattern of substring.",
     )
-    @argument("--verbose", "-v", action="store_true", help="Verbose output.")
-    @argument("--very-verbose", "-vv", action="store_true", help="Very verbose output.")
+    @argument(
+        "--verbose",
+        "-v",
+        action="count",
+        default=0,
+        help="Verbose output. Use -vv for very verbose.",
+    )
     @argument(
         "--preserve-fixtures",
         action="store_true",
@@ -981,13 +988,10 @@ def run_test(self, context: Context, line: str) -> None:
         """Run unit test(s)."""
         args = parse_argstring(self.run_test, line)
 
-        verbosity = Verbosity.VERBOSE if args.verbose else Verbosity.DEFAULT
-        verbosity = Verbosity.VERY_VERBOSE if args.very_verbose else verbosity
-
         context.test(
             match_patterns=args.pattern,
             tests=args.tests,
-            verbosity=verbosity,
+            verbosity=Verbosity(args.verbose),
             preserve_fixtures=args.preserve_fixtures,
         )
 
@@ -1014,18 +1018,19 @@ def audit(self, context: Context, line: str) -> None:
         help="Skip the connection test.",
         default=False,
     )
-    @argument("--verbose", "-v", action="store_true", help="Verbose output.")
-    @argument("--very-verbose", "-vv", action="store_true", help="Very verbose output.")
+    @argument(
+        "--verbose",
+        "-v",
+        action="count",
+        default=0,
+        help="Verbose output. Use -vv for very verbose.",
+    )
     @line_magic
     @pass_sqlmesh_context
     def info(self, context: Context, line: str) -> None:
         """Display SQLMesh project information."""
         args = parse_argstring(self.info, line)
-
-        verbosity = Verbosity.VERBOSE if args.verbose else Verbosity.DEFAULT
-        verbosity = Verbosity.VERY_VERBOSE if args.very_verbose else verbosity
-
-        context.print_info(skip_connection=args.skip_connection, verbosity=verbosity)
+        context.print_info(skip_connection=args.skip_connection, verbosity=Verbosity(args.verbose))
 
     @magic_arguments()
     @line_magic

sqlmesh/utils/__init__.py

@@ -16,6 +16,7 @@
 from collections import defaultdict
 from contextlib import contextmanager
 from copy import deepcopy
+from enum import IntEnum
 from functools import lru_cache, reduce, wraps
 from pathlib import Path
 
@@ -338,3 +339,11 @@ def type_is_known(d_type: t.Union[exp.DataType, exp.ColumnDef]) -> bool:
 def columns_to_types_all_known(columns_to_types: t.Dict[str, exp.DataType]) -> bool:
     """Checks that all column types are known and not NULL."""
     return all(type_is_known(expression) for expression in columns_to_types.values())
+
+
+class Verbosity(IntEnum):
+    """Verbosity levels for SQLMesh output."""
+
+    DEFAULT = 0
+    VERBOSE = 1
+    VERY_VERBOSE = 2