sqlmesh 0.211.2.dev2__py3-none-any.whl → 0.211.2.dev4__py3-none-any.whl

sqlmesh/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.211.2.dev2'
-__version_tuple__ = version_tuple = (0, 211, 2, 'dev2')
+__version__ = version = '0.211.2.dev4'
+__version_tuple__ = version_tuple = (0, 211, 2, 'dev4')
 
 __commit_id__ = commit_id = None

sqlmesh/dbt/manifest.py

@@ -673,12 +673,17 @@ def _node_base_config(node: ManifestNode) -> t.Dict[str, t.Any]:
 
 
 def _convert_jinja_test_to_macro(test_jinja: str) -> str:
-    TEST_TAG_REGEX = r"\s*{%\s*test\s+"
-    ENDTEST_REGEX = r"{%\s*endtest\s*%}"
+    TEST_TAG_REGEX = r"\s*{%-?\s*test\s+"
+    ENDTEST_REGEX = r"{%-?\s*endtest\s*-?%}"
+
     match = re.match(TEST_TAG_REGEX, test_jinja)
     if not match:
         # already a macro
         return test_jinja
 
-    macro = "{% macro test_" + test_jinja[match.span()[-1] :]
-    return re.sub(ENDTEST_REGEX, "{% endmacro %}", macro)
+    test_tag = test_jinja[: match.span()[-1]]
+
+    macro_tag = re.sub(r"({%-?\s*)test\s+", r"\1macro test_", test_tag)
+    macro = macro_tag + test_jinja[match.span()[-1] :]
+
+    return re.sub(ENDTEST_REGEX, lambda m: m.group(0).replace("endtest", "endmacro"), macro)

sqlmesh/lsp/api.py

@@ -25,7 +25,7 @@ class ApiRequest(CustomMethodRequestBaseClass):
     """
 
     requestId: str
-    endpoint: str
+    url: str
     method: t.Optional[str] = "GET"
     params: t.Optional[t.Dict[str, t.Any]] = None
     body: t.Optional[t.Dict[str, t.Any]] = None

sqlmesh/lsp/main.py

@@ -326,7 +326,7 @@ class SQLMeshLanguageServer:
         ls.log_trace(f"API request: {request}")
         context = self._context_get_or_load()
 
-        parsed_url = urllib.parse.urlparse(request.endpoint)
+        parsed_url = urllib.parse.urlparse(request.url)
         path_parts = parsed_url.path.strip("/").split("/")
 
         if request.method == "GET":
@@ -423,7 +423,7 @@ class SQLMeshLanguageServer:
                         )
                 return ApiResponseGetTableDiff(data=table_diff_result)
 
-        raise NotImplementedError(f"API request not implemented: {request.endpoint}")
+        raise NotImplementedError(f"API request not implemented: {request.url}")
 
     def _custom_supported_methods(
         self, ls: LanguageServer, params: SupportedMethodsRequest

{sqlmesh-0.211.2.dev2.dist-info → sqlmesh-0.211.2.dev4.dist-info}/METADATA

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

{sqlmesh-0.211.2.dev2.dist-info → sqlmesh-0.211.2.dev4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=QjwaamJIdW7voXoS880yAx7tHm-Im4_mqGA-XJgafos,7631
-sqlmesh/_version.py,sha256=_SX7vdymMYLUIT2uNWUZp-U7rXKSg-_tOmix0J3KAwA,721
+sqlmesh/_version.py,sha256=CpcGqhTUX6laAH4kgkh4Bc20yAeFnRpUptSNG3CP_6I,721
 sqlmesh/magics.py,sha256=xLh3u4eqpVrKRVN5KF3X84RPRqjygAB9AJP1TXwH8hg,42086
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -133,7 +133,7 @@ sqlmesh/dbt/column.py,sha256=Kvj_N3D_QegcoNQG7VqRiqy-FRfupud-6ilhlykBOgE,1873
 sqlmesh/dbt/common.py,sha256=q77xwKSSuRqcdqbYRwpwcbAqK0ODeqcho1NCxRs_aDA,8001
 sqlmesh/dbt/context.py,sha256=H3DR3-dyRaV3-Py2WaMnyD3VWXTQZRh_BerguBshImk,10482
 sqlmesh/dbt/loader.py,sha256=GlP4BFKjqLpVMcMExiAp1nVJbTWu5LNqNUxVZraWslQ,16034
-sqlmesh/dbt/manifest.py,sha256=fzXyfW8zywvyQTyXRO-DwoxIxj-iIx6aqftfsGVsUX8,27556
+sqlmesh/dbt/manifest.py,sha256=GDPNR4e7fgCuQFoX7cqjiGH6fw-30w0gUBCZaNRek-w,27711
 sqlmesh/dbt/model.py,sha256=o2qxulIhnKQ3TfmYqtECjMeEiwneP0kvu8Ny2zS5vsU,26958
 sqlmesh/dbt/package.py,sha256=IBBQueVB4_4C9tIk0-GUL-O2uibNxXu6W2a4AeHHcOU,4322
 sqlmesh/dbt/profile.py,sha256=hAqL8lfT98pSBY-wCInPg2WhFEjCNUGF2bx5UcWFx-4,3939
@@ -165,7 +165,7 @@ sqlmesh/integrations/github/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 sqlmesh/integrations/github/cicd/command.py,sha256=w3oWhvR4utEurB5UABXj4iVBIojkCnZ0wTazIFmVmnc,12246
 sqlmesh/integrations/github/cicd/config.py,sha256=n4KyNv65y1gpys82iLAQZUb6g2pnzywyV_7cOrQXsnI,3669
 sqlmesh/integrations/github/cicd/controller.py,sha256=0I5mHPz3HBJR5lkR-2J9Bj06Yn-Q5_a8Z1tg2pcqOWc,54927
-sqlmesh/lsp/api.py,sha256=8IUY_JQoY1skj4LvIbMr6tm32_3vJ4_9mX9fWGVbUYQ,2510
+sqlmesh/lsp/api.py,sha256=Z_8Op6CWqdbmEeidCQgMcVmRooQujqaynn-0EOw4478,2505
 sqlmesh/lsp/commands.py,sha256=7tZPePSH-IwBYmXJPIlqGM7pi4rOCLEtc3fKJglAxZs,72
 sqlmesh/lsp/completions.py,sha256=7Lhboh6xyoMJ3kkHG3aZz1xVbDwKiXeQKdIRj5xlUOA,6674
 sqlmesh/lsp/context.py,sha256=VIL_Xl3II6I79ILZ67UTY9u6OzgkLHDTEpTK91DJxAA,20892
@@ -173,7 +173,7 @@ sqlmesh/lsp/custom.py,sha256=npzNznpUJ3ELY_WU4n_4I73lAjuTapI0_HKCFsoMcOk,5132
 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=DGSL56puDT2LwpybKc9xW_8ErvjX_z7R6GWSGhEEILM,52363
+sqlmesh/lsp/main.py,sha256=RMT2HTCismeHfAvYeOAIUlD-YlUSORBImt5mLsBDlto,52353
 sqlmesh/lsp/reference.py,sha256=-TTT5NIIGDQoEDCzH8RNgEINt0p9DYclzEn4rBjreRI,18475
 sqlmesh/lsp/rename.py,sha256=AFj-zJGWiBgHSj1jx1rOx4yJmmw1QpEcob648epM8gk,4668
 sqlmesh/lsp/tests_ranges.py,sha256=YO5w534J5_y2NWxj9t637wHLbFDJdXBvM7i5F4C-P0I,2308
@@ -294,7 +294,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.211.2.dev2.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.211.2.dev4.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 sqlmesh_dbt/__init__.py,sha256=awYS5y5mz-1NUmx6i5h5NSTJ7tidRl9NC0FAnFWSF6U,350
 sqlmesh_dbt/cli.py,sha256=wSShIx02GCYz0Ciq808GbbO9tjXYkaM6U6SFoT7rmpA,4117
 sqlmesh_dbt/console.py,sha256=80sCEbrKfR5f3SvxIyI7hw_SuiDiiUwuJYxXbQO2014,830
@@ -419,8 +419,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=8XTwgOh6QBbNy_hTM1JuHgRjbnie-pGPrphiW-FNLjQ,6058
-sqlmesh-0.211.2.dev2.dist-info/METADATA,sha256=eRMMo1P2DMyeqqYL3g5V9rjB_JN40Tcx0F70pYBKnhU,26773
-sqlmesh-0.211.2.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.211.2.dev2.dist-info/entry_points.txt,sha256=sHAf6tQczIM8xZoduN4qaUjV7QEPVUUW_LCT8EDUMv4,155
-sqlmesh-0.211.2.dev2.dist-info/top_level.txt,sha256=RQ-33FPe2IgL0rgossAfJkCRtqslz9b7wFARqiWLC5Q,24
-sqlmesh-0.211.2.dev2.dist-info/RECORD,,
+sqlmesh-0.211.2.dev4.dist-info/METADATA,sha256=6ou8D2jPxN2-MWT0tMsKwl47mf1sNphzjVQs2fbPI1E,26773
+sqlmesh-0.211.2.dev4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.211.2.dev4.dist-info/entry_points.txt,sha256=sHAf6tQczIM8xZoduN4qaUjV7QEPVUUW_LCT8EDUMv4,155
+sqlmesh-0.211.2.dev4.dist-info/top_level.txt,sha256=RQ-33FPe2IgL0rgossAfJkCRtqslz9b7wFARqiWLC5Q,24
+sqlmesh-0.211.2.dev4.dist-info/RECORD,,