sqlmesh 0.183.1.dev13__py3-none-any.whl → 0.183.1.dev15__py3-none-any.whl

sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.183.1.dev13'
-__version_tuple__ = version_tuple = (0, 183, 1, 'dev13')
+__version__ = version = '0.183.1.dev15'
+__version_tuple__ = version_tuple = (0, 183, 1, 'dev15')

sqlmesh/lsp/completions.py

@@ -3,9 +3,10 @@ from sqlglot import Dialect, Tokenizer
 from sqlmesh.lsp.custom import AllModelsResponse
 import typing as t
 from sqlmesh.lsp.context import AuditTarget, LSPContext, ModelTarget
+from sqlmesh.lsp.uri import URI
 
 
-def get_sql_completions(context: t.Optional[LSPContext], file_uri: str) -> AllModelsResponse:
+def get_sql_completions(context: t.Optional[LSPContext], file_uri: URI) -> AllModelsResponse:
     """
     Return a list of completions for a given file.
     """
@@ -15,7 +16,7 @@ def get_sql_completions(context: t.Optional[LSPContext], file_uri: str) -> AllMo
     )
 
 
-def get_models(context: t.Optional[LSPContext], file_uri: t.Optional[str]) -> t.Set[str]:
+def get_models(context: t.Optional[LSPContext], file_uri: t.Optional[URI]) -> t.Set[str]:
     """
     Return a list of models for a given file.
 
@@ -41,7 +42,7 @@ def get_models(context: t.Optional[LSPContext], file_uri: t.Optional[str]) -> t.
     return all_models
 
 
-def get_keywords(context: t.Optional[LSPContext], file_uri: t.Optional[str]) -> t.Set[str]:
+def get_keywords(context: t.Optional[LSPContext], file_uri: t.Optional[URI]) -> t.Set[str]:
     """
     Return a list of sql keywords for a given file.
     If no context is provided, return ANSI SQL keywords.

sqlmesh/lsp/context.py

@@ -1,8 +1,9 @@
 from dataclasses import dataclass
-from pathlib import Path
 from sqlmesh.core.context import Context
 import typing as t
 
+from sqlmesh.lsp.uri import URI
+
 
 @dataclass
 class ModelTarget:
@@ -28,26 +29,24 @@ class LSPContext:
         self.context = context
 
         # Add models to the map
-        model_map: t.Dict[str, ModelTarget] = {}
+        model_map: t.Dict[URI, ModelTarget] = {}
         for model in context.models.values():
             if model._path is not None:
-                path = Path(model._path).resolve()
-                uri = f"file://{path.as_posix()}"
+                uri = URI.from_path(model._path)
                 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] = {}
+        audit_map: t.Dict[URI, 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()}"
+                uri = URI.from_path(audit._path)
                 if uri not in audit_map:
                     audit_map[uri] = AuditTarget(name=audit.name)
 
-        self.map: t.Dict[str, t.Union[ModelTarget, AuditTarget]] = {
+        self.map: t.Dict[URI, t.Union[ModelTarget, AuditTarget]] = {
             **model_map,
             **audit_map,
         }

sqlmesh/lsp/main.py

@@ -23,6 +23,7 @@ from sqlmesh.lsp.custom import ALL_MODELS_FEATURE, AllModelsRequest, AllModelsRe
 from sqlmesh.lsp.reference import (
     get_references,
 )
+from sqlmesh.lsp.uri import URI
 from web.server.api.endpoints.lineage import model_lineage
 from web.server.api.endpoints.models import get_models
 
@@ -42,7 +43,7 @@ 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[str, t.List[AnnotatedRuleViolation]] = {}
+        self.lint_cache: t.Dict[URI, t.List[AnnotatedRuleViolation]] = {}
 
         # Register LSP features (e.g., formatting, hover, etc.)
         self._register_features()
@@ -82,10 +83,11 @@ class SQLMeshLanguageServer:
         @self.server.feature(ALL_MODELS_FEATURE)
         def all_models(ls: LanguageServer, params: AllModelsRequest) -> AllModelsResponse:
             try:
-                context = self._context_get_or_load(params.textDocument.uri)
-                return get_sql_completions(context, params.textDocument.uri)
+                uri = URI(params.textDocument.uri)
+                context = self._context_get_or_load(uri)
+                return get_sql_completions(context, uri)
             except Exception as e:
-                return get_sql_completions(None, params.textDocument.uri)
+                return get_sql_completions(None, uri)
 
         @self.server.feature(API_FEATURE)
         def api(
@@ -106,67 +108,62 @@ class SQLMeshLanguageServer:
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_OPEN)
         def did_open(ls: LanguageServer, params: types.DidOpenTextDocumentParams) -> None:
-            context = self._context_get_or_load(params.text_document.uri)
-            if self.lint_cache.get(params.text_document.uri) is not None:
+            uri = URI(params.text_document.uri)
+            context = self._context_get_or_load(uri)
+            if self.lint_cache.get(uri) is not None:
                 ls.publish_diagnostics(
                     params.text_document.uri,
-                    SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(
-                        self.lint_cache[params.text_document.uri]
-                    ),
+                    SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(self.lint_cache[uri]),
                 )
                 return
-            models = context.map[params.text_document.uri]
+            models = context.map[uri]
             if models is None:
                 return
             if not isinstance(models, ModelTarget):
                 return
-            self.lint_cache[params.text_document.uri] = context.context.lint_models(
+            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[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:
-            context = self._context_get_or_load(params.text_document.uri)
-            models = context.map[params.text_document.uri]
+            uri = URI(params.text_document.uri)
+            context = self._context_get_or_load(uri)
+            models = context.map[uri]
             if models is None:
                 return
             if not isinstance(models, ModelTarget):
                 return
-            self.lint_cache[params.text_document.uri] = context.context.lint_models(
+            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[params.text_document.uri]
-                ),
+                SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(self.lint_cache[uri]),
             )
 
         @self.server.feature(types.TEXT_DOCUMENT_DID_SAVE)
         def did_save(ls: LanguageServer, params: types.DidSaveTextDocumentParams) -> None:
-            context = self._context_get_or_load(params.text_document.uri)
-            models = context.map[params.text_document.uri]
+            uri = URI(params.text_document.uri)
+            context = self._context_get_or_load(uri)
+            models = context.map[uri]
             if models is None:
                 return
             if not isinstance(models, ModelTarget):
                 return
-            self.lint_cache[params.text_document.uri] = context.context.lint_models(
+            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[params.text_document.uri]
-                ),
+                SQLMeshLanguageServer._diagnostics_to_lsp_diagnostics(self.lint_cache[uri]),
             )
 
         @self.server.feature(types.TEXT_DOCUMENT_FORMATTING)
@@ -175,14 +172,15 @@ class SQLMeshLanguageServer:
         ) -> t.List[types.TextEdit]:
             """Format the document using SQLMesh `format_model_expressions`."""
             try:
-                self._ensure_context_for_document(params.text_document.uri)
+                uri = URI(params.text_document.uri)
+                self._ensure_context_for_document(uri)
                 document = ls.workspace.get_text_document(params.text_document.uri)
                 if self.lsp_context is None:
                     raise RuntimeError(f"No context found for document: {document.path}")
 
                 # Perform formatting using the loaded context
-                self.lsp_context.context.format(paths=(Path(document.path),))
-                with open(document.path, "r+", encoding="utf-8") as file:
+                self.lsp_context.context.format(paths=(str(uri.to_path()),))
+                with open(uri.to_path(), "r+", encoding="utf-8") as file:
                     new_text = file.read()
 
                 # Return a single edit that replaces the entire file.
@@ -206,14 +204,13 @@ class SQLMeshLanguageServer:
         def hover(ls: LanguageServer, params: types.HoverParams) -> t.Optional[types.Hover]:
             """Provide hover information for an object."""
             try:
-                self._ensure_context_for_document(params.text_document.uri)
+                uri = URI(params.text_document.uri)
+                self._ensure_context_for_document(uri)
                 document = ls.workspace.get_text_document(params.text_document.uri)
                 if self.lsp_context is None:
                     raise RuntimeError(f"No context found for document: {document.path}")
 
-                references = get_references(
-                    self.lsp_context, params.text_document.uri, params.position
-                )
+                references = get_references(self.lsp_context, uri, params.position)
                 if not references:
                     return None
                 reference = references[0]
@@ -236,14 +233,13 @@ class SQLMeshLanguageServer:
         ) -> t.List[types.LocationLink]:
             """Jump to an object's definition."""
             try:
-                self._ensure_context_for_document(params.text_document.uri)
+                uri = URI(params.text_document.uri)
+                self._ensure_context_for_document(uri)
                 document = ls.workspace.get_text_document(params.text_document.uri)
                 if self.lsp_context is None:
                     raise RuntimeError(f"No context found for document: {document.path}")
 
-                references = get_references(
-                    self.lsp_context, params.text_document.uri, params.position
-                )
+                references = get_references(self.lsp_context, uri, params.position)
                 return [
                     types.LocationLink(
                         target_uri=reference.uri,
@@ -263,7 +259,7 @@ class SQLMeshLanguageServer:
                 ls.show_message(f"Error getting references: {e}", types.MessageType.Error)
                 return []
 
-    def _context_get_or_load(self, document_uri: str) -> LSPContext:
+    def _context_get_or_load(self, document_uri: URI) -> LSPContext:
         if self.lsp_context is None:
             self._ensure_context_for_document(document_uri)
         if self.lsp_context is None:
@@ -272,7 +268,7 @@ class SQLMeshLanguageServer:
 
     def _ensure_context_for_document(
         self,
-        document_uri: str,
+        document_uri: URI,
     ) -> None:
         """
         Ensure that a context exists for the given document if applicable by searching
@@ -285,7 +281,7 @@ class SQLMeshLanguageServer:
             return
 
         # No context yet: try to find config and load it
-        path = Path(self._uri_to_path(document_uri)).resolve()
+        path = document_uri.to_path()
         if path.suffix not in (".sql", ".py"):
             return
 
@@ -321,7 +317,8 @@ class SQLMeshLanguageServer:
 
         # Get rule definition location for diagnostics link
         rule_location = diagnostic.rule.get_definition_location()
-        rule_uri = f"file://{rule_location.file_path}#L{rule_location.start_line}"
+        rule_uri_wihout_extension = URI.from_path(rule_location.file_path)
+        rule_uri = f"{rule_uri_wihout_extension.value}#L{rule_location.start_line}"
 
         # Use URI format to create a link for "related information"
         return types.Diagnostic(
@@ -350,11 +347,9 @@ class SQLMeshLanguageServer:
         return lsp_diagnostics
 
     @staticmethod
-    def _uri_to_path(uri: str) -> str:
+    def _uri_to_path(uri: str) -> Path:
         """Convert a URI to a path."""
-        if uri.startswith("file://"):
-            return Path(uri[7:]).resolve().as_posix()
-        return Path(uri).resolve().as_posix()
+        return URI(uri).to_path()
 
     def start(self) -> None:
         """Start the server with I/O transport."""

sqlmesh/lsp/reference.py

@@ -5,7 +5,7 @@ from sqlmesh.core.dialect import normalize_model_name
 from sqlmesh.core.model.definition import SqlModel
 from sqlmesh.lsp.context import LSPContext, ModelTarget, AuditTarget
 from sqlglot import exp
-
+from sqlmesh.lsp.uri import URI
 from sqlmesh.utils.pydantic import PydanticModel
 
 
@@ -51,7 +51,7 @@ def by_position(position: Position) -> t.Callable[[Reference], bool]:
 
 
 def get_references(
-    lint_context: LSPContext, document_uri: str, position: Position
+    lint_context: LSPContext, document_uri: URI, position: Position
 ) -> t.List[Reference]:
     """
     Get references at a specific position in a document.
@@ -72,7 +72,7 @@ def get_references(
 
 
 def get_model_definitions_for_a_path(
-    lint_context: LSPContext, document_uri: str
+    lint_context: LSPContext, document_uri: URI
 ) -> t.List[Reference]:
     """
     Get the model references for a given path.
@@ -89,9 +89,8 @@ def get_model_definitions_for_a_path(
     - Match to models that the model refers to
     """
     # Ensure the path is a sql file
-    if not document_uri.endswith(".sql"):
+    if document_uri.to_path().suffix != ".sql":
         return []
-
     # Get the file info from the context map
     if document_uri not in lint_context.map:
         return []
@@ -163,7 +162,7 @@ def get_model_definitions_for_a_path(
         # Check whether the path exists
         if not referenced_model_path.is_file():
             continue
-        referenced_model_uri = f"file://{referenced_model_path}"
+        referenced_model_uri = URI.from_path(referenced_model_path)
 
         # Extract metadata for positioning
         table_meta = TokenPositionDetails.from_meta(table.this.meta)
@@ -180,7 +179,7 @@ def get_model_definitions_for_a_path(
 
         references.append(
             Reference(
-                uri=referenced_model_uri,
+                uri=referenced_model_uri.value,
                 range=Range(start=start_pos, end=end_pos),
                 description=referenced_model.description,
             )

sqlmesh/lsp/uri.py

@@ -0,0 +1,33 @@
+from pathlib import Path
+from pygls.uris import from_fs_path, to_fs_path
+import typing as t
+
+
+class URI:
+    """
+    A URI is a unique identifier for a file used in the LSP.
+    """
+
+    def __init__(self, uri: str):
+        self.value: str = uri
+
+    def __hash__(self) -> int:
+        return hash(self.value)
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, URI):
+            return False
+        return self.value == other.value
+
+    def __repr__(self) -> str:
+        return f"URI({self.value})"
+
+    def to_path(self) -> Path:
+        p = to_fs_path(self.value)
+        return Path(p)
+
+    @staticmethod
+    def from_path(path: t.Union[str, Path]) -> "URI":
+        if isinstance(path, Path):
+            path = path.as_posix()
+        return URI(from_fs_path(path))

{sqlmesh-0.183.1.dev13.dist-info → sqlmesh-0.183.1.dev15.dist-info}/METADATA

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

{sqlmesh-0.183.1.dev13.dist-info → sqlmesh-0.183.1.dev15.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=DRovDXI-9D9xeYDP7t8Fq7mI31S2btlN-LHPOK3y7PA,7240
-sqlmesh/_version.py,sha256=r1h8oOb4Q5TZ8NJee8QttMuSQOnNvc4OpDwiNd4bVXk,530
+sqlmesh/_version.py,sha256=2exB2FHBanlFKTsxUOxzoROhSF3yNz5Z-ZwMXJwhFj0,530
 sqlmesh/magics.py,sha256=9oY1Uz8uwsuTtPRg9HTYDxnGiJ7-OVRCpmCgAhbKHUU,39431
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -156,11 +156,12 @@ sqlmesh/integrations/github/cicd/command.py,sha256=a48qtSeRM7RD3IeydJwHLAZBHRbmF
 sqlmesh/integrations/github/cicd/config.py,sha256=qEy0mRfPYJw1pm68UK0v1_4kZBj5QodnpIsOZ8JjZro,1838
 sqlmesh/integrations/github/cicd/controller.py,sha256=AiEMsRW4WSVxXP_7oQSIdzBzmYPxfYDgYeOYRk9sfJA,41388
 sqlmesh/lsp/api.py,sha256=Ls7BjrPSovvOu6VU_eFR0_nHcbsQl020eJvGbdWi7s8,1957
-sqlmesh/lsp/completions.py,sha256=ScW0H9couhfW6QckEX2djVYTClRPXpT2Hdcg1qLfUUY,3479
-sqlmesh/lsp/context.py,sha256=vUpbWYjKYuwDvU3zkzhAgw9An-TeVYe_5KTk-ec_UwM,1569
+sqlmesh/lsp/completions.py,sha256=Jadpjxod_VYq2dCUuFhEVyI9odO13ZtyGmtd3YSOuaM,3511
+sqlmesh/lsp/context.py,sha256=N_sd9uuuDi40ABexjT_r9QuIrRBmYPfJltqaGGDekmM,1473
 sqlmesh/lsp/custom.py,sha256=GvNAiW7imPI8xmIx3qLWN5FljGPHFJKh0N5b6aZnwRo,489
-sqlmesh/lsp/main.py,sha256=AHVkfOvmDh3NqgfGF41uAnlxUDZdFyx5HEpGgCA_F1o,16346
-sqlmesh/lsp/reference.py,sha256=3vmLpEDbsJ740DfaOc2_ESZnXsUxWLS4lUunoO9km9s,8121
+sqlmesh/lsp/main.py,sha256=MmL5UuNkft1Yu4Fk_ILEkUJXctsfQ0kBvNz6eHpmgIY,15981
+sqlmesh/lsp/reference.py,sha256=YsXAPkxo_qMC_rDimpJTn4ri0bo9H6RIAyNkD9oWgY4,8166
+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
 sqlmesh/migrations/v0002_remove_identify.py,sha256=ZeHuodZcQzRRZX0B0Y7SSkK3qqlDuz316kmvzojeyoU,113
@@ -266,7 +267,7 @@ sqlmesh/utils/pandas.py,sha256=WmNlTLuv_qLelrcTnwb05QMaW53AYM6dpOW0o3dz6qM,2051
 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.183.1.dev13.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.183.1.dev15.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=nPqIDCJmonOaEAp4hhwrwgPdwt_F-5zzw-WW1kJqq3I,5472
 web/client/dist/assets/Audits-DiRd7NXk.js,sha256=Q5dIFqsHps-vVYD8037NpTPW_1juQgn_Ov45smEm7Y8,1041
@@ -384,8 +385,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.183.1.dev13.dist-info/METADATA,sha256=7NkwiO76SBBCfGw32NAtChvGgj6bOvJMwThr8MOy0Pc,25253
-sqlmesh-0.183.1.dev13.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-sqlmesh-0.183.1.dev13.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.183.1.dev13.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.183.1.dev13.dist-info/RECORD,,
+sqlmesh-0.183.1.dev15.dist-info/METADATA,sha256=opz3Uf97U7Z808YjH1ZpgvbAi1k-L3qMy-YBFp7tL1o,25253
+sqlmesh-0.183.1.dev15.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+sqlmesh-0.183.1.dev15.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.183.1.dev15.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.183.1.dev15.dist-info/RECORD,,