sqlmesh 0.189.3.dev24__py3-none-any.whl → 0.189.3.dev26__py3-none-any.whl

sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.189.3.dev24'
-__version_tuple__ = version_tuple = (0, 189, 3, 'dev24')
+__version__ = version = '0.189.3.dev26'
+__version_tuple__ = version_tuple = (0, 189, 3, 'dev26')

sqlmesh/core/model/common.py

@@ -5,6 +5,7 @@ import typing as t
 from pathlib import Path
 
 from astor import to_source
+from difflib import get_close_matches
 from sqlglot import exp
 from sqlglot.helper import ensure_list
 
@@ -267,13 +268,33 @@ def validate_extra_and_required_fields(
 ) -> None:
     missing_required_fields = klass.missing_required_fields(provided_fields)
     if missing_required_fields:
+        field_names = "'" + "', '".join(missing_required_fields) + "'"
         raise_config_error(
-            f"Missing required fields {missing_required_fields} in the {entity_name}"
+            f"Please add required field{'s' if len(missing_required_fields) > 1 else ''} {field_names} to the {entity_name}."
         )
 
     extra_fields = klass.extra_fields(provided_fields)
     if extra_fields:
-        raise_config_error(f"Invalid extra fields {extra_fields} in the {entity_name}")
+        extra_field_names = "'" + "', '".join(extra_fields) + "'"
+
+        all_fields = klass.all_fields()
+        close_matches = {}
+        for field in extra_fields:
+            matches = get_close_matches(field, all_fields, n=1)
+            if matches:
+                close_matches[field] = matches[0]
+
+        if len(close_matches) == 1:
+            similar_msg = ". Did you mean " + "'" + "', '".join(close_matches.values()) + "'?"
+        else:
+            similar = [
+                f"- {field}: Did you mean '{match}'?" for field, match in close_matches.items()
+            ]
+            similar_msg = "\n\n  " + "\n  ".join(similar) if similar else ""
+
+        raise_config_error(
+            f"Invalid field name{'s' if len(extra_fields) > 1 else ''} present in the {entity_name}: {extra_field_names}{similar_msg}"
+        )
 
 
 def single_value_or_tuple(values: t.Sequence) -> exp.Identifier | exp.Tuple:

sqlmesh/core/model/definition.py

@@ -2156,7 +2156,10 @@ Learn more at https://sqlmesh.readthedocs.io/en/stable/concepts/models/overview
         name = get_model_name(path)
 
     if not name:
-        raise_config_error("Model must have a name", path)
+        raise_config_error(
+            "Please add the required 'name' field to the MODEL block at the top of the file.\n\n"
+            + "Learn more at https://sqlmesh.readthedocs.io/en/stable/concepts/models/overview"
+        )
     if "default_catalog" in meta_fields:
         raise_config_error(
             "`default_catalog` cannot be set on a per-model basis. It must be set at the connection level.",
@@ -2400,7 +2403,7 @@ def _create_model(
     **kwargs: t.Any,
 ) -> Model:
     validate_extra_and_required_fields(
-        klass, {"name", *kwargs} - {"grain", "table_properties"}, "model definition"
+        klass, {"name", *kwargs} - {"grain", "table_properties"}, "MODEL block"
     )
 
     for prop in PROPERTIES:

sqlmesh/core/model/kind.py

@@ -1015,7 +1015,9 @@ def create_model_kind(v: t.Any, dialect: str, defaults: t.Dict[str, t.Any]) -> M
                 actual_kind_type, _ = custom_materialization
                 return actual_kind_type(**props)
 
-        validate_extra_and_required_fields(kind_type, set(props), f"model kind '{name}'")
+        validate_extra_and_required_fields(
+            kind_type, set(props), f"MODEL block 'kind {name}' field"
+        )
         return kind_type(**props)
 
     name = (v.name if isinstance(v, exp.Expression) else str(v)).upper()

sqlmesh/lsp/main.py

@@ -88,6 +88,8 @@ class SQLMeshLanguageServer:
     def _create_lsp_context(self, paths: t.List[Path]) -> t.Optional[LSPContext]:
         """Create a new LSPContext instance using the configured context class.
 
+        On success, sets self.lsp_context and returns the created context.
+
         Args:
             paths: List of paths to pass to the context constructor
 
@@ -96,7 +98,9 @@ class SQLMeshLanguageServer:
         """
         try:
             context = self.context_class(paths=paths)
-            return LSPContext(context)
+            lsp_context = LSPContext(context)
+            self.lsp_context = lsp_context
+            return lsp_context
         except Exception as e:
             self.server.log_trace(f"Error creating context: {e}")
             return None
@@ -132,9 +136,7 @@ class SQLMeshLanguageServer:
                         for ext in ("py", "yml", "yaml"):
                             config_path = folder_path / f"config.{ext}"
                             if config_path.exists():
-                                lsp_context = self._create_lsp_context([folder_path])
-                                if lsp_context:
-                                    self.lsp_context = lsp_context
+                                if self._create_lsp_context([folder_path]):
                                     loaded_sqlmesh_message(ls, folder_path)
                                     return  # Exit after successfully loading any config
             except Exception as e:
@@ -299,9 +301,7 @@ class SQLMeshLanguageServer:
 
             # Reload the entire context and create a new LSPContext
             if self.lsp_context is not None:
-                new_lsp_context = self._create_lsp_context(list(self.lsp_context.context.configs))
-                if new_lsp_context:
-                    self.lsp_context = new_lsp_context
+                if self._create_lsp_context(list(self.lsp_context.context.configs)):
                     return
 
             context = self._context_get_or_load(uri)
@@ -672,9 +672,7 @@ class SQLMeshLanguageServer:
         for ext in ("py", "yml", "yaml"):
             config_path = folder_uri / f"config.{ext}"
             if config_path.exists():
-                lsp_context = self._create_lsp_context([folder_uri])
-                if lsp_context:
-                    self.lsp_context = lsp_context
+                if self._create_lsp_context([folder_uri]):
                     loaded_sqlmesh_message(self.server, folder_uri)
                     return
 
@@ -683,9 +681,7 @@ class SQLMeshLanguageServer:
             for ext in ("py", "yml", "yaml"):
                 config_path = workspace_folder / f"config.{ext}"
                 if config_path.exists():
-                    lsp_context = self._create_lsp_context([workspace_folder])
-                    if lsp_context:
-                        self.lsp_context = lsp_context
+                    if self._create_lsp_context([workspace_folder]):
                         loaded_sqlmesh_message(self.server, workspace_folder)
                         return
 
@@ -714,9 +710,7 @@ class SQLMeshLanguageServer:
             for ext in ("py", "yml", "yaml"):
                 config_path = path / f"config.{ext}"
                 if config_path.exists():
-                    lsp_context = self._create_lsp_context([path])
-                    if lsp_context:
-                        self.lsp_context = lsp_context
+                    if self._create_lsp_context([path]):
                         loaded = True
                         # Re-check context for the document now that it's loaded
                         return self._ensure_context_for_document(document_uri)
@@ -728,9 +722,7 @@ class SQLMeshLanguageServer:
                 for ext in ("py", "yml", "yaml"):
                     config_path = workspace_folder / f"config.{ext}"
                     if config_path.exists():
-                        lsp_context = self._create_lsp_context([workspace_folder])
-                        if lsp_context:
-                            self.lsp_context = lsp_context
+                        if self._create_lsp_context([workspace_folder]):
                             loaded_sqlmesh_message(self.server, workspace_folder)
                             return
 

{sqlmesh-0.189.3.dev24.dist-info → sqlmesh-0.189.3.dev26.dist-info}/METADATA

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

{sqlmesh-0.189.3.dev24.dist-info → sqlmesh-0.189.3.dev26.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=QjwaamJIdW7voXoS880yAx7tHm-Im4_mqGA-XJgafos,7631
-sqlmesh/_version.py,sha256=UVSc5rHw9Ijtrxery7cxNfYMoA7Ntm8dKrodV0E-RaI,530
+sqlmesh/_version.py,sha256=Tv9ovWxOSpdbHXuF6XXZZB7EB3Hl6WhHiNMGv71Eeq4,530
 sqlmesh/magics.py,sha256=gjzoxREb1XT8Yho_PQMlMqhhkLq_sEfBM8S3PTgxvWE,40337
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -86,10 +86,10 @@ sqlmesh/core/metric/definition.py,sha256=Yd5aVgsZCDPJ43aGP7WqtzZOuuSUtB8uJGVA6Jw
 sqlmesh/core/metric/rewriter.py,sha256=GiSTHfn2kinqCfNPYgZPRk93JFLzVaaejHtHDQ0yXZI,7326
 sqlmesh/core/model/__init__.py,sha256=C8GRZ53xuXEA9hQv3BQS9pNNyd9rZ06R_B96UYGhDu4,1644
 sqlmesh/core/model/cache.py,sha256=csun0RJguHzKX6-qITcOs4fVP4f8_Ts8qiUVV4sHY6Q,7869
-sqlmesh/core/model/common.py,sha256=vbcXFhWE22-FeKYAVIlKWvTb-wkeC8XISjU_TIlak0c,16252
+sqlmesh/core/model/common.py,sha256=-AC57zytc-AGtSpk6lDcnpw-7g0FXV6aW8OfiyTqcBM,17151
 sqlmesh/core/model/decorator.py,sha256=v_sVudNROGrtj5cZ3vgcOFnwPdzwoUGY6REAkQpIMQc,8927
-sqlmesh/core/model/definition.py,sha256=G2FHqCsJaDOzRcJCdTlfe6Ygl55rh9RAEXC1Zaka8uA,108470
-sqlmesh/core/model/kind.py,sha256=i6_AMBarXPGPoMdF9kzBkyqS9tu__a2339-BoX7TgCM,36010
+sqlmesh/core/model/definition.py,sha256=052_23d3oAfzk62DPzjfyhHkwqUtf_ZY5Hm03u7pV5U,108638
+sqlmesh/core/model/kind.py,sha256=ZyjfGuXO5pSGJfAZC91-RR4Kc2mwL6g3LO0tgew9Ldk,36044
 sqlmesh/core/model/meta.py,sha256=D9InI9M2-IXeb34vkXNQSLALL8xVXjZ_LXwI-Tqxm7I,21197
 sqlmesh/core/model/schema.py,sha256=OClbAeA8LpW-IiSiLT_TlDWkEqmIIvSk0GXq8SWI-GQ,3443
 sqlmesh/core/model/seed.py,sha256=a0M-1zY1gOkN5ph2GQyataEdBSCtq50YjeFk2LyvInI,5058
@@ -165,7 +165,7 @@ sqlmesh/lsp/custom.py,sha256=40ekRrcsJ-lsF4-uPs4mo8CFegTWK_zKzi4am_NO9oo,2196
 sqlmesh/lsp/description.py,sha256=4QIGC9ix8IzmWF6DVUNhY4m1Crk3sNQA6hZ1RbyqU78,827
 sqlmesh/lsp/helpers.py,sha256=igzUgeYAO3LUZFr3qN4l9hzztOy66lRubX93KtCMduY,654
 sqlmesh/lsp/hints.py,sha256=j-blccBUil94yRoDjWfkSM0HqMmsKD6hP2TaWdWWVk4,3734
-sqlmesh/lsp/main.py,sha256=klOs4Gn0pLF161jWJaosXdN3a9GcPSrEZHmJkrsO7k4,35538
+sqlmesh/lsp/main.py,sha256=-rthyo8sdcUHVEq0PY8DuvhydIldnY0vU3A5pckKjEE,35061
 sqlmesh/lsp/reference.py,sha256=2rAYfwrKRfxlYA3psTDLacxYWvuFaouMyS7plOSYHiQ,23883
 sqlmesh/lsp/uri.py,sha256=mvSLbZGmMTHPpliThOtVWiFcHnfJzp1w39q9l-xD2SI,802
 sqlmesh/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -275,7 +275,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.189.3.dev24.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.189.3.dev26.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=k5bAEoPDJ0BhYQ4hBcKWObITCxIgqOUC28nGXvEDrt0,5472
 web/client/dist/assets/Audits-Pgs8N6IE.js,sha256=BQuc9kiznZSqTnzNrJSDNqAAdOTGjNQJt32M1sHZFok,1041
@@ -393,8 +393,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=SCy3-pr5x6bEEiOaZGCDbiHQhpgxwmnz3Acqa2Ie6jI,2090
-sqlmesh-0.189.3.dev24.dist-info/METADATA,sha256=0PizIioIzUPUhpgbzjlzI6iNfv1y0tG8ikX1qh8MFf0,26541
-sqlmesh-0.189.3.dev24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.189.3.dev24.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.189.3.dev24.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.189.3.dev24.dist-info/RECORD,,
+sqlmesh-0.189.3.dev26.dist-info/METADATA,sha256=Z16WyPmLttfdZese8uvDUgK8MupC0mBXFxsM8v7GTOY,26541
+sqlmesh-0.189.3.dev26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.189.3.dev26.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.189.3.dev26.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.189.3.dev26.dist-info/RECORD,,