sqlmesh 0.190.1.dev1__py3-none-any.whl → 0.190.1.dev3__py3-none-any.whl

sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.190.1.dev1'
-__version_tuple__ = version_tuple = (0, 190, 1, 'dev1')
+__version__ = version = '0.190.1.dev3'
+__version_tuple__ = version_tuple = (0, 190, 1, 'dev3')

sqlmesh/lsp/helpers.py

@@ -6,22 +6,35 @@ from sqlmesh.core.linter.helpers import (
 )
 
 
-def to_lsp_range(
-    range: SQLMeshRange,
-) -> Range:
+def to_sqlmesh_position(position: Position) -> SQLMeshPosition:
     """
-    Converts a SQLMesh Range to an LSP Range.
+    Converts an LSP Position to a SQLMesh Position.
     """
-    return Range(
-        start=Position(line=range.start.line, character=range.start.character),
-        end=Position(line=range.end.line, character=range.end.character),
-    )
+    return SQLMeshPosition(line=position.line, character=position.character)
 
 
-def to_lsp_position(
-    position: SQLMeshPosition,
-) -> Position:
+def to_lsp_position(position: SQLMeshPosition) -> Position:
     """
     Converts a SQLMesh Position to an LSP Position.
     """
     return Position(line=position.line, character=position.character)
+
+
+def to_sqlmesh_range(range: Range) -> SQLMeshRange:
+    """
+    Converts an LSP Range to a SQLMesh Range.
+    """
+    return SQLMeshRange(
+        start=to_sqlmesh_position(range.start),
+        end=to_sqlmesh_position(range.end),
+    )
+
+
+def to_lsp_range(range: SQLMeshRange) -> Range:
+    """
+    Converts a SQLMesh Range to an LSP Range.
+    """
+    return Range(
+        start=to_lsp_position(range.start),
+        end=to_lsp_position(range.end),
+    )

sqlmesh/lsp/main.py

@@ -48,6 +48,7 @@ from sqlmesh.lsp.hints import get_hints
 from sqlmesh.lsp.reference import (
     LSPCteReference,
     LSPModelReference,
+    LSPExternalModelReference,
     get_references,
     get_all_references,
 )
@@ -444,11 +445,19 @@ class SQLMeshLanguageServer:
                 references = get_references(self.lsp_context, uri, params.position)
                 location_links = []
                 for reference in references:
-                    # Use target_range if available (CTEs, Macros), otherwise default to start of file
-                    if not isinstance(reference, LSPModelReference):
-                        target_range = reference.target_range
-                        target_selection_range = reference.target_range
-                    else:
+                    # Use target_range if available (CTEs, Macros, and external models in YAML)
+                    if isinstance(reference, LSPModelReference):
+                        # Regular SQL models - default to start of file
+                        target_range = types.Range(
+                            start=types.Position(line=0, character=0),
+                            end=types.Position(line=0, character=0),
+                        )
+                        target_selection_range = types.Range(
+                            start=types.Position(line=0, character=0),
+                            end=types.Position(line=0, character=0),
+                        )
+                    elif isinstance(reference, LSPExternalModelReference):
+                        # External models may have target_range set for YAML files
                         target_range = types.Range(
                             start=types.Position(line=0, character=0),
                             end=types.Position(line=0, character=0),
@@ -457,6 +466,13 @@ class SQLMeshLanguageServer:
                             start=types.Position(line=0, character=0),
                             end=types.Position(line=0, character=0),
                         )
+                        if reference.target_range is not None:
+                            target_range = reference.target_range
+                            target_selection_range = reference.target_range
+                    else:
+                        # CTEs and Macros always have target_range
+                        target_range = reference.target_range
+                        target_selection_range = reference.target_range
 
                     location_links.append(
                         types.LocationLink(

sqlmesh/lsp/reference.py

@@ -8,7 +8,7 @@ from sqlmesh.core.dialect import normalize_model_name
 from sqlmesh.core.linter.helpers import (
     TokenPositionDetails,
 )
-from sqlmesh.core.model.definition import SqlModel
+from sqlmesh.core.model.definition import SqlModel, ExternalModel
 from sqlmesh.lsp.context import LSPContext, ModelTarget, AuditTarget
 from sqlglot import exp
 from sqlmesh.lsp.description import generate_markdown_description
@@ -22,10 +22,11 @@ import ast
 from sqlmesh.core.model import Model
 from sqlmesh import macro
 import inspect
+from ruamel.yaml import YAML
 
 
 class LSPModelReference(PydanticModel):
-    """A LSP reference to a model."""
+    """A LSP reference to a model, excluding external models."""
 
     type: t.Literal["model"] = "model"
     uri: str
@@ -33,6 +34,16 @@ class LSPModelReference(PydanticModel):
     markdown_description: t.Optional[str] = None
 
 
+class LSPExternalModelReference(PydanticModel):
+    """A LSP reference to an external model."""
+
+    type: t.Literal["external_model"] = "external_model"
+    uri: str
+    range: Range
+    markdown_description: t.Optional[str] = None
+    target_range: t.Optional[Range] = None
+
+
 class LSPCteReference(PydanticModel):
     """A LSP reference to a CTE."""
 
@@ -53,7 +64,8 @@ class LSPMacroReference(PydanticModel):
 
 
 Reference = t.Annotated[
-    t.Union[LSPModelReference, LSPCteReference, LSPMacroReference], Field(discriminator="type")
+    t.Union[LSPModelReference, LSPCteReference, LSPMacroReference, LSPExternalModelReference],
+    Field(discriminator="type"),
 ]
 
 
@@ -243,16 +255,38 @@ def get_model_definitions_for_a_path(
 
                 description = generate_markdown_description(referenced_model)
 
-                references.append(
-                    LSPModelReference(
-                        uri=referenced_model_uri.value,
-                        range=Range(
-                            start=to_lsp_position(start_pos_sqlmesh),
-                            end=to_lsp_position(end_pos_sqlmesh),
-                        ),
-                        markdown_description=description,
+                # For external models in YAML files, find the specific model block
+                if isinstance(referenced_model, ExternalModel):
+                    yaml_target_range: t.Optional[Range] = None
+                    if (
+                        referenced_model_path.suffix in (".yaml", ".yml")
+                        and referenced_model_path.is_file()
+                    ):
+                        yaml_target_range = _get_yaml_model_range(
+                            referenced_model_path, referenced_model.name
+                        )
+                    references.append(
+                        LSPExternalModelReference(
+                            uri=referenced_model_uri.value,
+                            range=Range(
+                                start=to_lsp_position(start_pos_sqlmesh),
+                                end=to_lsp_position(end_pos_sqlmesh),
+                            ),
+                            markdown_description=description,
+                            target_range=yaml_target_range,
+                        )
+                    )
+                else:
+                    references.append(
+                        LSPModelReference(
+                            uri=referenced_model_uri.value,
+                            range=Range(
+                                start=to_lsp_position(start_pos_sqlmesh),
+                                end=to_lsp_position(end_pos_sqlmesh),
+                            ),
+                            markdown_description=description,
+                        )
                     )
-                )
 
     return references
 
@@ -699,3 +733,31 @@ def _position_within_range(position: Position, range: Range) -> bool:
         range.end.line > position.line
         or (range.end.line == position.line and range.end.character >= position.character)
     )
+
+
+def _get_yaml_model_range(path: Path, model_name: str) -> t.Optional[Range]:
+    """
+    Find the range of a specific model block in a YAML file.
+
+    Args:
+        yaml_path: Path to the YAML file
+        model_name: Name of the model to find
+
+    Returns:
+        The Range of the model block in the YAML file, or None if not found
+    """
+    yaml = YAML()
+    with path.open("r", encoding="utf-8") as f:
+        data = yaml.load(f)
+
+    if not isinstance(data, list):
+        return None
+
+    for item in data:
+        if isinstance(item, dict) and item.get("name") == model_name:
+            # Get size of block by taking the earliest line/col in the items block and the last line/col of the block
+            position_data = item.lc.data["name"]  # type: ignore
+            start = Position(line=position_data[2], character=position_data[3])
+            end = Position(line=position_data[2], character=position_data[3] + len(item["name"]))
+            return Range(start=start, end=end)
+    return None

{sqlmesh-0.190.1.dev1.dist-info → sqlmesh-0.190.1.dev3.dist-info}/METADATA

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

{sqlmesh-0.190.1.dev1.dist-info → sqlmesh-0.190.1.dev3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=QjwaamJIdW7voXoS880yAx7tHm-Im4_mqGA-XJgafos,7631
-sqlmesh/_version.py,sha256=ZZOoESKdHETwaV_Vjl91NS8kfaWiViqZ_Vp9mSULRVw,528
+sqlmesh/_version.py,sha256=hqtfkM900kyLDFBA0kXts6JWhLh4HOvDmPLKEFfLcJQ,528
 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
@@ -163,10 +163,10 @@ sqlmesh/lsp/completions.py,sha256=OTI7Ga6NNtaC_k80W1wI9Tft0gMBmaTJOt6gW_DF6GE,64
 sqlmesh/lsp/context.py,sha256=QGbNL0sifxzVJ7T1U5oWcJ5FXrOrLrVKt1jtH1qM_50,6099
 sqlmesh/lsp/custom.py,sha256=3eNuwP4Q5vT7l9RxpPYUiY-91c2w5FSTEKSHdGJf7CA,2705
 sqlmesh/lsp/description.py,sha256=4QIGC9ix8IzmWF6DVUNhY4m1Crk3sNQA6hZ1RbyqU78,827
-sqlmesh/lsp/helpers.py,sha256=igzUgeYAO3LUZFr3qN4l9hzztOy66lRubX93KtCMduY,654
+sqlmesh/lsp/helpers.py,sha256=EFc1u3-b7kSv5-tNwmKUDxId72RCLDBnN2lLTgRSzzQ,1020
 sqlmesh/lsp/hints.py,sha256=j-blccBUil94yRoDjWfkSM0HqMmsKD6hP2TaWdWWVk4,3734
-sqlmesh/lsp/main.py,sha256=70h_T_YSNAkQm3G7kfjytx0_tKP9_cd6ySOpT_Vo3Gg,35696
-sqlmesh/lsp/reference.py,sha256=2rAYfwrKRfxlYA3psTDLacxYWvuFaouMyS7plOSYHiQ,23883
+sqlmesh/lsp/main.py,sha256=4fpL59afwuI4iPBHQedWEarM9Wa5e5IWQ_KMF8eW6NU,36664
+sqlmesh/lsp/reference.py,sha256=8hZT3wH8zmWiFEySS1_nVhhLg-CKCGncf9wG3LGBef8,26432
 sqlmesh/lsp/uri.py,sha256=mvSLbZGmMTHPpliThOtVWiFcHnfJzp1w39q9l-xD2SI,802
 sqlmesh/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/migrations/v0001_init.py,sha256=h8FwMYJj9_O8yGpk12guaSaGwX5A3we2GiKeHrXi15o,2048
@@ -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.190.1.dev1.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.190.1.dev3.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.190.1.dev1.dist-info/METADATA,sha256=0O6EhEIHwVFgtfAGBAnZjDD5OQiQqg33vvpyEnGkjl8,26540
-sqlmesh-0.190.1.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.190.1.dev1.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.190.1.dev1.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.190.1.dev1.dist-info/RECORD,,
+sqlmesh-0.190.1.dev3.dist-info/METADATA,sha256=pS822y8QNXG1CP3s9f3hbOJlnbj7cMrX9QHeNzLvor4,26540
+sqlmesh-0.190.1.dev3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.190.1.dev3.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.190.1.dev3.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.190.1.dev3.dist-info/RECORD,,