sqlmesh 0.211.2.dev1__py3-none-any.whl → 0.211.2.dev2__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.dev1'
-__version_tuple__ = version_tuple = (0, 211, 2, 'dev1')
+__version__ = version = '0.211.2.dev2'
+__version_tuple__ = version_tuple = (0, 211, 2, 'dev2')
 
 __commit_id__ = commit_id = None

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

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

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

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=QjwaamJIdW7voXoS880yAx7tHm-Im4_mqGA-XJgafos,7631
-sqlmesh/_version.py,sha256=QDMgWd2kaku_v99PCDuRQan67ofMU76bCDtOk7sma3U,721
+sqlmesh/_version.py,sha256=_SX7vdymMYLUIT2uNWUZp-U7rXKSg-_tOmix0J3KAwA,721
 sqlmesh/magics.py,sha256=xLh3u4eqpVrKRVN5KF3X84RPRqjygAB9AJP1TXwH8hg,42086
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -294,14 +294,14 @@ 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.dev1.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.211.2.dev2.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 sqlmesh_dbt/__init__.py,sha256=awYS5y5mz-1NUmx6i5h5NSTJ7tidRl9NC0FAnFWSF6U,350
-sqlmesh_dbt/cli.py,sha256=6CqnLKx3DJmacvKtKHmade3RPNBfao2YSi5dh0SI9j4,3853
+sqlmesh_dbt/cli.py,sha256=wSShIx02GCYz0Ciq808GbbO9tjXYkaM6U6SFoT7rmpA,4117
 sqlmesh_dbt/console.py,sha256=80sCEbrKfR5f3SvxIyI7hw_SuiDiiUwuJYxXbQO2014,830
 sqlmesh_dbt/error.py,sha256=khi7UM_nqH4T47QL0NQbiXUvpr15Amh0F-Rtt4Xov20,885
-sqlmesh_dbt/operations.py,sha256=1mA9MqVQB2bqk9JnZCNZ1hxIhp1lau05ANUqEHok8V4,5290
+sqlmesh_dbt/operations.py,sha256=EON-uSJaLkjh_uyhHAiRWdT1yuD2SqZq5CnepmJmZZU,5584
 sqlmesh_dbt/options.py,sha256=noB_qK4uGGi7Erqk1XkkMaFz5aUc6lp44wwn1Nv_LI4,737
-sqlmesh_dbt/selectors.py,sha256=RJITA13d2hILvQYSiWFi_4aZeu0YzxREERb23GVm5P8,4846
+sqlmesh_dbt/selectors.py,sha256=4w8eE0qAgoYC2K8afk3whfju-u3e5muXGwgkfXxQR3Y,5228
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=9Xh9IRDTAsC-XXYlaB1dLXv3dv15cDXnW2qz1z-Dj98,5472
 web/client/dist/assets/Audits-Ucsx1GzF.js,sha256=fZhFbeOvI1RlQt7dBwG-GLDt5SBbCdbTY0i4zfXFGwE,1041
@@ -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.dev1.dist-info/METADATA,sha256=8xFcuH2RBAoQhG9N9RKDVUlWJEZmlzDWKMg7Mon2Qls,26773
-sqlmesh-0.211.2.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.211.2.dev1.dist-info/entry_points.txt,sha256=sHAf6tQczIM8xZoduN4qaUjV7QEPVUUW_LCT8EDUMv4,155
-sqlmesh-0.211.2.dev1.dist-info/top_level.txt,sha256=RQ-33FPe2IgL0rgossAfJkCRtqslz9b7wFARqiWLC5Q,24
-sqlmesh-0.211.2.dev1.dist-info/RECORD,,
+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_dbt/cli.py

@@ -46,10 +46,19 @@ exclude_option = click.option("--exclude", multiple=True, help="Specify the node
 @click.group(invoke_without_command=True)
 @click.option("--profile", help="Which existing profile to load. Overrides output.profile")
 @click.option("-t", "--target", help="Which target to load for the given profile")
+@click.option(
+    "-d",
+    "--debug/--no-debug",
+    default=False,
+    help="Display debug logging during dbt execution. Useful for debugging and making bug reports events to help when debugging.",
+)
 @click.pass_context
 @cli_global_error_handler
 def dbt(
-    ctx: click.Context, profile: t.Optional[str] = None, target: t.Optional[str] = None
+    ctx: click.Context,
+    profile: t.Optional[str] = None,
+    target: t.Optional[str] = None,
+    debug: bool = False,
 ) -> None:
     """
     An ELT tool for managing your SQL transformations and data models, powered by the SQLMesh engine.
@@ -61,7 +70,9 @@ def dbt(
 
     # we have a partially applied function here because subcommands might set extra options like --vars
     # that need to be known before we attempt to load the project
-    ctx.obj = functools.partial(create, project_dir=Path.cwd(), profile=profile, target=target)
+    ctx.obj = functools.partial(
+        create, project_dir=Path.cwd(), profile=profile, target=target, debug=debug
+    )
 
     if not ctx.invoked_subcommand:
         if profile or target:

sqlmesh_dbt/operations.py

@@ -16,9 +16,10 @@ logger = logging.getLogger(__name__)
 
 
 class DbtOperations:
-    def __init__(self, sqlmesh_context: Context, dbt_project: Project):
+    def __init__(self, sqlmesh_context: Context, dbt_project: Project, debug: bool = False):
         self.context = sqlmesh_context
         self.project = dbt_project
+        self.debug = debug
 
     def list_(
         self,
@@ -55,6 +56,10 @@ class DbtOperations:
         self, select: t.Optional[t.List[str]] = None, exclude: t.Optional[t.List[str]] = None
     ) -> t.Dict[str, Model]:
         if sqlmesh_selector := selectors.to_sqlmesh(select or [], exclude or []):
+            if self.debug:
+                self.console.print(f"dbt --select: {select}")
+                self.console.print(f"dbt --exclude: {exclude}")
+                self.console.print(f"sqlmesh equivalent: '{sqlmesh_selector}'")
             model_selector = self.context._new_selector()
             selected_models = {
                 fqn: model
@@ -119,7 +124,7 @@ def create(
         # so that DbtOperations can query information from the DBT project files in order to invoke SQLMesh correctly
         dbt_project = dbt_loader._projects[0]
 
-        return DbtOperations(sqlmesh_context, dbt_project)
+        return DbtOperations(sqlmesh_context, dbt_project, debug=debug)
 
 
 def init_project_if_required(project_dir: Path) -> None:

sqlmesh_dbt/selectors.py

@@ -37,6 +37,10 @@ def to_sqlmesh(dbt_select: t.Collection[str], dbt_exclude: t.Collection[str]) ->
             -> "+main.model_a & ^(raw.src_data)"
         --select "+main.model_a" --select "main.*b+" --exclude "raw.src_data"
             -> "(+main.model_a | main.*b+) & ^(raw.src_data)"
+        --select "+main.model_a" --select "main.*b+" --exclude "raw.src_data" --exclude "main.model_c"
+            -> "(+main.model_a | main.*b+) & ^(raw.src_data | main.model_c)"
+        --select "+main.model_a main.*b+" --exclude "raw.src_data main.model_c"
+            -> "(+main.model_a | main.*b+) & ^(raw.src_data | main.model_c)"
     """
     if not dbt_select and not dbt_exclude:
         return None
@@ -44,8 +48,13 @@ def to_sqlmesh(dbt_select: t.Collection[str], dbt_exclude: t.Collection[str]) ->
     select_expr = " | ".join(_to_sqlmesh(expr) for expr in dbt_select)
     select_expr = _wrap(select_expr) if dbt_exclude and len(dbt_select) > 1 else select_expr
 
-    exclude_expr = " | ".join(_to_sqlmesh(expr, negate=True) for expr in dbt_exclude)
-    exclude_expr = _wrap(exclude_expr) if dbt_select and len(dbt_exclude) > 1 else exclude_expr
+    exclude_expr = ""
+
+    if dbt_exclude:
+        exclude_expr = " | ".join(_to_sqlmesh(expr) for expr in dbt_exclude)
+        exclude_expr = _negate(
+            _wrap(exclude_expr) if dbt_select and len(dbt_exclude) > 1 else exclude_expr
+        )
 
     main_expr = " & ".join([expr for expr in [select_expr, exclude_expr] if expr])
 
@@ -56,13 +65,9 @@ def to_sqlmesh(dbt_select: t.Collection[str], dbt_exclude: t.Collection[str]) ->
     return main_expr
 
 
-def _to_sqlmesh(selector_str: str, negate: bool = False) -> str:
+def _to_sqlmesh(selector_str: str) -> str:
     unions, intersections = _split_unions_and_intersections(selector_str)
 
-    if negate:
-        unions = [_negate(u) for u in unions]
-        intersections = [_negate(i) for i in intersections]
-
     union_expr = " | ".join(unions)
     intersection_expr = " & ".join(intersections)
 
@@ -79,6 +84,7 @@ def _split_unions_and_intersections(selector_str: str) -> t.Tuple[t.List[str], t
     # break space-separated items like: "my_first_model my_second_model" into a list of selectors to union
     # and comma-separated items like: "my_first_model,my_second_model" into a list of selectors to intersect
     # but, take into account brackets, eg "(my_first_model & my_second_model)" should not be split
+    # also take into account both types in the same string, eg "my_first_model my_second_model model_3,model_4,model_5"
 
     def _split_by(input: str, delimiter: str) -> t.Iterator[str]:
         buf = ""