sqlmesh 0.183.1.dev13__tar.gz → 0.183.1.dev15__tar.gz

{sqlmesh-0.183.1.dev13 → sqlmesh-0.183.1.dev15}/.circleci/continue_config.yml

@@ -11,6 +11,9 @@ parameters:
     type: boolean
     default: false
 
+orbs:
+  windows: circleci/windows@5.0
+
 commands:
   halt_unless_core:
     steps:
@@ -96,6 +99,38 @@ jobs:
       - store_test_results:
           path: test-results
 
+  style_and_cicd_tests_windows:
+    executor:
+      name: windows/default
+      size: large
+    environment:
+      PYTEST_XDIST_AUTO_NUM_WORKERS: 4
+    steps:
+      - halt_unless_core
+      - checkout
+      - run:
+          name: Install Python 3.9
+          command: |
+            choco install python --version=3.9 -y
+            refreshenv
+      - run: 
+          name: Install make
+          command: choco install make -y
+      - run:
+          name: Install SQLMesh dev dependencies
+          command: make install-dev
+      - run:
+          name: Fix Git URL override
+          command: git config --global --unset url."ssh://git@github.com".insteadOf
+      # - run:
+      #     name: Run linters and code style checks
+      #     command: make py-style
+      - run:
+          name: Run cicd tests
+          command: pytest -n auto -m "fast" --junitxml=test-results/junit-cicd.xml tests/lsp
+      - store_test_results:
+          path: test-results
+
   migration_test:
     docker:
       - image: cimg/python:3.10
@@ -269,6 +304,7 @@ workflows:
                 - "3.10"
                 - "3.11"
                 - "3.12"
+      - style_and_cicd_tests_windows
       - engine_tests_docker:
           name: engine_<< matrix.engine >>
           matrix:

{sqlmesh-0.183.1.dev13 → sqlmesh-0.183.1.dev15}/PKG-INFO

@@ -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 → sqlmesh-0.183.1.dev15}/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-0.183.1.dev13 → sqlmesh-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-0.183.1.dev13 → sqlmesh-0.183.1.dev15}/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-0.183.1.dev13 → sqlmesh-0.183.1.dev15}/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-0.183.1.dev13 → sqlmesh-0.183.1.dev15}/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-0.183.1.dev15/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 → sqlmesh-0.183.1.dev15}/sqlmesh.egg-info/PKG-INFO

@@ -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 → sqlmesh-0.183.1.dev15}/sqlmesh.egg-info/SOURCES.txt

@@ -350,6 +350,7 @@ sqlmesh/lsp/context.py
 sqlmesh/lsp/custom.py
 sqlmesh/lsp/main.py
 sqlmesh/lsp/reference.py
+sqlmesh/lsp/uri.py
 sqlmesh/migrations/__init__.py
 sqlmesh/migrations/v0001_init.py
 sqlmesh/migrations/v0002_remove_identify.py

{sqlmesh-0.183.1.dev13 → sqlmesh-0.183.1.dev15}/tests/lsp/test_completions.py

@@ -37,7 +37,7 @@ def test_get_sql_completions_with_context_and_file_uri():
     lsp_context = LSPContext(context)
 
     file_uri = next(
-        key for key in lsp_context.map.keys() if key.endswith("models/active_customers.sql")
+        key for key in lsp_context.map.keys() if str(key.to_path()).endswith("active_customers.sql")
     )
     completions = get_sql_completions(lsp_context, file_uri)
     assert len(completions.keywords) > len(TOKENIZER_KEYWORDS)

{sqlmesh-0.183.1.dev13 → sqlmesh-0.183.1.dev15}/tests/lsp/test_context.py

@@ -14,7 +14,7 @@ def test_lsp_context():
 
     # find one model in the map
     active_customers_key = next(
-        key for key in lsp_context.map.keys() if key.endswith("models/active_customers.sql")
+        key for key in lsp_context.map.keys() if str(key.to_path()).endswith("active_customers.sql")
     )
 
     # Check that the value is a ModelInfo with the expected model name

{sqlmesh-0.183.1.dev13 → sqlmesh-0.183.1.dev15}/tests/lsp/test_reference.py

@@ -25,11 +25,13 @@ def test_reference() -> None:
     references = get_model_definitions_for_a_path(lsp_context, active_customers_uri)
 
     assert len(references) == 1
-    assert references[0].uri == sushi_customers_uri
+    assert references[0].uri == sushi_customers_uri.value
 
     # Check that the reference in the correct range is sushi.customers
-    path = active_customers_uri.removeprefix("file://")
-    read_file = open(path, "r").readlines()
+    path = active_customers_uri.to_path()
+    with open(path, "r") as file:
+        read_file = file.readlines()
+
     # Get the string range in the read file
     referenced_text = get_string_from_range(read_file, references[0].range)
     assert referenced_text == "sushi.customers"
@@ -49,8 +51,9 @@ def test_reference_with_alias() -> None:
     references = get_model_definitions_for_a_path(lsp_context, waiter_revenue_by_day_uri)
     assert len(references) == 3
 
-    path = waiter_revenue_by_day_uri.removeprefix("file://")
-    read_file = open(path, "r").readlines()
+    path = waiter_revenue_by_day_uri.to_path()
+    with open(path, "r") as file:
+        read_file = file.readlines()
 
     assert references[0].uri.endswith("orders.py")
     assert get_string_from_range(read_file, references[0].range) == "sushi.orders"
@@ -83,11 +86,12 @@ def test_standalone_audit_reference() -> None:
     references = get_model_definitions_for_a_path(lsp_context, audit_uri)
 
     assert len(references) == 1
-    assert references[0].uri == items_uri
+    assert references[0].uri == items_uri.value
 
     # Check that the reference in the correct range is sushi.items
-    path = audit_uri.removeprefix("file://")
-    read_file = open(path, "r").readlines()
+    path = audit_uri.to_path()
+    with open(path, "r") as file:
+        read_file = file.readlines()
     referenced_text = get_string_from_range(read_file, references[0].range)
     assert referenced_text == "sushi.items"
 
@@ -130,7 +134,7 @@ def test_filter_references_by_position() -> None:
     assert len(all_references) == 3
 
     # Get file contents to locate positions for testing
-    path = waiter_revenue_by_day_uri.removeprefix("file://")
+    path = waiter_revenue_by_day_uri.to_path()
     with open(path, "r") as file:
         read_file = file.readlines()