sqlmesh 0.188.1.dev7__tar.gz → 0.188.1.dev9__tar.gz

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

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

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

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.188.1.dev7'
-__version_tuple__ = version_tuple = (0, 188, 1, 'dev7')
+__version__ = version = '0.188.1.dev9'
+__version_tuple__ = version_tuple = (0, 188, 1, 'dev9')

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/sqlmesh/core/loader.py

@@ -452,10 +452,12 @@ class Loader(abc.ABC):
         self._path_mtimes[path] = path.stat().st_mtime
 
     def _failed_to_load_model_error(self, path: Path, error: t.Union[str, Exception]) -> str:
-        base_message = f"Failed to load model definition at '{path}':"
+        base_message = f"Failed to load model from file '{path}':"
         if isinstance(error, ValidationError):
             return validation_error_message(error, base_message)
-        return f"{base_message}\n  {error}"
+        # indent all lines of error message
+        error_message = str(error).replace("\n", "\n  ")
+        return f"{base_message}\n\n  {error_message}"
 
 
 class SqlMeshLoader(Loader):

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/sqlmesh/core/model/definition.py

@@ -2036,18 +2036,25 @@ def load_sql_based_model(
         variables: The variables to pass to the model.
         kwargs: Additional kwargs to pass to the loader.
     """
+    missing_model_msg = f"""Please add a MODEL block at the top of the file. Example:
+
+MODEL (
+  name sqlmesh_example.full_model, --model name
+  kind FULL, --materialization
+  cron '@daily', --schedule
+);
+
+Learn more at https://sqlmesh.readthedocs.io/en/stable/concepts/models/overview
+"""
+
     if not expressions:
-        raise_config_error("Incomplete model definition, missing MODEL statement", path)
+        raise_config_error(missing_model_msg)
 
     dialect = dialect or ""
     meta = expressions[0]
     if not isinstance(meta, d.Model):
         if not infer_names:
-            raise_config_error(
-                "The MODEL statement is required as the first statement in the definition, "
-                "unless model name inference is enabled.",
-                path,
-            )
+            raise_config_error(missing_model_msg)
         meta = d.Model(expressions=[])  # Dummy meta node
         expressions.insert(0, meta)
 

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/sqlmesh/dbt/builtin.py

@@ -30,7 +30,7 @@ logger = logging.getLogger(__name__)
 
 class Exceptions:
     def raise_compiler_error(self, msg: str) -> None:
-        if DBT_VERSION >= (1, 4):
+        if DBT_VERSION >= (1, 4, 0):
             from dbt.exceptions import CompilationError
 
             raise CompilationError(msg)

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/sqlmesh/dbt/manifest.py

@@ -238,7 +238,7 @@ class ManifestHelper:
             dependencies.macros.append(MacroReference(package="dbt", name="get_where_subquery"))
             dependencies.macros.append(MacroReference(package="dbt", name="should_store_failures"))
 
-            sql = node.raw_code if DBT_VERSION >= (1, 3) else node.raw_sql  # type: ignore
+            sql = node.raw_code if DBT_VERSION >= (1, 3, 0) else node.raw_sql  # type: ignore
             dependencies = dependencies.union(self._extra_dependencies(sql, node.package_name))
             dependencies = dependencies.union(
                 self._flatten_dependencies_from_macros(dependencies.macros, node.package_name)
@@ -278,7 +278,7 @@ class ManifestHelper:
                 node_name = f"{node_name}_v{node_version}"
 
             if node.resource_type in {"model", "snapshot"}:
-                sql = node.raw_code if DBT_VERSION >= (1, 3) else node.raw_sql  # type: ignore
+                sql = node.raw_code if DBT_VERSION >= (1, 3, 0) else node.raw_sql  # type: ignore
                 dependencies = Dependencies(
                     macros=macro_references, refs=_refs(node), sources=_sources(node)
                 )
@@ -305,7 +305,7 @@ class ManifestHelper:
             if node.resource_type == "operation" and (
                 set(node.tags) & {"on-run-start", "on-run-end"}
             ):
-                sql = node.raw_code if DBT_VERSION >= (1, 3) else node.raw_sql  # type: ignore
+                sql = node.raw_code if DBT_VERSION >= (1, 3, 0) else node.raw_sql  # type: ignore
                 node_name = node.name
                 node_path = Path(node.original_file_path)
 
@@ -339,7 +339,7 @@ class ManifestHelper:
 
         variables = (
             self.variable_overrides
-            if DBT_VERSION >= (1, 5)
+            if DBT_VERSION >= (1, 5, 0)
             else json.dumps(self.variable_overrides)
         )
 
@@ -354,7 +354,7 @@ class ManifestHelper:
         )
         flags.set_from_args(args, None)
 
-        if DBT_VERSION >= (1, 8):
+        if DBT_VERSION >= (1, 8, 0):
             from dbt_common.context import set_invocation_context  # type: ignore
 
             set_invocation_context(os.environ)
@@ -371,7 +371,7 @@ class ManifestHelper:
 
         self._project_name = project.project_name
 
-        if DBT_VERSION >= (1, 8):
+        if DBT_VERSION >= (1, 8, 0):
             from dbt.mp_context import get_mp_context  # type: ignore
 
             register_adapter(runtime_config, get_mp_context())  # type: ignore
@@ -546,7 +546,7 @@ def _macro_references(
 
 
 def _refs(node: ManifestNode) -> t.Set[str]:
-    if DBT_VERSION >= (1, 5):
+    if DBT_VERSION >= (1, 5, 0):
         result = set()
         for r in node.refs:
             ref_name = f"{r.package}.{r.name}" if r.package else r.name

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/sqlmesh/dbt/relation.py

@@ -1,7 +1,7 @@
 from sqlmesh.dbt.util import DBT_VERSION
 
 
-if DBT_VERSION < (1, 8):
+if DBT_VERSION < (1, 8, 0):
     from dbt.contracts.relation import *  # type: ignore  # noqa: F403
 else:
     from dbt.adapters.contracts.relation import *  # type: ignore # noqa: F403

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/sqlmesh/dbt/target.py

@@ -167,7 +167,7 @@ class DuckDbConfig(TargetConfig):
         if not isinstance(data, dict):
             return data
 
-        if "database" not in data and DBT_VERSION >= (1, 5):
+        if "database" not in data and DBT_VERSION >= (1, 5, 0):
             path = data.get("path")
             data["database"] = (
                 "memory"
@@ -424,7 +424,7 @@ class RedshiftConfig(TargetConfig):
 
     @classproperty
     def column_class(cls) -> t.Type[Column]:
-        if DBT_VERSION < (1, 6):
+        if DBT_VERSION < (1, 6, 0):
             from dbt.adapters.redshift import RedshiftColumn  # type: ignore
 
             return RedshiftColumn

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/sqlmesh/dbt/util.py

@@ -5,14 +5,18 @@ import pandas as pd
 from dbt.version import get_installed_version
 
 
-def _get_dbt_version() -> t.Tuple[int, int]:
+def _get_dbt_version() -> t.Tuple[int, int, int]:
     dbt_version = get_installed_version()
-    return (int(dbt_version.major or "0"), int(dbt_version.minor or "0"))
+    return (
+        int(dbt_version.major or "0"),
+        int(dbt_version.minor or "0"),
+        int(dbt_version.patch or "0"),
+    )
 
 
 DBT_VERSION = _get_dbt_version()
 
-if DBT_VERSION < (1, 8):
+if DBT_VERSION < (1, 8, 0):
     from dbt.clients.agate_helper import table_from_data_flat, empty_table, as_matrix  # type: ignore  # noqa: F401
 else:
     from dbt_common.clients.agate_helper import table_from_data_flat, empty_table, as_matrix  # type: ignore  # noqa: F401

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

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

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/tests/core/test_loader.py

@@ -159,7 +159,7 @@ def execute(
 
     with pytest.raises(
         ConfigError,
-        match=r"Failed to load model definition at '.*'.\n  Duplicate name: 'test_schema.test_model'.",
+        match=r"Failed to load model from file '.*'.\n\n  Duplicate name: 'test_schema.test_model'.",
     ):
         Context(paths=tmp_path, config=config)
 

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/tests/core/test_model.py

@@ -576,7 +576,7 @@ def test_no_model_statement(tmp_path: Path):
     expressions = d.parse("SELECT 1 AS x")
     with pytest.raises(
         ConfigError,
-        match="The MODEL statement is required as the first statement in the definition, unless model name inference is enabled. at '.'",
+        match="Please add a MODEL block at the top of the file. Example:",
     ):
         load_sql_based_model(expressions)
 
@@ -613,7 +613,7 @@ def test_unordered_model_statements():
 
     with pytest.raises(ConfigError) as ex:
         load_sql_based_model(expressions)
-    assert "MODEL statement is required" in str(ex.value)
+    assert "Please add a MODEL block at the top of the file. Example:" in str(ex.value)
 
 
 def test_no_query():

{sqlmesh-0.188.1.dev7 → sqlmesh-0.188.1.dev9}/tests/utils/test_metaprogramming.py

@@ -108,7 +108,7 @@ def other_func(a: int) -> int:
 
 
 @contextmanager
-def test_context_manager():
+def sample_context_manager():
     yield
 
 
@@ -141,7 +141,7 @@ def main_func(y: int, foo=exp.true(), *, bar=expressions.Literal.number(1) + 2)
     def closure(z: int) -> int:
         return z + Z
 
-    with test_context_manager():
+    with sample_context_manager():
         pass
 
     return closure(y) + other_func(Y)
@@ -171,7 +171,7 @@ def test_func_globals() -> None:
         "exp": exp,
         "expressions": exp,
         "fetch_data": fetch_data,
-        "test_context_manager": test_context_manager,
+        "sample_context_manager": sample_context_manager,
         "function_with_custom_decorator": function_with_custom_decorator,
         "SQLGLOT_META": SQLGLOT_META,
     }
@@ -211,7 +211,7 @@ def test_normalize_source() -> None:
 
     def closure(z: int):
         return z + Z
-    with test_context_manager():
+    with sample_context_manager():
         pass
     return closure(y) + other_func(Y)"""
     )
@@ -261,7 +261,7 @@ def test_serialize_env() -> None:
 
     def closure(z: int):
         return z + Z
-    with test_context_manager():
+    with sample_context_manager():
         pass
     return closure(y) + other_func(Y)""",
         ),
@@ -318,9 +318,9 @@ class DataClass:
         ),
         "func": Executable(
             payload="""@contextmanager
-def test_context_manager():
+def sample_context_manager():
     yield""",
-            name="test_context_manager",
+            name="sample_context_manager",
             path="test_metaprogramming.py",
             alias="func",
         ),
@@ -344,11 +344,11 @@ def test_context_manager():
     my_lambda()
     return X + a + W""",
         ),
-        "test_context_manager": Executable(
+        "sample_context_manager": Executable(
             payload="""@contextmanager
-def test_context_manager():
+def sample_context_manager():
     yield""",
-            name="test_context_manager",
+            name="sample_context_manager",
             path="test_metaprogramming.py",
         ),
         "wraps": Executable(payload="from functools import wraps", kind=ExecutableKind.IMPORT),