sqlmesh 0.188.1.dev7__py3-none-any.whl → 0.188.1.dev9__py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → sqlmesh-0.188.1.dev9.dist-info}/METADATA

@@ -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.dist-info → sqlmesh-0.188.1.dev9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=69xw6bTmi4cW90M-sl3g6wLDgxVcLHcKg1q8GS3lqyA,7466
-sqlmesh/_version.py,sha256=wywJkf5IKZ8yoj5ZLyjSrChyrg233K3yMpowNlVlFOA,528
+sqlmesh/_version.py,sha256=J6UXr6hz7vwXl3srz5_6WMBoF82VLWEkVOGib6miMi4,528
 sqlmesh/magics.py,sha256=fu7-OeT_0_TAkWZOLoiioE3-3iFpvTRxFCbQUlRnfuw,39944
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,7 +18,7 @@ sqlmesh/core/context_diff.py,sha256=I7luvY2za30E5ynVaFPaEQQEmNViJpWAmW48PGSyDCU,
 sqlmesh/core/dialect.py,sha256=fPTV517IOS0nWMxYznNNQnXkQkFFrPOSKe8ghsQ0o8A,49759
 sqlmesh/core/environment.py,sha256=Fsih6WZ7Tx4ec0XIlmIIspUWcmijPNW5uHPRQSWuhA8,12315
 sqlmesh/core/lineage.py,sha256=zjB0Zfamo2Fja2r5SSZPMbrEKTXr1WjozZPVqvxdybI,3143
-sqlmesh/core/loader.py,sha256=exNCHmw06-CRBtOk-Hk5Ivw3gCowDWbxcvhMJVxpDd8,35887
+sqlmesh/core/loader.py,sha256=yGMqZasaOrkwoDnIO1rQyxwFKkZggHL3VQAEeLhKYsM,35994
 sqlmesh/core/macros.py,sha256=wSKkFDZ2eIvhPENIsQ_7j27zVMHIgT-2juRjGvDeEKM,59620
 sqlmesh/core/node.py,sha256=r4_1MRTPcU0MAlwZ5KzrykLT58B7dkKvHzPCsJmEKD8,14497
 sqlmesh/core/notification_target.py,sha256=PPGoDrgbRKxr27vJEu03XqNTQLYTw0ZF_b0yAapxGeI,16158
@@ -87,7 +87,7 @@ sqlmesh/core/model/__init__.py,sha256=C8GRZ53xuXEA9hQv3BQS9pNNyd9rZ06R_B96UYGhDu
 sqlmesh/core/model/cache.py,sha256=csun0RJguHzKX6-qITcOs4fVP4f8_Ts8qiUVV4sHY6Q,7869
 sqlmesh/core/model/common.py,sha256=vbcXFhWE22-FeKYAVIlKWvTb-wkeC8XISjU_TIlak0c,16252
 sqlmesh/core/model/decorator.py,sha256=v_sVudNROGrtj5cZ3vgcOFnwPdzwoUGY6REAkQpIMQc,8927
-sqlmesh/core/model/definition.py,sha256=wdWkRROrIwbq4xJ5g76go5kDmOvGFWvx4oTmuWFoMvg,108366
+sqlmesh/core/model/definition.py,sha256=5OXQTAfDe3e5ZYTgX3ziHE-ZHfdZvr_JBFNIpWx_agE,108444
 sqlmesh/core/model/kind.py,sha256=i6_AMBarXPGPoMdF9kzBkyqS9tu__a2339-BoX7TgCM,36010
 sqlmesh/core/model/meta.py,sha256=osJgfSj6maIIdWAHzDVCkXXL--__gnKvqkzxM6Nuq6g,20779
 sqlmesh/core/model/schema.py,sha256=OClbAeA8LpW-IiSiLT_TlDWkEqmIIvSk0GXq8SWI-GQ,3443
@@ -123,22 +123,22 @@ sqlmesh/core/test/runner.py,sha256=yno0GDUW9angCy2ZeLIZE9lKrqBiJOnFibu6RLuct6I,6
 sqlmesh/dbt/__init__.py,sha256=KUv-lW5sG9D2ceXAIzA4MLcjyhzq3E-7qJP4P_PH2EU,144
 sqlmesh/dbt/adapter.py,sha256=NAY8E7R9S-DsKn3LnPUvZvQNONRE7hthmuBs1a5ao64,16761
 sqlmesh/dbt/basemodel.py,sha256=XuiK9-r5JWzvZGEk98Jt4ukR2exfMDsotGZqYx5xluc,12561
-sqlmesh/dbt/builtin.py,sha256=fyzv4qR1isfnID1oWz-r46oDQvS90DN5mMUEWgapvN8,15153
+sqlmesh/dbt/builtin.py,sha256=Z1fmEkF5gVS1LMpuOOlZGwzdslcYNgW38-_b_n3KUfM,15156
 sqlmesh/dbt/column.py,sha256=Kvj_N3D_QegcoNQG7VqRiqy-FRfupud-6ilhlykBOgE,1873
 sqlmesh/dbt/common.py,sha256=g4PAL-sEdlnfb_zT-WW3xh-oamyCUoK8dUiDEMVwDWI,7804
 sqlmesh/dbt/context.py,sha256=dxClM-G1IeMbP0v5yxC_va8QNU-uKghW2dBlSZHJOk0,10331
 sqlmesh/dbt/loader.py,sha256=oDFj9OcWJxd72eN9u9gHM_bWj7T5EQuGnLViSdtLbMU,15472
-sqlmesh/dbt/manifest.py,sha256=a6gs4fpTBIb3p4r2dVp_4TKQqjpUEorfb9XWgmmfK3A,24126
+sqlmesh/dbt/manifest.py,sha256=vHNHIkz3SQgZWoHrCsnSKNBptTCUtgG724_3QKTtnhM,24147
 sqlmesh/dbt/model.py,sha256=-TqeldZAqW-4g84Xi_16DpUD3atImk_9OHMbATIKYb8,26328
 sqlmesh/dbt/package.py,sha256=IBBQueVB4_4C9tIk0-GUL-O2uibNxXu6W2a4AeHHcOU,4322
 sqlmesh/dbt/profile.py,sha256=Fz2c0dJNN0xBgYEogCIKBTByjNvlA2BVBzOLQCfdEfM,3788
 sqlmesh/dbt/project.py,sha256=4PJHPVWIKDd71J5__iICqEp21nFiijKjJkiE5kZIH5Y,3980
-sqlmesh/dbt/relation.py,sha256=3w_4_Dj-oZXUEdBqOl9U6twbt8S2gDNMaFRb3unqkE8,224
+sqlmesh/dbt/relation.py,sha256=rgDJQUuENjqq7kpMJJ6AdlgwYmcYjA1oFj6LCYCS-Hg,227
 sqlmesh/dbt/seed.py,sha256=E7pFhtGwRrC9U_VZJNABwLTa-Nk4OeD-gOtjSpvYmDA,4251
 sqlmesh/dbt/source.py,sha256=IZK-aOV-KdWIOPuXqRjJZAZ7phW1HUXoHtE-3clgkx4,4125
-sqlmesh/dbt/target.py,sha256=YFCqQPhPcMa_7chMoKTTwIYEqaERlDvNipEGPw2RmM4,40529
+sqlmesh/dbt/target.py,sha256=vPxOFAWbtFpvdUit5qaFOLEQ7IKOoOvIzr2nxzs5DUE,40535
 sqlmesh/dbt/test.py,sha256=aOTKqYpVafff-TU4Xhbc9eZr6QAuFLMxIu_sV-18JLQ,8282
-sqlmesh/dbt/util.py,sha256=uDFgAXBRFTHNVLJdNhMASqOURe_1OH132AD97sMjj1E,774
+sqlmesh/dbt/util.py,sha256=0HjMx86XOQGKR5gh84JtIjafxUbLGdpltwxvbtK86p0,844
 sqlmesh/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/engines/commands.py,sha256=Fjy_seH1JL2EZxFNJBr0-eIaOn5PNY-JEb0nBbcr6Go,6094
 sqlmesh/engines/spark/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -270,7 +270,7 @@ sqlmesh/utils/pydantic.py,sha256=I898jAFqa3qU6lG2uPpRebVFncOUo8ZrLWM_R3K3DHU,116
 sqlmesh/utils/rich.py,sha256=xNZyPCqEc4TAlJlsEthg-5eYUWpaizz0QjBzO7a1Yv4,1509
 sqlmesh/utils/windows.py,sha256=r7Yin4WEwbvH7sKA3hOJtRsclmscNuBeCklCfVPvtQs,611
 sqlmesh/utils/yaml.py,sha256=np-WVcwmwsKghCgAj1OBBMsK1SXSRn4wR-H37cGiFr8,2282
-sqlmesh-0.188.1.dev7.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.188.1.dev9.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=SZAIyEMRTaAz5h63Jg1UPib6v2scbURBURXaYWbeels,5472
 web/client/dist/assets/Audits-yd9300pl.js,sha256=Vv7BcvM07rW2_89mRd0suy-0FuYGjDX4NI8dQTw7u5s,1041
@@ -388,8 +388,8 @@ web/server/api/endpoints/models.py,sha256=ud-lRwriyI_OYg9tZchrBgeiXELiRTLNEodraf
 web/server/api/endpoints/modules.py,sha256=8hqqgonGay_mJmpCw0IdbjsPhWlQH2VLdKAqha-myac,468
 web/server/api/endpoints/plan.py,sha256=OYuQ_4dgbhG9ibTcX1a8mvYgH3ANxw9Fhbb4wg6QWqc,9222
 web/server/api/endpoints/table_diff.py,sha256=Wd5YxeKbZB7AkrDvqFgvV9ZQlnKYOF1n5W_w2EHE_Zw,2085
-sqlmesh-0.188.1.dev7.dist-info/METADATA,sha256=wVn3ufUjSd0LQ3CHHjN3Ek8MiRR9hvmDK9Ray6Pk9oc,26531
-sqlmesh-0.188.1.dev7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.188.1.dev7.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.188.1.dev7.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.188.1.dev7.dist-info/RECORD,,
+sqlmesh-0.188.1.dev9.dist-info/METADATA,sha256=Gzfm6oZ-NzxB4r7YBmk0M-SC5q4BvKpfgGt_X0hNgs8,26531
+sqlmesh-0.188.1.dev9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.188.1.dev9.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.188.1.dev9.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.188.1.dev9.dist-info/RECORD,,