temp [ci skip]

Author: benfdking

examples/sushi/models/customers.sql

@@ -2,12 +2,14 @@ MODEL (
   name sushi.customers,
   kind FULL,
   owner jen,
+  owners test,
   cron '@daily',
   tags (pii, fact),
   grain customer_id,
+  grains why,
   description 'Sushi customer data',
   column_descriptions (
-    customer_id = 'customer_id uniquely identifies customers'
+    customer_id = 'customer_id uniquely i:wdentifies customers'
   )
 );
 

sqlmesh/core/linter/helpers.py

@@ -118,7 +118,7 @@ def read_range_from_file(file: Path, text_range: Range) -> str:
 
 def get_range_of_model_block(
     sql: str,
-    dialect: str,
+    dialect: t.Optional[str] = None,
 ) -> t.Optional[Range]:
     """
     Get the range of the model block in an SQL file.

sqlmesh/core/model/common.py

@@ -275,9 +275,12 @@ def validate_extra_and_required_fields(
 ) -> None:
     missing_required_fields = klass.missing_required_fields(provided_fields)
     if missing_required_fields:
-        if path is None:
-            raise_config_error(
-        raise ModelBlockFieldValidationMissingFieldsError(path, missing_required_fields)
+        if path is not None:
+            raise ModelBlockFieldValidationMissingFieldsError(path, missing_required_fields)
+        field_names = "'" + "', '".join(missing_required_fields) + "'"
+        raise_config_error(
+            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:

sqlmesh/lsp/errors.py

@@ -1,34 +1,88 @@
-from lsprotocol.types import Diagnostic
-from sqlmesh.utils.errors import ConfigError, ModeBlockExtraFields, ModelBlockFieldValidationMissingFieldsError
+from lsprotocol.types import Diagnostic, DiagnosticSeverity, Range, Position
+
+from sqlmesh.core.linter.helpers import get_range_of_model_block
+from sqlmesh.lsp.helpers import to_lsp_range
+from sqlmesh.lsp.uri import URI
+from sqlmesh.utils.errors import (
+    ConfigError,
+    ModeBlockExtraFields,
+    ModelBlockFieldValidationMissingFieldsError,
+)
 import typing as t
 
-type ContextFailedError = str | ConfigError | ModeBlockExtraFields | ModelBlockFieldValidationMissingFieldsError
+type ContextFailedError = (
+    str | ConfigError | ModeBlockExtraFields | ModelBlockFieldValidationMissingFieldsError
+)
+
 
-def contextErrorToDiagnostic(error: Exception,) -> t.Tuple[t.Optional[t.Tuple[str, Diagnostic]], ContextFailedError]:
+def contextErrorToDiagnostic(
+    error: Exception,
+) -> t.Tuple[t.Optional[t.Tuple[str, Diagnostic]], ContextFailedError]:
     if isinstance(error, ModelBlockFieldValidationMissingFieldsError):
         return missingErrorToDiagnostic(error), error
-    if isinstance(error, ModeBlockExtraFields)
+    if isinstance(error, ModeBlockExtraFields):
         return extraFieldsErrorToDiagnostic(error), error
     if isinstance(error, ConfigError):
         return configErrorToDiagnostic(error), error
     return None, str(error)
 
 
 def missingErrorToDiagnostic(
-        error: ModelBlockFieldValidationMissingFieldsError,
-) ->t.Optional[t.Tuple[str, Diagnostic]]:
-    raise NotImplementedError()
+    error: ModelBlockFieldValidationMissingFieldsError,
+) -> t.Optional[t.Tuple[str, Diagnostic]]:
+    if error.location is None:
+        return None
+    uri = URI.from_path(error.location).value
+    with open(error.location, "r") as file:
+        content = file.read()
+    model_block = get_range_of_model_block(content)
+    if model_block is None:
+        return None
+    return uri, Diagnostic(
+        message=str(error),
+        range=to_lsp_range(model_block),
+        severity=DiagnosticSeverity.Error,
+        source="SQLMesh",
+    )
+
 
 def extraFieldsErrorToDiagnostic(
-        error: ModeBlockExtraFields,
+    error: ModeBlockExtraFields,
 ) -> t.Optional[t.Tuple[str, Diagnostic]]:
-    raise NotImplementedError()
+    if error.location is None:
+        return None
+    uri = URI.from_path(error.location).value
+    with open(error.location, "r") as file:
+        content = file.read()
+    model_block = get_range_of_model_block(content)
+    if model_block is None:
+        return None
+    return uri, Diagnostic(
+        message=str(error),
+        range=to_lsp_range(model_block),
+        severity=DiagnosticSeverity.Error,
+        source="SQLMesh",
+    )
 
-def configErrorToDiagnostic(
-        error: ConfigError,
-) ->t.Optional[t.Tuple[str, Diagnostic]]:
-    return Diagnostic(
 
+def configErrorToDiagnostic(
+    error: ConfigError,
+) -> t.Optional[t.Tuple[str, Diagnostic]]:
+    if error.location is None:
+        return None
+    uri = URI.from_path(error.location).value
+    return uri, Diagnostic(
+        range=Range(
+            start=Position(
+                line=0,
+                character=0,
+            ),
+            end=Position(
+                line=0,
+                character=0,
+            ),
+        ),
+        message=str(error),
+        severity=DiagnosticSeverity.Error,
+        source="SQLMesh",
     )
-    raise NotImplementedError()
-

sqlmesh/lsp/main.py

@@ -57,7 +57,7 @@
 )
 from sqlmesh.lsp.rename import prepare_rename, rename_symbol, get_document_highlights
 from sqlmesh.lsp.uri import URI
-from sqlmesh.utils.errors import ConfigError, ModelBlockFieldValidationMissingFieldsError, ModeBlockExtraFields
+from sqlmesh.utils.errors import ConfigError
 from web.server.api.endpoints.lineage import column_lineage, model_lineage
 from web.server.api.endpoints.models import get_models
 from typing import Union
@@ -894,9 +894,10 @@ def _create_lsp_context(
             return self.context_state.lsp_context
         except Exception as e:
             # Only show the error message once
-            (uri, diagnostic), error = contextErrorToDiagnostic(e)
+            diagnostic, error = contextErrorToDiagnostic(e)
             if diagnostic:
-                ls.publish_diagnostics(uri, [diagnostic])
+                uri, lsp_diagnostic = diagnostic
+                ls.publish_diagnostics(uri, [lsp_diagnostic])
 
             # Store the error in context state such that later requests can
             # show the actual error. Try to preserve any partially loaded context

sqlmesh/utils/errors.py

@@ -52,27 +52,32 @@ def message(missing_fields: t.Set[str]) -> str:
 
 class ModeBlockExtraFields(ConfigError):
     """Raised when there are extra fields in a model block that are not defined in the model schema. If there are close
-     matches, this tries to recommend them"""
+    matches, this tries to recommend them"""
 
-    def __init__(self, path: Path, extra_fields: t.Dict[str, t.Optional[None]]) -> None:
+    def __init__(self, path: t.Optional[Path], extra_fields: t.Dict[str, t.Optional[str]]) -> None:
         super().__init__(
             self.message(extra_fields),
             path,
         )
         self.extra_fields = extra_fields
 
     @staticmethod
-    def message(extra_fields: t.Dict[str, t.Optional[None]]) -> str:
-        if len(extra_with_close_match) == 1:
-            similar_msg = (
-                ". Did you mean " + "'" + "', '".join(extra_with_close_match.values()) + "'?"
-            )
-        else:
+    def message(extra_fields: t.Dict[str, t.Optional[str]]) -> str:
+        extra_field_names = "'" + "', '".join(extra_fields.keys()) + "'"
+
+        close_matches = {field: match for field, match in extra_fields.items() if match is not None}
+
+        if len(close_matches) == 1:
+            similar_msg = ". Did you mean '" + list(close_matches.values())[0] + "'?"
+        elif close_matches:
             similar = [
                 f"- {field}: Did you mean '{match}'?" for field, match in close_matches.items()
             ]
-            similar_msg = "\n\n  " + "\n  ".join(similar) if similar else ""
-        return f"Invalid field name{'s' if len(extra_fields) > 1 else ''} present in the {entity_name}: {extra_field_names}{similar_msg}"
+            similar_msg = "\n\n  " + "\n  ".join(similar)
+        else:
+            similar_msg = ""
+
+        return f"Invalid field name{'s' if len(extra_fields) > 1 else ''} present in the model block: {extra_field_names}{similar_msg}"
 
 
 class MissingDependencyError(SQLMeshError):