sqlmesh 0.184.4.dev7__tar.gz → 0.184.4.dev9__tar.gz

{sqlmesh-0.184.4.dev7 → sqlmesh-0.184.4.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.184.4.dev7
+Version: 0.184.4.dev9
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.184.4.dev7 → sqlmesh-0.184.4.dev9}/sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.184.4.dev7'
-__version_tuple__ = version_tuple = (0, 184, 4, 'dev7')
+__version__ = version = '0.184.4.dev9'
+__version_tuple__ = version_tuple = (0, 184, 4, 'dev9')

{sqlmesh-0.184.4.dev7 → sqlmesh-0.184.4.dev9}/sqlmesh/cli/main.py

@@ -346,11 +346,13 @@ def diff(ctx: click.Context, environment: t.Optional[str] = None) -> None:
     "--skip-tests",
     is_flag=True,
     help="Skip tests prior to generating the plan if they are defined.",
+    default=None,
 )
 @click.option(
     "--skip-linter",
     is_flag=True,
     help="Skip linting prior to generating the plan if the linter is enabled.",
+    default=None,
 )
 @click.option(
     "--restate-model",
@@ -363,17 +365,20 @@ def diff(ctx: click.Context, environment: t.Optional[str] = None) -> None:
     "--no-gaps",
     is_flag=True,
     help="Ensure that new snapshots have no data gaps when comparing to existing snapshots for matching models in the target environment.",
+    default=None,
 )
 @click.option(
     "--skip-backfill",
     "--dry-run",
     is_flag=True,
     help="Skip the backfill step and only create a virtual update for the plan.",
+    default=None,
 )
 @click.option(
     "--empty-backfill",
     is_flag=True,
     help="Produce empty backfill. Like --skip-backfill no models will be backfilled, unlike --skip-backfill missing intervals will be recorded as if they were backfilled.",
+    default=None,
 )
 @click.option(
     "--forward-only",
@@ -439,6 +444,7 @@ def diff(ctx: click.Context, environment: t.Optional[str] = None) -> None:
     "--run",
     is_flag=True,
     help="Run latest intervals as part of the plan application (prod environment only).",
+    default=None,
 )
 @click.option(
     "--enable-preview",
@@ -450,6 +456,7 @@ def diff(ctx: click.Context, environment: t.Optional[str] = None) -> None:
     "--diff-rendered",
     is_flag=True,
     help="Output text differences for the rendered versions of the models and standalone audits",
+    default=None,
 )
 @opt.verbose
 @click.pass_context

{sqlmesh-0.184.4.dev7 → sqlmesh-0.184.4.dev9}/sqlmesh/core/test/definition.py

@@ -349,18 +349,21 @@ class ModelTest(unittest.TestCase):
         else:
             _raise_error(f"Model '{name}' is an unsupported model type for testing", path)
 
-        return test_type(
-            body,
-            test_name,
-            t.cast(Model, model),
-            models,
-            engine_adapter,
-            dialect,
-            path,
-            preserve_fixtures,
-            default_catalog,
-            concurrency,
-        )
+        try:
+            return test_type(
+                body,
+                test_name,
+                t.cast(Model, model),
+                models,
+                engine_adapter,
+                dialect,
+                path,
+                preserve_fixtures,
+                default_catalog,
+                concurrency,
+            )
+        except Exception as e:
+            raise TestError(f"Failed to create test {test_name} ({path})\n{str(e)}")
 
     def __str__(self) -> str:
         return f"{self.test_name} ({self.path})"
@@ -905,8 +908,8 @@ def _row_difference(left: pd.DataFrame, right: pd.DataFrame) -> pd.DataFrame:
 
 def _raise_error(msg: str, path: Path | None = None) -> None:
     if path:
-        raise TestError(f"{msg} at {path}")
-    raise TestError(msg)
+        raise TestError(f"Failed to run test at {path}:\n{msg}")
+    raise TestError(f"Failed to run test:\n{msg}")
 
 
 def _normalize_df_value(value: t.Any) -> t.Any:

{sqlmesh-0.184.4.dev7 → sqlmesh-0.184.4.dev9}/sqlmesh/core/test/result.py

@@ -17,6 +17,8 @@ class ModelTextTestResult(unittest.TextTestResult):
     def __init__(self, *args: t.Any, **kwargs: t.Any):
         super().__init__(*args, **kwargs)
         self.successes = []
+        self.original_failures: t.List[t.Tuple[unittest.TestCase, ErrorType]] = []
+        self.original_errors: t.List[t.Tuple[unittest.TestCase, ErrorType]] = []
 
     def addSubTest(
         self,
@@ -48,8 +50,9 @@ class ModelTextTestResult(unittest.TextTestResult):
             test: The test case.
             err: A tuple of the form returned by sys.exc_info(), i.e., (type, value, traceback).
         """
-        exctype, value, tb = err
-        self.original_err = (test, err)
+        exctype, value, _ = err
+        self.original_failures.append((test, err))
+        # Intentionally ignore the traceback to hide it from the user
         return super().addFailure(test, (exctype, value, None))  # type: ignore
 
     def addError(self, test: unittest.TestCase, err: ErrorType) -> None:
@@ -59,8 +62,10 @@ class ModelTextTestResult(unittest.TextTestResult):
             test: The test case.
             err: A tuple of the form returned by sys.exc_info(), i.e., (type, value, traceback).
         """
-        self.original_err = (test, err)
-        return super().addError(test, err)  # type: ignore
+        exctype, value, _ = err
+        self.original_errors.append((test, err))
+        # Intentionally ignore the traceback to hide it from the user
+        return super().addError(test, (exctype, value, None))  # type: ignore
 
     def addSuccess(self, test: unittest.TestCase) -> None:
         """Called when the test case test succeeds.
@@ -105,9 +110,10 @@ class ModelTextTestResult(unittest.TextTestResult):
             stream.writeln(unittest.TextTestResult.separator2)
             stream.writeln(failure)
 
-        for _, error in errors:
+        for test_case, error in errors:
             stream.writeln(unittest.TextTestResult.separator1)
-            stream.writeln(f"ERROR: {error}")
+            stream.writeln(f"ERROR: {test_case}")
+            stream.writeln(error)
 
         # Output final report
         stream.writeln(unittest.TextTestResult.separator2)

{sqlmesh-0.184.4.dev7 → sqlmesh-0.184.4.dev9}/sqlmesh/core/test/runner.py

@@ -150,9 +150,11 @@ def run_tests(
             if result.successes:
                 combined_results.addSuccess(result.successes[0])
             elif result.errors:
-                combined_results.addError(result.original_err[0], result.original_err[1])
+                for error_test, error in result.original_errors:
+                    combined_results.addError(error_test, error)
             elif result.failures:
-                combined_results.addFailure(result.original_err[0], result.original_err[1])
+                for failure_test, failure in result.original_failures:
+                    combined_results.addFailure(failure_test, failure)
             elif result.skipped:
                 skipped_args = result.skipped[0]
                 combined_results.addSkip(skipped_args[0], skipped_args[1])

{sqlmesh-0.184.4.dev7 → sqlmesh-0.184.4.dev9}/sqlmesh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.184.4.dev7
+Version: 0.184.4.dev9
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.184.4.dev7 → sqlmesh-0.184.4.dev9}/tests/core/test_test.py

@@ -2,7 +2,9 @@ from __future__ import annotations
 
 import datetime
 import typing as t
+import io
 from pathlib import Path
+import unittest
 from unittest.mock import call, patch
 from shutil import copyfile
 
@@ -28,6 +30,7 @@ from sqlmesh.core.engine_adapter import EngineAdapter
 from sqlmesh.core.macros import MacroEvaluator, macro
 from sqlmesh.core.model import Model, SqlModel, load_sql_based_model, model
 from sqlmesh.core.test.definition import ModelTest, PythonModelTest, SqlModelTest
+from sqlmesh.core.test.result import ModelTextTestResult
 from sqlmesh.utils.errors import ConfigError, SQLMeshError, TestError
 from sqlmesh.utils.yaml import dump as dump_yaml
 from sqlmesh.utils.yaml import load as load_yaml
@@ -1039,7 +1042,8 @@ test_foo:
             context=Context(config=Config(model_defaults=ModelDefaultsConfig(dialect="duckdb"))),
         ).run(),
         expected_msg=(
-            "sqlmesh.utils.errors.TestError: Detected unknown column(s)\n\n"
+            "sqlmesh.utils.errors.TestError: Failed to run test:\n"
+            "Detected unknown column(s)\n\n"
             "Expected column(s): id, value\n"
             "Unknown column(s): foo\n"
         ),
@@ -2520,3 +2524,61 @@ test_test_upstream_table_python:
             context=sushi_context,
         ).run()
     )
+
+
+@pytest.mark.parametrize("is_error", [True, False])
+def test_model_test_text_result_reporting_no_traceback(
+    sushi_context: Context, full_model_with_two_ctes: SqlModel, is_error: bool
+) -> None:
+    test = _create_test(
+        body=load_yaml(
+            """
+test_foo:
+  model: sushi.foo
+  inputs:
+    raw:
+      - id: 1
+  outputs:
+    ctes:
+      source:
+        - id: 1
+      renamed:
+        - fid: 1
+  vars:
+    start: 2022-01-01
+    end: 2022-01-01
+                """
+        ),
+        test_name="test_foo",
+        model=sushi_context.upsert_model(full_model_with_two_ctes),
+        context=sushi_context,
+    )
+    stream = io.StringIO()
+    result = ModelTextTestResult(
+        stream=unittest.runner._WritelnDecorator(stream),  # type: ignore
+        verbosity=1,
+        descriptions=True,
+    )
+
+    try:
+        raise Exception("failure")
+    except Exception as e:
+        assert e.__traceback__ is not None
+        if is_error:
+            result.addError(test, (e.__class__, e, e.__traceback__))
+        else:
+            result.addFailure(test, (e.__class__, e, e.__traceback__))
+
+    result.log_test_report(0)
+
+    stream.seek(0)
+    output = stream.read()
+
+    # Make sure that the traceback is not printed
+    assert "Traceback" not in output
+    assert "File" not in output
+    assert "line" not in output
+
+    prefix = "ERROR" if is_error else "FAIL"
+    assert f"{prefix}: test_foo (None)" in output
+    assert "Exception: failure" in output