sqlmesh 0.180.1.dev7__py3-none-any.whl → 0.180.1.dev9__py3-none-any.whl

sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.180.1.dev7'
-__version_tuple__ = version_tuple = (0, 180, 1, 'dev7')
+__version__ = version = '0.180.1.dev9'
+__version_tuple__ = version_tuple = (0, 180, 1, 'dev9')

sqlmesh/lsp/completions.py

@@ -2,7 +2,7 @@ from functools import lru_cache
 from sqlglot import Dialect, Tokenizer
 from sqlmesh.lsp.custom import AllModelsResponse
 import typing as t
-from sqlmesh.lsp.context import LSPContext
+from sqlmesh.lsp.context import AuditTarget, LSPContext, ModelTarget
 
 
 def get_sql_completions(context: t.Optional[LSPContext], file_uri: str) -> AllModelsResponse:
@@ -24,11 +24,20 @@ def get_models(context: t.Optional[LSPContext], file_uri: t.Optional[str]) -> t.
     """
     if context is None:
         return set()
-    all_models = set(model for models in context.map.values() for model in models)
-    if file_uri is not None:
-        models_file_refers_to = context.map[file_uri]
-        for model in models_file_refers_to:
-            all_models.discard(model)
+
+    all_models = set()
+    # Extract model names from ModelInfo objects
+    for file_info in context.map.values():
+        if isinstance(file_info, ModelTarget):
+            all_models.update(file_info.names)
+
+    # Remove models from the current file
+    if file_uri is not None and file_uri in context.map:
+        file_info = context.map[file_uri]
+        if isinstance(file_info, ModelTarget):
+            for model in file_info.names:
+                all_models.discard(model)
+
     return all_models
 
 
@@ -43,16 +52,25 @@ def get_keywords(context: t.Optional[LSPContext], file_uri: t.Optional[str]) ->
     If both a context and a file_uri are provided, returns the keywords
     for the dialect of the model that the file belongs to.
     """
-    if file_uri is not None and context is not None:
-        models = context.map[file_uri]
-        if models:
-            model = models[0]
-            model_from_context = context.context.get_model(model)
-            if model_from_context is not None:
-                if model_from_context.dialect:
-                    return get_keywords_from_tokenizer(model_from_context.dialect)
+    if file_uri is not None and context is not None and file_uri in context.map:
+        file_info = context.map[file_uri]
+
+        # Handle ModelInfo objects
+        if isinstance(file_info, ModelTarget) and file_info.names:
+            model_name = file_info.names[0]
+            model_from_context = context.context.get_model(model_name)
+            if model_from_context is not None and model_from_context.dialect:
+                return get_keywords_from_tokenizer(model_from_context.dialect)
+
+        # Handle AuditInfo objects
+        elif isinstance(file_info, AuditTarget) and file_info.name:
+            audit = context.context.standalone_audits.get(file_info.name)
+            if audit is not None and audit.dialect:
+                return get_keywords_from_tokenizer(audit.dialect)
+
     if context is not None:
         return get_keywords_from_tokenizer(context.context.default_dialect)
+
     return get_keywords_from_tokenizer(None)
 
 

sqlmesh/lsp/context.py

@@ -1,20 +1,53 @@
-from collections import defaultdict
+from dataclasses import dataclass
 from pathlib import Path
 from sqlmesh.core.context import Context
 import typing as t
 
 
+@dataclass
+class ModelTarget:
+    """Information about models in a file."""
+
+    names: t.List[str]
+
+
+@dataclass
+class AuditTarget:
+    """Information about standalone audits in a file."""
+
+    name: str
+
+
 class LSPContext:
     """
-    A context that is used for linting. It contains the context and a reverse map of file uri to model names .
+    A context that is used for linting. It contains the context and a reverse map of file uri to
+    model names and standalone audit names.
     """
 
     def __init__(self, context: Context) -> None:
         self.context = context
-        map: t.Dict[str, t.List[str]] = defaultdict(list)
+
+        # Add models to the map
+        model_map: t.Dict[str, ModelTarget] = {}
         for model in context.models.values():
             if model._path is not None:
                 path = Path(model._path).resolve()
-                map[f"file://{path.as_posix()}"].append(model.name)
+                uri = f"file://{path.as_posix()}"
+                if uri in model_map:
+                    model_map[uri].names.append(model.name)
+                else:
+                    model_map[uri] = ModelTarget(names=[model.name])
+
+        # Add standalone audits to the map
+        audit_map: t.Dict[str, AuditTarget] = {}
+        for audit in context.standalone_audits.values():
+            if audit._path is not None:
+                path = Path(audit._path).resolve()
+                uri = f"file://{path.as_posix()}"
+                if uri not in audit_map:
+                    audit_map[uri] = AuditTarget(name=audit.name)
 
-        self.map = map
+        self.map: t.Dict[str, t.Union[ModelTarget, AuditTarget]] = {
+            **model_map,
+            **audit_map,
+        }

sqlmesh/lsp/main.py

@@ -12,7 +12,7 @@ from sqlmesh._version import __version__
 from sqlmesh.core.context import Context
 from sqlmesh.core.linter.definition import AnnotatedRuleViolation
 from sqlmesh.lsp.completions import get_sql_completions
-from sqlmesh.lsp.context import LSPContext
+from sqlmesh.lsp.context import LSPContext, ModelTarget
 from sqlmesh.lsp.custom import ALL_MODELS_FEATURE, AllModelsRequest, AllModelsResponse
 from sqlmesh.lsp.reference import get_model_definitions_for_a_path
 
@@ -91,8 +91,10 @@ class SQLMeshLanguageServer:
             models = context.map[params.text_document.uri]
             if models is None:
                 return
+            if not isinstance(models, ModelTarget):
+                return
             self.lint_cache[params.text_document.uri] = context.context.lint_models(
-                models,
+                models.names,
                 raise_on_error=False,
             )
             ls.publish_diagnostics(
@@ -108,8 +110,10 @@ class SQLMeshLanguageServer:
             models = context.map[params.text_document.uri]
             if models is None:
                 return
+            if not isinstance(models, ModelTarget):
+                return
             self.lint_cache[params.text_document.uri] = context.context.lint_models(
-                models,
+                models.names,
                 raise_on_error=False,
             )
             ls.publish_diagnostics(
@@ -125,8 +129,10 @@ class SQLMeshLanguageServer:
             models = context.map[params.text_document.uri]
             if models is None:
                 return
+            if not isinstance(models, ModelTarget):
+                return
             self.lint_cache[params.text_document.uri] = context.context.lint_models(
-                models,
+                models.names,
                 raise_on_error=False,
             )
             ls.publish_diagnostics(

sqlmesh/lsp/reference.py

@@ -3,7 +3,7 @@ import typing as t
 
 from sqlmesh.core.dialect import normalize_model_name
 from sqlmesh.core.model.definition import SqlModel
-from sqlmesh.lsp.context import LSPContext
+from sqlmesh.lsp.context import LSPContext, ModelTarget, AuditTarget
 from sqlglot import exp
 
 from sqlmesh.utils.pydantic import PydanticModel
@@ -20,7 +20,7 @@ def get_model_definitions_for_a_path(
     """
     Get the model references for a given path.
 
-    Works for models and audits.
+    Works for models and standalone audits.
     Works for targeting sql and python models.
 
     Steps:
@@ -31,39 +31,63 @@ def get_model_definitions_for_a_path(
     - Try get_model before normalization
     - Match to models that the model refers to
     """
-    # Ensure the path is a sql model
+    # Ensure the path is a sql file
     if not document_uri.endswith(".sql"):
         return []
 
-    # Get the model
-    models = lint_context.map[document_uri]
-    if not models:
+    # Get the file info from the context map
+    if document_uri not in lint_context.map:
         return []
-    model = lint_context.context.get_model(model_or_snapshot=models[0], raise_if_missing=False)
-    if model is None or not isinstance(model, SqlModel):
+
+    file_info = lint_context.map[document_uri]
+
+    # Process based on whether it's a model or standalone audit
+    if isinstance(file_info, ModelTarget):
+        # It's a model
+        model = lint_context.context.get_model(
+            model_or_snapshot=file_info.names[0], raise_if_missing=False
+        )
+        if model is None or not isinstance(model, SqlModel):
+            return []
+
+        query = model.query
+        dialect = model.dialect
+        depends_on = model.depends_on
+        file_path = model._path
+    elif isinstance(file_info, AuditTarget):
+        # It's a standalone audit
+        audit = lint_context.context.standalone_audits.get(file_info.name)
+        if audit is None:
+            return []
+
+        query = audit.query
+        dialect = audit.dialect
+        depends_on = audit.depends_on
+        file_path = audit._path
+    else:
         return []
 
     # Find all possible references
     references = []
-    tables = list(model.query.find_all(exp.Table))
+
+    # Get SQL query and find all table references
+    tables = list(query.find_all(exp.Table))
     if len(tables) == 0:
         return []
 
-    read_file = open(model._path, "r").readlines()
+    read_file = open(file_path, "r").readlines()
 
     for table in tables:
-        depends_on = model.depends_on
-
         # Normalize the table reference
         unaliased = table.copy()
         if unaliased.args.get("alias") is not None:
             unaliased.set("alias", None)
-        reference_name = unaliased.sql(dialect=model.dialect)
+        reference_name = unaliased.sql(dialect=dialect)
         try:
             normalized_reference_name = normalize_model_name(
                 reference_name,
                 default_catalog=lint_context.context.default_catalog,
-                dialect=model.dialect,
+                dialect=dialect,
             )
             if normalized_reference_name not in depends_on:
                 continue

{sqlmesh-0.180.1.dev7.dist-info → sqlmesh-0.180.1.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.180.1.dev7
+Version: 0.180.1.dev9
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License
@@ -232,7 +232,7 @@ Requires-Dist: pydantic>=2.0.0
 Requires-Dist: requests
 Requires-Dist: rich[jupyter]
 Requires-Dist: ruamel.yaml
-Requires-Dist: sqlglot[rs]~=26.16.3
+Requires-Dist: sqlglot[rs]~=26.17.1
 Requires-Dist: tenacity
 Requires-Dist: time-machine
 Requires-Dist: json-stream

{sqlmesh-0.180.1.dev7.dist-info → sqlmesh-0.180.1.dev9.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=uPXld_xTZ2NTruSfVJ_vR_w-uAxR3T-gMXAb-EphTe8,7167
-sqlmesh/_version.py,sha256=052Ck_Q6K5fDNQDCHUodUEMU99K561pVTbF5SgTNWmY,528
+sqlmesh/_version.py,sha256=VYRbEJ3LOEOPGpG3dWO2WeFAi5ujk2iTbCSRJC1yNkQ,528
 sqlmesh/magics.py,sha256=7BU9ec9zE4tjvZ3hdEqwFX2VVV-CI0h06TGZo_Ssi8M,39070
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -155,11 +155,11 @@ sqlmesh/integrations/github/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 sqlmesh/integrations/github/cicd/command.py,sha256=a48qtSeRM7RD3IeydJwHLAZBHRbmFdA7uHh7Yhe5a74,11301
 sqlmesh/integrations/github/cicd/config.py,sha256=qEy0mRfPYJw1pm68UK0v1_4kZBj5QodnpIsOZ8JjZro,1838
 sqlmesh/integrations/github/cicd/controller.py,sha256=AiEMsRW4WSVxXP_7oQSIdzBzmYPxfYDgYeOYRk9sfJA,41388
-sqlmesh/lsp/completions.py,sha256=w0ytB-WNYoDSSf_K-JOOs3FtLJUGAfzR3kkZZnCvS1E,2805
-sqlmesh/lsp/context.py,sha256=vLhQBDmwDG4QhE0s6h7zNSxB0pjzHmRzkJdH1oqldac,637
+sqlmesh/lsp/completions.py,sha256=ScW0H9couhfW6QckEX2djVYTClRPXpT2Hdcg1qLfUUY,3479
+sqlmesh/lsp/context.py,sha256=vUpbWYjKYuwDvU3zkzhAgw9An-TeVYe_5KTk-ec_UwM,1569
 sqlmesh/lsp/custom.py,sha256=GvNAiW7imPI8xmIx3qLWN5FljGPHFJKh0N5b6aZnwRo,489
-sqlmesh/lsp/main.py,sha256=QEWxoX-LtEfFVE-Qf6ke2iUfEjgl0TcM1J9Wo7THAwg,13332
-sqlmesh/lsp/reference.py,sha256=mpgAg3ckXei067EUeVulagbZsOui5Etb8U8Unu81hVs,5539
+sqlmesh/lsp/main.py,sha256=oOZXCWLYJ722_2zLg6lTXGfw5UXo8xt78qRO6IIKZh4,13588
+sqlmesh/lsp/reference.py,sha256=qLy6ovxcR_q7qcqDYqVbQ_5p8cpPYeBynfL7b12_PNU,6288
 sqlmesh/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/migrations/v0001_init.py,sha256=h8FwMYJj9_O8yGpk12guaSaGwX5A3we2GiKeHrXi15o,2048
 sqlmesh/migrations/v0002_remove_identify.py,sha256=ZeHuodZcQzRRZX0B0Y7SSkK3qqlDuz316kmvzojeyoU,113
@@ -265,7 +265,7 @@ sqlmesh/utils/pandas.py,sha256=j_tYhuPcWpzuPceZZ6IhdTVbmxYyGJW7l4FHr4bQqjM,1824
 sqlmesh/utils/pydantic.py,sha256=ioaAzYF42PutEJRyAS11-AHguiCG3yWI6VRcTVa2G-g,10470
 sqlmesh/utils/rich.py,sha256=xNZyPCqEc4TAlJlsEthg-5eYUWpaizz0QjBzO7a1Yv4,1509
 sqlmesh/utils/yaml.py,sha256=np-WVcwmwsKghCgAj1OBBMsK1SXSRn4wR-H37cGiFr8,2282
-sqlmesh-0.180.1.dev7.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.180.1.dev9.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=cQRIlDgkl6OgeWuHI9hM8bJhKUE9-Ji2NpQa2hlgNM8,5472
 web/client/dist/assets/Audits-4U9LnWyN.js,sha256=reXu-sKJ76kiaAZIGkCPvgO68Km9tj1PN_9mx6X6WAY,997
@@ -382,8 +382,8 @@ web/server/api/endpoints/models.py,sha256=SzS5bshzdXyM6hb948sZ_3k-xhpGCHkxkb7pHz
 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.180.1.dev7.dist-info/METADATA,sha256=1KbYPc5IlJFeCYcqieGPzuOFI1jK5g8lBHA7DXeBa3M,25307
-sqlmesh-0.180.1.dev7.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-sqlmesh-0.180.1.dev7.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.180.1.dev7.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.180.1.dev7.dist-info/RECORD,,
+sqlmesh-0.180.1.dev9.dist-info/METADATA,sha256=KbzT6tCNDRTRk8UqR-gygfQYKa8S4GaWDJjpMwzoEgs,25307
+sqlmesh-0.180.1.dev9.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+sqlmesh-0.180.1.dev9.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.180.1.dev9.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.180.1.dev9.dist-info/RECORD,,