tinybird 4.6.13.dev0__tar.gz → 4.6.15.dev0__tar.gz

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.13.dev0
+Version: 4.6.15.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.13
+********
+
+- `Added` ``tb datasource append`` and ``tb datasource replace`` support the experimental ``--experimental=use_v1`` option for local CSV, NDJSON, and Parquet files. It submits the import through the v1 endpoint and prints the queued job ID; pass ``--wait`` to wait for completion.
+
 4.6.12
 ********
 

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/client.py

@@ -441,6 +441,7 @@ class TinyB:
         sql_condition: Optional[str] = None,
         format: str = "csv",
         replace_options: Optional[Set[str]] = None,
+        use_v1: bool = False,
     ):
         params = {"name": datasource_name, "mode": mode, "format": format, "debug": "blocks_block_log"}
 
@@ -452,20 +453,43 @@ class TinyB:
 
         async with aiofiles.open(file, "rb") as content:
             file_content = await content.read()
-            if format == "csv":
-                files = {"csv": ("csv", file_content)}
-            else:
-                files = {"ndjson": ("ndjson", file_content)}
 
-            res = await self._req(
-                f"v0/datasources?{urlencode(params, safe='')}",
-                files=files,
+        if use_v1:
+            v1_params = {"format": format}
+            if sql_condition:
+                v1_params["replace_condition"] = sql_condition
+            if replace_options:
+                for option in list(replace_options):
+                    v1_params[option] = "true"
+            content_types = {
+                "csv": "text/csv",
+                "ndjson": "application/x-ndjson",
+                "parquet": "application/vnd.apache.parquet",
+            }
+            headers = {"Content-Type": content_types[format]}
+            if str(file).endswith(".gz"):
+                headers["Content-Encoding"] = "gzip"
+            return await self._req(
+                f"/v1/datasources/{quote(datasource_name, safe='')}/{mode}?{urlencode(v1_params, safe='')}",
+                data=file_content,
+                headers=headers,
                 method="POST",
             )
-            if status_callback:
-                status_callback(res)
 
-            return res
+        if format == "csv":
+            files = {"csv": ("csv", file_content)}
+        else:
+            files = {"ndjson": ("ndjson", file_content)}
+
+        res = await self._req(
+            f"v0/datasources?{urlencode(params, safe='')}",
+            files=files,
+            method="POST",
+        )
+        if status_callback:
+            status_callback(res)
+
+        return res
 
     async def datasource_truncate(self, datasource_name: str):
         return await self._req(f"/v0/datasources/{datasource_name}/truncate", method="POST", data="")

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/datafile/common.py

@@ -2091,6 +2091,7 @@ def parse(
             "sql": sql("sql"),
             "version": version,
             "deployment_method": assign_var("deployment_method", allowed_values={"alter"}),
+            "export_service": export_service,  # Deprecated
             "export_connection_name": assign_var("export_connection_name"),
             "export_schedule": assign_var("export_schedule"),
             "export_bucket_uri": assign_var("export_bucket_uri"),

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/datafile/parse_pipe.py

@@ -52,20 +52,35 @@ def parse_pipe(
             if "type" in node:
                 node["type"] = node["type"].lower()
             sql = node.get("sql", "")
-            if sql.strip()[0] == "%":
+            source_sql = sql.strip()
+            if not source_sql:
+                raise click.ClickException(
+                    FeedbackManager.error_parsing_node(node=node["name"], pipe=filename, error="Empty query")
+                )
+            if source_sql.startswith("%"):
                 secrets_list: Optional[List[str]] = None
                 if secrets:
                     secrets_list = list(secrets.keys())
                 # Setting test_mode=True to ignore errors on required parameters and
                 # secrets_in_test_mode=False to raise errors on missing secrets
                 sql, _, variable_warnings = render_sql_template(
-                    sql[1:],
+                    source_sql[1:],
                     name=node["name"],
                     secrets=secrets_list,
                     test_mode=True,
                     secrets_in_test_mode=ignore_secrets,
                 )
                 doc.warnings = variable_warnings
+                if not sql.strip():
+                    raise click.ClickException(
+                        FeedbackManager.error_parsing_node(
+                            node=node["name"],
+                            pipe=filename,
+                            error="Template renders to an empty query without parameters",
+                        )
+                    )
+            else:
+                sql = source_sql
             # it'll fail with a ModuleNotFoundError when the toolset is not available but it returns the parsed doc
             from tinybird.sql_toolset import format_sql as toolset_format_sql
 
@@ -79,13 +94,15 @@ def parse_pipe(
             )
         )
     except ValueError as e:
-        t, template_variables, _ = get_template_and_variables(sql, name=node["name"])
+        source_sql = node.get("sql", "")
+        source_sql_stripped = source_sql.strip()
+        t, template_variables, _ = get_template_and_variables(source_sql, name=node["name"])
 
-        if sql.strip()[0] != "%" and len(template_variables) > 0:
+        if not source_sql_stripped.startswith("%") and len(template_variables) > 0:
             raise click.ClickException(FeedbackManager.error_template_start(filename=filename))
         raise click.ClickException(
             FeedbackManager.error_parsing_file(
-                filename=filename, lineno="", error=f"{str(e)} + SQL(value error): {sql}"
+                filename=filename, lineno="", error=f"{str(e)} + SQL(value error): {source_sql}"
             )
         )
     except UnClosedIfError as e:

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/feedback_manager.py

@@ -864,6 +864,9 @@ class FeedbackManager:
     success_total_rows = success_message("** Total rows in {datasource}: {total_rows}")
     success_appended_datasource = success_message("** Data appended to Data Source '{datasource}' successfully!")
     success_replaced_datasource = success_message("** Data replaced in Data Source '{datasource}' successfully!")
+    success_import_job_queued = success_message("** {operation} import job queued: {job_id}")
+    success_import_job_completed = success_message("** {operation} import completed: {job_id}")
+    info_import_job_status = info_message("Check status: tb job details {job_id}")
     success_auth = success_message(
         "** Auth successful! \n** Configuration written to .tinyb file, consider adding it to .gitignore"
     )

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/sql_template.py

@@ -1396,7 +1396,7 @@ _namespace = {
 }
 
 
-reserved_vars = set(["_tt_tmp", "_tt_append", "isinstance", "str", "error", "custom_error", *list(vars(builtins))])
+reserved_vars = {"_tt_tmp", "_tt_append", "isinstance", "str", "error", "custom_error", *list(vars(builtins))}
 for p in DEFAULT_PARAM_NAMES:  # we handle these in an specific manner
     reserved_vars.discard(p)  # `format` is part of builtins
 # Allow 'id' to be used as a template parameter - https://gitlab.com/tinybird/analytics/-/issues/19119

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/sql_toolset.py

@@ -643,7 +643,7 @@ def replace_tables(
 
         if current_replacements:
             # We need to transform the dictionary into something cacheable, so a sorted tuple of tuples it is
-            r = tuple(sorted([(k, v) for k, v in current_replacements.items()]))
+            r = tuple(sorted(current_replacements.items()))
             sql = replace_tables_chquery_cached(
                 sql,
                 r,

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '4.6.13.dev0'
-__revision__ = '9f77ad2'
+__version__ = '4.6.15.dev0'
+__revision__ = '8311ae9'

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb/client.py

@@ -465,6 +465,7 @@ class TinyB:
         sql_condition: Optional[str] = None,
         format: str = "csv",
         replace_options: Optional[Set[str]] = None,
+        use_v1: bool = False,
     ):
         params = {"name": datasource_name, "mode": mode, "format": format, "debug": "blocks_block_log"}
 
@@ -476,6 +477,30 @@ class TinyB:
 
         with open(file, "rb") as content:
             file_content = content.read()
+        content_types = {
+            "csv": "text/csv",
+            "ndjson": "application/x-ndjson",
+            "parquet": "application/vnd.apache.parquet",
+        }
+        headers = {"Content-Type": content_types[format]}
+        if str(file).endswith(".gz"):
+            headers["Content-Encoding"] = "gzip"
+        if use_v1:
+            v1_params = {"format": format}
+            if sql_condition:
+                v1_params["replace_condition"] = sql_condition
+            if replace_options:
+                for option in list(replace_options):
+                    v1_params[option] = "true"
+            res = self._req(
+                f"/v1/datasources/{quote(datasource_name, safe='')}/{mode}?{urlencode(v1_params, safe='')}",
+                data=file_content,
+                headers=headers,
+                method="POST",
+            )
+            if "error" in res:
+                raise Exception(res["error"])
+            return res
         if format == "csv":
             files = {"csv": ("csv", file_content)}
         else:

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb/modules/common.py

@@ -925,7 +925,8 @@ def push_data(
     replace_options=None,
     concurrency: int = 1,
     silent: bool = False,
-):
+    use_v1: bool = False,
+) -> Optional[list[str]]:
     if url and type(url) is tuple:
         url = url[0]
 
@@ -962,6 +963,8 @@ def push_data(
         datasource_name: str, url: str, mode: str, sql_condition: Optional[str], replace_options: Optional[Set[str]]
     ):
         parsed = urlparse(url)
+        if use_v1 and parsed.scheme in ("http", "https"):
+            raise CLIException("--experimental=use_v1 only supports local files.")
         # poor man's format detection
         _format = get_format_from_filename_or_url(url)
         if parsed.scheme in ("http", "https"):
@@ -982,8 +985,15 @@ def push_data(
                 sql_condition=sql_condition,
                 format=_format,
                 replace_options=replace_options,
+                use_v1=use_v1,
             )
 
+        if use_v1:
+            job_id = res.get("id") or res.get("import_id")
+            if not isinstance(job_id, str):
+                raise CLIException("The v1 import response did not include a job ID.")
+            return job_id
+
         datasource_name = res["datasource"]["name"]
         try:
             datasource = client.get_datasource(datasource_name)
@@ -1014,6 +1024,8 @@ def push_data(
     try:
         tasks = [process_url(datasource_name, url, mode, sql_condition, replace_options) for url in urls]
         output = gather_with_concurrency(concurrency, *tasks)
+        if use_v1:
+            return list(output)
         parser, total_rows, appended_rows = list(output)[-1]
     except AuthNoTokenException:
         raise
@@ -1031,6 +1043,8 @@ def push_data(
 
             click.echo(FeedbackManager.success_progress_blocks())
 
+    return None
+
 
 def sync_data(ctx, datasource_name: str, yes: bool):
     client: TinyB = ctx.obj["client"]

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb/modules/config.py

@@ -85,7 +85,7 @@ class CLIConfig:
     def to_dict(self) -> Dict[str, Any]:
         """Helper to ease"""
         result: Dict[str, Any] = {}
-        result.update(dict((v.name, deepcopy(v.value)) for v in self._values.values()))
+        result.update({v.name: deepcopy(v.value) for v in self._values.values()})
         return result
 
     def __getitem__(self, key) -> Any:

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb/modules/datafile/build.py

@@ -951,7 +951,7 @@ def process_file(
                 "filename": filename,
                 "name": name + version,
                 "nodes": nodes,
-                "deps": [x for x in set(deps)],
+                "deps": list(set(deps)),
                 "tokens": doc.tokens,
                 "description": description,
                 "warnings": doc.warnings,

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb/modules/datafile/pipe_checker.py

@@ -162,12 +162,12 @@ class PipeChecker(unittest.TestCase):
 
         if self.ignore_order:
             current_data = (
-                sorted(normalize_array(current_data), key=itemgetter(*[k for k in current_data[0].keys()]))
+                sorted(normalize_array(current_data), key=itemgetter(*list(current_data[0].keys())))
                 if len(current_data) > 0
                 else current_data
             )
             checker_data = (
-                sorted(normalize_array(checker_data), key=itemgetter(*[k for k in checker_data[0].keys()]))
+                sorted(normalize_array(checker_data), key=itemgetter(*list(checker_data[0].keys())))
                 if len(checker_data) > 0
                 else checker_data
             )

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb/modules/datafile/playground.py

@@ -992,7 +992,7 @@ def process_file(
                 "filename": filename,
                 "name": name + version,
                 "nodes": nodes,
-                "deps": [x for x in set(deps)],
+                "deps": list(set(deps)),
                 "tokens": doc.tokens,
                 "description": description,
                 "warnings": doc.warnings,

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb/modules/datasource.py

@@ -35,6 +35,7 @@ from tinybird.tb.modules.common import (
     get_format_from_filename_or_url,
     normalize_datasource_name,
     push_data,
+    wait_job,
 )
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.connection_dynamodb import connection_create_dynamodb, validate_dynamodb_table
@@ -58,7 +59,7 @@ from tinybird.tb.modules.create import (
     generate_gcs_connection_file_with_secrets,
 )
 from tinybird.tb.modules.datafile.fixture import persist_fixture
-from tinybird.tb.modules.exceptions import CLIDatasourceException
+from tinybird.tb.modules.exceptions import CLIDatasourceException, CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager, get_cli_name
 from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml
@@ -66,6 +67,36 @@ from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.secret import save_secret_to_env_file
 from tinybird.tb.modules.telemetry import add_telemetry_event
 
+EXPERIMENTAL_FEATURE_USE_V1 = "use_v1"
+
+
+def _echo_v1_import_jobs_queued(job_ids: list[str], operation: str) -> None:
+    for job_id in job_ids:
+        click.echo(FeedbackManager.success(message=f"✓ {operation} import job queued: {job_id}"))
+        click.echo(FeedbackManager.gray(message=f"Check status: tb job details {job_id}"))
+
+
+def _wait_for_v1_import_jobs(client: TinyB, job_ids: list[str], operation: str) -> None:
+    for job_id in job_ids:
+        try:
+            wait_job(client, job_id, f"/v0/jobs/{job_id}", f"{operation} import")
+        except CLIException:
+            if _echo_v1_import_job_details(client, job_id):
+                raise click.exceptions.Exit(1)
+            raise
+        click.echo(FeedbackManager.success(message=f"✓ {operation} import completed: {job_id}"))
+
+
+def _echo_v1_import_job_details(client: TinyB, job_id: str) -> bool:
+    try:
+        job = client.job(job_id)
+    except Exception:
+        return False
+    click.echo(FeedbackManager.info_job(job=job_id))
+    echo_safe_humanfriendly_tables_format_smart_table([job.values()], column_names=job.keys())
+    click.echo("\n")
+    return True
+
 
 def _dynamodb_key_schema_sort_key(key_schema: dict[str, str]) -> int:
     if key_schema.get("key_type") == "HASH":
@@ -213,7 +244,14 @@ def datasource_ls(ctx: Context, match: Optional[str], format_: str):
 @click.option("--url", type=str, help="URL to append data from")
 @click.option("--file", type=str, help="Local file to append data from")
 @click.option("--events", type=str, help="Events to append data from")
+@click.option(
+    "--experimental",
+    type=click.Choice([EXPERIMENTAL_FEATURE_USE_V1]),
+    multiple=True,
+    help="Enable an experimental feature. May be specified multiple times.",
+)
 @click.option("--concurrency", help="How many files to submit concurrently", default=1, hidden=True)
+@click.option("--wait", is_flag=True, default=False, help="Wait for a v1 import job to finish.")
 @click.pass_context
 def datasource_append(
     ctx: Context,
@@ -222,7 +260,9 @@ def datasource_append(
     url: str,
     file: str,
     events: str,
+    experimental: tuple[str, ...],
     concurrency: int,
+    wait: bool,
 ):
     """
     Appends data to an existing data source from URL, local file  or a connector
@@ -237,6 +277,9 @@ def datasource_append(
     env: str = ctx.ensure_object(dict)["env"]
     client: TinyB = ctx.obj["client"]
     project: Project = ctx.ensure_object(dict)["project"]
+    use_v1 = EXPERIMENTAL_FEATURE_USE_V1 in experimental
+    if wait and not use_v1:
+        raise CLIDatasourceException("--wait requires --experimental=use_v1.")
 
     # If data is passed as argument, we detect if it's a JSON object, a URL or a file
     if data:
@@ -346,6 +389,8 @@ def datasource_append(
             raise CLIDatasourceException(FeedbackManager.error(message="Invalid ingestion option"))
 
     if events:
+        if use_v1:
+            raise CLIDatasourceException("--experimental=use_v1 only supports local files.")
         click.echo(FeedbackManager.highlight(message=f"\n» Sending events to {datasource_name}"))
         events_params = {"name": datasource_name}
         request_from = getattr(client, "request_from", None)
@@ -382,13 +427,14 @@ def datasource_append(
     else:
         click.echo(FeedbackManager.highlight(message=f"\n» Appending data to {datasource_name}"))
         try:
-            push_data(
+            job_ids = push_data(
                 client,
                 datasource_name,
                 data,
                 mode="append",
                 concurrency=concurrency,
                 silent=True,
+                use_v1=use_v1,
             )
         except Exception as e:
             is_quarantined = "quarantine" in str(e)
@@ -398,7 +444,12 @@ def datasource_append(
                 return
             else:
                 raise e
-        click.echo(FeedbackManager.success(message="✓ Rows appended!"))
+        if use_v1:
+            _echo_v1_import_jobs_queued(job_ids or [], "Append")
+            if wait:
+                _wait_for_v1_import_jobs(client, job_ids or [], "Append")
+        else:
+            click.echo(FeedbackManager.success(message="✓ Rows appended!"))
 
 
 @datasource.command(name="replace")
@@ -406,6 +457,13 @@ def datasource_append(
 @click.argument("url", nargs=-1, required=True)
 @click.option("--sql-condition", default=None, help="SQL WHERE condition to replace data", hidden=True)
 @click.option("--skip-incompatible-partition-key", is_flag=True, default=False, hidden=True)
+@click.option("--wait", is_flag=True, default=False, help="Wait for a v1 import job to finish.")
+@click.option(
+    "--experimental",
+    type=click.Choice([EXPERIMENTAL_FEATURE_USE_V1]),
+    multiple=True,
+    help="Enable an experimental feature. May be specified multiple times.",
+)
 @click.pass_context
 def datasource_replace(
     ctx: Context,
@@ -413,6 +471,8 @@ def datasource_replace(
     url,
     sql_condition,
     skip_incompatible_partition_key,
+    experimental: tuple[str, ...],
+    wait: bool,
 ):
     """
     Replaces the data in a data source from a URL, local file or a connector
@@ -426,14 +486,22 @@ def datasource_replace(
     if skip_incompatible_partition_key:
         replace_options.add("skip_incompatible_partition_key")
     client: TinyB = ctx.obj["client"]
-    push_data(
+    use_v1 = EXPERIMENTAL_FEATURE_USE_V1 in experimental
+    if wait and not use_v1:
+        raise CLIDatasourceException("--wait requires --experimental=use_v1.")
+    job_ids = push_data(
         client,
         datasource_name,
         url,
         mode="replace",
         sql_condition=sql_condition,
         replace_options=replace_options,
+        use_v1=use_v1,
     )
+    if use_v1:
+        _echo_v1_import_jobs_queued(job_ids or [], "Replace")
+        if wait:
+            _wait_for_v1_import_jobs(client, job_ids or [], "Replace")
 
 
 @datasource.command(name="analyze")

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb_cli_modules/common.py

@@ -963,7 +963,8 @@ async def push_data(
     sql_condition: Optional[str] = None,
     replace_options=None,
     concurrency: int = 1,
-):
+    use_v1: bool = False,
+) -> Optional[list[str]]:
     if url and type(url) is tuple:
         url = url[0]
     client: TinyB = ctx.obj["client"]
@@ -1000,6 +1001,8 @@ async def push_data(
         datasource_name: str, url: str, mode: str, sql_condition: Optional[str], replace_options: Optional[Set[str]]
     ):
         parsed = urlparse(url)
+        if use_v1 and parsed.scheme in ("http", "https"):
+            raise CLIException("--experimental=use_v1 only supports local files.")
         # poor man's format detection
         _format = get_format_from_filename_or_url(url)
         if parsed.scheme in ("http", "https"):
@@ -1020,8 +1023,15 @@ async def push_data(
                 sql_condition=sql_condition,
                 format=_format,
                 replace_options=replace_options,
+                use_v1=use_v1,
             )
 
+        if use_v1:
+            job_id = res.get("id") or res.get("import_id")
+            if not isinstance(job_id, str):
+                raise CLIException("The v1 import response did not include a job ID.")
+            return job_id
+
         datasource_name = res["datasource"]["name"]
         try:
             datasource = await client.get_datasource(datasource_name)
@@ -1052,6 +1062,8 @@ async def push_data(
     try:
         tasks = [process_url(datasource_name, url, mode, sql_condition, replace_options) for url in urls]
         output = await gather_with_concurrency(concurrency, *tasks)
+        if use_v1:
+            return list(output)
         parser, total_rows, appended_rows = list(output)[-1]
     except AuthNoTokenException:
         raise
@@ -1072,6 +1084,8 @@ async def push_data(
             click.echo(FeedbackManager.success_appended_datasource(datasource=datasource_name))
         click.echo(FeedbackManager.info_data_pushed(datasource=datasource_name))
 
+    return None
+
 
 async def sync_data(ctx, datasource_name: str, yes: bool):
     client: TinyB = ctx.obj["client"]

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb_cli_modules/config.py

@@ -88,7 +88,7 @@ class CLIConfig:
     def to_dict(self) -> Dict[str, Any]:
         """Helper to ease"""
         result: Dict[str, Any] = self._parent.to_dict() if self._parent else {}
-        result.update(dict((v.name, deepcopy(v.value)) for v in self._values.values()))
+        result.update({v.name: deepcopy(v.value) for v in self._values.values()})
         return result
 
     def __getitem__(self, key) -> Any:

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tb_cli_modules/datasource.py

@@ -15,7 +15,7 @@ from click import Context
 
 from tinybird.client import AuthNoTokenException, CanNotBeDeletedException, DoesNotExistException, TinyB
 from tinybird.config import get_display_host
-from tinybird.datafile_common import get_name_version, wait_job
+from tinybird.datafile_common import get_name_version
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.branch import warn_if_in_live
 from tinybird.tb_cli_modules.cli import cli
@@ -34,9 +34,12 @@ from tinybird.tb_cli_modules.common import (
     validate_kafka_auto_offset_reset,
     validate_kafka_group,
     validate_kafka_topic,
+    wait_job,
 )
 from tinybird.tb_cli_modules.config import CLIConfig
-from tinybird.tb_cli_modules.exceptions import CLIDatasourceException
+from tinybird.tb_cli_modules.exceptions import CLIDatasourceException, CLIException
+
+EXPERIMENTAL_FEATURE_USE_V1 = "use_v1"
 
 
 @cli.group()
@@ -45,6 +48,34 @@ def datasource(ctx):
     """Data Sources commands"""
 
 
+def _echo_v1_import_jobs_queued(job_ids: list[str], operation: str) -> None:
+    for job_id in job_ids:
+        click.echo(FeedbackManager.success_import_job_queued(operation=operation, job_id=job_id))
+        click.echo(FeedbackManager.info_import_job_status(job_id=job_id))
+
+
+async def _wait_for_v1_import_jobs(client: TinyB, job_ids: list[str], operation: str) -> None:
+    for job_id in job_ids:
+        try:
+            await wait_job(client, job_id, f"/v0/jobs/{job_id}", f"{operation} import")
+        except CLIException:
+            if await _echo_v1_import_job_details(client, job_id):
+                raise click.exceptions.Exit(1)
+            raise
+        click.echo(FeedbackManager.success_import_job_completed(operation=operation, job_id=job_id))
+
+
+async def _echo_v1_import_job_details(client: TinyB, job_id: str) -> bool:
+    try:
+        job = await client.job(job_id)
+    except Exception:
+        return False
+    click.echo(FeedbackManager.info_job(job=job_id))
+    echo_safe_humanfriendly_tables_format_smart_table([job.values()], column_names=job.keys())
+    click.echo("\n")
+    return True
+
+
 @datasource.command(name="ls")
 @click.option("--match", default=None, help="Retrieve any resources matching the pattern. eg --match _test")
 @click.option(
@@ -135,6 +166,13 @@ async def datasource_ls(ctx: Context, match: Optional[str], format_: str):
     hidden=True,
 )
 @click.option("--concurrency", help="How many files to submit concurrently", default=1, hidden=True)
+@click.option("--wait", is_flag=True, default=False, help="Wait for a v1 import job to finish.")
+@click.option(
+    "--experimental",
+    type=click.Choice([EXPERIMENTAL_FEATURE_USE_V1]),
+    multiple=True,
+    help="Enable an experimental feature. May be specified multiple times.",
+)
 @click.pass_context
 @coro
 async def datasource_append(
@@ -145,6 +183,8 @@ async def datasource_append(
     incremental: Optional[str],
     ignore_empty: bool,
     concurrency: int,
+    experimental: tuple[str, ...],
+    wait: bool,
 ):
     """
     Appends data to an existing Data Source from URL, local file  or a connector
@@ -157,7 +197,14 @@ async def datasource_append(
 
     if not url:
         raise CLIDatasourceException(FeedbackManager.error_missing_url(datasource=datasource_name))
-    await push_data(ctx, datasource_name, url, mode="append", concurrency=concurrency)
+    use_v1 = EXPERIMENTAL_FEATURE_USE_V1 in experimental
+    if wait and not use_v1:
+        raise CLIDatasourceException("--wait requires --experimental=use_v1.")
+    job_ids = await push_data(ctx, datasource_name, url, mode="append", concurrency=concurrency, use_v1=use_v1)
+    if use_v1:
+        _echo_v1_import_jobs_queued(job_ids or [], "Append")
+        if wait:
+            await _wait_for_v1_import_jobs(ctx.obj["client"], job_ids or [], "Append")
 
 
 @datasource.command(name="replace")
@@ -165,6 +212,13 @@ async def datasource_append(
 @click.argument("url", nargs=-1)
 @click.option("--sql-condition", default=None, help="SQL WHERE condition to replace data", hidden=True)
 @click.option("--skip-incompatible-partition-key", is_flag=True, default=False, hidden=True)
+@click.option("--wait", is_flag=True, default=False, help="Wait for a v1 import job to finish.")
+@click.option(
+    "--experimental",
+    type=click.Choice([EXPERIMENTAL_FEATURE_USE_V1]),
+    multiple=True,
+    help="Enable an experimental feature. May be specified multiple times.",
+)
 @click.pass_context
 @coro
 async def datasource_replace(
@@ -173,6 +227,8 @@ async def datasource_replace(
     url,
     sql_condition,
     skip_incompatible_partition_key,
+    experimental: tuple[str, ...],
+    wait: bool,
 ):
     """
     Replaces the data in a data source from a URL, local file or a connector
@@ -189,14 +245,22 @@ async def datasource_replace(
     replace_options = set()
     if skip_incompatible_partition_key:
         replace_options.add("skip_incompatible_partition_key")
-    await push_data(
+    use_v1 = EXPERIMENTAL_FEATURE_USE_V1 in experimental
+    if wait and not use_v1:
+        raise CLIDatasourceException("--wait requires --experimental=use_v1.")
+    job_ids = await push_data(
         ctx,
         datasource_name,
         url,
         mode="replace",
         sql_condition=sql_condition,
         replace_options=replace_options,
+        use_v1=use_v1,
     )
+    if use_v1:
+        _echo_v1_import_jobs_queued(job_ids or [], "Replace")
+        if wait:
+            await _wait_for_v1_import_jobs(ctx.obj["client"], job_ids or [], "Replace")
 
 
 @datasource.command(name="analyze")

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird/tornado_template.py

@@ -916,10 +916,10 @@ def _parse(reader: _TemplateReader, template, in_block=None, in_loop=None):
 
         # Intermediate ("else", "elif", etc) blocks
         intermediate_blocks = {
-            "else": set(["if", "for", "while", "try"]),
-            "elif": set(["if"]),
-            "except": set(["try"]),
-            "finally": set(["try"]),
+            "else": {"if", "for", "while", "try"},
+            "elif": {"if"},
+            "except": {"try"},
+            "finally": {"try"},
         }
         allowed_parents = intermediate_blocks.get(operator)
 
@@ -997,7 +997,7 @@ def _parse(reader: _TemplateReader, template, in_block=None, in_loop=None):
 
         elif operator in ("break", "continue"):
             if not in_loop:
-                reader.raise_parse_error("%s outside %s block" % (operator, set(["for", "while"])))
+                reader.raise_parse_error("%s outside %s block" % (operator, {"for", "while"}))
             body.chunks.append(_Statement(contents, line))
             continue
 

{tinybird-4.6.13.dev0 → tinybird-4.6.15.dev0}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.13.dev0
+Version: 4.6.15.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.13
+********
+
+- `Added` ``tb datasource append`` and ``tb datasource replace`` support the experimental ``--experimental=use_v1`` option for local CSV, NDJSON, and Parquet files. It submits the import through the v1 endpoint and prints the queued job ID; pass ``--wait`` to wait for completion.
+
 4.6.12
 ********