tinybird-cli 6.5.1.dev0__tar.gz → 6.5.4.dev0__tar.gz

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.5.1.dev0
+Version: 6.5.4.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -22,7 +22,7 @@ Requires-Dist: requests<3,>=2.28.1
 Requires-Dist: shandy-sqlfmt==0.11.1
 Requires-Dist: shandy-sqlfmt[jinjafmt]==0.11.1
 Requires-Dist: toposort==1.10
-Requires-Dist: tornado~=6.0.0
+Requires-Dist: tornado~=6.5.5
 Requires-Dist: urllib3<2,>=1.26.14
 Requires-Dist: wheel
 Requires-Dist: packaging<24,>=23.1
@@ -43,6 +43,17 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.5.3
+***********
+
+- `Added` ``tb datasource delete`` now accepts ``--lightweight-delete``, ``--partition`` and ``--projection-mode``, backed by the ``POST /v1/datasources/{name}/delete`` endpoint that uses ClickHouse's lightweight ``DELETE FROM`` instead of the heavy ``ALTER TABLE ... DELETE`` mutation. Lightweight delete is synchronous by default and returns the affected row count plus a partition-level mutation block; pass ``--no-wait`` to enqueue a job and receive the v0-compatible envelope.
+
+6.5.1
+***********
+
+- `Added` `tb connection create kafka` accepts four new flags — ``--oauthbearer-method``, ``--oauthbearer-aws-region``, ``--oauthbearer-aws-role-arn``, ``--oauthbearer-aws-external-id`` — for creating Amazon MSK connections with SASL ``OAUTHBEARER`` (IAM) authentication. Prompts interactively for region, role ARN, and external ID when the flags are omitted.
+- `Changed` `tb branch create` now shows a deprecation warning (instead of failing) when `--ignore-datasource` is provided, and continues by ignoring that flag.
+
 6.5.0
 ***********
 

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.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__ = '6.5.1.dev0'
-__revision__ = '676e19d'
+__version__ = '6.5.4.dev0'
+__revision__ = 'a87d7b3'

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/client.py

@@ -470,10 +470,26 @@ class TinyB:
     async def datasource_truncate(self, datasource_name: str):
         return await self._req(f"/v0/datasources/{datasource_name}/truncate", method="POST", data="")
 
-    async def datasource_delete_rows(self, datasource_name: str, delete_condition: str, dry_run: bool = False):
-        params = {"delete_condition": delete_condition}
+    async def datasource_delete_rows(
+        self,
+        datasource_name: str,
+        delete_condition: str,
+        dry_run: bool = False,
+        lightweight: bool = False,
+        wait: bool = True,
+        partition: Optional[str] = None,
+        projection_mode: Optional[str] = None,
+    ):
+        params: Dict[str, Any] = {"delete_condition": delete_condition}
+        if lightweight:
+            params["wait"] = "true" if wait else "false"
+            if partition:
+                params["partition"] = partition
+            if projection_mode:
+                params["projection_mode"] = projection_mode
+            return await self._req(f"/v1/datasources/{datasource_name}/delete", method="POST", data=params)
         if dry_run:
-            params.update({"dry_run": "true"})
+            params["dry_run"] = "true"
         return await self._req(f"/v0/datasources/{datasource_name}/delete", method="POST", data=params)
 
     async def datasource_dependencies(
@@ -770,14 +786,11 @@ class TinyB:
         branch_name: str,
         last_partition: Optional[bool],
         all: Optional[bool],
-        ignore_datasources: Optional[List[str]],
     ):
         params = {
             "name": branch_name,
             "data": LAST_PARTITION if last_partition else (ALL_PARTITIONS if all else ""),
         }
-        if ignore_datasources:
-            params["ignore_datasources"] = ",".join(ignore_datasources)
         return await self._req(f"/v0/environments?{urlencode(params)}", method="POST", data=b"")
 
     async def branch_workspace_data(
@@ -785,7 +798,6 @@ class TinyB:
         workspace_id: str,
         last_partition: bool,
         all: bool,
-        ignore_datasources: Optional[List[str]] = None,
     ):
         params = {}
         if last_partition:
@@ -793,8 +805,6 @@ class TinyB:
 
         if all:
             params["mode"] = ALL_PARTITIONS
-        if ignore_datasources:
-            params["ignore_datasources"] = ",".join(ignore_datasources)
         url = f"/v0/environments/{workspace_id}/data?{urlencode(params)}"
         return await self._req(url, method="POST", data=b"")
 

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/datafile_common.py

@@ -1373,6 +1373,9 @@ async def process_file(
         if not skip_connectors:
             try:
                 is_oauthbearer = params.get("kafka_sasl_mechanism") == "OAUTHBEARER"
+                # PLAINTEXT brokers have no SASL at all, so a key/secret pair is
+                # neither produced by the wizard nor expected on the wire.
+                is_plaintext = params.get("kafka_security_protocol") == "PLAINTEXT"
                 connector_params = {
                     "kafka_bootstrap_servers": params.get("kafka_bootstrap_servers", None),
                     "kafka_key": params.get("kafka_key", None),
@@ -1382,6 +1385,10 @@ async def process_file(
                     "kafka_schema_registry_url": params.get("kafka_schema_registry_url", None),
                     "kafka_ssl_ca_pem": get_ca_pem_content(params.get("kafka_ssl_ca_pem", None), filename),
                     "kafka_sasl_mechanism": params.get("kafka_sasl_mechanism", None),
+                    # Explicit default — None would be dropped by the client's
+                    # `if value is not None` filter, leaving the server to pick
+                    # its own protocol instead of the SASL_SSL we want.
+                    "kafka_security_protocol": params.get("kafka_security_protocol", "SASL_SSL"),
                     "kafka_sasl_oauthbearer_method": params.get("kafka_sasl_oauthbearer_method", None),
                     "kafka_sasl_oauthbearer_aws_region": params.get("kafka_sasl_oauthbearer_aws_region", None),
                     "kafka_sasl_oauthbearer_aws_role_arn": params.get("kafka_sasl_oauthbearer_aws_role_arn", None),
@@ -1402,6 +1409,11 @@ async def process_file(
                             connector_params["kafka_sasl_oauthbearer_aws_region"],
                             connector_params["kafka_sasl_oauthbearer_aws_role_arn"],
                         ]
+                    elif is_plaintext:
+                        # No SASL, no credentials — only the broker address matters.
+                        required_params = [
+                            connector_params["kafka_bootstrap_servers"],
+                        ]
                     else:
                         required_params = [
                             connector_params["kafka_bootstrap_servers"],
@@ -3134,7 +3146,7 @@ async def new_pipe(
                     scopes.append(sc)
                 try:
                     r = await tb_client.alter_tokens(token_name, scopes)
-                    token = r["token"]  # type: ignore
+                    token = r["token"]  # type: ignore[index, unused-ignore]
                 except Exception as e:
                     raise click.ClickException(FeedbackManager.error_creating_pipe(error=e))
             else:
@@ -3144,7 +3156,7 @@ async def new_pipe(
                     r = await tb_client.create_token(
                         token_name, [f"PIPES:{tk['permissions']}:{p['name']}"], "P", p["name"]
                     )
-                    token = r["token"]  # type: ignore
+                    token = r["token"]  # type: ignore[index, unused-ignore]
                 except Exception as e:
                     raise click.ClickException(FeedbackManager.error_creating_pipe(error=e))
 
@@ -5282,8 +5294,16 @@ async def _gather_with_concurrency(n, *tasks):
     semaphore = Semaphore(n)
 
     async def sem_task(task):
-        async with semaphore:
-            return await task
+        try:
+            async with semaphore:
+                return await task
+        finally:
+            # If we never reached `await task` (e.g. cancelled while waiting
+            # on the semaphore after a sibling raised), close the coroutine
+            # so it doesn't surface as a "coroutine was never awaited"
+            # RuntimeWarning at GC time. close() is a no-op on an already
+            # exhausted coroutine, so the happy path is unaffected.
+            task.close()
 
     wrapped = [ensure_future(sem_task(t)) for t in tasks]
     try:

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/feedback_manager.py

@@ -879,6 +879,11 @@ class FeedbackManager:
     success_delete_rows_datasource = success_message(
         "** Data Source '{datasource}' rows deleted matching condition \"{delete_condition}\""
     )
+    success_lightweight_delete_rows_datasource = success_message(
+        "** Data Source '{datasource}' rows deleted matching condition \"{delete_condition}\""
+        "\n   Rows affected: {rows_affected}"
+        "\n   Partitions scanned: {partitions_scanned} (done: {partitions_done}, in progress: {partitions_in_progress})"
+    )
     success_dry_run_delete_rows_datasource = success_message(
         "** [DRY RUN] Data Source '{datasource}' rows '{rows}' matching condition \"{delete_condition}\" to be deleted"
     )

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/sql.py

@@ -398,6 +398,14 @@ def parse_table_structure(schema: str) -> List[Dict[str, Any]]:
     >>> parse_table_structure('c Nullable(Float32) DEFAULT NULL')
     [{'name': 'c', 'type': 'Float32', 'codec': None, 'default_value': None, 'jsonpath': None, 'nullable': True, 'normalized_name': 'c'}]
 
+    >>> parse_table_structure('c LowCardinality(Nullable(String))')
+    [{'name': 'c', 'type': 'LowCardinality(Nullable(String))', 'codec': None, 'default_value': None, 'jsonpath': None, 'nullable': False, 'normalized_name': 'c'}]
+
+    >>> parse_table_structure('c Nullable(LowCardinality(Nullable(String)))')
+    Traceback (most recent call last):
+    ...
+    ValueError: Nested type LowCardinality(Nullable(String)) cannot be inside Nullable type
+
     >>> parse_table_structure("c String DEFAULT 'bla'")
     [{'name': 'c', 'type': 'String', 'codec': None, 'default_value': "DEFAULT 'bla'", 'jsonpath': None, 'nullable': False, 'normalized_name': 'c'}]
 

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/sql_template.py

@@ -7,7 +7,7 @@ from collections import deque
 from datetime import datetime
 from functools import lru_cache
 from json import loads
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+from typing import Any, Callable, Dict, List, Optional, Tuple, Union, cast
 
 from tornado import escape
 from tornado.util import ObjectDict, exec_in, unicode_type
@@ -1499,7 +1499,7 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
     )
 
     exec_in(self.compiled, namespace)
-    execute = namespace["_tt_execute"]
+    execute = cast(Callable[[], bytes], namespace["_tt_execute"])
     # Clear the traceback module's cache of source data now that
     # we've generated a new template (mainly for this module's
     # unittests, where different tests reuse the same name).

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/sql_toolset.py

@@ -158,7 +158,7 @@ def has_unoptimized_join(sql: str, left_table: Optional[Union[Tuple[str, str], T
             raise UnoptimizedJoinException(sql)
 
 
-def format_where_for_mutation_command(where_clause: str) -> str:
+def format_where_for_mutation_command(where_clause: str, lightweight: bool = False) -> str:
     """
     >>> format_where_for_mutation_command("numnights = 99")
     'DELETE WHERE numnights = 99'
@@ -170,11 +170,14 @@ def format_where_for_mutation_command(where_clause: str) -> str:
     "DELETE WHERE reservationid = \\\\'\\\\\\\\\\\\'foo\\\\'"
     >>> format_where_for_mutation_command("reservationid = '\\\\'foo'")
     "DELETE WHERE reservationid = \\\\'\\\\\\\\\\\\'foo\\\\'"
+    >>> format_where_for_mutation_command("number < 3", lightweight=True)
+    'UPDATE _row_exists = 0 WHERE number < 3'
     """
     formatted_condition = chquery.format(f"""SELECT {where_clause}""").split("SELECT ")[1]
     formatted_condition = formatted_condition.replace("\\", "\\\\").replace("'", "''")
     quoted_condition = chquery.format(f"SELECT '{formatted_condition}'").split("SELECT ")[1]
-    return f"DELETE WHERE {quoted_condition[1:-1]}"
+    prefix = "UPDATE _row_exists = 0 WHERE" if lightweight else "DELETE WHERE"
+    return f"{prefix} {quoted_condition[1:-1]}"
 
 
 # Functions that take table/dictionary names as string literal arguments.

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/tb_cli_modules/branch.py

@@ -389,11 +389,21 @@ async def branch_current() -> None:
 )
 @coro
 async def create_branch(
-    branch_name: Optional[str], last_partition: bool, all: bool, ignore_datasources: List[str], wait: bool
+    branch_name: Optional[str],
+    last_partition: bool,
+    all: bool,
+    ignore_datasources: Tuple[str, ...],
+    wait: bool,
 ) -> None:
     if last_partition and all:
         raise CLIException(FeedbackManager.error_exception(error="Use --last-partition or --all but not both"))
-    await create_workspace_branch(branch_name, last_partition, all, list(ignore_datasources), wait)
+    if ignore_datasources:
+        click.echo(
+            FeedbackManager.warning_deprecated(
+                warning="--ignore-datasource is no longer supported for `tb branch create` and will be ignored."
+            )
+        )
+    await create_workspace_branch(branch_name, last_partition, all, wait)
 
 
 @branch.command(name="rm", short_help="Removes a Branch from the Workspace. It can't be recovered.")
@@ -468,14 +478,6 @@ async def delete_branch(branch_name_or_id: str, yes: bool) -> None:
     help="Attach all data from 'main' to the new Branch. Use only if you actually need all the data in the Branch",
     hidden=True,
 )
-@click.option(
-    "-i",
-    "--ignore-datasource",
-    "ignore_datasources",
-    type=str,
-    multiple=True,
-    help="Ignore specified data source partitions",
-)
 @click.option(
     "--wait",
     is_flag=True,
@@ -483,7 +485,7 @@ async def delete_branch(branch_name_or_id: str, yes: bool) -> None:
     help="Wait for data branch jobs to finish, showing a progress bar. Disabled by default.",
 )
 @coro
-async def data_branch(last_partition: bool, all: bool, ignore_datasources: List[str], wait: bool) -> None:
+async def data_branch(last_partition: bool, all: bool, wait: bool) -> None:
     if last_partition and all:
         raise CLIException(FeedbackManager.error_exception(error="Use --last-partition or --all but not both"))
 
@@ -500,7 +502,7 @@ async def data_branch(last_partition: bool, all: bool, ignore_datasources: List[
         raise CLIException(FeedbackManager.error_not_allowed_in_main_branch())
 
     try:
-        response = await client.branch_workspace_data(config["id"], last_partition, all, ignore_datasources)
+        response = await client.branch_workspace_data(config["id"], last_partition, all)
 
         is_job: bool = "job" in response
         is_summary: bool = "partitions" in response

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/tb_cli_modules/common.py

@@ -112,7 +112,9 @@ def echo_safe_humanfriendly_tables_format_smart_table(data: Iterable[Any], colum
     try:
         click.echo(humanfriendly.tables.format_smart_table(data, column_names=column_names))
     except ValueError as exc:
-        if str(exc) == "max() arg is an empty sequence":
+        # Python 3.11 wording: "max() arg is an empty sequence"
+        # Python 3.12 wording: "max() iterable argument is empty"
+        if str(exc) in ("max() arg is an empty sequence", "max() iterable argument is empty"):
             click.echo("------------")
             click.echo("Empty")
             click.echo("------------")
@@ -677,7 +679,6 @@ async def create_workspace_branch(
     branch_name: Optional[str],
     last_partition: bool,
     all: bool,
-    ignore_datasources: Optional[List[str]],
     wait: Optional[bool],
 ) -> None:
     """
@@ -701,7 +702,6 @@ async def create_workspace_branch(
             branch_name,
             last_partition,
             all,
-            ignore_datasources,
         )
         assert isinstance(response, dict)
 

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/tb_cli_modules/connection.py

@@ -35,6 +35,18 @@ from tinybird.tb_cli_modules.common import (
 )
 from tinybird.tb_cli_modules.exceptions import CLIConnectionException
 
+
+def _upper_or_none(_ctx: click.Context, _param: click.Parameter, value: Optional[str]) -> Optional[str]:
+    """Click callback that uppercases the option value if present.
+
+    The async client matches Kafka SASL mechanisms case-sensitively (see
+    ``tinybird/client.py``), so we normalize at the flag layer to avoid the
+    mismatch where the CLI treats ``--sasl-mechanism oauthbearer`` as IAM
+    but the client falls through and sends PLAIN credentials.
+    """
+    return value.upper() if value else value
+
+
 DATA_CONNECTOR_SETTINGS: Dict[DataConnectorType, List[str]] = {
     DataConnectorType.KAFKA: [
         "kafka_bootstrap_servers",
@@ -46,6 +58,10 @@ DATA_CONNECTOR_SETTINGS: Dict[DataConnectorType, List[str]] = {
         "kafka_sasl_mechanism",
         "kafka_schema_registry_url",
         "kafka_ssl_ca_pem",
+        "kafka_sasl_oauthbearer_method",
+        "kafka_sasl_oauthbearer_aws_region",
+        "kafka_sasl_oauthbearer_aws_role_arn",
+        "kafka_sasl_oauthbearer_aws_external_id",
     ],
     DataConnectorType.GCLOUD_SCHEDULER: ["gcscheduler_region"],
     DataConnectorType.GCLOUD_STORAGE: [
@@ -79,7 +95,7 @@ DATA_CONNECTOR_SETTINGS: Dict[DataConnectorType, List[str]] = {
 }
 
 SENSITIVE_CONNECTOR_SETTINGS = {
-    DataConnectorType.KAFKA: ["kafka_sasl_plain_password"],
+    DataConnectorType.KAFKA: ["kafka_sasl_plain_password", "kafka_sasl_oauthbearer_aws_role_arn"],
     DataConnectorType.GCLOUD_SCHEDULER: [
         "gcscheduler_target_url",
         "gcscheduler_job_name",
@@ -120,14 +136,33 @@ def connection_create(ctx: Context) -> None:
 @click.option(
     "--sasl-mechanism",
     default="PLAIN",
+    callback=_upper_or_none,
     help="Authentication method for connection-based protocols. Defaults to 'PLAIN'",
 )
 @click.option(
     "--security-protocol",
     default="SASL_SSL",
+    callback=_upper_or_none,
     help="Security protocol for connection-based protocols. Defaults to 'SASL_SSL'",
 )
 @click.option("--ssl-ca-pem", default=None, help="Path or content of the CA Certificate file in PEM format")
+@click.option(
+    "--oauthbearer-method",
+    default=None,
+    callback=_upper_or_none,
+    help="OAUTHBEARER token provider. Use 'AWS' for Amazon MSK IAM authentication.",
+)
+@click.option("--oauthbearer-aws-region", default=None, help="AWS region of the MSK cluster (OAUTHBEARER+AWS only)")
+@click.option(
+    "--oauthbearer-aws-role-arn",
+    default=None,
+    help="ARN of the IAM role to assume for the MSK cluster (OAUTHBEARER+AWS only)",
+)
+@click.option(
+    "--oauthbearer-aws-external-id",
+    default=None,
+    help="Optional external_id for the AWS assume-role call. If omitted the server derives it from the workspace.",
+)
 @click.pass_context
 @coro
 async def connection_create_kafka(
@@ -141,6 +176,10 @@ async def connection_create_kafka(
     sasl_mechanism: Optional[str],
     security_protocol: Optional[str],
     ssl_ca_pem: Optional[str],
+    oauthbearer_method: Optional[str],
+    oauthbearer_aws_region: Optional[str],
+    oauthbearer_aws_role_arn: Optional[str],
+    oauthbearer_aws_external_id: Optional[str],
 ) -> None:
     """
     Add a Kafka connection
@@ -149,21 +188,39 @@ async def connection_create_kafka(
     $ tb connection create kafka --bootstrap-servers google.com:80 --key a --secret b --connection-name c
     """
 
+    # `--sasl-mechanism` arrives uppercased via the _upper_or_none callback.
+    is_oauthbearer = sasl_mechanism == "OAUTHBEARER"
+
     bootstrap_servers and validate_kafka_bootstrap_servers(bootstrap_servers)
-    key and validate_kafka_key(key)
-    secret and validate_kafka_secret(secret)
+    if not is_oauthbearer:
+        key and validate_kafka_key(key)
+        secret and validate_kafka_secret(secret)
     schema_registry_url and validate_kafka_schema_registry_url(schema_registry_url)
     auto_offset_reset and validate_kafka_auto_offset_reset(auto_offset_reset)
 
     if not bootstrap_servers:
         bootstrap_servers = click.prompt("Kafka Bootstrap Server")
         validate_kafka_bootstrap_servers(bootstrap_servers)
-    if key is None:
-        key = click.prompt("Key")
-        validate_kafka_key(key)
-    if secret is None:
-        secret = click.prompt("Secret", hide_input=True)
-        validate_kafka_secret(secret)
+    if is_oauthbearer:
+        if not oauthbearer_method:
+            oauthbearer_method = "AWS"
+        if not oauthbearer_aws_region:
+            oauthbearer_aws_region = click.prompt("AWS region (e.g. us-east-1)")
+        if not oauthbearer_aws_role_arn:
+            oauthbearer_aws_role_arn = click.prompt("AWS IAM role ARN")
+        if not oauthbearer_aws_external_id:
+            # Pre-shared external_id (set by the cluster owner in the role's trust
+            # policy). Empty answer = let the server derive one from the workspace.
+            provided = click.prompt("External ID (optional, leave blank to let the server derive one)", default="")
+            if provided and provided.strip():
+                oauthbearer_aws_external_id = provided.strip()
+    else:
+        if key is None:
+            key = click.prompt("Key")
+            validate_kafka_key(key)
+        if secret is None:
+            secret = click.prompt("Secret", hide_input=True)
+            validate_kafka_secret(secret)
     if not connection_name:
         connection_name = click.prompt(
             f"Connection name (optional, current: {bootstrap_servers})", default=bootstrap_servers
@@ -172,6 +229,19 @@ async def connection_create_kafka(
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     client: TinyB = obj["client"]
 
+    # Only forward the OAUTHBEARER kwargs when the user actually picked OAUTHBEARER.
+    # The receiving client accepts them as kwargs either way, but keeping the call
+    # symmetric with the auth mechanism makes the intent obvious to readers
+    oauthbearer_kwargs = (
+        {
+            "kafka_sasl_oauthbearer_method": oauthbearer_method,
+            "kafka_sasl_oauthbearer_aws_region": oauthbearer_aws_region,
+            "kafka_sasl_oauthbearer_aws_role_arn": oauthbearer_aws_role_arn,
+            "kafka_sasl_oauthbearer_aws_external_id": oauthbearer_aws_external_id,
+        }
+        if is_oauthbearer
+        else {}
+    )
     result = await client.connection_create_kafka(
         bootstrap_servers,
         key,
@@ -182,6 +252,7 @@ async def connection_create_kafka(
         sasl_mechanism,
         security_protocol,
         get_ca_pem_content(ssl_ca_pem),
+        **oauthbearer_kwargs,
     )
 
     id = result["id"]

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird/tb_cli_modules/datasource.py

@@ -363,23 +363,70 @@ async def datasource_truncate(ctx, datasource_name, yes, cascade):
 @click.argument("datasource_name")
 @click.option("--sql-condition", default=None, 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", is_flag=True, default=False, help="Wait for delete job to finish, disabled by default")
+@click.option(
+    "--wait/--no-wait",
+    default=None,
+    help="Wait for the delete to finish. Defaults to true with --lightweight-delete (sync request), "
+    "false otherwise (returns a job id).",
+)
 @click.option("--dry-run", is_flag=True, default=False, help="Run the command without deleting anything")
+@click.option(
+    "--lightweight-delete",
+    "lightweight",
+    is_flag=True,
+    default=False,
+    help="Use ClickHouse lightweight DELETE. Defaults to waiting inline and returning rows_affected; "
+    "pass --no-wait to enqueue a job instead. Not compatible with --dry-run.",
+)
+@click.option(
+    "--partition",
+    default=None,
+    help="Restrict the lightweight delete to a single partition expression. Only valid with --lightweight-delete.",
+)
+@click.option(
+    "--projection-mode",
+    type=click.Choice(["throw", "drop", "rebuild"]),
+    default=None,
+    help="How ClickHouse should handle table projections when running the lightweight DELETE. "
+    "throw: fail the DELETE if the table has any projection defined (ClickHouse default). "
+    "drop: drop the affected projections so the DELETE can proceed; they will need to be recreated. "
+    "rebuild: rebuild the affected projections after the DELETE finishes. "
+    "Only valid with --lightweight-delete.",
+)
 @click.pass_context
 @coro
-async def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait, dry_run):
+async def datasource_delete_rows(
+    ctx, datasource_name, sql_condition, yes, wait, dry_run, lightweight, partition, projection_mode
+):
     """
     Delete rows from a datasource
 
     - Delete rows with SQL condition: `tb datasource delete [datasource_name] --sql-condition "country='ES'"`
 
     - Delete rows with SQL condition and wait for the job to finish: `tb datasource delete [datasource_name] --sql-condition "country='ES'" --wait`
+
+    - Use ClickHouse lightweight DELETE (synchronous, no job): `tb datasource delete [datasource_name] --sql-condition "country='ES'" --lightweight-delete`
+
+    - Use ClickHouse lightweight DELETE and return immediately with a job id: `tb datasource delete [datasource_name] --sql-condition "country='ES'" --lightweight-delete --no-wait`
     """
 
     semver: str = ctx.ensure_object(dict)["config"]["semver"]
     await warn_if_in_live(semver)
 
     client: TinyB = ctx.ensure_object(dict)["client"]
+    if lightweight and dry_run:
+        raise CLIDatasourceException(
+            FeedbackManager.error_exception(error="--lightweight-delete is not compatible with --dry-run")
+        )
+    if (partition or projection_mode) and not lightweight:
+        raise CLIDatasourceException(
+            FeedbackManager.error_exception(error="--partition and --projection-mode require --lightweight-delete")
+        )
+    # Lightweight delete is sync by default (the endpoint blocks and returns
+    # rows_affected); the classic /v0/ delete is async by default (returns a
+    # job id). The tri-state --wait/--no-wait lets users override either.
+    if wait is None:
+        wait = lightweight
     if (
         dry_run
         or yes
@@ -390,7 +437,15 @@ async def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait,
         )
     ):
         try:
-            res = await client.datasource_delete_rows(datasource_name, sql_condition, dry_run)
+            res = await client.datasource_delete_rows(
+                datasource_name,
+                sql_condition,
+                dry_run,
+                lightweight=lightweight,
+                wait=wait,
+                partition=partition,
+                projection_mode=projection_mode,
+            )
             if dry_run:
                 click.echo(
                     FeedbackManager.success_dry_run_delete_rows_datasource(
@@ -398,10 +453,24 @@ async def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait,
                     )
                 )
                 return
+            # Lightweight sync path returns rows_affected directly, no job involved.
+            if lightweight and wait:
+                mutation = res.get("mutation") or {}
+                click.echo(
+                    FeedbackManager.success_lightweight_delete_rows_datasource(
+                        datasource=datasource_name,
+                        delete_condition=sql_condition,
+                        rows_affected=res.get("rows_affected", 0),
+                        partitions_scanned=mutation.get("partitions_scanned", 0),
+                        partitions_done=mutation.get("partitions_done", 0),
+                        partitions_in_progress=mutation.get("partitions_in_progress", 0),
+                    )
+                )
+                return
             job_id = res["job_id"]
             job_url = res["job_url"]
             click.echo(FeedbackManager.info_datasource_delete_rows_job_url(url=job_url))
-            if wait:
+            if wait and not lightweight:
                 progress_symbols = ["-", "\\", "|", "/"]
                 progress_str = "Waiting for the job to finish"
                 # TODO: Use click.echo instead of print and see if the behavior is the same

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.5.1.dev0
+Version: 6.5.4.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -22,7 +22,7 @@ Requires-Dist: requests<3,>=2.28.1
 Requires-Dist: shandy-sqlfmt==0.11.1
 Requires-Dist: shandy-sqlfmt[jinjafmt]==0.11.1
 Requires-Dist: toposort==1.10
-Requires-Dist: tornado~=6.0.0
+Requires-Dist: tornado~=6.5.5
 Requires-Dist: urllib3<2,>=1.26.14
 Requires-Dist: wheel
 Requires-Dist: packaging<24,>=23.1
@@ -43,6 +43,17 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.5.3
+***********
+
+- `Added` ``tb datasource delete`` now accepts ``--lightweight-delete``, ``--partition`` and ``--projection-mode``, backed by the ``POST /v1/datasources/{name}/delete`` endpoint that uses ClickHouse's lightweight ``DELETE FROM`` instead of the heavy ``ALTER TABLE ... DELETE`` mutation. Lightweight delete is synchronous by default and returns the affected row count plus a partition-level mutation block; pass ``--no-wait`` to enqueue a job and receive the v0-compatible envelope.
+
+6.5.1
+***********
+
+- `Added` `tb connection create kafka` accepts four new flags — ``--oauthbearer-method``, ``--oauthbearer-aws-region``, ``--oauthbearer-aws-role-arn``, ``--oauthbearer-aws-external-id`` — for creating Amazon MSK connections with SASL ``OAUTHBEARER`` (IAM) authentication. Prompts interactively for region, role ARN, and external ID when the flags are omitted.
+- `Changed` `tb branch create` now shows a deprecation warning (instead of failing) when `--ignore-datasource` is provided, and continues by ignoring that flag.
+
 6.5.0
 ***********
 

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird_cli.egg-info/SOURCES.txt

@@ -36,7 +36,6 @@ tinybird/tb_cli_modules/token.py
 tinybird/tb_cli_modules/workspace.py
 tinybird/tb_cli_modules/workspace_members.py
 tinybird/tb_cli_modules/tinyunit/tinyunit.py
-tinybird/tb_cli_modules/tinyunit/tinyunit_lib.py
 tinybird_cli.egg-info/PKG-INFO
 tinybird_cli.egg-info/SOURCES.txt
 tinybird_cli.egg-info/dependency_links.txt

{tinybird_cli-6.5.1.dev0 → tinybird_cli-6.5.4.dev0}/tinybird_cli.egg-info/requires.txt

@@ -13,7 +13,7 @@ requests<3,>=2.28.1
 shandy-sqlfmt==0.11.1
 shandy-sqlfmt[jinjafmt]==0.11.1
 toposort==1.10
-tornado~=6.0.0
+tornado~=6.5.5
 urllib3<2,>=1.26.14
 wheel
 packaging<24,>=23.1

tinybird_cli-6.5.1.dev0/tinybird/tb_cli_modules/tinyunit/tinyunit_lib.py

@@ -1,65 +0,0 @@
-import json
-from collections import namedtuple
-from json import JSONEncoder
-from typing import Optional
-
-
-class MyJSONEncoder(JSONEncoder):
-    # def default(self, in_obj):
-    #     loaded_data = [
-    #             DataUnitTest(
-    #                 getattr(unitDataTest, 'name'),
-    #                 getattr(unitDataTest, 'description'),
-    #                 getattr(unitDataTest, 'enabled'),
-    #                 getattr(unitDataTest, 'endpoint'),
-    #                 getattr(unitDataTest, 'result'),
-    #                 getattr(unitDataTest, 'time'),
-    #                 getattr(unitDataTest, 'sql'))
-    #             for unitDataTest in in_obj]
-    #     return loaded_data
-    def default(self, obj):
-        return obj.to_json()
-
-
-class DataUnitTest:
-    def __init__(
-        self,
-        name: str,
-        description: str,
-        enabled: bool,
-        endpoint: Optional[str],
-        result: Optional[str],
-        time: int,
-        sql: str,
-    ):
-        self.name = name
-        self.description = description
-        self.enabled = enabled
-        self.endpoint = endpoint
-        self.result = result
-        self.time = time
-        self.sql = sql
-
-    def __iter__(self):
-        yield from {
-            "name": self.name,
-            "description": self.description,
-            "enabled": self.enabled,
-            "endpoint": self.endpoint,
-            "sql": self.sql,
-            "result": self.result,
-            "time": self.time,
-        }.items()
-
-    def __str__(self):
-        return json.dumps(dict(self), ensure_ascii=False)
-
-    def __repr__(self):
-        return self.__str__()
-
-    def to_json(self):
-        return self.__str__()
-
-
-def customDataUnitTestDecoder(dataUnitTestDict):
-    return namedtuple("X", dataUnitTestDict.keys())(*dataUnitTestDict.values())