tinybird-cli 6.5.6.dev0__py3-none-any.whl → 6.5.8.dev0__py3-none-any.whl

tinybird/tb_cli_modules/datasource.py

@@ -37,9 +37,7 @@ from tinybird.tb_cli_modules.common import (
     wait_job,
 )
 from tinybird.tb_cli_modules.config import CLIConfig
-from tinybird.tb_cli_modules.exceptions import CLIDatasourceException, CLIException
-
-EXPERIMENTAL_FEATURE_USE_V1 = "use_v1"
+from tinybird.tb_cli_modules.exceptions import CLIDatasourceException
 
 
 @cli.group()
@@ -54,28 +52,6 @@ def _echo_v1_import_jobs_queued(job_ids: list[str], operation: str) -> None:
         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(
@@ -166,12 +142,10 @@ 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.",
+    "--wait/--no-wait",
+    default=True,
+    help="Wait for the import to finish (default); use --no-wait to only queue it.",
 )
 @click.pass_context
 @coro
@@ -183,7 +157,6 @@ async def datasource_append(
     incremental: Optional[str],
     ignore_empty: bool,
     concurrency: int,
-    experimental: tuple[str, ...],
     wait: bool,
 ):
     """
@@ -197,14 +170,9 @@ async def datasource_append(
 
     if not url:
         raise CLIDatasourceException(FeedbackManager.error_missing_url(datasource=datasource_name))
-    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")
+    job_ids = await push_data(ctx, datasource_name, url, mode="append", concurrency=concurrency, wait=wait)
+    if job_ids:
+        _echo_v1_import_jobs_queued(job_ids, "Append")
 
 
 @datasource.command(name="replace")
@@ -212,12 +180,10 @@ 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.",
+    "--wait/--no-wait",
+    default=True,
+    help="Wait for the import to finish (default); use --no-wait to only queue it.",
 )
 @click.pass_context
 @coro
@@ -227,7 +193,6 @@ async def datasource_replace(
     url,
     sql_condition,
     skip_incompatible_partition_key,
-    experimental: tuple[str, ...],
     wait: bool,
 ):
     """
@@ -245,9 +210,6 @@ async def datasource_replace(
     replace_options = set()
     if skip_incompatible_partition_key:
         replace_options.add("skip_incompatible_partition_key")
-    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,
@@ -255,12 +217,10 @@ async def datasource_replace(
         mode="replace",
         sql_condition=sql_condition,
         replace_options=replace_options,
-        use_v1=use_v1,
+        wait=wait,
     )
-    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")
+    if job_ids:
+        _echo_v1_import_jobs_queued(job_ids, "Replace")
 
 
 @datasource.command(name="analyze")
@@ -425,7 +385,7 @@ async def datasource_truncate(ctx, datasource_name, yes, cascade):
 
 @datasource.command(name="delete")
 @click.argument("datasource_name")
-@click.option("--sql-condition", default=None, help="SQL WHERE condition to remove rows", hidden=True, required=True)
+@click.option("--sql-condition", help="SQL WHERE condition to remove rows", hidden=True, required=True)
 @click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
 @click.option(
     "--wait/--no-wait",
@@ -557,7 +517,7 @@ async def datasource_delete_rows(
                             )
                         )
                         break
-                    elif res["status"] == "error":
+                    if res["status"] == "error":
                         print("\n")  # noqa: T201
                         raise CLIDatasourceException(FeedbackManager.error_exception(error=res["error"]))
                     await asyncio.sleep(1)

tinybird/tb_cli_modules/pipe.py

@@ -16,7 +16,15 @@ from click import 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
+from tinybird.datafile_common import (
+    PipeNodeTypes,
+    PipeTypes,
+    folder_push,
+    get_name_version,
+    local_copy_node_uses_on_demand_compute,
+    process_file,
+    wait_job,
+)
 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
@@ -272,7 +280,7 @@ async def pipe_populate(
         if not materialized_ids:
             raise CLIPipeException(FeedbackManager.error_populate_no_materialized_in_pipe(pipe=pipe_name))
 
-        elif len(materialized_ids) > 1:
+        if len(materialized_ids) > 1:
             raise CLIPipeException(FeedbackManager.error_populate_several_materialized_in_pipe(pipe=pipe_name))
 
         node = materialized_ids[0]
@@ -328,9 +336,8 @@ async def pipe_unlink_output_node(
 
             if not node_uid:
                 raise CLIPipeException(FeedbackManager.error_unlinking_pipe_not_linked(pipe=pipe_name_or_id))
-            else:
-                await client.pipe_unlink_materialized(pipe["name"], node_uid)
-                click.echo(FeedbackManager.success_pipe_unlinked(pipe=pipe["name"]))
+            await client.pipe_unlink_materialized(pipe["name"], node_uid)
+            click.echo(FeedbackManager.success_pipe_unlinked(pipe=pipe["name"]))
 
         if pipe["type"] == PipeTypes.COPY:
             click.echo(FeedbackManager.info_unlinking_copy_pipe(pipe=pipe["name"]))
@@ -343,9 +350,8 @@ async def pipe_unlink_output_node(
 
             if not node_uid:
                 raise CLIPipeException(FeedbackManager.error_unlinking_pipe_not_linked(pipe=pipe_name_or_id))
-            else:
-                await client.pipe_remove_copy(pipe["name"], node_uid)
-                click.echo(FeedbackManager.success_pipe_unlinked(pipe=pipe["name"]))
+            await client.pipe_remove_copy(pipe["name"], node_uid)
+            click.echo(FeedbackManager.success_pipe_unlinked(pipe=pipe["name"]))
 
         if pipe["type"] == PipeTypes.DATA_SINK:
             click.echo(FeedbackManager.info_unlinking_sink_pipe(pipe=pipe["name"]))
@@ -358,9 +364,8 @@ async def pipe_unlink_output_node(
 
             if not node_uid:
                 raise CLIPipeException(FeedbackManager.error_unlinking_pipe_not_linked(pipe=pipe_name_or_id))
-            else:
-                await client.pipe_remove_sink(pipe["name"], node_uid)
-                click.echo(FeedbackManager.success_pipe_unlinked(pipe=pipe["name"]))
+            await client.pipe_remove_sink(pipe["name"], node_uid)
+            click.echo(FeedbackManager.success_pipe_unlinked(pipe=pipe["name"]))
 
         if pipe["type"] == PipeTypes.STREAM:
             click.echo(FeedbackManager.info_unlinking_stream_pipe(pipe=pipe["name"]))
@@ -368,9 +373,8 @@ async def pipe_unlink_output_node(
 
             if not node_uid:
                 raise CLIPipeException(FeedbackManager.error_unlinking_pipe_not_linked(pipe=pipe_name_or_id))
-            else:
-                await client.pipe_remove_stream(pipe["name"], node_uid)
-                click.echo(FeedbackManager.success_pipe_unlinked(pipe=pipe["name"]))
+            await client.pipe_remove_stream(pipe["name"], node_uid)
+            click.echo(FeedbackManager.success_pipe_unlinked(pipe=pipe["name"]))
 
     except AuthNoTokenException:
         raise
@@ -753,30 +757,41 @@ async def pipe_copy_run(
 
     params = dict(key_value.split("=") for key_value in param) if param else {}
 
-    if yes or click.confirm(FeedbackManager.warning_confirm_copy_pipe(pipe=pipe_name_or_id)):
-        click.echo(FeedbackManager.info_copy_job_running(pipe=pipe_name_or_id))
-        client: TinyB = ctx.ensure_object(dict)["client"]
+    if not yes and not click.confirm(FeedbackManager.warning_confirm_copy_pipe(pipe=pipe_name_or_id)):
+        return
 
-        try:
-            response = await client.pipe_run_copy(pipe_name_or_id, params, mode, on_demand_compute=on_demand_compute)
+    if (
+        on_demand_compute
+        and not yes
+        and local_copy_node_uses_on_demand_compute(".", pipe_name_or_id) is False
+        and not click.confirm(
+            FeedbackManager.warning_confirm_on_demand_compute_differs_from_datafile(pipe=pipe_name_or_id),
+            default=False,
+        )
+    ):
+        return
 
-            job_id = response["job"]["job_id"]
-            job_url = response["job"]["job_url"]
-            target_datasource_id = response["tags"]["copy_target_datasource"]
-            target_datasource = await client.get_datasource(target_datasource_id)
-            target_datasource_name = target_datasource["name"]
-            click.echo(
-                FeedbackManager.success_copy_job_created(target_datasource=target_datasource_name, job_url=job_url)
-            )
+    click.echo(FeedbackManager.info_copy_job_running(pipe=pipe_name_or_id))
+    client: TinyB = ctx.ensure_object(dict)["client"]
 
-            if wait:
-                await wait_job(client, job_id, job_url, "** Copying data")
-                click.echo(FeedbackManager.success_data_copied_to_ds(target_datasource=target_datasource_name))
+    try:
+        response = await client.pipe_run_copy(pipe_name_or_id, params, mode, on_demand_compute=on_demand_compute)
 
-        except AuthNoTokenException:
-            raise
-        except Exception as e:
-            raise CLIPipeException(FeedbackManager.error_creating_copy_job(error=e))
+        job_id = response["job"]["job_id"]
+        job_url = response["job"]["job_url"]
+        target_datasource_id = response["tags"]["copy_target_datasource"]
+        target_datasource = await client.get_datasource(target_datasource_id)
+        target_datasource_name = target_datasource["name"]
+        click.echo(FeedbackManager.success_copy_job_created(target_datasource=target_datasource_name, job_url=job_url))
+
+        if wait:
+            await wait_job(client, job_id, job_url, "** Copying data")
+            click.echo(FeedbackManager.success_data_copied_to_ds(target_datasource=target_datasource_name))
+
+    except AuthNoTokenException:
+        raise
+    except Exception as e:
+        raise CLIPipeException(FeedbackManager.error_creating_copy_job(error=e))
 
 
 @pipe_copy.command(name="resume", short_help="Resume a paused copy pipe")

tinybird/tb_cli_modules/tinyunit/tinyunit.py

@@ -102,18 +102,18 @@ class TestResult:
     def status(self) -> Status:
         if len(self.data) > 0:
             return FAILED
-        elif self.error:
+        if self.error:
             return Status.build_error_with_msg(self.error)
-        elif (
+        if (
             self.max_bytes_read is not None
             and self.max_elapsed_time is not None
             and self.read_bytes > self.max_bytes_read
             and self.elapsed_time > self.max_elapsed_time
         ):
             return PASS_OVER_TIME_AND_READ_BYTES
-        elif self.max_bytes_read is not None and self.read_bytes > self.max_bytes_read:
+        if self.max_bytes_read is not None and self.read_bytes > self.max_bytes_read:
             return PASS_OVER_READ_BYTES
-        elif self.max_elapsed_time is not None and self.elapsed_time > self.max_elapsed_time:
+        if self.max_elapsed_time is not None and self.elapsed_time > self.max_elapsed_time:
             return PASS_OVER_TIME
         return PASS
 

tinybird/tb_cli_modules/token.py

@@ -6,11 +6,10 @@ import pyperclip
 from click import Context
 from humanfriendly import parse_timespan
 
-from tinybird.client import AuthNoTokenException, TinyB
+from tinybird.client import AuthNoTokenException, DoesNotExistException, TinyB
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.cli import cli
 from tinybird.tb_cli_modules.common import (
-    DoesNotExistException,
     coro,
     echo_safe_humanfriendly_tables_format_smart_table,
 )

tinybird/tb_cli_modules/workspace.py

@@ -115,17 +115,16 @@ async def clear_workspace(ctx: Context, yes: bool, dry_run: bool) -> None:
         if config["id"] == workspace["id"]:
             if workspace.get("is_branch"):
                 raise CLIWorkspaceException(FeedbackManager.error_not_allowed_in_branch(cli="tb"))
-            else:
-                click.echo(FeedbackManager.info_current_workspace())
-                table.append(
-                    [
-                        workspace["name"],
-                        workspace["id"],
-                        workspace["role"],
-                        _get_workspace_plan_name(workspace["plan"]),
-                        True,
-                    ]
-                )
+            click.echo(FeedbackManager.info_current_workspace())
+            table.append(
+                [
+                    workspace["name"],
+                    workspace["id"],
+                    workspace["role"],
+                    _get_workspace_plan_name(workspace["plan"]),
+                    True,
+                ]
+            )
             break
 
     echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
@@ -178,8 +177,7 @@ async def clear_workspace(ctx: Context, yes: bool, dry_run: bool) -> None:
                 except Exception as e:
                     if "is a Shared Data Source" in str(e):
                         raise CLIWorkspaceException(FeedbackManager.error_operation_can_not_be_performed(error=e))
-                    else:
-                        raise CLIWorkspaceException(FeedbackManager.error_exception(error=e))
+                    raise CLIWorkspaceException(FeedbackManager.error_exception(error=e))
             else:
                 click.echo(FeedbackManager.info_dry_removing_datasource(datasource=ds_name))