sqlmesh 0.204.1.dev5__py3-none-any.whl → 0.204.1.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.204.1.dev5'
-__version_tuple__ = version_tuple = (0, 204, 1, 'dev5')
+__version__ = version = '0.204.1.dev6'
+__version_tuple__ = version_tuple = (0, 204, 1, 'dev6')

sqlmesh/lsp/main.py

@@ -496,10 +496,10 @@ class SQLMeshLanguageServer:
                         target_range = reference.target_range
                         target_selection_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,
@@ -523,9 +523,9 @@ class SQLMeshLanguageServer:
 
                 # Convert references to Location objects
                 locations = [
-                    types.Location(uri=ref.uri, range=ref.range)
+                    types.Location(uri=URI.from_path(ref.path).value, 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/lsp/reference.py

@@ -29,7 +29,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 +40,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 +51,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 +60,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
@@ -209,7 +209,7 @@ def get_model_definitions_for_a_path(
 
                             references.append(
                                 LSPCteReference(
-                                    uri=document_uri.value,  # Same file
+                                    path=document_uri.to_path(),  # Same file
                                     range=table_range,
                                     target_range=target_range,
                                 )
@@ -219,7 +219,7 @@ 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,
@@ -270,7 +270,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,7 +298,7 @@ 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),
@@ -313,7 +312,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,7 +323,7 @@ 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),
@@ -337,7 +336,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,
@@ -481,10 +480,9 @@ 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,
+            path=path,
             range=to_lsp_range(macro_range),
             target_range=Range(
                 start=Position(line=start_line - 1, character=0),
@@ -517,7 +515,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 +557,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 +573,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 +582,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 +598,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 +607,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 +660,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 +671,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 +711,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 +731,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 +740,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,
@@ -822,7 +820,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 +835,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 +855,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 +873,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 +882,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/lsp/rename.py

@@ -90,7 +90,7 @@ 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] = []
 

{sqlmesh-0.204.1.dev5.dist-info → sqlmesh-0.204.1.dev6.dist-info}/METADATA

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

{sqlmesh-0.204.1.dev5.dist-info → sqlmesh-0.204.1.dev6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=QjwaamJIdW7voXoS880yAx7tHm-Im4_mqGA-XJgafos,7631
-sqlmesh/_version.py,sha256=fbJau8MH7oiDWFftxCnpgfHAJg9fGWsPwbB-3cOj1OI,528
+sqlmesh/_version.py,sha256=z2bst6lZyy7YghpZT31C7nMoI32K7ixUo99WvUC7v3Q,528
 sqlmesh/magics.py,sha256=bEzYqXHcM0P3CjyUZ1O9arlmXAdLAhoglKbQ29fD9AE,41842
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -171,9 +171,9 @@ sqlmesh/lsp/description.py,sha256=PjguwyVw5YeYSgT0JMhkf5U1Jry-sDPLvQ2caIR9JPQ,85
 sqlmesh/lsp/errors.py,sha256=3NMim_5J00Eypz7t8b7XbkBfy8gIsRkeq-VcjD4COtc,1489
 sqlmesh/lsp/helpers.py,sha256=EFc1u3-b7kSv5-tNwmKUDxId72RCLDBnN2lLTgRSzzQ,1020
 sqlmesh/lsp/hints.py,sha256=j-blccBUil94yRoDjWfkSM0HqMmsKD6hP2TaWdWWVk4,3734
-sqlmesh/lsp/main.py,sha256=ZOcANYSo9_1tanuRyvpNrE43DpHTyCsYmOEWWJFFa0o,39964
-sqlmesh/lsp/reference.py,sha256=YFg0DwwCcr7A99ZJV69V1H3oYmEw4uRFrhhAYR3SJYw,33160
-sqlmesh/lsp/rename.py,sha256=399v1vyVRHHxvbCHVcuS4Pl8K2N-Z60JdZ6e1znOI4s,4397
+sqlmesh/lsp/main.py,sha256=lTFXCaqSxJOS2ftGuvx65d4whgJV0iz25vtkB3Qt3kI,40010
+sqlmesh/lsp/reference.py,sha256=PD9lfihjQIN9pmllzEWL2qXtZtvktAL8_ybmPJ-8W-I,33038
+sqlmesh/lsp/rename.py,sha256=OwZsgEqK5sQkHXEx2SwINxquGF92xkHZ9nQLl7SqUiY,4419
 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
@@ -285,7 +285,7 @@ sqlmesh/utils/pydantic.py,sha256=o_NsXbIpDqNpUA1Uc5xF0ZzoXQYYB0DfHwdRxBwXPNk,120
 sqlmesh/utils/rich.py,sha256=cwQ5nJ6sgz64xHtoh6_ec7ReV5YpsOGhMtUJnwoRfEI,3549
 sqlmesh/utils/windows.py,sha256=r7Yin4WEwbvH7sKA3hOJtRsclmscNuBeCklCfVPvtQs,611
 sqlmesh/utils/yaml.py,sha256=hvo5lmybYLcIx4p6CQwufS8X4MbwS60lEBnCmYJCXmU,2336
-sqlmesh-0.204.1.dev5.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.204.1.dev6.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=SXykdSRNgrT1k6I2dPZPEfpxPjIsi8-yVFijt-naSA4,5472
 web/client/dist/assets/Audits-Jm353fhk.js,sha256=ry6b5IKT3hLAfD5C3T2BqxulfauEV0n0YZ2vsP4eQ_U,1041
@@ -403,8 +403,8 @@ web/server/api/endpoints/models.py,sha256=kwj0s7uve3iZSMfmjkoPVMFMeY1sD0peTeyrWf
 web/server/api/endpoints/modules.py,sha256=8hqqgonGay_mJmpCw0IdbjsPhWlQH2VLdKAqha-myac,468
 web/server/api/endpoints/plan.py,sha256=bbbY50W_2MsZSTxOHWMKz0tbIm75nsRSlPy8GI2fg9Q,9306
 web/server/api/endpoints/table_diff.py,sha256=SCy3-pr5x6bEEiOaZGCDbiHQhpgxwmnz3Acqa2Ie6jI,2090
-sqlmesh-0.204.1.dev5.dist-info/METADATA,sha256=sT5HaOw1myp03lnPj5gp0knBV7Qyj2_LJiFCiac5hdE,26678
-sqlmesh-0.204.1.dev5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.204.1.dev5.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.204.1.dev5.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.204.1.dev5.dist-info/RECORD,,
+sqlmesh-0.204.1.dev6.dist-info/METADATA,sha256=OwTowzEaVG2PoyaqSaW0u7YDPOP8Pka8vfovlN6Qzh0,26678
+sqlmesh-0.204.1.dev6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.204.1.dev6.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.204.1.dev6.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.204.1.dev6.dist-info/RECORD,,