sqlmesh 0.189.3.dev15__py3-none-any.whl → 0.189.3.dev16__py3-none-any.whl

sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.189.3.dev15'
-__version_tuple__ = version_tuple = (0, 189, 3, 'dev15')
+__version__ = version = '0.189.3.dev16'
+__version_tuple__ = version_tuple = (0, 189, 3, 'dev16')

sqlmesh/lsp/completions.py

@@ -1,13 +1,16 @@
 from functools import lru_cache
 from sqlglot import Dialect, Tokenizer
 from sqlmesh.lsp.custom import AllModelsResponse
+from sqlmesh import macro
 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: t.Optional[URI], content: t.Optional[str] = None
+    context: t.Optional[LSPContext] = None,
+    file_uri: t.Optional[URI] = None,
+    content: t.Optional[str] = None,
 ) -> AllModelsResponse:
     """
     Return a list of completions for a given file.
@@ -26,6 +29,7 @@ def get_sql_completions(
     return AllModelsResponse(
         models=list(get_models(context, file_uri)),
         keywords=all_keywords,
+        macros=list(get_macros(context, file_uri)),
     )
 
 
@@ -56,6 +60,17 @@ def get_models(context: t.Optional[LSPContext], file_uri: t.Optional[URI]) -> t.
     return all_models
 
 
+def get_macros(context: t.Optional[LSPContext], file_uri: t.Optional[URI]) -> t.Set[str]:
+    """Return a set of all macros with the ``@`` prefix."""
+    names = set(macro.get_registry())
+    try:
+        if context is not None:
+            names.update(context.context._macros)
+    except Exception:
+        pass
+    return names
+
+
 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.
@@ -138,6 +153,7 @@ def get_dialect(context: t.Optional[LSPContext], file_uri: t.Optional[URI]) -> t
 def extract_keywords_from_content(content: str, dialect: t.Optional[str] = None) -> t.Set[str]:
     """
     Extract identifiers from SQL content using the tokenizer.
+
     Only extracts identifiers (variable names, table names, column names, etc.)
     that are not SQL keywords.
     """
@@ -155,7 +171,7 @@ def extract_keywords_from_content(content: str, dialect: t.Optional[str] = None)
                 keywords.add(token.text)
 
     except Exception:
-        # If tokenization fails, return empty set
+        # If tokenization fails, return an empty set
         pass
 
     return keywords

sqlmesh/lsp/context.py

@@ -176,18 +176,13 @@ class LSPContext:
             if audit._path is not None
         ]
 
-    def get_autocomplete(
-        self, uri: t.Optional[URI], content: t.Optional[str] = None
+    @staticmethod
+    def get_completions(
+        self: t.Optional["LSPContext"] = None,
+        uri: t.Optional[URI] = None,
+        file_content: t.Optional[str] = None,
     ) -> AllModelsResponse:
-        """Get autocomplete suggestions for a file.
-
-        Args:
-            uri: The URI of the file to get autocomplete suggestions for.
-            content: The content of the file (optional).
-
-        Returns:
-            AllModelsResponse containing models and keywords.
-        """
+        """Get completion suggestions for a file"""
         from sqlmesh.lsp.completions import get_sql_completions
 
-        return get_sql_completions(self, uri, content)
+        return get_sql_completions(self, uri, file_content)

sqlmesh/lsp/custom.py

@@ -20,6 +20,7 @@ class AllModelsResponse(PydanticModel):
 
     models: t.List[str]
     keywords: t.List[str]
+    macros: t.List[str]
 
 
 RENDER_MODEL_FEATURE = "sqlmesh/render_model"

sqlmesh/lsp/helpers.py

@@ -0,0 +1,27 @@
+from lsprotocol.types import Range, Position
+
+from sqlmesh.core.linter.helpers import (
+    Range as SQLMeshRange,
+    Position as SQLMeshPosition,
+)
+
+
+def to_lsp_range(
+    range: SQLMeshRange,
+) -> Range:
+    """
+    Converts a SQLMesh Range to an LSP Range.
+    """
+    return Range(
+        start=Position(line=range.start.line, character=range.start.character),
+        end=Position(line=range.end.line, character=range.end.character),
+    )
+
+
+def to_lsp_position(
+    position: SQLMeshPosition,
+) -> Position:
+    """
+    Converts a SQLMesh Position to an LSP Position.
+    """
+    return Position(line=position.line, character=position.character)

sqlmesh/lsp/main.py

@@ -145,7 +145,7 @@ class SQLMeshLanguageServer:
 
             try:
                 context = self._context_get_or_load(uri)
-                return context.get_autocomplete(uri, content)
+                return LSPContext.get_completions(context, uri, content)
             except Exception as e:
                 from sqlmesh.lsp.completions import get_sql_completions
 
@@ -565,7 +565,10 @@ class SQLMeshLanguageServer:
                 )
                 return types.WorkspaceDiagnosticReport(items=[])
 
-        @self.server.feature(types.TEXT_DOCUMENT_COMPLETION)
+        @self.server.feature(
+            types.TEXT_DOCUMENT_COMPLETION,
+            types.CompletionOptions(trigger_characters=["@"]),  # advertise "@" for macros
+        )
         def completion(
             ls: LanguageServer, params: types.CompletionParams
         ) -> t.Optional[types.CompletionList]:
@@ -583,7 +586,7 @@ class SQLMeshLanguageServer:
                     pass
 
                 # Get completions using the existing completions module
-                completion_response = context.get_autocomplete(uri, content)
+                completion_response = LSPContext.get_completions(context, uri, content)
 
                 completion_items = []
                 # Add model completions
@@ -595,7 +598,26 @@ class SQLMeshLanguageServer:
                             detail="SQLMesh Model",
                         )
                     )
-                # Add keyword completions
+                # Add macro completions
+                triggered_by_at = (
+                    params.context is not None
+                    and getattr(params.context, "trigger_character", None) == "@"
+                )
+
+                for macro_name in completion_response.macros:
+                    insert_text = macro_name if triggered_by_at else f"@{macro_name}"
+
+                    completion_items.append(
+                        types.CompletionItem(
+                            label=f"@{macro_name}",
+                            insert_text=insert_text,
+                            insert_text_format=types.InsertTextFormat.PlainText,
+                            filter_text=macro_name,
+                            kind=types.CompletionItemKind.Function,
+                            detail="SQLMesh Macro",
+                        )
+                    )
+
                 for keyword in completion_response.keywords:
                     completion_items.append(
                         types.CompletionItem(

sqlmesh/lsp/reference.py

@@ -7,14 +7,14 @@ from sqlmesh.core.audit import StandaloneAudit
 from sqlmesh.core.dialect import normalize_model_name
 from sqlmesh.core.linter.helpers import (
     TokenPositionDetails,
-    Range as SQLMeshRange,
-    Position as SQLMeshPosition,
 )
 from sqlmesh.core.model.definition import SqlModel
 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
@@ -624,24 +624,3 @@ def _position_within_range(position: Position, range: Range) -> bool:
         range.end.line > position.line
         or (range.end.line == position.line and range.end.character >= position.character)
     )
-
-
-def to_lsp_range(
-    range: SQLMeshRange,
-) -> Range:
-    """
-    Converts a SQLMesh Range to an LSP Range.
-    """
-    return Range(
-        start=Position(line=range.start.line, character=range.start.character),
-        end=Position(line=range.end.line, character=range.end.character),
-    )
-
-
-def to_lsp_position(
-    position: SQLMeshPosition,
-) -> Position:
-    """
-    Converts a SQLMesh Position to an LSP Position.
-    """
-    return Position(line=position.line, character=position.character)

{sqlmesh-0.189.3.dev15.dist-info → sqlmesh-0.189.3.dev16.dist-info}/METADATA

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

{sqlmesh-0.189.3.dev15.dist-info → sqlmesh-0.189.3.dev16.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=QjwaamJIdW7voXoS880yAx7tHm-Im4_mqGA-XJgafos,7631
-sqlmesh/_version.py,sha256=1eLtQgqb1L-uJQOiBtrfXfj7cI1FPqjuUvkYTjt35xQ,530
+sqlmesh/_version.py,sha256=KfgTUJjeG5ywaHgAjhP6EdeZuF4EZOqNtxrzAhc-txM,530
 sqlmesh/magics.py,sha256=gjzoxREb1XT8Yho_PQMlMqhhkLq_sEfBM8S3PTgxvWE,40337
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -159,13 +159,14 @@ sqlmesh/integrations/github/cicd/command.py,sha256=rNWb-aMOA9R23YumD5vPwR0PgPGGj
 sqlmesh/integrations/github/cicd/config.py,sha256=tRhMZaLf1p6AWXvi67n85Q-lptJNGt1Wk_Jr61ytpiM,2104
 sqlmesh/integrations/github/cicd/controller.py,sha256=IgUWK9orYSMiElO3GaL6Ja-osFgA7je3RDcLChWUi5s,43769
 sqlmesh/lsp/api.py,sha256=LJdECSaEZoPbu_Xl4KscVG-WLt7_g4dY-zKGO68dH14,2162
-sqlmesh/lsp/completions.py,sha256=Y6zNKNne91tzRm5vRk82JmhIpo7dIBUoK8GGQesGlT8,5746
-sqlmesh/lsp/context.py,sha256=36bUTiMSyfX91bri_F1aivDvSllq0rKidIM_RGAtirs,6253
-sqlmesh/lsp/custom.py,sha256=f6-s5gJop6YjTmX7jfwTIqjYvinhMpv_T9v0H7g4DuM,2172
+sqlmesh/lsp/completions.py,sha256=dsGE8f6RWNjOPvs80QdTvv1YaKo1bbTJ5ZzQmnNcpbA,6184
+sqlmesh/lsp/context.py,sha256=QGbNL0sifxzVJ7T1U5oWcJ5FXrOrLrVKt1jtH1qM_50,6099
+sqlmesh/lsp/custom.py,sha256=40ekRrcsJ-lsF4-uPs4mo8CFegTWK_zKzi4am_NO9oo,2196
 sqlmesh/lsp/description.py,sha256=4QIGC9ix8IzmWF6DVUNhY4m1Crk3sNQA6hZ1RbyqU78,827
+sqlmesh/lsp/helpers.py,sha256=igzUgeYAO3LUZFr3qN4l9hzztOy66lRubX93KtCMduY,654
 sqlmesh/lsp/hints.py,sha256=j-blccBUil94yRoDjWfkSM0HqMmsKD6hP2TaWdWWVk4,3734
-sqlmesh/lsp/main.py,sha256=QojzsVkMxm3ZZmMwbIRkzS-RwxYSpXInp5owow16L_4,35410
-sqlmesh/lsp/reference.py,sha256=GKZw0TSvo6Y1FwV67jIliG1ofwDChyymF4yxVxzrEAQ,22026
+sqlmesh/lsp/main.py,sha256=QpwMayubrXIgapAWuiGtkW_RTrcvvo_8qA8-IpGVG0I,36375
+sqlmesh/lsp/reference.py,sha256=hHkSdnlcdoMO5nAhrpY1Ui-hRJ_SqX_5YqRGV192nPQ,21525
 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
@@ -274,7 +275,7 @@ sqlmesh/utils/pydantic.py,sha256=I898jAFqa3qU6lG2uPpRebVFncOUo8ZrLWM_R3K3DHU,116
 sqlmesh/utils/rich.py,sha256=xNZyPCqEc4TAlJlsEthg-5eYUWpaizz0QjBzO7a1Yv4,1509
 sqlmesh/utils/windows.py,sha256=r7Yin4WEwbvH7sKA3hOJtRsclmscNuBeCklCfVPvtQs,611
 sqlmesh/utils/yaml.py,sha256=np-WVcwmwsKghCgAj1OBBMsK1SXSRn4wR-H37cGiFr8,2282
-sqlmesh-0.189.3.dev15.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.189.3.dev16.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=OVPMTMsqC8zy0qnBcMb7PpVcqTHdIJoCmJLYh7gC1Xs,5472
 web/client/dist/assets/Audits-Bvr7M5Cg.js,sha256=GrigkyEVYbM5zy0PAjOXdqmVV0kL-STP5gFQmx35vhw,1041
@@ -392,8 +393,8 @@ web/server/api/endpoints/models.py,sha256=ud-lRwriyI_OYg9tZchrBgeiXELiRTLNEodraf
 web/server/api/endpoints/modules.py,sha256=8hqqgonGay_mJmpCw0IdbjsPhWlQH2VLdKAqha-myac,468
 web/server/api/endpoints/plan.py,sha256=OYuQ_4dgbhG9ibTcX1a8mvYgH3ANxw9Fhbb4wg6QWqc,9222
 web/server/api/endpoints/table_diff.py,sha256=SCy3-pr5x6bEEiOaZGCDbiHQhpgxwmnz3Acqa2Ie6jI,2090
-sqlmesh-0.189.3.dev15.dist-info/METADATA,sha256=FhiDjFsrLh-IeiBxB5zemuzTieFkVC2210fZVgzTsQg,26541
-sqlmesh-0.189.3.dev15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.189.3.dev15.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.189.3.dev15.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.189.3.dev15.dist-info/RECORD,,
+sqlmesh-0.189.3.dev16.dist-info/METADATA,sha256=v0_guwqYg2fdwDYdVgmVV6SBmXvvr-AWIJ_LuVA8mQY,26541
+sqlmesh-0.189.3.dev16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.189.3.dev16.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.189.3.dev16.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.189.3.dev16.dist-info/RECORD,,