sqlmesh 0.187.6.dev4__py3-none-any.whl → 0.187.6.dev6__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.6.dev4'
-__version_tuple__ = version_tuple = (0, 187, 6, 'dev4')
+__version__ = version = '0.187.6.dev6'
+__version_tuple__ = version_tuple = (0, 187, 6, 'dev6')

sqlmesh/dbt/loader.py

@@ -28,7 +28,6 @@ from sqlmesh.utils import UniqueKeyDict
 from sqlmesh.utils.errors import ConfigError
 from sqlmesh.utils.jinja import (
     JinjaMacroRegistry,
-    extract_macro_references_and_variables,
     make_jinja_registry,
 )
 
@@ -240,11 +239,11 @@ class DbtLoader(Loader):
     def _load_environment_statements(self, macros: MacroRegistry) -> t.List[EnvironmentStatements]:
         """Loads dbt's on_run_start, on_run_end hooks into sqlmesh's before_all, after_all statements respectively."""
 
-        environment_statements: t.List[EnvironmentStatements] = []
+        hooks_by_package_name: t.Dict[str, EnvironmentStatements] = {}
+        project_names: t.Set[str] = set()
         dialect = self.config.dialect
         for project in self._load_projects():
             context = project.context
-            hooks_by_package_name: t.Dict[str, EnvironmentStatements] = {}
             for package_name, package in project.packages.items():
                 context.set_and_render_variables(package.variables, package_name)
                 on_run_start: t.List[str] = [
@@ -256,18 +255,14 @@ class DbtLoader(Loader):
                     for on_run_hook in sorted(package.on_run_end.values(), key=lambda h: h.index)
                 ]
 
-                if statements := on_run_start + on_run_end:
-                    jinja_references, used_variables = extract_macro_references_and_variables(
-                        *statements
-                    )
+                if on_run_start or on_run_end:
+                    dependencies = Dependencies()
+                    for hook in [*package.on_run_start.values(), *package.on_run_end.values()]:
+                        dependencies = dependencies.union(hook.dependencies)
 
-                    statements_context = context.context_for_dependencies(
-                        Dependencies(
-                            variables=used_variables,
-                        )
-                    )
+                    statements_context = context.context_for_dependencies(dependencies)
                     jinja_registry = make_jinja_registry(
-                        statements_context.jinja_macros, package_name, jinja_references
+                        statements_context.jinja_macros, package_name, set(dependencies.macros)
                     )
                     jinja_registry.add_globals(statements_context.jinja_globals)
 
@@ -283,15 +278,15 @@ class DbtLoader(Loader):
                         python_env={},
                         jinja_macros=jinja_registry,
                     )
-                # Project hooks should be executed first and then rest of the packages
-                environment_statements = [
-                    statements
-                    for _, statements in sorted(
-                        hooks_by_package_name.items(),
-                        key=lambda item: 0 if item[0] == context.project_name else 1,
-                    )
-                ]
-        return environment_statements
+                    project_names.add(package_name)
+
+        return [
+            statements
+            for _, statements in sorted(
+                hooks_by_package_name.items(),
+                key=lambda item: 0 if item[0] in project_names else 1,
+            )
+        ]
 
     def _compute_yaml_max_mtime_per_subfolder(self, root: Path) -> t.Dict[Path, float]:
         if not root.is_dir():

sqlmesh/dbt/manifest.py

@@ -292,13 +292,24 @@ class ManifestHelper:
                 sql = node.raw_code if DBT_VERSION >= (1, 3) else node.raw_sql  # type: ignore
                 node_name = node.name
                 node_path = Path(node.original_file_path)
+
+                dependencies = Dependencies(
+                    macros=_macro_references(self._manifest, node),
+                    refs=_refs(node),
+                    sources=_sources(node),
+                )
+                dependencies = dependencies.union(self._extra_dependencies(sql, node.package_name))
+                dependencies = dependencies.union(
+                    self._flatten_dependencies_from_macros(dependencies.macros, node.package_name)
+                )
+
                 if "on-run-start" in node.tags:
                     self._on_run_start_per_package[node.package_name][node_name] = HookConfig(
-                        sql=sql, index=node.index or 0, path=node_path
+                        sql=sql, index=node.index or 0, path=node_path, dependencies=dependencies
                     )
                 else:
                     self._on_run_end_per_package[node.package_name][node_name] = HookConfig(
-                        sql=sql, index=node.index or 0, path=node_path
+                        sql=sql, index=node.index or 0, path=node_path, dependencies=dependencies
                     )
 
     @property

sqlmesh/dbt/package.py

@@ -34,6 +34,7 @@ class HookConfig(PydanticModel):
     sql: str
     index: int
     path: Path
+    dependencies: Dependencies
 
 
 class Package(PydanticModel):

sqlmesh/lsp/main.py

@@ -57,8 +57,12 @@ class SQLMeshLanguageServer:
         self.server = LanguageServer(server_name, version)
         self.context_class = context_class
         self.lsp_context: t.Optional[LSPContext] = None
-        self.lint_cache: t.Dict[URI, t.List[AnnotatedRuleViolation]] = {}
 
+        # Cache stores tuples of (diagnostics, diagnostic_version)
+        self.lint_cache: t.Dict[URI, t.Tuple[t.List[AnnotatedRuleViolation], int]] = {}
+        self._diagnostic_version_counter: int = 0
+
+        self.client_supports_pull_diagnostics = False
         # Register LSP features (e.g., formatting, hover, etc.)
         self._register_features()
 
@@ -69,6 +73,18 @@ class SQLMeshLanguageServer:
         def initialize(ls: LanguageServer, params: types.InitializeParams) -> None:
             """Initialize the server when the client connects."""
             try:
+                # Check if client supports pull diagnostics
+                if params.capabilities and params.capabilities.text_document:
+                    diagnostics = getattr(params.capabilities.text_document, "diagnostic", None)
+                    if diagnostics:
+                        self.client_supports_pull_diagnostics = True
+                        ls.log_trace("Client supports pull diagnostics")
+                    else:
+                        self.client_supports_pull_diagnostics = False
+                        ls.log_trace("Client does not support pull diagnostics")
+                else:
+                    self.client_supports_pull_diagnostics = False
+
                 if params.workspace_folders:
                     # Try to find a SQLMesh config file in any workspace folder (only at the root level)
                     for folder in params.workspace_folders:
@@ -153,61 +169,71 @@ class SQLMeshLanguageServer:
         def did_open(ls: LanguageServer, params: types.DidOpenTextDocumentParams) -> None:
             uri = URI(params.text_document.uri)
             context = self._context_get_or_load(uri)
-            if self.lint_cache.get(uri) is not None:
+            models = context.map[uri.to_path()]
+            if models is None or not isinstance(models, ModelTarget):
+                return
+
+            if self.lint_cache.get(uri) is None:
+                diagnostics = context.context.lint_models(
+                    models.names,
+                    raise_on_error=False,
+                )
+                self._diagnostic_version_counter += 1
+                self.lint_cache[uri] = (diagnostics, self._diagnostic_version_counter)
+
+            # Only publish diagnostics if client doesn't support pull diagnostics
+            if not self.client_supports_pull_diagnostics:
+                diagnostics, _ = self.lint_cache[uri]
                 ls.publish_diagnostics(
                     params.text_document.uri,
-                    SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(self.lint_cache[uri]),
+                    SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(diagnostics),
                 )
-                return
-            models = context.map[uri.to_path()]
-            if models is None:
-                return
-            if not isinstance(models, ModelTarget):
-                return
-            self.lint_cache[uri] = context.context.lint_models(
-                models.names,
-                raise_on_error=False,
-            )
-            ls.publish_diagnostics(
-                params.text_document.uri,
-                SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(self.lint_cache[uri]),
-            )
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_CHANGE)
         def did_change(ls: LanguageServer, params: types.DidChangeTextDocumentParams) -> None:
             uri = URI(params.text_document.uri)
             context = self._context_get_or_load(uri)
             models = context.map[uri.to_path()]
-            if models is None:
+            if models is None or not isinstance(models, ModelTarget):
                 return
-            if not isinstance(models, ModelTarget):
-                return
-            self.lint_cache[uri] = context.context.lint_models(
+
+            # Always update the cache
+            diagnostics = context.context.lint_models(
                 models.names,
                 raise_on_error=False,
             )
-            ls.publish_diagnostics(
-                params.text_document.uri,
-                SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(self.lint_cache[uri]),
-            )
+            self._diagnostic_version_counter += 1
+            self.lint_cache[uri] = (diagnostics, self._diagnostic_version_counter)
+
+            # Only publish diagnostics if client doesn't support pull diagnostics
+            if not self.client_supports_pull_diagnostics:
+                ls.publish_diagnostics(
+                    params.text_document.uri,
+                    SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(diagnostics),
+                )
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_SAVE)
         def did_save(ls: LanguageServer, params: types.DidSaveTextDocumentParams) -> None:
             uri = URI(params.text_document.uri)
             context = self._context_get_or_load(uri)
             models = context.map[uri.to_path()]
-            if models is None:
-                return
-            if not isinstance(models, ModelTarget):
+            if models is None or not isinstance(models, ModelTarget):
                 return
-            self.lint_cache[uri] = context.context.lint_models(
+
+            # Always update the cache
+            diagnostics = context.context.lint_models(
                 models.names,
                 raise_on_error=False,
             )
-            ls.publish_diagnostics(
-                params.text_document.uri,
-                SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(self.lint_cache[uri]),
-            )
+            self._diagnostic_version_counter += 1
+            self.lint_cache[uri] = (diagnostics, self._diagnostic_version_counter)
+
+            # Only publish diagnostics if client doesn't support pull diagnostics
+            if not self.client_supports_pull_diagnostics:
+                ls.publish_diagnostics(
+                    params.text_document.uri,
+                    SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(diagnostics),
+                )
 
         @self.server.feature(types.TEXT_DOCUMENT_FORMATTING)
         def formatting(
@@ -327,6 +353,125 @@ class SQLMeshLanguageServer:
                 ls.show_message(f"Error getting references: {e}", types.MessageType.Error)
                 return []
 
+        @self.server.feature(types.TEXT_DOCUMENT_DIAGNOSTIC)
+        def diagnostic(
+            ls: LanguageServer, params: types.DocumentDiagnosticParams
+        ) -> types.DocumentDiagnosticReport:
+            """Handle diagnostic pull requests from the client."""
+            try:
+                uri = URI(params.text_document.uri)
+                diagnostics, result_id = self._get_diagnostics_for_uri(uri)
+
+                # Check if client provided a previous result ID
+                if hasattr(params, "previous_result_id") and params.previous_result_id == result_id:
+                    # Return unchanged report if diagnostics haven't changed
+                    return types.RelatedUnchangedDocumentDiagnosticReport(
+                        kind=types.DocumentDiagnosticReportKind.Unchanged,
+                        result_id=str(result_id),
+                    )
+
+                return types.RelatedFullDocumentDiagnosticReport(
+                    kind=types.DocumentDiagnosticReportKind.Full,
+                    items=diagnostics,
+                    result_id=str(result_id),
+                )
+            except Exception as e:
+                ls.show_message(f"Error getting diagnostics: {e}", types.MessageType.Error)
+                return types.RelatedFullDocumentDiagnosticReport(
+                    kind=types.DocumentDiagnosticReportKind.Full,
+                    items=[],
+                )
+
+        @self.server.feature(types.WORKSPACE_DIAGNOSTIC)
+        def workspace_diagnostic(
+            ls: LanguageServer, params: types.WorkspaceDiagnosticParams
+        ) -> types.WorkspaceDiagnosticReport:
+            """Handle workspace-wide diagnostic pull requests from the client."""
+            try:
+                if self.lsp_context is None:
+                    current_path = Path.cwd()
+                    self._ensure_context_in_folder(current_path)
+
+                if self.lsp_context is None:
+                    return types.WorkspaceDiagnosticReport(items=[])
+
+                items: t.List[
+                    t.Union[
+                        types.WorkspaceFullDocumentDiagnosticReport,
+                        types.WorkspaceUnchangedDocumentDiagnosticReport,
+                    ]
+                ] = []
+
+                # Get all SQL and Python model files from the context
+                for path, target in self.lsp_context.map.items():
+                    if isinstance(target, ModelTarget):
+                        uri = URI.from_path(path)
+                        diagnostics, result_id = self._get_diagnostics_for_uri(uri)
+
+                        # Check if we have a previous result ID for this file
+                        previous_result_id = None
+                        if hasattr(params, "previous_result_ids") and params.previous_result_ids:
+                            for prev in params.previous_result_ids:
+                                if prev.uri == uri.value:
+                                    previous_result_id = prev.value
+                                    break
+
+                        if previous_result_id and previous_result_id == result_id:
+                            # File hasn't changed
+                            items.append(
+                                types.WorkspaceUnchangedDocumentDiagnosticReport(
+                                    kind=types.DocumentDiagnosticReportKind.Unchanged,
+                                    result_id=str(result_id),
+                                    uri=uri.value,
+                                )
+                            )
+                        else:
+                            # File has changed or is new
+                            items.append(
+                                types.WorkspaceFullDocumentDiagnosticReport(
+                                    kind=types.DocumentDiagnosticReportKind.Full,
+                                    result_id=str(result_id),
+                                    uri=uri.value,
+                                    items=diagnostics,
+                                )
+                            )
+
+                return types.WorkspaceDiagnosticReport(items=items)
+
+            except Exception as e:
+                ls.show_message(
+                    f"Error getting workspace diagnostics: {e}", types.MessageType.Error
+                )
+                return types.WorkspaceDiagnosticReport(items=[])
+
+    def _get_diagnostics_for_uri(self, uri: URI) -> t.Tuple[t.List[types.Diagnostic], int]:
+        """Get diagnostics for a specific URI, returning (diagnostics, result_id)."""
+        # Check if we have cached diagnostics
+        if uri in self.lint_cache:
+            diagnostics, result_id = self.lint_cache[uri]
+            return SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(diagnostics), result_id
+
+        # Try to get diagnostics by loading context and linting
+        try:
+            context = self._context_get_or_load(uri)
+            models = context.map[uri.to_path()]
+            if models is None or not isinstance(models, ModelTarget):
+                return [], 0
+
+            # Lint the models and cache the results
+            diagnostics = context.context.lint_models(
+                models.names,
+                raise_on_error=False,
+            )
+            self._diagnostic_version_counter += 1
+            self.lint_cache[uri] = (diagnostics, self._diagnostic_version_counter)
+            return SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(
+                diagnostics
+            ), self._diagnostic_version_counter
+        except Exception:
+            # If we can't get diagnostics, return empty list with no result ID
+            return [], 0
+
     def _context_get_or_load(self, document_uri: URI) -> LSPContext:
         if self.lsp_context is None:
             self._ensure_context_for_document(document_uri)

{sqlmesh-0.187.6.dev4.dist-info → sqlmesh-0.187.6.dev6.dist-info}/METADATA

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

{sqlmesh-0.187.6.dev4.dist-info → sqlmesh-0.187.6.dev6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=69xw6bTmi4cW90M-sl3g6wLDgxVcLHcKg1q8GS3lqyA,7466
-sqlmesh/_version.py,sha256=C4T6nkl1kGjUogTseJFJ2Pu-EZYveAA2mwAtIdwMTow,528
+sqlmesh/_version.py,sha256=nwLeHNJZHDMcITzvamR5IDQO8DhPkF3cQ712so8RVsw,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
@@ -127,10 +127,10 @@ sqlmesh/dbt/builtin.py,sha256=fyzv4qR1isfnID1oWz-r46oDQvS90DN5mMUEWgapvN8,15153
 sqlmesh/dbt/column.py,sha256=Kvj_N3D_QegcoNQG7VqRiqy-FRfupud-6ilhlykBOgE,1873
 sqlmesh/dbt/common.py,sha256=g4PAL-sEdlnfb_zT-WW3xh-oamyCUoK8dUiDEMVwDWI,7804
 sqlmesh/dbt/context.py,sha256=dxClM-G1IeMbP0v5yxC_va8QNU-uKghW2dBlSZHJOk0,10331
-sqlmesh/dbt/loader.py,sha256=H-ky9kNd7QgSvBvCXsf8le3E3v3RUhNJOwwPSH0ud1M,15760
-sqlmesh/dbt/manifest.py,sha256=iKfUWiqydIW3YnX6hqWAzRc-TmhiXfVFS7e29XJaS6E,22906
+sqlmesh/dbt/loader.py,sha256=oDFj9OcWJxd72eN9u9gHM_bWj7T5EQuGnLViSdtLbMU,15472
+sqlmesh/dbt/manifest.py,sha256=EONLFvJxl_w2SEPgFT1b2WaArQgNUODWZJLp7fuCWJI,23443
 sqlmesh/dbt/model.py,sha256=-TqeldZAqW-4g84Xi_16DpUD3atImk_9OHMbATIKYb8,26328
-sqlmesh/dbt/package.py,sha256=WM5Ve6o0QPW3rZxhw1xbr3yX2619I5KtHOKK1qe5mfU,4291
+sqlmesh/dbt/package.py,sha256=IBBQueVB4_4C9tIk0-GUL-O2uibNxXu6W2a4AeHHcOU,4322
 sqlmesh/dbt/profile.py,sha256=Fz2c0dJNN0xBgYEogCIKBTByjNvlA2BVBzOLQCfdEfM,3788
 sqlmesh/dbt/project.py,sha256=4PJHPVWIKDd71J5__iICqEp21nFiijKjJkiE5kZIH5Y,3980
 sqlmesh/dbt/relation.py,sha256=3w_4_Dj-oZXUEdBqOl9U6twbt8S2gDNMaFRb3unqkE8,224
@@ -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=afQif7TFaaSMlJmuHGTu2g51SwJ9ij8pjic6OQbnP6s,20214
+sqlmesh/lsp/main.py,sha256=Lg_XHxXNScStf0aiOUptijZnBLOIjcmmhsFgM5w2rNo,27405
 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.6.dev4.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.187.6.dev6.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.6.dev4.dist-info/METADATA,sha256=hDrrEGmJ_2vG-fNyrp1WVdzueow0l3CJOGeORAa-OPo,26493
-sqlmesh-0.187.6.dev4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.187.6.dev4.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.187.6.dev4.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.187.6.dev4.dist-info/RECORD,,
+sqlmesh-0.187.6.dev6.dist-info/METADATA,sha256=LPngDmRnD-PUHYU9VsgtEwdgog70kQ1iUaiS9YlbuUQ,26493
+sqlmesh-0.187.6.dev6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.187.6.dev6.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.187.6.dev6.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.187.6.dev6.dist-info/RECORD,,