sqlmesh 0.183.1.dev7__py3-none-any.whl → 0.183.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.183.1.dev7'
-__version_tuple__ = version_tuple = (0, 183, 1, 'dev7')
+__version__ = version = '0.183.1.dev9'
+__version_tuple__ = version_tuple = (0, 183, 1, 'dev9')

sqlmesh/core/loader.py

@@ -223,7 +223,7 @@ class Loader(abc.ABC):
         if external_models_path.exists() and external_models_path.is_dir():
             paths_to_load.extend(self._glob_paths(external_models_path, extension=".yaml"))
 
-        def _load() -> t.List[Model]:
+        def _load(path: Path) -> t.List[Model]:
             try:
                 with open(path, "r", encoding="utf-8") as file:
                     return [
@@ -241,21 +241,30 @@ class Loader(abc.ABC):
                         for row in YAML().load(file.read())
                     ]
             except Exception as ex:
-                raise ConfigError(f"Failed to load model definition at '{path}'.\n{ex}")
+                self._raise_failed_to_load_model_error(path, str(ex))
+                raise
 
         for path in paths_to_load:
             self._track_file(path)
 
-            external_models = cache.get_or_load_models(path, _load)
+            external_models = cache.get_or_load_models(path, lambda: _load(path))
             # external models with no explicit gateway defined form the base set
             for model in external_models:
                 if model.gateway is None:
+                    if model.fqn in models:
+                        self._raise_failed_to_load_model_error(
+                            path, f"Duplicate external model name: '{model.name}'."
+                        )
                     models[model.fqn] = model
 
             # however, if there is a gateway defined, gateway-specific models take precedence
             if gateway:
                 for model in external_models:
                     if model.gateway == gateway:
+                        if model.fqn in models and models[model.fqn].gateway == gateway:
+                            self._raise_failed_to_load_model_error(
+                                path, f"Duplicate external model name: '{model.name}'."
+                            )
                         models.update({model.fqn: model})
 
         return models
@@ -363,6 +372,9 @@ class Loader(abc.ABC):
 
         return self._variables_by_gateway[gateway_name]
 
+    def _raise_failed_to_load_model_error(self, path: Path, message: str) -> None:
+        raise ConfigError(f"Failed to load model definition at '{path}'.\n{message}")
+
 
 class SqlMeshLoader(Loader):
     """Loads macros and models for a context using the SQLMesh file formats"""
@@ -484,9 +496,14 @@ class SqlMeshLoader(Loader):
                         default_catalog_per_gateway=self.context.default_catalog_per_gateway,
                     )
                 except Exception as ex:
-                    raise ConfigError(f"Failed to load model definition at '{path}'.\n{ex}")
+                    self._raise_failed_to_load_model_error(path, str(ex))
+                    raise
 
             for model in cache.get_or_load_models(path, _load):
+                if model.fqn in models:
+                    self._raise_failed_to_load_model_error(
+                        path, f"Duplicate SQL model name: '{model.name}'."
+                    )
                 if model.enabled:
                     models[model.fqn] = model
 
@@ -544,7 +561,7 @@ class SqlMeshLoader(Loader):
                             if model.enabled:
                                 models[model.fqn] = model
                 except Exception as ex:
-                    raise ConfigError(f"Failed to load model definition at '{path}'.\n{ex}")
+                    self._raise_failed_to_load_model_error(path, str(ex))
 
         finally:
             model_registry._dialect = None

sqlmesh/utils/__init__.py

@@ -136,7 +136,7 @@ class registry_decorator:
         except ValueError:
             # No need to raise due to duplicate key if the functions are identical
             if func.__code__.co_code != registry[func_name].func.__code__.co_code:
-                raise
+                raise ValueError(f"Duplicate name: '{func_name}'.")
 
         @wraps(func)
         def wrapper(*args: t.Any, **kwargs: t.Any) -> DECORATOR_RETURN_TYPE:

{sqlmesh-0.183.1.dev7.dist-info → sqlmesh-0.183.1.dev9.dist-info}/METADATA

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

{sqlmesh-0.183.1.dev7.dist-info → sqlmesh-0.183.1.dev9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=DRovDXI-9D9xeYDP7t8Fq7mI31S2btlN-LHPOK3y7PA,7240
-sqlmesh/_version.py,sha256=JtA2gDttk1pi5qeBWWEx3xhLJvDCw_byUIL1TZnVJvk,528
+sqlmesh/_version.py,sha256=o3HUehMkS345GYljyIblmMHsHVEI0lzikU8rWLq9dPc,528
 sqlmesh/magics.py,sha256=9oY1Uz8uwsuTtPRg9HTYDxnGiJ7-OVRCpmCgAhbKHUU,39431
 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=s9toP17d4tJfOpFH91LcjGK2CM64PVuB0MPkeFgF4hQ,
 sqlmesh/core/dialect.py,sha256=fPTV517IOS0nWMxYznNNQnXkQkFFrPOSKe8ghsQ0o8A,49759
 sqlmesh/core/environment.py,sha256=0TTQf4C4LXwf37fm-dfYv1qyG7vtZfQI5rizgm5g0j0,11442
 sqlmesh/core/lineage.py,sha256=zjB0Zfamo2Fja2r5SSZPMbrEKTXr1WjozZPVqvxdybI,3143
-sqlmesh/core/loader.py,sha256=HczzAYejuUfkM5dymKb-h5SRNzHg2EJcAojvAke2VSE,31104
+sqlmesh/core/loader.py,sha256=97_nTWdNdEnz-LNK7AO-tkH9mo_lpe5vJIDGMvaL-bs,31979
 sqlmesh/core/macros.py,sha256=0OE317oNkkENHBess2IiFflgRbtmMsTEmKrTnWGI2_4,59092
 sqlmesh/core/node.py,sha256=r4_1MRTPcU0MAlwZ5KzrykLT58B7dkKvHzPCsJmEKD8,14497
 sqlmesh/core/notification_target.py,sha256=PPGoDrgbRKxr27vJEu03XqNTQLYTw0ZF_b0yAapxGeI,16158
@@ -246,7 +246,7 @@ sqlmesh/migrations/v0081_update_partitioned_by.py,sha256=Dvus_xfKUHI3xntAWU55_cT
 sqlmesh/migrations/v0082_warn_if_incorrectly_duplicated_statements.py,sha256=K-Z0ghTCFSZuAYzNSUXF4L8axihPemM15EOXHcqkK3s,2489
 sqlmesh/migrations/v0083_use_sql_for_scd_time_data_type_data_hash.py,sha256=0r-SlncPec4TBpnQTeblPsiIjIOVKc10GjBVbFPGcFA,148
 sqlmesh/schedulers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sqlmesh/utils/__init__.py,sha256=fXRHsHFEiYYW88RE-pTgQZV_1h9mr6KtVyaAW_orQAw,10852
+sqlmesh/utils/__init__.py,sha256=4vN2s-t0p0c9l4erdOFONl_j8StaW6Eljt_SBffMW80,10898
 sqlmesh/utils/aws.py,sha256=krxyhrKtsMJDEjT567UbGZogjJ9JRHkvAV-Cg3FVndM,1062
 sqlmesh/utils/cache.py,sha256=y58l95ka8RgSX-r6Opav4RBKWLnNYLUYqLfDOPI8HzI,4526
 sqlmesh/utils/concurrency.py,sha256=HvK_AwVfy3Npzmsthmd73Z5tLhY-Anrb472IkaoRjOw,9041
@@ -266,7 +266,7 @@ sqlmesh/utils/pandas.py,sha256=j_tYhuPcWpzuPceZZ6IhdTVbmxYyGJW7l4FHr4bQqjM,1824
 sqlmesh/utils/pydantic.py,sha256=ioaAzYF42PutEJRyAS11-AHguiCG3yWI6VRcTVa2G-g,10470
 sqlmesh/utils/rich.py,sha256=xNZyPCqEc4TAlJlsEthg-5eYUWpaizz0QjBzO7a1Yv4,1509
 sqlmesh/utils/yaml.py,sha256=np-WVcwmwsKghCgAj1OBBMsK1SXSRn4wR-H37cGiFr8,2282
-sqlmesh-0.183.1.dev7.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.183.1.dev9.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=nPqIDCJmonOaEAp4hhwrwgPdwt_F-5zzw-WW1kJqq3I,5472
 web/client/dist/assets/Audits-DiRd7NXk.js,sha256=Q5dIFqsHps-vVYD8037NpTPW_1juQgn_Ov45smEm7Y8,1041
@@ -384,8 +384,8 @@ web/server/api/endpoints/models.py,sha256=SzS5bshzdXyM6hb948sZ_3k-xhpGCHkxkb7pHz
 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.183.1.dev7.dist-info/METADATA,sha256=PTsnxfQSDcLqBn0etBOx0PWsPxuIZ6sR_nEWoRH5--c,25252
-sqlmesh-0.183.1.dev7.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-sqlmesh-0.183.1.dev7.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.183.1.dev7.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.183.1.dev7.dist-info/RECORD,,
+sqlmesh-0.183.1.dev9.dist-info/METADATA,sha256=K4d2hO9kth3jL5u3_d1ySlEJ5qqd4aZ91XmuH0AA35U,25252
+sqlmesh-0.183.1.dev9.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+sqlmesh-0.183.1.dev9.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.183.1.dev9.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.183.1.dev9.dist-info/RECORD,,