sqlmesh 0.187.2.dev1__py3-none-any.whl → 0.187.3.dev2__py3-none-any.whl

sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.187.2.dev1'
-__version_tuple__ = version_tuple = (0, 187, 2, 'dev1')
+__version__ = version = '0.187.3.dev2'
+__version_tuple__ = version_tuple = (0, 187, 3, 'dev2')

sqlmesh/core/model/definition.py

@@ -2173,24 +2173,18 @@ def load_sql_based_model(
         **meta_fields,
     )
 
-    if query_or_seed_insert is not None and (
-        isinstance(query_or_seed_insert, (exp.Query, d.JinjaQuery))
-        or (
-            # Macro functions are allowed in place of model queries only when there are no
-            # other statements in the model definition, otherwise they would be ambiguous
-            isinstance(query_or_seed_insert, d.MacroFunc)
-            and (query_or_seed_insert.this.name.lower() == "union" or len(expressions) == 2)
-        )
-    ):
+    kind = common_kwargs.pop("kind", ModelMeta.all_field_infos()["kind"].default)
+
+    if kind.name != ModelKindName.SEED:
         return create_sql_model(
             name,
             query_or_seed_insert,
+            kind=kind,
             time_column_format=time_column_format,
             **common_kwargs,
         )
-    seed_properties = {
-        p.name.lower(): p.args.get("value") for p in common_kwargs.pop("kind").expressions
-    }
+
+    seed_properties = {p.name.lower(): p.args.get("value") for p in kind.expressions}
     return create_seed_model(
         name,
         SeedKind(**seed_properties),
@@ -2200,7 +2194,7 @@ def load_sql_based_model(
 
 def create_sql_model(
     name: TableName,
-    query: exp.Expression,
+    query: t.Optional[exp.Expression],
     **kwargs: t.Any,
 ) -> Model:
     """Creates a SQL model.
@@ -2215,6 +2209,7 @@ def create_sql_model(
             "A query is required and must be a SELECT statement, a UNION statement, or a JINJA_QUERY block",
             kwargs.get("path"),
         )
+        assert isinstance(query, (exp.Query, d.JinjaQuery, d.MacroFunc))
 
     return _create_model(SqlModel, name, query=query, **kwargs)
 

sqlmesh/lsp/main.py

@@ -421,12 +421,24 @@ class SQLMeshLanguageServer:
     def _diagnostics_to_lsp_diagnostics(
         diagnostics: t.List[AnnotatedRuleViolation],
     ) -> t.List[types.Diagnostic]:
-        lsp_diagnostics: t.List[types.Diagnostic] = []
+        """
+        Converts a list of AnnotatedRuleViolations to a list of LSP diagnostics. It will remove duplicates based on the message and range.
+        """
+        lsp_diagnostics = {}
         for diagnostic in diagnostics:
             lsp_diagnostic = SQLMeshLanguageServer._diagnostic_to_lsp_diagnostic(diagnostic)
             if lsp_diagnostic is not None:
-                lsp_diagnostics.append(lsp_diagnostic)
-        return lsp_diagnostics
+                # Create a unique key combining message and range
+                diagnostic_key = (
+                    lsp_diagnostic.message,
+                    lsp_diagnostic.range.start.line,
+                    lsp_diagnostic.range.start.character,
+                    lsp_diagnostic.range.end.line,
+                    lsp_diagnostic.range.end.character,
+                )
+                if diagnostic_key not in lsp_diagnostics:
+                    lsp_diagnostics[diagnostic_key] = lsp_diagnostic
+        return list(lsp_diagnostics.values())
 
     @staticmethod
     def _uri_to_path(uri: str) -> Path:

{sqlmesh-0.187.2.dev1.dist-info → sqlmesh-0.187.3.dev2.dist-info}/METADATA

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

{sqlmesh-0.187.2.dev1.dist-info → sqlmesh-0.187.3.dev2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=69xw6bTmi4cW90M-sl3g6wLDgxVcLHcKg1q8GS3lqyA,7466
-sqlmesh/_version.py,sha256=dgppKmJoTWenm0m3Rd3mnoNTYUY251JNpGOdyxYgsN4,528
+sqlmesh/_version.py,sha256=qObjpA8QkbICnjYxMOO66zN-MPoOmDZgscAVZWJBDzo,528
 sqlmesh/magics.py,sha256=JHorAZNtezf123jmTyNSoUC9yHmv-08hMP205PJmmIo,39750
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -87,7 +87,7 @@ sqlmesh/core/model/__init__.py,sha256=C8GRZ53xuXEA9hQv3BQS9pNNyd9rZ06R_B96UYGhDu
 sqlmesh/core/model/cache.py,sha256=WJdn54xmA3NtX0dlX-DZnYlrWDhj4ycoq_4FD4MK2yg,7502
 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=QBwGNL7Jqg8BGgpZfTtKciRJA7axkI5FShJJjnUDQ4w,108645
+sqlmesh/core/model/definition.py,sha256=wdWkRROrIwbq4xJ5g76go5kDmOvGFWvx4oTmuWFoMvg,108366
 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
@@ -160,7 +160,7 @@ sqlmesh/lsp/completions.py,sha256=Uo8lUzPBeoB58Eu2642YoAtNI0pgIFWFSvwmuJALTv4,35
 sqlmesh/lsp/context.py,sha256=nCWg2uVH28-IJC2uDYuCbiXTh1lUFElSpNu4Q-fDWi4,2918
 sqlmesh/lsp/custom.py,sha256=1YVcQz0y-4cdsvTdOQvlhUQXwOqPBWi3v_u1X2EqQxE,901
 sqlmesh/lsp/description.py,sha256=4QIGC9ix8IzmWF6DVUNhY4m1Crk3sNQA6hZ1RbyqU78,827
-sqlmesh/lsp/main.py,sha256=s8e9mD-J6pbxCrEZiMlRL0DvUu1rD3vxVdebgx5kjhA,19609
+sqlmesh/lsp/main.py,sha256=afQif7TFaaSMlJmuHGTu2g51SwJ9ij8pjic6OQbnP6s,20214
 sqlmesh/lsp/reference.py,sha256=v4VXMYQY9rPC8b5w-jzob3i77VdZ1FZ8sA_-sWuPx7M,10502
 sqlmesh/lsp/uri.py,sha256=mvSLbZGmMTHPpliThOtVWiFcHnfJzp1w39q9l-xD2SI,802
 sqlmesh/migrations/__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.187.2.dev1.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.187.3.dev2.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=M50OuwjW63dRCS0Dz40Yecgvw9ecLFqizbTa6gv5Nd4,5472
 web/client/dist/assets/Audits-BPlxzqeG.js,sha256=TCx1qCjCGgmUSvH6HoPr5t8ztbRXMlOxrcW4o7hRjlA,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.187.2.dev1.dist-info/METADATA,sha256=qffwII-CI9Ck8Bq6FXIbyTWknPfy68u10bZC-WuZ8g8,25550
-sqlmesh-0.187.2.dev1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-sqlmesh-0.187.2.dev1.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.187.2.dev1.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.187.2.dev1.dist-info/RECORD,,
+sqlmesh-0.187.3.dev2.dist-info/METADATA,sha256=4XzJO3udftuJppHc31Wk97BXBIhZEFSGx9CM6w1-baU,25550
+sqlmesh-0.187.3.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.187.3.dev2.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.187.3.dev2.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.187.3.dev2.dist-info/RECORD,,

{sqlmesh-0.187.2.dev1.dist-info → sqlmesh-0.187.3.dev2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any