temp

[ci skip]

Author: benfdking

examples/sushi/config.py

@@ -13,6 +13,7 @@
     PlanConfig,
     SparkConnectionConfig,
 )
+from sqlmesh.core.config.linter import LinterConfig
 from sqlmesh.core.notification_target import (
     BasicSMTPNotificationTarget,
     SlackApiNotificationTarget,
@@ -41,6 +42,15 @@
     },
     default_gateway="duckdb",
     model_defaults=model_defaults,
+    linter=LinterConfig(
+        enabled=True,
+        rules=[
+            "ambiguousorinvalidcolumn",
+            "invalidselectstarexpansion",
+            "noselectstar",
+            "nomissingaudits",
+        ],
+    ),
 )
 
 bigquery_config = Config(

sqlmesh/lsp/main.py

@@ -32,7 +32,8 @@ def __init__(
         """
         self.server = LanguageServer(server_name, version)
         self.context_class = context_class
-        self.context: t.Optional[Context] = None
+        # A tuple of (context, reverse_map) where the reverse_map is uri to model name
+        self.context_and_reverse_map: t.Optional[t.Tuple[Context, t.Dict[str, str]]] = None
         self.lint_cache: t.Dict[str, t.List[RuleViolationWithModelAndType]] = {}
 
         # Register LSP features (e.g., formatting, hover, etc.)
@@ -43,42 +44,39 @@ def _register_features(self) -> None:
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_OPEN)
         def did_open(ls: LanguageServer, params: types.DidOpenTextDocumentParams) -> None:
-            if self.context is None:
+            if self.context_and_reverse_map is None:
                 self.ensure_context_for_document(
                     ls.workspace.get_document(params.text_document.uri)
                 )
-            if self.context is None:
+            if self.context_and_reverse_map is None:
                 raise RuntimeError("No context found")
-            self.lint_cache[params.text_document.uri] = self.context.lint_models(
-                [params.text_document.uri]
+            self.lint_cache[params.text_document.uri] = self.context_and_reverse_map[0].lint_models(
+                [SQLMeshLanguageServer._uri_to_path(params.text_document.uri)]
             )
             ls.publish_diagnostics(
                 params.text_document.uri,
-                [
-                    self._diagnostic_to_lsp_diagnostic(diagnostic)
-                    for diagnostic in self.lint_cache[params.text_document.uri]
-                    if diagnostic is not None
-                ],
+                SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(
+                    self.lint_cache[params.text_document.uri]
+                ),
             )
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_CHANGE)
         def did_change(ls: LanguageServer, params: types.DidChangeTextDocumentParams) -> None:
-            if self.context is None:
+            if self.context_and_reverse_map is None:
                 self.ensure_context_for_document(
                     ls.workspace.get_document(params.text_document.uri)
                 )
-            if self.context is None:
+            if self.context_and_reverse_map is None:
                 raise RuntimeError("No context found")
-            self.lint_cache[params.text_document.uri] = self.context.lint_models(
-                [params.text_document.uri]
+            model = self.context_and_reverse_map[1][params.text_document.uri]
+            self.lint_cache[params.text_document.uri] = self.context_and_reverse_map[0].lint_models(
+                [model]
             )
             ls.publish_diagnostics(
                 params.text_document.uri,
-                [
-                    self._diagnostic_to_lsp_diagnostic(diagnostic)
-                    for diagnostic in self.lint_cache[params.text_document.uri]
-                    if diagnostic is not None
-                ],
+                SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(
+                    self.lint_cache[params.text_document.uri]
+                ),
             )
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_CLOSE)
@@ -87,22 +85,21 @@ def did_close(ls: LanguageServer, params: types.DidCloseTextDocumentParams) -> N
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_SAVE)
         def did_save(ls: LanguageServer, params: types.DidSaveTextDocumentParams) -> None:
-            if self.context is None:
+            if self.context_and_reverse_map is None:
                 self.ensure_context_for_document(
                     ls.workspace.get_document(params.text_document.uri)
                 )
-            if self.context is None:
+            if self.context_and_reverse_map is None:
                 raise RuntimeError("No context found")
-            self.lint_cache[params.text_document.uri] = self.context.lint_models(
-                [params.text_document.uri]
+            model = self.context_and_reverse_map[1][params.text_document.uri]
+            self.lint_cache[params.text_document.uri] = self.context_and_reverse_map[0].lint_models(
+                [model]
             )
             ls.publish_diagnostics(
                 params.text_document.uri,
-                [
-                    self._diagnostic_to_lsp_diagnostic(diagnostic)
-                    for diagnostic in self.lint_cache[params.text_document.uri]
-                    if diagnostic is not None
-                ],
+                SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(
+                    self.lint_cache[params.text_document.uri]
+                ),
             )
 
         @self.server.feature(types.TEXT_DOCUMENT_FORMATTING)
@@ -115,11 +112,11 @@ def formatting(
                     ls.workspace.get_document(params.text_document.uri)
                 )
 
-                if self.context is None:
+                if self.context_and_reverse_map is None:
                     raise RuntimeError(f"No context found for document: {document.path}")
 
                 # Perform formatting using the loaded context
-                self.context.format(paths=(Path(document.path),))
+                self.context_and_reverse_map[0].format(paths=(Path(document.path),))
                 with open(document.path, "r+", encoding="utf-8") as file:
                     new_text = file.read()
 
@@ -146,8 +143,16 @@ def ensure_context_for_document(self, document: TextDocument) -> TextDocument:
         for a config.py or config.yml file in the parent directories.
         """
         # If the context is already loaded, check if this document belongs to it.
-        if self.context is not None:
-            self.context.load()  # Reload or refresh context
+        if self.context_and_reverse_map is not None:
+            context, _ = self.context_and_reverse_map
+            context.load()  # Reload or refresh context
+            self.context_and_reverse_map = (
+                context,
+                {
+                    f"file://{Path(model._path).resolve().as_posix()}": model.name
+                    for model in context._models.values()
+                },
+            )
             return document
 
         # No context yet: try to find config and load it
@@ -163,7 +168,14 @@ def ensure_context_for_document(self, document: TextDocument) -> TextDocument:
                 if config_path.exists():
                     try:
                         # Use user-provided instantiator to build the context
-                        self.context = self.context_class(paths=[path])
+                        context = self.context_class(paths=[path])
+                        self.context_and_reverse_map = (
+                            context,
+                            {
+                                f"file://{Path(model._path).resolve().as_posix()}": model.name
+                                for model in context._models.values()
+                            },
+                        )
                         self.server.show_message(f"Context loaded for: {path}")
                         loaded = True
                         # Re-check context for document now that it's loaded
@@ -195,6 +207,26 @@ def _diagnostic_to_lsp_diagnostic(
             else types.DiagnosticSeverity.Warning,
         )
 
+    @staticmethod
+    def _diagnostics_to_lsp_diagnostics(
+        diagnostics: t.List[RuleViolationWithModelAndType],
+    ) -> t.List[types.Diagnostic]:
+        lsp_diagnostics: t.List[types.Diagnostic] = []
+        for diagnostic in diagnostics:
+            if diagnostic is None:
+                continue
+            lsp_diagnostic = SQLMeshLanguageServer._diagnostic_to_lsp_diagnostic(diagnostic)
+            if lsp_diagnostic is not None:
+                lsp_diagnostics.append(lsp_diagnostic)
+        return lsp_diagnostics
+
+    @staticmethod
+    def _uri_to_path(uri: str) -> str:
+        """Convert a URI to a path."""
+        if uri.startswith("file://"):
+            return Path(uri[7:]).resolve().as_posix()
+        return Path(uri).resolve().as_posix()
+
     def start(self) -> None:
         """Start the server with I/O transport."""
         logging.basicConfig(level=logging.DEBUG)