sqlmesh 0.204.1.dev5__tar.gz → 0.204.1.dev7__tar.gz

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/PKG-INFO

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

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.204.1.dev5'
-__version_tuple__ = version_tuple = (0, 204, 1, 'dev5')
+__version__ = version = '0.204.1.dev7'
+__version_tuple__ = version_tuple = (0, 204, 1, 'dev7')

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/sqlmesh/core/linter/helpers.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from sqlmesh.core.linter.rule import Position, Range
+from sqlmesh.core.linter.rule import Range, Position
 from sqlmesh.utils.pydantic import PydanticModel
 from sqlglot import tokenize, TokenType
 import typing as t

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/sqlmesh/lsp/main.py

@@ -48,6 +48,7 @@ from sqlmesh.lsp.custom import (
     CustomMethod,
 )
 from sqlmesh.lsp.errors import ContextFailedError, context_error_to_diagnostic
+from sqlmesh.lsp.helpers import to_lsp_range, to_sqlmesh_position
 from sqlmesh.lsp.hints import get_hints
 from sqlmesh.lsp.reference import (
     LSPCteReference,
@@ -418,7 +419,7 @@ class SQLMeshLanguageServer:
                 context = self._context_get_or_load(uri)
                 document = ls.workspace.get_text_document(params.text_document.uri)
 
-                references = get_references(context, uri, params.position)
+                references = get_references(context, uri, to_sqlmesh_position(params.position))
                 if not references:
                     return None
                 reference = references[0]
@@ -429,7 +430,7 @@ class SQLMeshLanguageServer:
                         kind=types.MarkupKind.Markdown,
                         value=reference.markdown_description,
                     ),
-                    range=reference.range,
+                    range=to_lsp_range(reference.range),
                 )
 
             except Exception as e:
@@ -464,7 +465,7 @@ class SQLMeshLanguageServer:
                 uri = URI(params.text_document.uri)
                 context = self._context_get_or_load(uri)
 
-                references = get_references(context, uri, params.position)
+                references = get_references(context, uri, to_sqlmesh_position(params.position))
                 location_links = []
                 for reference in references:
                     # Use target_range if available (CTEs, Macros, and external models in YAML)
@@ -489,20 +490,20 @@ class SQLMeshLanguageServer:
                             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
+                            target_range = to_lsp_range(reference.target_range)
+                            target_selection_range = to_lsp_range(reference.target_range)
                     else:
                         # CTEs and Macros always have target_range
-                        target_range = reference.target_range
-                        target_selection_range = reference.target_range
+                        target_range = to_lsp_range(reference.target_range)
+                        target_selection_range = to_lsp_range(reference.target_range)
 
-                    if reference.uri is not None:
+                    if reference.path is not None:
                         location_links.append(
                             types.LocationLink(
-                                target_uri=reference.uri,
+                                target_uri=URI.from_path(reference.path).value,
                                 target_selection_range=target_selection_range,
                                 target_range=target_range,
-                                origin_selection_range=reference.range,
+                                origin_selection_range=to_lsp_range(reference.range),
                             )
                         )
                 return location_links
@@ -519,13 +520,15 @@ class SQLMeshLanguageServer:
                 uri = URI(params.text_document.uri)
                 context = self._context_get_or_load(uri)
 
-                all_references = get_all_references(context, uri, params.position)
+                all_references = get_all_references(
+                    context, uri, to_sqlmesh_position(params.position)
+                )
 
                 # Convert references to Location objects
                 locations = [
-                    types.Location(uri=ref.uri, range=ref.range)
+                    types.Location(uri=URI.from_path(ref.path).value, range=to_lsp_range(ref.range))
                     for ref in all_references
-                    if ref.uri is not None
+                    if ref.path is not None
                 ]
 
                 return locations if locations else None

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/sqlmesh/lsp/reference.py

@@ -1,4 +1,3 @@
-from lsprotocol.types import Range, Position
 import typing as t
 from pathlib import Path
 from pydantic import Field
@@ -8,13 +7,13 @@ from sqlmesh.core.dialect import normalize_model_name
 from sqlmesh.core.linter.helpers import (
     TokenPositionDetails,
 )
+from sqlmesh.core.linter.rule import Range, Position
 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
 from sqlglot.optimizer.scope import build_scope
 
-from sqlmesh.lsp.helpers import to_lsp_range, to_lsp_position
 from sqlmesh.lsp.uri import URI
 from sqlmesh.utils.pydantic import PydanticModel
 from sqlglot.optimizer.normalize_identifiers import normalize_identifiers
@@ -29,7 +28,7 @@ class LSPModelReference(PydanticModel):
     """A LSP reference to a model, excluding external models."""
 
     type: t.Literal["model"] = "model"
-    uri: str
+    path: Path
     range: Range
     markdown_description: t.Optional[str] = None
 
@@ -40,9 +39,9 @@ class LSPExternalModelReference(PydanticModel):
     type: t.Literal["external_model"] = "external_model"
     range: Range
     target_range: t.Optional[Range] = None
-    uri: t.Optional[str] = None
-    """The URI of the external model, typically a YAML file, it is optional because
-    external models can be unregistered and so they URI is not available."""
+    path: t.Optional[Path] = None
+    """The path of the external model, typically a YAML file, it is optional because
+    external models can be unregistered and so the path is not available."""
 
     markdown_description: t.Optional[str] = None
 
@@ -51,7 +50,7 @@ class LSPCteReference(PydanticModel):
     """A LSP reference to a CTE."""
 
     type: t.Literal["cte"] = "cte"
-    uri: str
+    path: Path
     range: Range
     target_range: Range
 
@@ -60,7 +59,7 @@ class LSPMacroReference(PydanticModel):
     """A LSP reference to a macro."""
 
     type: t.Literal["macro"] = "macro"
-    uri: str
+    path: Path
     range: Range
     target_range: Range
     markdown_description: t.Optional[str] = None
@@ -203,15 +202,11 @@ def get_model_definitions_for_a_path(
                                 table.this.meta
                             ).to_range(read_file)
 
-                            # Convert SQLMesh Range to LSP Range
-                            target_range = to_lsp_range(target_range_sqlmesh)
-                            table_range = to_lsp_range(table_range_sqlmesh)
-
                             references.append(
                                 LSPCteReference(
-                                    uri=document_uri.value,  # Same file
-                                    range=table_range,
-                                    target_range=target_range,
+                                    path=document_uri.to_path(),  # Same file
+                                    range=table_range_sqlmesh,
+                                    target_range=target_range_sqlmesh,
                                 )
                             )
 
@@ -219,10 +214,10 @@ def get_model_definitions_for_a_path(
                                 scope=scope,
                                 reference_name=table.name,
                                 read_file=read_file,
-                                referenced_model_uri=document_uri,
+                                referenced_model_path=document_uri.to_path(),
                                 description="",
                                 reference_type="cte",
-                                cte_target_range=target_range,
+                                cte_target_range=target_range_sqlmesh,
                             )
                             references.extend(column_references)
                     continue
@@ -257,8 +252,8 @@ def get_model_definitions_for_a_path(
                     references.append(
                         LSPExternalModelReference(
                             range=Range(
-                                start=to_lsp_position(start_pos_sqlmesh),
-                                end=to_lsp_position(end_pos_sqlmesh),
+                                start=start_pos_sqlmesh,
+                                end=end_pos_sqlmesh,
                             ),
                             markdown_description="Unregistered external model",
                         )
@@ -270,7 +265,6 @@ def get_model_definitions_for_a_path(
                 # Check whether the path exists
                 if not referenced_model_path.is_file():
                     continue
-                referenced_model_uri = URI.from_path(referenced_model_path)
 
                 # Extract metadata for positioning
                 table_meta = TokenPositionDetails.from_meta(table.this.meta)
@@ -299,10 +293,10 @@ def get_model_definitions_for_a_path(
                         )
                     references.append(
                         LSPExternalModelReference(
-                            uri=referenced_model_uri.value,
+                            path=referenced_model_path,
                             range=Range(
-                                start=to_lsp_position(start_pos_sqlmesh),
-                                end=to_lsp_position(end_pos_sqlmesh),
+                                start=start_pos_sqlmesh,
+                                end=end_pos_sqlmesh,
                             ),
                             markdown_description=description,
                             target_range=yaml_target_range,
@@ -313,7 +307,7 @@ def get_model_definitions_for_a_path(
                         scope=scope,
                         reference_name=normalized_reference_name,
                         read_file=read_file,
-                        referenced_model_uri=referenced_model_uri,
+                        referenced_model_path=referenced_model_path,
                         description=description,
                         yaml_target_range=yaml_target_range,
                         reference_type="external_model",
@@ -324,10 +318,10 @@ def get_model_definitions_for_a_path(
                 else:
                     references.append(
                         LSPModelReference(
-                            uri=referenced_model_uri.value,
+                            path=referenced_model_path,
                             range=Range(
-                                start=to_lsp_position(start_pos_sqlmesh),
-                                end=to_lsp_position(end_pos_sqlmesh),
+                                start=start_pos_sqlmesh,
+                                end=end_pos_sqlmesh,
                             ),
                             markdown_description=description,
                         )
@@ -337,7 +331,7 @@ def get_model_definitions_for_a_path(
                         scope=scope,
                         reference_name=normalized_reference_name,
                         read_file=read_file,
-                        referenced_model_uri=referenced_model_uri,
+                        referenced_model_path=referenced_model_path,
                         description=description,
                         reference_type="model",
                         default_catalog=lint_context.context.default_catalog,
@@ -433,7 +427,7 @@ def get_macro_reference(
             macro_range = TokenPositionDetails.from_meta(node.meta).to_range(read_file)
 
             # Check if it's a built-in method
-            if builtin := get_built_in_macro_reference(macro_name, to_lsp_range(macro_range)):
+            if builtin := get_built_in_macro_reference(macro_name, macro_range):
                 return builtin
         else:
             # Skip if we can't get the position
@@ -481,11 +475,10 @@ def get_macro_reference(
             return None
 
         # Create a reference to the macro definition
-        macro_uri = URI.from_path(path)
 
         return LSPMacroReference(
-            uri=macro_uri.value,
-            range=to_lsp_range(macro_range),
+            path=path,
+            range=macro_range,
             target_range=Range(
                 start=Position(line=start_line - 1, character=0),
                 end=Position(line=end_line - 1, character=get_length_of_end_line),
@@ -517,7 +510,7 @@ def get_built_in_macro_reference(macro_name: str, macro_range: Range) -> t.Optio
     end_line_number = line_number + len(source_lines) - 1
 
     return LSPMacroReference(
-        uri=URI.from_path(Path(filename)).value,
+        path=Path(filename),
         range=macro_range,
         target_range=Range(
             start=Position(line=line_number - 1, character=0),
@@ -559,12 +552,12 @@ def get_model_find_all_references(
 
     assert isinstance(model_at_position, LSPModelReference)  # for mypy
 
-    target_model_uri = model_at_position.uri
+    target_model_path = model_at_position.path
 
     # Start with the model definition
     all_references: t.List[LSPModelReference] = [
         LSPModelReference(
-            uri=model_at_position.uri,
+            path=model_at_position.path,
             range=Range(
                 start=Position(line=0, character=0),
                 end=Position(line=0, character=0),
@@ -575,7 +568,7 @@ def get_model_find_all_references(
 
     # Then add references from the current file
     current_file_refs = filter(
-        lambda ref: isinstance(ref, LSPModelReference) and ref.uri == target_model_uri,
+        lambda ref: isinstance(ref, LSPModelReference) and ref.path == target_model_path,
         get_model_definitions_for_a_path(lint_context, document_uri),
     )
 
@@ -584,7 +577,7 @@ def get_model_find_all_references(
 
         all_references.append(
             LSPModelReference(
-                uri=document_uri.value,
+                path=document_uri.to_path(),
                 range=ref.range,
                 markdown_description=ref.markdown_description,
             )
@@ -600,7 +593,7 @@ def get_model_find_all_references(
 
         # Get model references that point to the target model
         matching_refs = filter(
-            lambda ref: isinstance(ref, LSPModelReference) and ref.uri == target_model_uri,
+            lambda ref: isinstance(ref, LSPModelReference) and ref.path == target_model_path,
             get_model_definitions_for_a_path(lint_context, file_uri),
         )
 
@@ -609,7 +602,7 @@ def get_model_find_all_references(
 
             all_references.append(
                 LSPModelReference(
-                    uri=file_uri.value,
+                    path=path,
                     range=ref.range,
                     markdown_description=ref.markdown_description,
                 )
@@ -662,7 +655,7 @@ def get_cte_references(
     # Add the CTE definition
     matching_references = [
         LSPCteReference(
-            uri=document_uri.value,
+            path=document_uri.to_path(),
             range=target_cte_definition_range,
             target_range=target_cte_definition_range,
         )
@@ -673,7 +666,7 @@ def get_cte_references(
         if ref.target_range == target_cte_definition_range:
             matching_references.append(
                 LSPCteReference(
-                    uri=document_uri.value,
+                    path=document_uri.to_path(),
                     range=ref.range,
                     target_range=ref.target_range,
                 )
@@ -713,13 +706,13 @@ def get_macro_find_all_references(
 
     assert isinstance(macro_at_position, LSPMacroReference)  # for mypy
 
-    target_macro_uri = macro_at_position.uri
+    target_macro_path = macro_at_position.path
     target_macro_target_range = macro_at_position.target_range
 
     # Start with the macro definition
     all_references: t.List[LSPMacroReference] = [
         LSPMacroReference(
-            uri=target_macro_uri,
+            path=target_macro_path,
             range=target_macro_target_range,
             target_range=target_macro_target_range,
             markdown_description=None,
@@ -733,7 +726,7 @@ def get_macro_find_all_references(
         # Get macro references that point to the same macro definition
         matching_refs = filter(
             lambda ref: isinstance(ref, LSPMacroReference)
-            and ref.uri == target_macro_uri
+            and ref.path == target_macro_path
             and ref.target_range == target_macro_target_range,
             get_macro_definitions_for_a_path(lsp_context, file_uri),
         )
@@ -742,7 +735,7 @@ def get_macro_find_all_references(
             assert isinstance(ref, LSPMacroReference)  # for mypy
             all_references.append(
                 LSPMacroReference(
-                    uri=file_uri.value,
+                    path=path,
                     range=ref.range,
                     target_range=ref.target_range,
                     markdown_description=ref.markdown_description,
@@ -813,8 +806,8 @@ def _get_column_table_range(column: exp.Column, read_file: t.List[str]) -> Range
     end_range = TokenPositionDetails.from_meta(table_parts[-1].meta).to_range(read_file)
 
     return Range(
-        start=to_lsp_position(start_range.start),
-        end=to_lsp_position(end_range.end),
+        start=start_range.start,
+        end=end_range.end,
     )
 
 
@@ -822,7 +815,7 @@ def _process_column_references(
     scope: t.Any,
     reference_name: str,
     read_file: t.List[str],
-    referenced_model_uri: URI,
+    referenced_model_path: Path,
     description: t.Optional[str] = None,
     yaml_target_range: t.Optional[Range] = None,
     reference_type: t.Literal["model", "external_model", "cte"] = "model",
@@ -837,7 +830,7 @@ def _process_column_references(
         scope: The SQL scope to search for columns
         reference_name: The full reference name (may include database/catalog)
         read_file: The file content as list of lines
-        referenced_model_uri: URI of the referenced model
+        referenced_model_path: Path of the referenced model
         description: Markdown description for the reference
         yaml_target_range: Target range for external models (YAML files)
         reference_type: Type of reference - "model", "external_model", or "cte"
@@ -857,7 +850,7 @@ def _process_column_references(
                     table_range = _get_column_table_range(column, read_file)
                     references.append(
                         LSPCteReference(
-                            uri=referenced_model_uri.value,
+                            path=referenced_model_path,
                             range=table_range,
                             target_range=cte_target_range,
                         )
@@ -875,7 +868,7 @@ def _process_column_references(
                     if reference_type == "external_model":
                         references.append(
                             LSPExternalModelReference(
-                                uri=referenced_model_uri.value,
+                                path=referenced_model_path,
                                 range=table_range,
                                 markdown_description=description,
                                 target_range=yaml_target_range,
@@ -884,7 +877,7 @@ def _process_column_references(
                     else:
                         references.append(
                             LSPModelReference(
-                                uri=referenced_model_uri.value,
+                                path=referenced_model_path,
                                 range=table_range,
                                 markdown_description=description,
                             )

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/sqlmesh/lsp/rename.py

@@ -9,6 +9,7 @@ from lsprotocol.types import (
 )
 
 from sqlmesh.lsp.context import LSPContext
+from sqlmesh.lsp.helpers import to_sqlmesh_position, to_lsp_range
 from sqlmesh.lsp.reference import (
     _position_within_range,
     get_cte_references,
@@ -18,7 +19,7 @@ from sqlmesh.lsp.uri import URI
 
 
 def prepare_rename(
-    lsp_context: LSPContext, document_uri: URI, position: Position
+    lsp_context: LSPContext, document_uri: URI, lsp_position: Position
 ) -> t.Optional[PrepareRenameResult_Type1]:
     """
     Prepare for rename operation by checking if the symbol at the position can be renamed.
@@ -32,6 +33,7 @@ def prepare_rename(
         PrepareRenameResult if the symbol can be renamed, None otherwise
     """
     # Check if there's a CTE at this position
+    position = to_sqlmesh_position(lsp_position)
     cte_references = get_cte_references(lsp_context, document_uri, position)
     if cte_references:
         # Find the target CTE definition to get its range
@@ -46,14 +48,16 @@ def prepare_rename(
                 target_range = ref.target_range
                 break
         if target_range:
-            return PrepareRenameResult_Type1(range=target_range, placeholder="cte_name")
+            return PrepareRenameResult_Type1(
+                range=to_lsp_range(target_range), placeholder="cte_name"
+            )
 
     # For now, only CTEs are supported
     return None
 
 
 def rename_symbol(
-    lsp_context: LSPContext, document_uri: URI, position: Position, new_name: str
+    lsp_context: LSPContext, document_uri: URI, lsp_position: Position, new_name: str
 ) -> t.Optional[WorkspaceEdit]:
     """
     Perform rename operation on the symbol at the given position.
@@ -68,7 +72,9 @@ def rename_symbol(
         WorkspaceEdit with the changes, or None if no symbol to rename
     """
     # Check if there's a CTE at this position
-    cte_references = get_cte_references(lsp_context, document_uri, position)
+    cte_references = get_cte_references(
+        lsp_context, document_uri, to_sqlmesh_position(lsp_position)
+    )
     if cte_references:
         return _rename_cte(cte_references, new_name)
 
@@ -90,12 +96,12 @@ def _rename_cte(cte_references: t.List[LSPCteReference], new_name: str) -> Works
     changes: t.Dict[str, t.List[TextEdit]] = {}
 
     for ref in cte_references:
-        uri = ref.uri
+        uri = URI.from_path(ref.path).value
         if uri not in changes:
             changes[uri] = []
 
         # Create a text edit for this reference
-        text_edit = TextEdit(range=ref.range, new_text=new_name)
+        text_edit = TextEdit(range=to_lsp_range(ref.range), new_text=new_name)
         changes[uri].append(text_edit)
 
     return WorkspaceEdit(changes=changes)
@@ -119,7 +125,7 @@ def get_document_highlights(
         List of DocumentHighlight objects or None if no symbol found
     """
     # Check if there's a CTE at this position
-    cte_references = get_cte_references(lsp_context, document_uri, position)
+    cte_references = get_cte_references(lsp_context, document_uri, to_sqlmesh_position(position))
     if cte_references:
         highlights = []
         for ref in cte_references:
@@ -130,7 +136,7 @@ def get_document_highlights(
                 else DocumentHighlightKind.Read
             )
 
-            highlights.append(DocumentHighlight(range=ref.range, kind=kind))
+            highlights.append(DocumentHighlight(range=to_lsp_range(ref.range), kind=kind))
         return highlights
 
     # For now, only CTEs are supported

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/sqlmesh.egg-info/PKG-INFO

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

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/tests/lsp/test_reference.py

@@ -1,5 +1,5 @@
-from lsprotocol.types import Position
 from sqlmesh.core.context import Context
+from sqlmesh.core.linter.rule import Position
 from sqlmesh.lsp.context import LSPContext, ModelTarget, AuditTarget
 from sqlmesh.lsp.reference import LSPModelReference, get_model_definitions_for_a_path, by_position
 from sqlmesh.lsp.uri import URI
@@ -25,9 +25,9 @@ def test_reference() -> None:
     references = get_model_definitions_for_a_path(lsp_context, active_customers_uri)
 
     assert len(references) == 1
-    uri = references[0].uri
-    assert uri is not None
-    assert URI(uri) == URI.from_path(sushi_customers_path)
+    path = references[0].path
+    assert path is not None
+    assert path == sushi_customers_path
 
     # Check that the reference in the correct range is sushi.customers
     path = active_customers_uri.to_path()
@@ -61,7 +61,7 @@ def test_reference_with_alias() -> None:
     with open(waiter_revenue_by_day_path, "r") as file:
         read_file = file.readlines()
 
-    assert references[0].uri.endswith("orders.py")
+    assert str(references[0].path).endswith("orders.py")
     assert get_string_from_range(read_file, references[0].range) == "sushi.orders"
     assert (
         references[0].markdown_description
@@ -76,9 +76,9 @@ def test_reference_with_alias() -> None:
 | end_ts | INT |  |
 | event_date | DATE |  |"""
     )
-    assert references[1].uri.endswith("order_items.py")
+    assert str(references[1].path).endswith("order_items.py")
     assert get_string_from_range(read_file, references[1].range) == "sushi.order_items"
-    assert references[2].uri.endswith("items.py")
+    assert str(references[2].path).endswith("items.py")
     assert get_string_from_range(read_file, references[2].range) == "sushi.items"
 
 
@@ -102,7 +102,7 @@ def test_standalone_audit_reference() -> None:
     references = get_model_definitions_for_a_path(lsp_context, URI.from_path(audit_path))
 
     assert len(references) == 1
-    assert references[0].uri == URI.from_path(items_path).value
+    assert references[0].path == items_path
 
     # Check that the reference in the correct range is sushi.items
     with open(audit_path, "r") as file:
@@ -161,7 +161,7 @@ def test_filter_references_by_position() -> None:
         position_inside = Position(line=middle_line, character=middle_char)
         filtered = list(filter(by_position(position_inside), all_references))
         assert len(filtered) == 1
-        assert filtered[0].uri == reference.uri
+        assert filtered[0].path == reference.path
         assert filtered[0].range == reference.range
 
         # For testing outside position, use a position before the current reference

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/tests/lsp/test_reference_cte.py

@@ -27,7 +27,7 @@ def test_cte_parsing():
     position = Position(line=ranges[1].start.line, character=ranges[1].start.character + 4)
     references = get_references(lsp_context, URI.from_path(sushi_customers_path), position)
     assert len(references) == 1
-    assert references[0].uri == URI.from_path(sushi_customers_path).value
+    assert references[0].path == sushi_customers_path
     assert isinstance(references[0], LSPCteReference)
     assert (
         references[0].range.start.line == ranges[1].start.line
@@ -42,7 +42,7 @@ def test_cte_parsing():
     position = Position(line=ranges[1].start.line, character=ranges[1].start.character + 4)
     references = get_references(lsp_context, URI.from_path(sushi_customers_path), position)
     assert len(references) == 1
-    assert references[0].uri == URI.from_path(sushi_customers_path).value
+    assert references[0].path == sushi_customers_path
     assert isinstance(references[0], LSPCteReference)
     assert (
         references[0].range.start.line == ranges[1].start.line

{sqlmesh-0.204.1.dev5 → sqlmesh-0.204.1.dev7}/tests/lsp/test_reference_cte_find_all.py

@@ -28,7 +28,7 @@ def test_cte_find_all_references():
     references = get_cte_references(lsp_context, URI.from_path(sushi_customers_path), position)
     # Should find the definition, FROM clause, and column prefix usages
     assert len(references) == 4  # definition + FROM + 2 column prefix uses
-    assert all(ref.uri == URI.from_path(sushi_customers_path).value for ref in references)
+    assert all(ref.path == sushi_customers_path for ref in references)
 
     reference_ranges = [ref.range for ref in references]
     for expected_range in ranges:
@@ -46,7 +46,7 @@ def test_cte_find_all_references():
 
     # Should find the same references
     assert len(references) == 4  # definition + FROM + 2 column prefix uses
-    assert all(ref.uri == URI.from_path(sushi_customers_path).value for ref in references)
+    assert all(ref.path == sushi_customers_path for ref in references)
 
     reference_ranges = [ref.range for ref in references]
     for expected_range in ranges:
@@ -82,7 +82,7 @@ def test_cte_find_all_references_outer():
 
     # Should find both the definition and the usage
     assert len(references) == 2
-    assert all(ref.uri == URI.from_path(sushi_customers_path).value for ref in references)
+    assert all(ref.path == sushi_customers_path for ref in references)
 
     # Verify that we found both occurrences
     reference_ranges = [ref.range for ref in references]
@@ -101,7 +101,7 @@ def test_cte_find_all_references_outer():
 
     # Should find the same references
     assert len(references) == 2
-    assert all(ref.uri == URI.from_path(sushi_customers_path).value for ref in references)
+    assert all(ref.path == sushi_customers_path for ref in references)
 
     reference_ranges = [ref.range for ref in references]
     for expected_range in ranges: