tinybird-cli 5.21.2.dev0__tar.gz → 5.22.1.dev0__tar.gz

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 5.21.2.dev0
+Version: 5.22.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -16,7 +16,7 @@ Requires-Dist: croniter==1.3.15
 Requires-Dist: GitPython~=3.1.32
 Requires-Dist: humanfriendly~=8.2
 Requires-Dist: pydantic~=2.8.0
-Requires-Dist: pyperclip==1.8.2
+Requires-Dist: pyperclip==1.9.0
 Requires-Dist: pyyaml<6.1,>=6.0
 Requires-Dist: requests<3,>=2.28.1
 Requires-Dist: shandy-sqlfmt==0.11.1
@@ -61,6 +61,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.21.2
+***********
+
+- `Improved` Error message when trying to format a file using `tb fmt` or when we are running `tb init --git` to include the resource name and source (local/remote)
+
 5.21.1
 ***********
 

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '5.21.2.dev0'
-__revision__ = '5949c64'
+__version__ = '5.22.1.dev0'
+__revision__ = '1515157'

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/ch_utils/constants.py

@@ -257,4 +257,10 @@ VALID_QUERY_FORMATS = (
     "Native",
     "RowBinaryWithNamesAndTypes",
     "TabSeparated",
+    "JSONCompactEachRowWithNamesAndTypes",
+    "TabSeparatedWithNamesAndTypes",
+    "JSONCompactEachRow",
+    "JSONCompact",
+    "JSONStringsEachRowWithProgress",
+    "ODBCDriver2",
 )

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/config.py

@@ -38,13 +38,10 @@ LEGACY_HOSTS = {
     "https://api.wadus3.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus3",
     "https://api.wadus4.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus4",
     "https://api.wadus5.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus5",
-    "https://api.wadus6.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus6",
     "https://api.wadus1.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus1",
     "https://api.wadus2.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus2",
     "https://api.wadus3.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus3",
     "https://api.wadus4.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus4",
-    "https://api.wadus5.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus5",
-    "https://api.wadus6.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus6",
     "https://ui.tinybird.co": "https://app.tinybird.co/gcp/europe-west3",
     "https://ui.us-east.tinybird.co": "https://app.tinybird.co/gcp/us-east4",
     "https://ui.us-east.aws.tinybird.co": "https://app.tinybird.co/aws/us-east-1",
@@ -62,13 +59,10 @@ LEGACY_HOSTS = {
     "https://ui.wadus3.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus3",
     "https://ui.wadus4.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus4",
     "https://ui.wadus5.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus5",
-    "https://ui.wadus6.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus6",
     "https://ui.wadus1.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus1",
     "https://ui.wadus2.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus2",
     "https://ui.wadus3.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus3",
     "https://ui.wadus4.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus4",
-    "https://ui.wadus5.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus5",
-    "https://ui.wadus6.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus6",
 }
 
 

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/connectors.py

@@ -369,13 +369,7 @@ class Snowflake(Connector):
             the_type = "String"
             if t.startswith("NUMBER"):
                 the_type = "Int32"
-            if (
-                t.startswith("FLOAT")
-                or t.startswith("DOUBLE")
-                or t.startswith("REAL")
-                or t.startswith("NUMERIC")
-                or t.startswith("DECIMAL")
-            ):
+            if t.startswith(("FLOAT", "DOUBLE", "REAL", "NUMERIC", "DECIMAL")):
                 the_type = "Float32"
             if t == "DATE":
                 the_type = "Date"

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/context.py

@@ -3,15 +3,15 @@ from typing import TYPE_CHECKING
 
 # Avoid circular import error
 if TYPE_CHECKING:
-    from tinybird.user import User
+    from hfi.hfi_workspace_data import HfiWorkspaceData
+
 
 workspace_id: ContextVar[str] = ContextVar("workspace_id")
-workspace: ContextVar["User"] = ContextVar("workspace")
+hfi_workspace_data: ContextVar["HfiWorkspaceData"] = ContextVar("hfi_workspace_data")
 table_id: ContextVar[str] = ContextVar("table_id")
 hfi_frequency: ContextVar[float] = ContextVar("hfi_frequency")
 hfi_frequency_gatherer: ContextVar[float] = ContextVar("hfi_frequency_gatherer")
 use_gatherer: ContextVar[bool] = ContextVar("use_gatherer")
-allow_gatherer_fallback: ContextVar[bool] = ContextVar("allow_gatherer_fallback")
 gatherer_allow_s3_backup_on_user_errors: ContextVar[bool] = ContextVar("gatherer_allow_s3_backup_on_user_errors")
 disable_template_security_validation: ContextVar[bool] = ContextVar("disable_template_security_validation")
 origin: ContextVar[str] = ContextVar("origin")

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/datafile_common.py

@@ -147,6 +147,9 @@ ON_DEMAND = "@on-demand"
 DEFAULT_CRON_PERIOD: int = 60
 
 
+# TODO: This class is duplicated in tinybird/datafile/common.py with a slightly different
+# _REPLACEMENTS tuple. The duplication happened during the CLI/server code split (commit
+# f86d02cdd7). Consider extracting shared code into a common module that both files can import.
 class ImportReplacements:
     _REPLACEMENTS: Tuple[Tuple[str, str, Optional[str]], ...] = (
         ("import_service", "service", None),
@@ -167,7 +170,7 @@ class ImportReplacements:
         return [x[0] for x in ImportReplacements._REPLACEMENTS]
 
     @staticmethod
-    def get_api_param_for_datafile_param(connector_service: str, key: str) -> Tuple[Optional[str], Optional[str]]:
+    def get_api_param_for_datafile_param(key: str) -> Tuple[Optional[str], Optional[str]]:
         """Returns the API parameter name and default value for a given
         datafile parameter.
         """
@@ -552,9 +555,7 @@ class Deployment:
                 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")
+                    filename for filename in filenames if filename.endswith((f"{change}.pipe", f"{change}.datasource"))
                 ]
         return filenames_from_changed
 
@@ -1280,7 +1281,7 @@ def parse(
                 if (
                     parser_state.multiline
                     and cmd.lower() in cmds
-                    and not (line.startswith(" ") or line.startswith("\t") or line.lower().startswith("from"))
+                    and not (line.startswith((" ", "\t")) or line.lower().startswith("from"))
                 ):
                     parser_state.multiline = False
                     cmds[parser_state.command](
@@ -1458,11 +1459,8 @@ async def process_file(
                 raise click.ClickException(FeedbackManager.error_missing_table_arn(datasource=datasource["name"]))
             if not params.get("import_export_bucket", None):
                 raise click.ClickException(FeedbackManager.error_missing_export_bucket(datasource=datasource["name"]))
-        else:
-            if not params.get("import_external_datasource", None):
-                raise click.ClickException(
-                    FeedbackManager.error_missing_external_datasource(datasource=datasource["name"])
-                )
+        elif not params.get("import_external_datasource", None):
+            raise click.ClickException(FeedbackManager.error_missing_external_datasource(datasource=datasource["name"]))
 
         return params
 
@@ -1585,7 +1583,7 @@ async def process_file(
             #
             # Note: any unknown import_ parameter is leaved as is.
             for key in ImportReplacements.get_datafile_parameter_keys():
-                replacement, default_value = ImportReplacements.get_api_param_for_datafile_param(service, key)
+                replacement, default_value = ImportReplacements.get_api_param_for_datafile_param(key)
                 if not replacement:
                     continue  # We should not reach this never, but just in case...
 
@@ -3057,26 +3055,23 @@ async def new_pipe(
         if wait_populate:
             result = await wait_job(tb_client, job_id, job_url, "Populating")
             click.echo(FeedbackManager.info_populate_job_result(result=result))
-    else:
-        if data.get("type") == "default" and not skip_tokens and not as_standard and not copy_node and not sink_node:
-            # FIXME: set option to add last node as endpoint in the API
-            endpoint_node = next(
-                (node for node in data.get("nodes", []) if node.get("type") == "endpoint"), data.get("nodes", [])[-1]
+    elif data.get("type") == "default" and not skip_tokens and not as_standard and not copy_node and not sink_node:
+        # FIXME: set option to add last node as endpoint in the API
+        endpoint_node = next(
+            (node for node in data.get("nodes", []) if node.get("type") == "endpoint"), data.get("nodes", [])[-1]
+        )
+        try:
+            data = await tb_client._req(
+                f"/v0/pipes/{p['name']}/nodes/{endpoint_node.get('id')}/endpoint?{urlencode(cli_params)}",
+                method="POST",
+                headers=headers,
+            )
+        except Exception as e:
+            raise Exception(
+                FeedbackManager.error_creating_endpoint(node=endpoint_node.get("name"), pipe=p["name"], error=str(e))
             )
-            try:
-                data = await tb_client._req(
-                    f"/v0/pipes/{p['name']}/nodes/{endpoint_node.get('id')}/endpoint?{urlencode(cli_params)}",
-                    method="POST",
-                    headers=headers,
-                )
-            except Exception as e:
-                raise Exception(
-                    FeedbackManager.error_creating_endpoint(
-                        node=endpoint_node.get("name"), pipe=p["name"], error=str(e)
-                    )
-                )
 
-            click.echo(FeedbackManager.success_test_endpoint_no_token(host=host, pipe=p["name"]))
+        click.echo(FeedbackManager.success_test_endpoint_no_token(host=host, pipe=p["name"]))
 
     if copy_node:
         pipe_id = data["id"]
@@ -3523,32 +3518,28 @@ async def new_ds(
     if alter_response and make_changes:
         # alter operation finished
         pass
+    elif (
+        os.getenv("TB_I_KNOW_WHAT_I_AM_DOING")
+        and click.prompt(FeedbackManager.info_ask_for_datasource_confirmation()) == ds_name
+    ):  # TODO move to CLI
+        try:
+            await client.datasource_delete(ds_name)
+            click.echo(FeedbackManager.success_delete_datasource(datasource=ds_name))
+        except Exception:
+            raise click.ClickException(FeedbackManager.error_removing_datasource(datasource=ds_name))
+        return
+    elif alter_error_message:
+        raise click.ClickException(
+            FeedbackManager.error_datasource_already_exists_and_alter_failed(
+                datasource=ds_name, alter_error_message=alter_error_message
+            )
+        )
+    elif promote_error_message:
+        raise click.ClickException(
+            FeedbackManager.error_promoting_datasource(datasource=ds_name, error=promote_error_message)
+        )
     else:
-        # removed replacing by default. When a datasource is removed data is
-        # removed and all the references needs to be updated
-        if (
-            os.getenv("TB_I_KNOW_WHAT_I_AM_DOING")
-            and click.prompt(FeedbackManager.info_ask_for_datasource_confirmation()) == ds_name
-        ):  # TODO move to CLI
-            try:
-                await client.datasource_delete(ds_name)
-                click.echo(FeedbackManager.success_delete_datasource(datasource=ds_name))
-            except Exception:
-                raise click.ClickException(FeedbackManager.error_removing_datasource(datasource=ds_name))
-            return
-        else:
-            if alter_error_message:
-                raise click.ClickException(
-                    FeedbackManager.error_datasource_already_exists_and_alter_failed(
-                        datasource=ds_name, alter_error_message=alter_error_message
-                    )
-                )
-            if promote_error_message:
-                raise click.ClickException(
-                    FeedbackManager.error_promoting_datasource(datasource=ds_name, error=promote_error_message)
-                )
-            else:
-                click.echo(FeedbackManager.warning_datasource_already_exists(datasource=ds_name))
+        click.echo(FeedbackManager.warning_datasource_already_exists(datasource=ds_name))
 
 
 async def new_token(token: Dict[str, Any], client: TinyB, force: bool = False):
@@ -4450,52 +4441,44 @@ async def folder_push(
                             error=e,
                         )
                         raise click.ClickException(exception)
-                else:
-                    if raise_on_exists:
-                        raise AlreadyExistsException(
-                            FeedbackManager.warning_name_already_exists(
-                                name=name if to_run[name]["version"] is None else f"{name}__v{to_run[name]['version']}"
-                            )
+                elif raise_on_exists:
+                    raise AlreadyExistsException(
+                        FeedbackManager.warning_name_already_exists(
+                            name=name if to_run[name]["version"] is None else f"{name}__v{to_run[name]['version']}"
                         )
+                    )
+                elif await name_matches_existing_resource(resource, name, tb_client):
+                    if resource == "pipes":
+                        click.echo(FeedbackManager.error_pipe_cannot_be_pushed(name=name))
                     else:
-                        if await name_matches_existing_resource(resource, name, tb_client):
-                            if resource == "pipes":
-                                click.echo(FeedbackManager.error_pipe_cannot_be_pushed(name=name))
-                            else:
-                                click.echo(FeedbackManager.error_datasource_cannot_be_pushed(name=name))
-                        else:
-                            click.echo(
-                                FeedbackManager.warning_name_already_exists(
-                                    name=(
-                                        name
-                                        if to_run[name]["version"] is None
-                                        else f"{name}__v{to_run[name]['version']}"
-                                    )
-                                )
-                            )
-            else:
-                if should_push_file(name, remote_resource_names, latest_datasource_versions, force, run_tests):
-                    if name not in resource_versions:
-                        version = ""
-                        if name in latest_datasource_versions:
-                            version = f"(v{latest_datasource_versions[name]})"
-                        click.echo(FeedbackManager.info_dry_processing_new_resource(name=name, version=version))
-                    else:
-                        click.echo(
-                            FeedbackManager.info_dry_processing_resource(
-                                name=name,
-                                version=latest_datasource_versions[name],
-                                latest_version=resource_versions.get(name),
-                            )
+                        click.echo(FeedbackManager.error_datasource_cannot_be_pushed(name=name))
+                else:
+                    click.echo(
+                        FeedbackManager.warning_name_already_exists(
+                            name=(name if to_run[name]["version"] is None else f"{name}__v{to_run[name]['version']}")
                         )
+                    )
+            elif should_push_file(name, remote_resource_names, latest_datasource_versions, force, run_tests):
+                if name not in resource_versions:
+                    version = ""
+                    if name in latest_datasource_versions:
+                        version = f"(v{latest_datasource_versions[name]})"
+                    click.echo(FeedbackManager.info_dry_processing_new_resource(name=name, version=version))
                 else:
-                    if await name_matches_existing_resource(resource, name, tb_client):
-                        if resource == "pipes":
-                            click.echo(FeedbackManager.warning_pipe_cannot_be_pushed(name=name))
-                        else:
-                            click.echo(FeedbackManager.warning_datasource_cannot_be_pushed(name=name))
-                    else:
-                        click.echo(FeedbackManager.warning_dry_name_already_exists(name=name))
+                    click.echo(
+                        FeedbackManager.info_dry_processing_resource(
+                            name=name,
+                            version=latest_datasource_versions[name],
+                            latest_version=resource_versions.get(name),
+                        )
+                    )
+            elif await name_matches_existing_resource(resource, name, tb_client):
+                if resource == "pipes":
+                    click.echo(FeedbackManager.warning_pipe_cannot_be_pushed(name=name))
+                else:
+                    click.echo(FeedbackManager.warning_datasource_cannot_be_pushed(name=name))
+            else:
+                click.echo(FeedbackManager.warning_dry_name_already_exists(name=name))
 
     async def push_files(
         dependency_graph: GraphDependencies,
@@ -4745,9 +4728,8 @@ async def folder_push(
                         force,
                         mode="append" if is_branch else "replace",
                     )
-        else:
-            if verbose:
-                click.echo(FeedbackManager.info_not_pushing_fixtures())
+        elif verbose:
+            click.echo(FeedbackManager.info_not_pushing_fixtures())
 
     await deployment.update_release(has_semver=has_semver, release_created=release_created)
 
@@ -4873,6 +4855,7 @@ async def format_datasource(
     for_deploy_diff: bool = False,
     skip_eval: bool = False,
     content: Optional[str] = None,
+    resource_source: Optional[str] = None,  # Not used for datasources, but kept for API consistency with format_pipe
 ) -> str:
     if datafile:
         doc = datafile
@@ -4976,11 +4959,25 @@ def format_tokens(file_parts: List[str], doc: Datafile) -> List[str]:
 
 
 def format_node_sql(
-    file_parts: List[str], node: Dict[str, Any], line_length: Optional[int] = None, lower_keywords: bool = False
+    file_parts: List[str],
+    node: Dict[str, Any],
+    line_length: Optional[int] = None,
+    lower_keywords: bool = False,
+    resource_name: Optional[str] = None,
+    resource_source: Optional[str] = None,
 ) -> 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, lower_keywords=lower_keywords))
+    file_parts.append(
+        format_sql(
+            node["sql"],
+            DATAFILE_INDENT,
+            line_length=line_length,
+            lower_keywords=lower_keywords,
+            resource_name=resource_name,
+            resource_source=resource_source,
+        )
+    )
     file_parts.append(DATAFILE_NEW_LINE)
     file_parts.append(DATAFILE_NEW_LINE)
     return file_parts
@@ -5100,6 +5097,8 @@ async def format_node(
     line_length: Optional[int] = None,
     unroll_includes: bool = False,
     lower_keywords: bool = False,
+    resource_name: Optional[str] = None,
+    resource_source: Optional[str] = None,
 ) -> None:
     if not unroll_includes:
         format_pipe_include(file_parts, node, includes)
@@ -5114,7 +5113,14 @@ 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, lower_keywords=lower_keywords)
+    format_node_sql(
+        file_parts,
+        node,
+        line_length=line_length,
+        lower_keywords=lower_keywords,
+        resource_name=resource_name,
+        resource_source=resource_source,
+    )
     await format_node_type(file_parts, node)
 
 
@@ -5127,6 +5133,7 @@ async def format_pipe(
     for_deploy_diff: bool = False,
     skip_eval: bool = False,
     content: Optional[str] = None,
+    resource_source: Optional[str] = None,
 ) -> str:
     if datafile:
         doc = datafile
@@ -5159,7 +5166,7 @@ async def format_pipe(
                 if "." in include_file
                 else eval_var(include_file)
             )
-            included_pipe = parse_pipe(include_file, skip_eval=skip_eval)
+            included_pipe = parse_pipe(str(include_file), skip_eval=skip_eval)
             pipe_nodes = doc.nodes.copy()
             for included_node in included_pipe.nodes.copy():
                 unrolled_included_node = next(
@@ -5175,10 +5182,12 @@ async def format_pipe(
             line_length=line_length,
             unroll_includes=unroll_includes,
             lower_keywords=bool(for_deploy_diff),
+            resource_name=filename,
+            resource_source=resource_source,
         )
 
     if not unroll_includes:
-        for k, _ in doc.includes.items():
+        for k in doc.includes.keys():
             if ".incl" not in k:
                 continue
             file_parts.append(f"INCLUDE {k}")
@@ -5190,8 +5199,21 @@ async def format_pipe(
     return result
 
 
-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)
+def format_sql(
+    sql: str,
+    DATAFILE_INDENT: str,
+    line_length: Optional[int] = None,
+    lower_keywords: bool = False,
+    resource_name: Optional[str] = None,
+    resource_source: Optional[str] = None,
+) -> str:
+    sql = format_sql_template(
+        sql.strip(),
+        line_length=line_length,
+        lower_keywords=lower_keywords,
+        resource_name=resource_name,
+        resource_source=resource_source,
+    )
     return "\n".join([f"{DATAFILE_INDENT}{part}" for part in sql.split("\n") if len(part.strip())])
 
 
@@ -5299,9 +5321,8 @@ async def folder_pull(
                                 if m in resources or m in resource_names:
                                     resource_to_write = resource_to_write.replace(match, m)
                             await fd.write(resource_to_write)
-                else:
-                    if verbose:
-                        click.echo(FeedbackManager.info_skip_already_exists())
+                elif verbose:
+                    click.echo(FeedbackManager.info_skip_already_exists())
             except Exception as e:
                 raise click.ClickException(FeedbackManager.error_exception(error=e))
 
@@ -5429,7 +5450,7 @@ async def diff_command(
                 sys.stdout.writelines(diff_lines)
                 click.echo("")
 
-    for rfilename, _ in local_resources.items():
+    for rfilename in local_resources.keys():
         if rfilename not in changed:
             for resource in remote_datasources + remote_pipes:
                 properties = get_name_version(resource["name"])
@@ -5460,7 +5481,7 @@ async def diff_files(
         with open(filename) as file:
             return file.readlines()
 
-    async def parse(filename, with_format=True, unroll_includes=False):
+    async def parse(filename, with_format=True, unroll_includes=False, resource_source=None):
         extensions = Path(filename).suffixes
         lines = None
         if is_file_a_datasource(filename):
@@ -5472,6 +5493,7 @@ async def diff_files(
                     client=client,
                     replace_includes=True,
                     for_deploy_diff=for_deploy,
+                    resource_source=resource_source,
                 )
                 if with_format
                 else file_lines(filename)
@@ -5484,6 +5506,7 @@ async def diff_files(
                     unroll_includes=unroll_includes,
                     replace_includes=True,
                     for_deploy_diff=for_deploy,
+                    resource_source=resource_source,
                 )
                 if with_format
                 else file_lines(filename)
@@ -5494,8 +5517,8 @@ async def diff_files(
             return [f"{l}\n" for l in lines.split("\n")] if with_format else lines  # noqa: E741
 
     try:
-        lines1 = await parse(from_file, with_format)
-        lines2 = await parse(to_file, with_format, unroll_includes=True)
+        lines1 = await parse(from_file, with_format, resource_source="remote")
+        lines2 = await parse(to_file, with_format, unroll_includes=True, resource_source="local")
     except FileNotFoundError as e:
         filename = os.path.basename(str(e)).strip("'")
         raise click.ClickException(FeedbackManager.error_diff_file(filename=filename))
@@ -5616,7 +5639,7 @@ def is_file_a_datasource(filename: str) -> bool:
 
         for line in lines:
             trimmed_line = line.strip().lower()
-            if trimmed_line.startswith("schema") or trimmed_line.startswith("engine"):
+            if trimmed_line.startswith(("schema", "engine")):
                 return True
 
     return False

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/sql.py

@@ -7,6 +7,9 @@ from typing import Any, Dict, Iterable, List, Optional
 
 valid_chars_name: str = string.ascii_letters + string.digits + "._`*<>+-'"
 valid_chars_fn: str = valid_chars_name + "[](),=!?:/ \n\t\r"
+# Use sets for O(1) membership checks in hot loops
+_VALID_CHARS_NAME_SET = set(valid_chars_name)
+_VALID_CHARS_FN_SET = set(valid_chars_fn)
 
 INDEX_WHITELIST = ["minmax", "set", "bloom_filter", "ngrambf_v1", "tokenbf_v1"]
 INDEX_SUPPORTED_TYPES = {
@@ -28,6 +31,15 @@ INDEX_SUPPORTED_TYPES = {
     "ngrambf_v1": ["String", "FixedString", "Map"],
 }
 
+# Precompiled regexes used across functions to avoid recompilation overhead
+_RE_FORMAT = re.compile(r"\s+format\s+(\w+)\s*$", re.IGNORECASE)
+_RE_REMOVE_FORMAT = re.compile(r"\s+(format)\s+(\w+)\s*$", re.IGNORECASE)
+_RE_TRY_FIX_NULLABLE_SAF = re.compile(r"SimpleAggregateFunction\((\w+),\s*(?!(?:Nullable))([\w,.()]+)\)")
+_RE_INDEX_ENTRY = re.compile(
+    r"(\w+)\s+([\w\s*\[\]\*\(\),\'\"-><.]+)\s+TYPE\s+(\w+)(?:\(([\w\s*.,]+)\))?(?:\s+GRANULARITY\s+(\d+))?"
+)
+_RE_REPLICATED_MT = re.compile(r"Replicated(.*)MergeTree\(([^\)]*)\)(.*)")
+
 
 @dataclass
 class TableIndex:
@@ -137,10 +149,9 @@ def get_format(sql: str) -> Optional[str]:
     >>> get_format('select * from test formAt JSON')
     'JSON'
     """
-    FORMAT_RE = r"\s+format\s+(\w+)\s*$"
     sql = sql.strip()
-    format = re.findall(FORMAT_RE, sql, re.IGNORECASE)
-    return format[0] if format else None
+    match = _RE_FORMAT.findall(sql)
+    return match[0] if match else None
 
 
 def get_format_group(sql: str) -> str:
@@ -151,10 +162,9 @@ def get_format_group(sql: str) -> str:
     >>> get_format_group('select * from test formAt JSON')
     ' formAt JSON'
     """
-    FORMAT_RE = r"\s+format\s+(\w+)\s*$"
     sql = sql.strip()
-    format = re.search(FORMAT_RE, sql, re.IGNORECASE)
-    return format.group() if format else ""
+    match = _RE_FORMAT.search(sql)
+    return match.group() if match else ""
 
 
 def wrap_finalize_aggregation(sql: str, describe_result: Dict[str, Any], fm_group: Optional[str] = None) -> str:
@@ -186,9 +196,8 @@ def remove_format(sql: str) -> str:
     >>> remove_format('select * from test formAt JSON')
     'select * from test'
     """
-    FORMAT_RE = r"\s+(format)\s+(\w+)\s*$"
     sql = sql.strip()
-    return re.sub(FORMAT_RE, "", sql, flags=re.IGNORECASE)
+    return _RE_REMOVE_FORMAT.sub("", sql)
 
 
 def col_name(name: str, backquotes: bool = True) -> str:
@@ -220,7 +229,7 @@ def try_to_fix_nullable_in_simple_aggregating_function(t: str) -> Optional[str]:
     # as it is done with other aggregate functions.
     # If not, the aggregation could return incorrect results.
     result = None
-    if match := re.search(r"SimpleAggregateFunction\((\w+),\s*(?!(?:Nullable))([\w,.()]+)\)", t):
+    if match := _RE_TRY_FIX_NULLABLE_SAF.search(t):
         fn = match.group(1)
         inner_type = match.group(2)
         result = f"SimpleAggregateFunction({fn}, Nullable({inner_type}))"
@@ -342,10 +351,7 @@ def parse_indexes_structure(indexes: Optional[List[str]]) -> List[TableIndex]:
         if index.count("TYPE") != 1:
             raise ValueError("invalid INDEX format. Usage: `name expr TYPE type_full GRANULARITY granularity`")
 
-        match = re.match(
-            r"(\w+)\s+([\w\s*\[\]\*\(\),\'\"-><.]+)\s+TYPE\s+(\w+)(?:\(([\w\s*.,]+)\))?(?:\s+GRANULARITY\s+(\d+))?",
-            index,
-        )
+        match = _RE_INDEX_ENTRY.match(index)
         if match:
             index_name, a, index_type, value, granularity = match.groups()
             index_expr = f"{index_type}({value})" if value else index_type
@@ -552,7 +558,7 @@ def clean_comments(schema_to_clean: str) -> str:
             if i + 1 < len(line) and line[i] == "-" and line[i + 1] == "-" and not inside_json_path:
                 return line[:i].strip()
 
-            if not inside_json_path and line[i:].startswith("`json:"):
+            if not inside_json_path and line.startswith("`json:", i):
                 inside_json_path = True
             elif inside_json_path and line[i] == "`":
                 inside_json_path = False
@@ -562,12 +568,12 @@ def clean_comments(schema_to_clean: str) -> str:
     if schema_to_clean is None:
         return schema_to_clean
 
-    cleaned_schema = ""
+    out_lines: List[str] = []
     for line in schema_to_clean.splitlines():
         cleaned_line = clean_line_comments(line)
         if cleaned_line:
-            cleaned_schema += cleaned_line + "\n"
-    return cleaned_schema.strip()
+            out_lines.append(cleaned_line)
+    return "\n".join(out_lines).strip()
 
 
 SyntaxExpr = namedtuple("SyntaxExpr", ["name", "regex"])
@@ -608,9 +614,9 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
 
     # Find the first SyntaxExpr in lookup that matches the schema at the current offset
     def lookahead_matches(lookup: Iterable) -> Optional[SyntaxExpr]:
+        # Use substring to preserve semantics of patterns anchored to end ($)
         s = schema[i:]
-        match = next((x for x in lookup if x.regex.match(s)), None)
-        return match
+        return next((x for x in lookup if x.regex.match(s)), None)
 
     def advance_single_char() -> None:
         nonlocal i, line, pos
@@ -647,7 +653,7 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
                 c = schema[i]
                 if c in " \t\r\n":
                     return schema[begin:i]
-                if c not in valid_chars_name:
+                if c not in _VALID_CHARS_NAME_SET:
                     raise ValueError(
                         format_parse_error(schema, i, pos, "wrong value, please check the schema syntax", line=line)
                     )
@@ -677,7 +683,9 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
                 context_stack.append("(")
             elif context is None and lookahead_matches(lookup):
                 return schema[begin:i].strip(" \t\r\n")
-            elif (context is None and c not in valid_chars_fn) or (context == "(" and c not in valid_chars_fn):
+            elif (context is None and c not in _VALID_CHARS_FN_SET) or (
+                context == "(" and c not in _VALID_CHARS_FN_SET
+            ):
                 raise ValueError(
                     format_parse_error(schema, i, pos, "wrong value, please check the schema syntax", line=line)
                 )
@@ -884,7 +892,7 @@ def engine_replicated_to_local(engine: str) -> str:
     if "Replicated" not in engine:
         return engine
 
-    return re.sub(r"Replicated(.*)MergeTree\(([^\)]*)\)(.*)", _replace, engine.strip())
+    return _RE_REPLICATED_MT.sub(_replace, engine.strip())
 
 
 def engine_patch_replicated_engine(engine: str, engine_full: Optional[str], new_table_name: str) -> Optional[str]:
@@ -907,7 +915,7 @@ def engine_patch_replicated_engine(engine: str, engine_full: Optional[str], new_
         paths = parts[2].split("/")
         paths[-1] = new_table_name
         zoo_path = "/".join(paths)
-        return "".join(parts[:2] + [zoo_path] + parts[3:])
+        return "".join([*parts[:2], zoo_path, *parts[3:]])
     return engine_full
 
 

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/sql_template.py

@@ -384,14 +384,13 @@ def array_type(types):
             if isinstance(x, Placeholder):
                 if default:
                     x = default
-                else:
-                    if _type and _type in types:
-                        if _type == "String":
-                            x = ""
-                        else:
-                            x = ",".join(map(str, [types[_type](x) for _ in range(2)]))
-                    else:
+                elif _type and _type in types:
+                    if _type == "String":
                         x = ""
+                    else:
+                        x = ",".join(map(str, [types[_type](x) for _ in range(2)]))
+                else:
+                    x = ""
             elif x is None:
                 x = default
                 if x is None:
@@ -1405,23 +1404,33 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
     namespace = {}
     template_execution_results = TemplateExecutionResults()
     for key in kwargs.get("tb_secrets", []):
+        # Avoid double-prefixing if the key already has the tb_secret_ prefix
         if is_secret_template_key(key):
             template_execution_results.add_template_param(key)
+        else:
+            template_execution_results.add_template_param(secret_template_key(key))
 
     if TB_SECRET_IN_TEST_MODE in kwargs:
         template_execution_results[TB_SECRET_IN_TEST_MODE] = None
 
-    def set_tb_secret(x):
+    def set_tb_secret(x, default=None):
         try:
             key = secret_template_key(x)
             if key in template_execution_results.template_params:
+                # secret available: Always use workspace secret regardless of test mode
                 template_execution_results.add_ch_param(x)
                 return Symbol("{" + sqlescape(x) + ": String}")
             else:
+                # secret not available: Check test mode and defaults
                 is_test_mode = TB_SECRET_IN_TEST_MODE in template_execution_results
-                if is_test_mode:
+                if default is not None:
+                    # Use provided default value
+                    return default
+                elif is_test_mode:
+                    # In test mode without default - return placeholder
                     return Symbol("{" + sqlescape(x) + ": String}")
                 else:
+                    # Not in test mode, no secret, no default - raise error
                     raise SQLTemplateException(
                         f"Cannot access secret '{x}'. Check the secret exists in the Workspace and the token has the required scope."
                     )
@@ -1832,7 +1841,7 @@ def get_var_names_and_types(t, node_id=None):
         raise SQLTemplateException(e)
 
 
-@lru_cache(maxsize=256)
+@lru_cache(maxsize=512)
 def get_var_names_and_types_cached(t: Template):
     return get_var_names_and_types(t)
 
@@ -2266,6 +2275,18 @@ def render_sql_template(
     Traceback (most recent call last):
     ...
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: Cannot access secret 'test'. Check the secret exists in the Workspace and the token has the required scope.
+    >>> render_sql_template("select * from table where str = {{tb_secret('test', 'default_value')}}", secrets = [])
+    ("select * from table where str = 'default_value'", {}, [])
+    >>> render_sql_template("select * from table where str = {{tb_secret('test', 'default_value')}}", secrets = [ 'tb_secret_test' ])
+    ('select * from table where str = {test: String}', {}, [])
+    >>> render_sql_template("select * from table where str = {{tb_secret('test', '')}}")
+    ("select * from table where str = ''", {}, [])
+    >>> render_sql_template("select * from table where str = {{tb_secret('test', 'default_value')}}", test_mode=True)
+    ("select * from table where str = 'default_value'", {}, [])
+    >>> render_sql_template("select * from table where str = {{tb_secret('test', '')}}", test_mode=True)
+    ("select * from table where str = ''", {}, [])
+    >>> render_sql_template("select * from table where str = {{tb_secret('test', 'default_value')}}", secrets = [ 'tb_secret_test' ], test_mode=True)
+    ('select * from table where str = {test: String}', {}, [])
     >>> render_sql_template("select * from table where str = {{String(test)}} and category = {{String(category, 'shirts')}} and color = {{ Int32(color)}}", test_mode=False)
     Traceback (most recent call last):
     ...
@@ -2364,6 +2385,14 @@ def render_sql_template(
                 documentation="/cli/advanced-templates.html",
             )
         raise SQLTemplateException(str(e), documentation="/cli/advanced-templates.html")
+    except IndexError as e:
+        # This happens when trying to access string indices on empty strings
+        if "string index out of range" in str(e):
+            raise SQLTemplateException(
+                "String index out of range. Check that string parameters have values before accessing specific characters (e.g., param[0]). Provide default values or add length checks in your template.",
+                documentation="/cli/advanced-templates.html",
+            )
+        raise SQLTemplateException(str(e), documentation="/cli/advanced-templates.html")
     except Exception as e:
         # errors might vary here, we need to support as much as possible
         # https://gitlab.com/tinybird/analytics/-/issues/943

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/sql_template_fmt.py

@@ -261,7 +261,13 @@ def _calc_str(self) -> str:
 Comment._calc_str = property(_calc_str)
 
 
-def format_sql_template(sql: str, line_length: Optional[int] = None, lower_keywords: bool = False) -> str:
+def format_sql_template(
+    sql: str,
+    line_length: Optional[int] = None,
+    lower_keywords: bool = False,
+    resource_name: Optional[str] = None,
+    resource_source: Optional[str] = None,
+) -> str:
     try:
         # https://github.com/tconbeer/sqlfmt/blob/c11775b92d8a45f0e91d871b81a88a894d620bec/src/sqlfmt/mode.py#L16-L29
         config: Dict[str, Any] = {
@@ -277,5 +283,7 @@ def format_sql_template(sql: str, line_length: Optional[int] = None, lower_keywo
             else api.format_string(sql, mode=mode).strip()
         )
     except Exception as e:
-        logging.warning(f"sqlfmt error: {str(e)}")
+        resource_info = f" in '{resource_name}'" if resource_name else ""
+        source_info = f" ({resource_source})" if resource_source else ""
+        logging.warning(f"sqlfmt error{resource_info}{source_info}: {str(e)}")
         return sql

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/sql_toolset.py

@@ -144,7 +144,7 @@ def format_where_for_mutation_command(where_clause: str) -> str:
     return f"DELETE WHERE {quoted_condition[1:-1]}"
 
 
-@lru_cache(maxsize=2**13)
+@lru_cache(maxsize=2**15)
 def sql_get_used_tables_cached(
     sql: str,
     raising: bool = False,
@@ -301,7 +301,7 @@ def replacements_to_tuples(replacements: dict) -> dict:
     return parsed_replacements
 
 
-@lru_cache(maxsize=2**13)
+@lru_cache(maxsize=2**15)
 def replace_tables_chquery_cached(
     sql: str,
     sorted_replacements: Optional[tuple] = None,

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/tb_cli_modules/cli.py

@@ -19,7 +19,7 @@ import humanfriendly
 from click import Context
 from packaging import version
 
-import tinybird.context as context
+from tinybird import context
 from tinybird.client import (
     AuthException,
     AuthNoTokenException,
@@ -904,7 +904,7 @@ async def sql(
                 verbose=False,
             )
             query = ""
-            for _, elem in dependencies_graph.to_run.items():
+            for elem in dependencies_graph.to_run.values():
                 for _node in elem["nodes"]:
                     if _node["params"]["name"].lower() == node.lower():
                         query = "".join(_node["sql"])
@@ -983,8 +983,8 @@ async def materialize(
     ctx: Context,
     filename: str,
     push_deps: bool,
-    workspace_map: List[str],
-    workspace: List[str],
+    workspace_map: Tuple[Tuple[str, str], ...],
+    workspace: Tuple[Tuple[str, str], ...],
     no_versions: bool,
     verbose: bool,
     force_populate: Optional[str],
@@ -999,7 +999,7 @@ async def materialize(
     click.echo(deprecation_notice)
     cl = create_tb_client(ctx)
 
-    async def _try_push_pipe_to_analyze(pipe_name):
+    async def _try_push_pipe_to_analyze(pipe_name: str) -> Optional[Any]:
         try:
             to_run = await folder_push(
                 cl,
@@ -1020,7 +1020,7 @@ async def materialize(
         except AlreadyExistsException as e:
             if "Datasource" in str(e):
                 click.echo(str(e))
-                return
+                return None
             if override_pipe or click.confirm(FeedbackManager.info_pipe_exists(name=pipe_name)):
                 to_run = await folder_push(
                     cl,
@@ -1038,7 +1038,7 @@ async def materialize(
                     verbose=verbose,
                 )
             else:
-                return
+                return None
         except click.ClickException as ex:
             # HACK: By now, datafile raises click.ClickException instead of
             # CLIException to avoid circular imports. Thats we need to trace
@@ -1229,7 +1229,7 @@ async def materialize(
         raise CLIException(FeedbackManager.error_exception(error=str(e)))
 
 
-def __patch_click_output():
+def __patch_click_output() -> None:
     import re
 
     CUSTOM_PATTERNS: List[str] = []

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/tb_cli_modules/common.py

@@ -1042,7 +1042,7 @@ def get_format_from_filename_or_url(filename_or_url: str) -> str:
     'csv'
     """
     filename_or_url = filename_or_url.lower()
-    if filename_or_url.endswith("json") or filename_or_url.endswith("ndjson"):
+    if filename_or_url.endswith(("json", "ndjson")):
         return "ndjson"
     if filename_or_url.endswith("parquet"):
         return "parquet"
@@ -1050,7 +1050,7 @@ def get_format_from_filename_or_url(filename_or_url: str) -> str:
         return "csv"
     try:
         parsed = urlparse(filename_or_url)
-        if parsed.path.endswith("json") or parsed.path.endswith("ndjson"):
+        if parsed.path.endswith(("json", "ndjson")):
             return "ndjson"
         if parsed.path.endswith("parquet"):
             return "parquet"

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/tb_cli_modules/pipe.py

@@ -13,7 +13,7 @@ import click
 import humanfriendly
 from click import Context
 
-import tinybird.context as context
+from tinybird import context
 from tinybird.client import AuthNoTokenException, DoesNotExistException, TinyB
 from tinybird.config import DEFAULT_API_HOST, FeatureFlags
 from tinybird.datafile_common import PipeNodeTypes, PipeTypes, folder_push, get_name_version, process_file, wait_job

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/tb_cli_modules/tinyunit/tinyunit.py

@@ -5,7 +5,6 @@ from typing import Any, Dict, Iterable, List, Optional
 import click
 import yaml
 from humanfriendly.tables import format_smart_table
-from typing_extensions import override
 
 from tinybird.client import TinyB
 from tinybird.feedback_manager import FeedbackManager
@@ -118,19 +117,6 @@ class TestResult:
             return PASS_OVER_TIME
         return PASS
 
-    @override
-    def __dict__(self):
-        return {
-            "name": self.name,
-            "data": self.data,
-            "elapsed_time": self.elapsed_time,
-            "read_bytes": self.read_bytes,
-            "max_elapsed_time": self.max_elapsed_time,
-            "max_bytes_read": self.max_bytes_read,
-            "error": self.error,
-            "status": self.status.name,
-        }
-
 
 @dataclass()
 class TestSummaryResults:

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/tb_cli_modules/tinyunit/tinyunit_lib.py

@@ -3,8 +3,6 @@ from collections import namedtuple
 from json import JSONEncoder
 from typing import Optional
 
-from typing_extensions import override
-
 
 class MyJSONEncoder(JSONEncoder):
     # def default(self, in_obj):
@@ -56,10 +54,6 @@ class DataUnitTest:
     def __str__(self):
         return json.dumps(dict(self), ensure_ascii=False)
 
-    @override
-    def __dict__(self):
-        return dict(self)
-
     def __repr__(self):
         return self.__str__()
 

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird/tornado_template.py

@@ -289,12 +289,11 @@ class Template:
         if whitespace is None:
             if loader and loader.whitespace:
                 whitespace = loader.whitespace
-            else:
+            elif name.endswith((".html", ".js")):
                 # Whitespace defaults by filename.
-                if name.endswith(".html") or name.endswith(".js"):
-                    whitespace = "single"
-                else:
-                    whitespace = "all"
+                whitespace = "single"
+            else:
+                whitespace = "all"
         # Validate the whitespace setting.
         filter_whitespace(whitespace, "")
 
@@ -1169,7 +1168,7 @@ def check_valid_expr(expr):
                 check_valid_expr(expr.slice.lower)
             if expr.slice.upper is not None:
                 check_valid_expr(expr.slice.upper)
-        elif isinstance(expr.slice, ast.Constant) or isinstance(expr.slice, ast.Subscript):
+        elif isinstance(expr.slice, (ast.Constant, ast.Subscript)):
             check_valid_expr(expr.slice)
         else:
             raise SecurityException(f"Invalid Slice expression: {ast.dump(expr.slice)}")
@@ -1178,7 +1177,7 @@ def check_valid_expr(expr):
             check_valid_expr(key)
         for value in expr.values:
             check_valid_expr(value)
-    elif isinstance(expr, ast.Tuple) or isinstance(expr, ast.List) or isinstance(expr, ast.Set):
+    elif isinstance(expr, (ast.Tuple, ast.List, ast.Set)):
         for x in expr.elts:
             check_valid_expr(x)
     elif isinstance(expr, ast.JoinedStr):

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 5.21.2.dev0
+Version: 5.22.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -16,7 +16,7 @@ Requires-Dist: croniter==1.3.15
 Requires-Dist: GitPython~=3.1.32
 Requires-Dist: humanfriendly~=8.2
 Requires-Dist: pydantic~=2.8.0
-Requires-Dist: pyperclip==1.8.2
+Requires-Dist: pyperclip==1.9.0
 Requires-Dist: pyyaml<6.1,>=6.0
 Requires-Dist: requests<3,>=2.28.1
 Requires-Dist: shandy-sqlfmt==0.11.1
@@ -61,6 +61,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.21.2
+***********
+
+- `Improved` Error message when trying to format a file using `tb fmt` or when we are running `tb init --git` to include the resource name and source (local/remote)
+
 5.21.1
 ***********
 

{tinybird_cli-5.21.2.dev0 → tinybird_cli-5.22.1.dev0}/tinybird_cli.egg-info/requires.txt

@@ -7,7 +7,7 @@ croniter==1.3.15
 GitPython~=3.1.32
 humanfriendly~=8.2
 pydantic~=2.8.0
-pyperclip==1.8.2
+pyperclip==1.9.0
 pyyaml<6.1,>=6.0
 requests<3,>=2.28.1
 shandy-sqlfmt==0.11.1