tinybird 4.6.3.dev0__py3-none-any.whl → 4.6.5.dev0__py3-none-any.whl

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/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.3.dev0'
-__revision__ = '78e5916'
+__version__ = '4.6.5.dev0'
+__revision__ = 'cad29af'

tinybird/tb/client.py

@@ -468,10 +468,26 @@ class TinyB:
         """Start Kafka ingestion for a datasource in a forward branch."""
         return self._req(f"/v0/datasources/{datasource_name}/start", method="POST", data="")
 
-    def datasource_delete_rows(self, datasource_name: str, delete_condition: str, dry_run: bool = False):
-        params = {"delete_condition": delete_condition}
-        if dry_run:
-            params.update({"dry_run": "true"})
+    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 self._req(f"/v1/datasources/{datasource_name}/delete", method="POST", data=params)
+        elif dry_run:
+            params["dry_run"] = "true"
         return self._req(f"/v0/datasources/{datasource_name}/delete", method="POST", data=params)
 
     def datasource_dependencies(

tinybird/tb/modules/datasource.py

@@ -596,19 +596,66 @@ def datasource_start(ctx: Context, datasource_name: str) -> None:
 @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
-def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait, dry_run):
+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`
     """
 
     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
@@ -619,7 +666,15 @@ def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait, dry_r
         )
     ):
         try:
-            res = client.datasource_delete_rows(datasource_name, sql_condition, dry_run)
+            res = 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(
@@ -627,10 +682,24 @@ def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait, dry_r
                     )
                 )
                 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/tb/modules/feedback_manager.py

@@ -1071,6 +1071,11 @@ STEP 3: ADD KEY TO SERVICE ACCOUNT
     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-4.6.3.dev0.dist-info → tinybird-4.6.5.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.3.dev0
+Version: 4.6.5.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.4
+*******
+
+- `Added` ``tb datasource delete`` now accepts ``--lightweight-delete``, ``--partition`` and ``--projection-mode``, backed by the new ``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 ``LightweightDeleteJob`` and receive the v0-compatible job envelope.
+
 4.6.2
 *******
 

{tinybird-4.6.3.dev0.dist-info → tinybird-4.6.5.dev0.dist-info}/RECORD

@@ -7,7 +7,7 @@ tinybird/service_datasources.py,sha256=tt_8G6yJcr2ZbsaR99ulExe79pNS8h9dzdGm45vf1
 tinybird/sql.py,sha256=qdqxsq1WPiGTk-SmZWaxvZb936ISdo1ChZhnC_uXeUE,49351
 tinybird/sql_template.py,sha256=nSzUdaQe18Da_8qlgLW7tsZl1pOa2kDaBa8TdrF6pJ4,128667
 tinybird/sql_template_fmt.py,sha256=Ma4qcs-2r8ZXQC4GUmrCqYz34DsnGF8k5lE2Jwnr314,10638
-tinybird/sql_toolset.py,sha256=xWY-EtixaZKUPuNY4WBz2fDwwNnmbgtdLsmI2wy67UA,27220
+tinybird/sql_toolset.py,sha256=TvWeH3DsB13SfJ97V_t_ZaFTJ1IAtsrxQ8E3FLL8_tE,27442
 tinybird/syncasync.py,sha256=rIPmCvygWSFqfnlVqhZH4N9gVVTvD6DEPsfoxGizYrI,27776
 tinybird/tornado_template.py,sha256=1_0nYFk_xJh_TMHh6AKkJILvnNY6xYmaM-uJ3Ofv7e8,42085
 tinybird/ch_utils/constants.py,sha256=yTNizMzgYNBzUc2EV3moBfdrDIggOe9hiuAgWF7sv2c,4333
@@ -19,10 +19,10 @@ tinybird/datafile/parse_datasource.py,sha256=yd58HrUF4yNJXLn6OsvKGpZJpvrcjLGAeJG
 tinybird/datafile/parse_pipe.py,sha256=-9bbgVuiWRyDYydrLVflDBt8GstZotMy6dklsrc6MUY,3859
 tinybird/iterating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tinybird/iterating/data_branch_modes.py,sha256=5YuDa-gr8mKwmES8Xro6TRKbQtaOtIw4GbC606Qhu3o,184
-tinybird/tb/__cli__.py,sha256=eh_8cfZSX_SsoNyJmyjPZu23B2buyeF98MGawLnIsqU,245
+tinybird/tb/__cli__.py,sha256=xM7igRIfbohieP2BEIHYA9bVS58bQ_S7S3iFmuBQysE,245
 tinybird/tb/check_pypi.py,sha256=Gp0HkHHDFMSDL6nxKlOY51z7z1Uv-2LRexNTZSHHGmM,552
 tinybird/tb/cli.py,sha256=IjiGfNIpxSxi1odK1kMj9s8lEhx3sAUgGA263XdmyR0,1119
-tinybird/tb/client.py,sha256=nrNFU8pLqzQbKqU4b2Jm1PQRthFrpFzDsetE84o-1k0,55494
+tinybird/tb/client.py,sha256=Udm3YWuRmv26XwWjVwQ9toAVsL7Dlu1Lx7aJZjfkMM4,56042
 tinybird/tb/config.py,sha256=CGCfBbCMlmVcBHQ0IMGc2IE4O2-1tZEPyD564JZoTbw,5659
 tinybird/tb/modules/branch.py,sha256=U50nj2kZllCkOHQfJWQ-YQ260pvlcssgStMSovmqMiU,10157
 tinybird/tb/modules/build.py,sha256=bGFoFppR_UbGUMDWFGDzfJ4nT3CGFwzCzl2o4OpwR2o,10420
@@ -37,13 +37,13 @@ tinybird/tb/modules/connection_kafka.py,sha256=Qc8uUNl5SvUcUGb_aG3AirYKw6673FoX1
 tinybird/tb/modules/connection_s3.py,sha256=KtPLeTXLQJ2SfveHHofz_MOLkmcmpJDloYb-gvRQ_dA,16604
 tinybird/tb/modules/copy.py,sha256=Apzjxiyinp6KmgamypPKEe3BAnpxG7MwYcSYkHiG8sA,6033
 tinybird/tb/modules/create.py,sha256=G3_wCUjNVzBiowo70NgwzmUUXXOxYO2LWjF9eEfcffc,22947
-tinybird/tb/modules/datasource.py,sha256=tpyLT-9ALZ8uCMKFHnnEEcqNuKQaaICi4IBp94Cc428,71632
+tinybird/tb/modules/datasource.py,sha256=tblNurkQXi6fps2izOjsg4xmGkPKd4FhBHPvrrN3PE8,74779
 tinybird/tb/modules/deployment.py,sha256=TNDlvaYmk-zouvaAdMXlyFPbgbnMKQOt76xpZBggJI0,21184
 tinybird/tb/modules/deployment_common.py,sha256=fLPWNNs8ZwSkWHJjLeqQUqTbKqnnhW1y8yKffBdDCo0,31948
 tinybird/tb/modules/deprecations.py,sha256=XXekrzPO9v12F1ToQDUGzLYJJ2wrEUlGKOkLCSdfHiM,4935
 tinybird/tb/modules/endpoint.py,sha256=yRTh6rQFJ98LA0hSC8rPD3EcDaJj41gk9oCsgcZPu_c,12112
 tinybird/tb/modules/exceptions.py,sha256=_1BHy0OixEkeF0fOCu1_1Pj8pJS4BNfUyucqCViJGTw,5958
-tinybird/tb/modules/feedback_manager.py,sha256=_tlMzju93UaOX7rk_EBpl95IdTqIC53DMBYZuKFph0A,77673
+tinybird/tb/modules/feedback_manager.py,sha256=dhGgC9HwerqFSVGbsRTbpTb9pvwSzqx52AdLQXSKPFY,78007
 tinybird/tb/modules/fmt.py,sha256=ejQC1-2mK42saA2R9DA-CENYgu06SUoiCoX4bCtRXT8,3734
 tinybird/tb/modules/info.py,sha256=oO2DpPT-hpQ2Gf_TBAJHQ_xIfc1WCBpiGWhiIeM_K4w,13042
 tinybird/tb/modules/infra.py,sha256=J9Noe9aZo5Y9ZKAhqh9jnv8azfivXLLHQ2a9TeMWN9s,32673
@@ -99,8 +99,8 @@ tinybird/tb_cli_modules/config.py,sha256=0kFDmsDcjKon32rgFGMHHKSbv4j5dOrXtVOlyuA
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=W098H6jmS4kpE7hN3tadaREBTf7oMocel-lkKWN0pU8,10466
-tinybird-4.6.3.dev0.dist-info/METADATA,sha256=eQdmwvUn8LjwYvXjblOOydgSuh3Fkxg7bC8pWONQVl4,13260
-tinybird-4.6.3.dev0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-tinybird-4.6.3.dev0.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-4.6.3.dev0.dist-info/top_level.txt,sha256=ZIQJTPCzMqnfDzM_hEGZrJqDSEcKnIK_49T86DGWpyQ,78
-tinybird-4.6.3.dev0.dist-info/RECORD,,
+tinybird-4.6.5.dev0.dist-info/METADATA,sha256=0yXzk_43TLjLFX1ryhENtzK8rMiGdItlD7CctIJVyec,13787
+tinybird-4.6.5.dev0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+tinybird-4.6.5.dev0.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-4.6.5.dev0.dist-info/top_level.txt,sha256=ZIQJTPCzMqnfDzM_hEGZrJqDSEcKnIK_49T86DGWpyQ,78
+tinybird-4.6.5.dev0.dist-info/RECORD,,