tinybird-cli 3.1.0.dev1__tar.gz → 3.1.0.dev3__tar.gz

{tinybird-cli-3.1.0.dev1 → tinybird-cli-3.1.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.1.0.dev1
+Version: 3.1.0.dev3
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,12 +19,21 @@ Changelog
 
 ---------
 
+3.1.0.dev3
+************
+
+- `Changed` option `--node` in `tb pipe populate` to required as it is already mandatory to specify the node to populate. Now, it will provide an error message if the `--node` option is not provided.
+
+3.1.0.dev2
+************
+
+- `Added` Ignore format changes on `tb deploy`. Only if `TB_DIFF_ON_DEPLOY` env variables is enabled
+
 3.1.0.dev1
 ************
 
 - `Added` `tb init --cicd` to generate CI/CD files not only when using `--git`. Combine with `--force` for overwrite
 
-
 3.0.2.dev3
 ************
 

{tinybird-cli-3.1.0.dev1 → tinybird-cli-3.1.0.dev3}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://docs.tinybird.co/cli.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '3.1.0.dev1'
-__revision__ = '6ab3285'
+__version__ = '3.1.0.dev3'
+__revision__ = 'c07d4f3'

{tinybird-cli-3.1.0.dev1 → tinybird-cli-3.1.0.dev3}/tinybird/datafile.py

@@ -434,6 +434,21 @@ class Deployment:
         self.tb_client = tb_client
         self.dry_run = dry_run
 
+    def _filenames_from_changed_modified(self, changed: Dict[str, Optional[str]], filenames: List[str]) -> List[str]:
+        filenames_from_changed = []
+        for change, type in changed.items():
+            if (
+                self.cli_git_release
+                and type
+                and self.cli_git_release.ChangeType(type) == self.cli_git_release.ChangeType.MODIFIED
+            ):
+                filenames_from_changed += [
+                    filename
+                    for filename in filenames
+                    if filename.endswith(f"{change}.pipe") or filename.endswith(f"{change}.datasource")
+                ]
+        return filenames_from_changed
+
     async def detect_changes(
         self, filenames: List[str], only_changes: bool = False, config: Optional[Dict[str, Any]] = None
     ):
@@ -462,6 +477,27 @@ class Deployment:
             changed = self.cli_git_release.get_changes_from_diffs(diffs, filenames)
             deleted = self.cli_git_release.get_deleted_from_diffs(diffs)
 
+            if getenv_bool("TB_DIFF_ON_DEPLOY", False):
+                filenames_to_diff = self._filenames_from_changed_modified(changed, filenames)
+
+                diff_command_output = await diff_command(
+                    filenames_to_diff,
+                    fmt=True,
+                    client=self.tb_client,
+                    with_print=False,
+                    for_deploy=True,
+                    clean_up=True,
+                )
+                found_ignored_by_format = None
+                for change, type in changed.items():
+                    if type and self.cli_git_release.ChangeType(type) == self.cli_git_release.ChangeType.MODIFIED:
+                        if change in diff_command_output and diff_command_output.get(change) is None:
+                            if not found_ignored_by_format:
+                                click.echo(FeedbackManager.info_detected_changes_only_format())
+                                found_ignored_by_format = True
+                            click.echo(FeedbackManager.info_ignored_only_format(resource=change))
+                            changed[change] = None
+
         else:
             # only changes flow
             changed = (
@@ -4035,6 +4071,7 @@ async def format_datasource(
     client: Optional[TinyB] = None,
     replace_includes: bool = False,
     datafile: Optional[Datafile] = None,
+    for_deploy_diff: bool = False,
 ) -> str:
     if datafile:
         doc = datafile
@@ -4061,6 +4098,8 @@ async def format_datasource(
                 }
             )
         format_version(file_parts, doc)
+        if for_deploy_diff:
+            format_description(file_parts, doc)
         format_tokens(file_parts, doc)
         format_schema(file_parts, doc.nodes[0])
         await format_engine(file_parts, doc.nodes[0], only_ttl=True, client=client)
@@ -4126,10 +4165,12 @@ def format_tokens(file_parts: List[str], doc: Datafile) -> List[str]:
     return file_parts
 
 
-def format_node_sql(file_parts: List[str], node: Dict[str, Any], line_length: Optional[int] = None) -> List[str]:
+def format_node_sql(
+    file_parts: List[str], node: Dict[str, Any], line_length: Optional[int] = None, lower_keywords: bool = False
+) -> List[str]:
     file_parts.append("SQL >")
     file_parts.append(DATAFILE_NEW_LINE)
-    file_parts.append(format_sql(node["sql"], DATAFILE_INDENT, line_length=line_length))
+    file_parts.append(format_sql(node["sql"], DATAFILE_INDENT, line_length=line_length, lower_keywords=lower_keywords))
     file_parts.append(DATAFILE_NEW_LINE)
     file_parts.append(DATAFILE_NEW_LINE)
     return file_parts
@@ -4237,6 +4278,7 @@ async def format_node(
     includes: Dict[str, Any],
     line_length: Optional[int] = None,
     unroll_includes: bool = False,
+    lower_keywords: bool = False,
 ) -> None:
     if not unroll_includes:
         format_pipe_include(file_parts, node, includes)
@@ -4251,7 +4293,7 @@ async def format_node(
 
     Doc = namedtuple("Doc", ["description"])
     format_description(file_parts, Doc(node.get("description", "")))
-    format_node_sql(file_parts, node, line_length=line_length)
+    format_node_sql(file_parts, node, line_length=line_length, lower_keywords=lower_keywords)
     await format_node_type(file_parts, node)
 
 
@@ -4261,6 +4303,7 @@ async def format_pipe(
     unroll_includes: bool = False,
     replace_includes: bool = False,
     datafile: Optional[Datafile] = None,
+    for_deploy_diff: bool = False,
 ) -> str:
     if datafile:
         doc = datafile
@@ -4301,7 +4344,14 @@ async def format_pipe(
                 if unrolled_included_node:
                     doc.nodes.remove(unrolled_included_node)
     for node in doc.nodes:
-        await format_node(file_parts, node, doc.includes, line_length=line_length, unroll_includes=unroll_includes)
+        await format_node(
+            file_parts,
+            node,
+            doc.includes,
+            line_length=line_length,
+            unroll_includes=unroll_includes,
+            lower_keywords=True if for_deploy_diff else False,
+        )
 
     if not unroll_includes:
         for k, _ in doc.includes.items():
@@ -4316,8 +4366,8 @@ async def format_pipe(
     return result
 
 
-def format_sql(sql: str, DATAFILE_INDENT: str, line_length: Optional[int] = None) -> str:
-    sql = format_sql_template(sql.strip(), line_length=line_length)
+def format_sql(sql: str, DATAFILE_INDENT: str, line_length: Optional[int] = None, lower_keywords: bool = False) -> str:
+    sql = format_sql_template(sql.strip(), line_length=line_length, lower_keywords=lower_keywords)
     return "\n".join([f"{DATAFILE_INDENT}{part}" for part in sql.split("\n") if len(part.strip())])
 
 
@@ -4478,6 +4528,7 @@ async def diff_command(
     verbose: Optional[bool] = None,
     clean_up: Optional[bool] = False,
     progress_bar: bool = False,
+    for_deploy: bool = False,
 ):
     def is_shared_datasource(name):
         return "." in name
@@ -4529,7 +4580,9 @@ async def diff_command(
             suffix = ".datasource" if ".datasource" in file else ".pipe"
             target = target_dir + os.path.sep + rfilename + suffix
 
-            diff_lines = await diff_files(target, file, with_format=fmt, with_color=(not no_color), client=client)
+            diff_lines = await diff_files(
+                target, file, with_format=fmt, with_color=(not no_color), client=client, for_deploy=for_deploy
+            )
             not_empty, diff_lines = peek(diff_lines)
             changed[rfilename] = not_empty
             if not_empty and with_print:
@@ -4561,6 +4614,7 @@ async def diff_files(
     with_format: bool = True,
     with_color: bool = False,
     client: Optional[TinyB] = None,
+    for_deploy: bool = False,
 ):
     def file_lines(filename):
         with open(filename) as file:
@@ -4572,14 +4626,21 @@ async def diff_files(
         if is_file_a_datasource(filename):
             lines = (
                 await format_datasource(
-                    filename, unroll_includes=unroll_includes, for_diff=True, client=client, replace_includes=True
+                    filename,
+                    unroll_includes=unroll_includes,
+                    for_diff=True,
+                    client=client,
+                    replace_includes=True,
+                    for_deploy_diff=for_deploy,
                 )
                 if with_format
                 else file_lines(filename)
             )
         elif (".pipe" in extensions) or (".incl" in extensions):
             lines = (
-                await format_pipe(filename, 100, unroll_includes=unroll_includes, replace_includes=True)
+                await format_pipe(
+                    filename, 100, unroll_includes=unroll_includes, replace_includes=True, for_deploy_diff=for_deploy
+                )
                 if with_format
                 else file_lines(filename)
             )

{tinybird-cli-3.1.0.dev1 → tinybird-cli-3.1.0.dev3}/tinybird/feedback_manager.py

@@ -628,6 +628,8 @@ Ready? """
     info_processing_from_include = info_message("\t{include_filename} => {filename}")
     info_deps_for_resource = info_message("\t{resource} => '{dep}'")
     info_deleting_resource = info_message("** {dry_run}Deleting '{resource_name}'")
+    info_detected_changes_only_format = info_message("** Ignoring resources due to only format changes:")
+    info_ignored_only_format = info_message("\t{resource}")
 
     info_cicd_generation_cancelled_by_user = info_message("** CI/CD files generation cancelled by user.")
     info_skipping_sharing_datasources_branch = info_message(

{tinybird-cli-3.1.0.dev1 → tinybird-cli-3.1.0.dev3}/tinybird/tb_cli_modules/pipe.py

@@ -211,7 +211,7 @@ async def pipe_ls(ctx: Context, match: str, format_: str):
 
 @pipe.command(name="populate")
 @click.argument("pipe_name")
-@click.option("--node", type=str, help="Name of the materialized node.")
+@click.option("--node", type=str, help="Name of the materialized node.", required=True)
 @click.option(
     "--sql-condition",
     type=str,

{tinybird-cli-3.1.0.dev1 → tinybird-cli-3.1.0.dev3}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.1.0.dev1
+Version: 3.1.0.dev3
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,12 +19,21 @@ Changelog
 
 ---------
 
+3.1.0.dev3
+************
+
+- `Changed` option `--node` in `tb pipe populate` to required as it is already mandatory to specify the node to populate. Now, it will provide an error message if the `--node` option is not provided.
+
+3.1.0.dev2
+************
+
+- `Added` Ignore format changes on `tb deploy`. Only if `TB_DIFF_ON_DEPLOY` env variables is enabled
+
 3.1.0.dev1
 ************
 
 - `Added` `tb init --cicd` to generate CI/CD files not only when using `--git`. Combine with `--force` for overwrite
 
-
 3.0.2.dev3
 ************