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

tinybird/iterating/data_branch_modes.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class DataBranchMode(Enum):
+    LAST_PARTITION = "last_partition"
+    ALL_PARTITIONS = "all_partitions"
+
+
+DATA_BRANCH_MODES = [a.value for a in DataBranchMode]

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.2.dev0'
-__revision__ = '41da03f'
+__version__ = '4.6.3.dev0'
+__revision__ = '78e5916'

tinybird/tb/client.py

@@ -772,14 +772,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 self._req(f"/v1/environments?{urlencode(params)}", method="POST", data=b"")
 
     def branch_workspace_data(

tinybird/tb/modules/branch.py

@@ -93,8 +93,14 @@ def branch_ls(sort: bool) -> None:
     help="Wait for data branch jobs to finish, showing a progress bar. Disabled by default.",
 )
 def create_branch(branch_name: Optional[str], last_partition: bool, ignore_datasources: List[str], wait: bool) -> None:
+    if ignore_datasources:
+        click.echo(
+            FeedbackManager.warning_deprecated(
+                warning="--ignore-datasource is no longer supported for `tb branch create` and will be ignored."
+            )
+        )
     normalized_branch_name = ensure_valid_workspace_name(branch_name) if branch_name else branch_name
-    create_workspace_branch(normalized_branch_name, last_partition, False, list(ignore_datasources), wait)
+    create_workspace_branch(normalized_branch_name, last_partition, False, wait)
 
 
 @branch.command(name="rm", short_help="Removes an branch from the workspace. It can't be recovered.")
@@ -182,6 +188,12 @@ def clear_branch(
     yes: bool,
 ) -> None:
     """Clear a branch by deleting and recreating it."""
+    if ignore_datasources:
+        click.echo(
+            FeedbackManager.warning_deprecated(
+                warning="--ignore-datasource is no longer supported for `tb branch clear` and will be ignored."
+            )
+        )
     config = CLIConfig.get_project_config()
     _ = try_update_config_with_remote(config, only_if_needed=True)
 
@@ -227,7 +239,7 @@ def clear_branch(
         client = config.get_client(token=current_main_workspace.get("token"))
         try:
             client.delete_branch(workspace_to_clear["id"])
-            response = client.create_workspace_branch(branch_name, last_partition, False, list(ignore_datasources))
+            response = client.create_workspace_branch(branch_name, last_partition, False)
             if wait and "job" in response:
                 job_id = response["job"]["job_id"]
                 job_url = response["job"]["job_url"]

tinybird/tb/modules/cli.py

@@ -21,6 +21,7 @@ import humanfriendly
 import requests
 from click import Context
 
+from tinybird.iterating.data_branch_modes import DataBranchMode
 from tinybird.tb import __cli__
 from tinybird.tb.check_pypi import CheckPypi
 from tinybird.tb.client import (
@@ -307,6 +308,37 @@ def get_dev_mode_from_tinybird_config(start_dir: str) -> Optional[str]:
     return mode
 
 
+def _resolve_branch_data_mode(raw: Dict[str, Any]) -> Tuple[Optional[str], bool]:
+    if "branch_data_on_create" in raw:
+        raise CLIException(
+            FeedbackManager.error(message="`branch_data_on_create` has been renamed to `branch_data_mode`.")
+        )
+
+    value = raw.get("branch_data_mode")
+    if value is None:
+        return DataBranchMode.LAST_PARTITION.value, False
+    if not isinstance(value, str):
+        raise CLIException(FeedbackManager.error(message="branch_data_mode must be a string."))
+
+    mode = value.strip().lower()
+    if not mode:
+        return DataBranchMode.LAST_PARTITION.value, False
+    if mode != DataBranchMode.LAST_PARTITION.value:
+        allowed = DataBranchMode.LAST_PARTITION.value
+        raise CLIException(
+            FeedbackManager.error(message=f"Invalid branch_data_mode '{value}'. Allowed values are: {allowed}.")
+        )
+    return mode, True
+
+
+def get_branch_data_mode_from_tinybird_config(start_dir: str) -> Tuple[Optional[str], bool]:
+    _, raw = _read_project_json_config(start_dir)
+    if not isinstance(raw, dict):
+        return DataBranchMode.LAST_PARTITION.value, False
+
+    return _resolve_branch_data_mode(raw)
+
+
 def find_project_config_file(start_dir: Path) -> Optional[Path]:
     current = start_dir.resolve()
     while True:
@@ -653,6 +685,17 @@ def cli(
     if tinybird_dev_mode:
         config["dev_mode"] = tinybird_dev_mode
 
+    branch_data_mode, branch_data_mode_explicit = get_branch_data_mode_from_tinybird_config(os.getcwd())
+    if branch_data_mode:
+        config["branch_data_mode"] = branch_data_mode
+        if branch_data_mode_explicit and config.get("dev_mode") == DEV_MODE_LOCAL:
+            click.echo(
+                FeedbackManager.warning(
+                    message="branch_data_mode is set in tinybird.config.json but dev_mode='local'. "
+                    "Branch data settings only apply to cloud branches."
+                )
+            )
+
     # Resolve project folder from tinybird.config.json (preferred) or legacy .tinyb cwd.
     folder_from_config = get_project_folder_from_tinybird_config(os.getcwd())
     if folder_from_config:
@@ -754,6 +797,12 @@ def cli(
                 FeedbackManager.gray(message=f"Using dev_mode={dev_mode}. Running deploy against Tinybird Cloud main.")
             )
 
+    _auto_create_branch = (
+        not explicit_env_selector
+        and ctx.invoked_subcommand == "build"
+        and dev_mode == DEV_MODE_BRANCH
+        and bool(effective_branch)
+    )
     client = create_ctx_client(
         ctx,
         config,
@@ -763,12 +812,8 @@ def cli(
         project_type=project_type,
         show_warnings=version_warning,
         branch=effective_branch,
-        create_branch_if_missing=(
-            not explicit_env_selector
-            and ctx.invoked_subcommand == "build"
-            and dev_mode == DEV_MODE_BRANCH
-            and bool(effective_branch)
-        ),
+        create_branch_if_missing=_auto_create_branch,
+        branch_data_mode=config.get("branch_data_mode") if _auto_create_branch else None,
     )
 
     if client:
@@ -1052,6 +1097,7 @@ def create_ctx_client(
     show_warnings: bool = True,
     branch: Optional[str] = None,
     create_branch_if_missing: bool = False,
+    branch_data_mode: Optional[str] = None,
 ):
     commands_without_ctx_client = [
         "auth",
@@ -1103,6 +1149,7 @@ def create_ctx_client(
             branch=branch,
             create_branch_if_missing=create_branch_if_missing,
             request_from=project_type,
+            branch_data_mode=branch_data_mode,
         )
         ctx.ensure_object(dict)["branch_created"] = branch_created
         return client

tinybird/tb/modules/common.py

@@ -33,6 +33,7 @@ from click._termui_impl import ProgressBar
 from humanfriendly.tables import format_pretty_table
 from thefuzz import process
 
+from tinybird.iterating.data_branch_modes import DataBranchMode
 from tinybird.tb.client import (
     AuthException,
     AuthNoTokenException,
@@ -369,6 +370,7 @@ def _get_tb_client(
     branch: Optional[str] = None,
     create_branch_if_missing: bool = False,
     request_from: Optional[str] = None,
+    branch_data_mode: Optional[str] = None,
 ) -> Tuple[TinyB, bool]:
     """Returns a tuple of (client, branch_created)."""
     resolved_request_from = request_from
@@ -390,11 +392,13 @@ def _get_tb_client(
     workspaces = cloud_client.user_workspaces_and_branches(version="v1")
     workspace = next((w for w in workspaces.get("workspaces", []) if w.get("name") == branch), None)
     if not workspace and create_branch_if_missing:
+        _last_partition = branch_data_mode == DataBranchMode.LAST_PARTITION.value
+        mode_label = branch_data_mode or "no data"
+        click.echo(FeedbackManager.gray(message=f"Creating branch '{branch}' with data_mode={mode_label}..."))
         response = cloud_client.create_workspace_branch(
             branch_name=branch,
-            last_partition=False,
+            last_partition=_last_partition,
             all=False,
-            ignore_datasources=None,
         )
         job_data = response.get("job") if isinstance(response, dict) else None
         if isinstance(job_data, dict):
@@ -2464,7 +2468,6 @@ def create_workspace_branch(
     branch_name: Optional[str],
     last_partition: bool,
     all: bool,
-    ignore_datasources: Optional[List[str]],
     wait: Optional[bool],
 ) -> None:
     """
@@ -2490,7 +2493,6 @@ def create_workspace_branch(
             branch_name,
             last_partition,
             all,
-            ignore_datasources,
         )
         assert isinstance(response, dict)
 

tinybird/tb/modules/preview.py

@@ -44,7 +44,6 @@ def _create_preview_branch(cloud_client: TinyB, preview_branch_name: str) -> Non
         branch_name=preview_branch_name,
         last_partition=False,
         all=False,
-        ignore_datasources=None,
     )
 
     job_data = response.get("job") if isinstance(response, dict) else None

tinybird/tb_cli_modules/common.py

@@ -679,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:
     """
@@ -703,7 +702,6 @@ async def create_workspace_branch(
             branch_name,
             last_partition,
             all,
-            ignore_datasources,
         )
         assert isinstance(response, dict)
 

{tinybird-4.6.2.dev0.dist-info → tinybird-4.6.3.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.2.dev0
+Version: 4.6.3.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,14 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.2
+*******
+
+- `Changed` Replaced `branch_data_on_create` with `branch_data_mode` in CLI project config handling. The legacy key now raises an explicit migration error.
+- `Changed` `branch_data_mode` now only accepts `last_partition` as a user-facing value.
+- `Fixed` `dev_mode=local` now warns about branch data mode only when `branch_data_mode` is explicitly set in `tinybird.config.json`.
+- `Changed` `tb branch create` and `tb branch clear` now show a deprecation warning (instead of failing) when `--ignore-datasource` is provided, and continue by ignoring that flag.
+
 4.6.1
 *******
 

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

@@ -17,17 +17,19 @@ tinybird/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1w
 tinybird/datafile/parse_connection.py,sha256=GxmGp_XnWbDZPDbh_PBxitlIMqZRYfDwxMBw-JQBp1g,1890
 tinybird/datafile/parse_datasource.py,sha256=yd58HrUF4yNJXLn6OsvKGpZJpvrcjLGAeJG1lgBe_zk,1891
 tinybird/datafile/parse_pipe.py,sha256=-9bbgVuiWRyDYydrLVflDBt8GstZotMy6dklsrc6MUY,3859
-tinybird/tb/__cli__.py,sha256=ghH8YiRtCEUACEVbZgch3RDH11g2M0Pxuf6s4Y3opmI,245
+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/check_pypi.py,sha256=Gp0HkHHDFMSDL6nxKlOY51z7z1Uv-2LRexNTZSHHGmM,552
 tinybird/tb/cli.py,sha256=IjiGfNIpxSxi1odK1kMj9s8lEhx3sAUgGA263XdmyR0,1119
-tinybird/tb/client.py,sha256=SEp4-XoRDXMEBj2_C1jfJKtZOkbiwNIYERPQN6uoolI,55646
+tinybird/tb/client.py,sha256=nrNFU8pLqzQbKqU4b2Jm1PQRthFrpFzDsetE84o-1k0,55494
 tinybird/tb/config.py,sha256=CGCfBbCMlmVcBHQ0IMGc2IE4O2-1tZEPyD564JZoTbw,5659
-tinybird/tb/modules/branch.py,sha256=QxcMPc_4xhw8WPz85YZ5L6SQZY-lZrF3CleujBEBJQU,9746
+tinybird/tb/modules/branch.py,sha256=U50nj2kZllCkOHQfJWQ-YQ260pvlcssgStMSovmqMiU,10157
 tinybird/tb/modules/build.py,sha256=bGFoFppR_UbGUMDWFGDzfJ4nT3CGFwzCzl2o4OpwR2o,10420
 tinybird/tb/modules/build_common.py,sha256=o04aeaoyGTnwhR0cEXAgQzc7SJya97YECoEihsi4SyU,24979
 tinybird/tb/modules/cicd.py,sha256=IO4qqsoLRXcubALb7vx_QnRpg3zIIxfaVO9bGomlESY,8267
-tinybird/tb/modules/cli.py,sha256=n_B9EapB1eYOWOfRHN1Jefip6LcmYrkLDIz5GoGCJhA,41889
-tinybird/tb/modules/common.py,sha256=5oyFPfrM4ct9-U3AmhtAKXTPUWw5eDoX55jxF3TK5H0,95286
+tinybird/tb/modules/cli.py,sha256=4Z0lqbGjikdO0L-wJDttFdGnT5aHrjAHnoIjkOPhXbc,43889
+tinybird/tb/modules/common.py,sha256=2bISIRdjHLc8SNty6vih-zCjRCssLW8WEM7r08uZcMA,95534
 tinybird/tb/modules/config.py,sha256=Z47lMZxFeX68b62bTzgj9379zn-9eT4cPbrcMJ_xTGQ,11431
 tinybird/tb/modules/connection.py,sha256=HwHn0YgwqcKEYCLr2OqDzJzAUFd65Wv8MZiSUw_TLII,18452
 tinybird/tb/modules/connection_dynamodb.py,sha256=j1Z0tXrlTZJU1LJ0rEzv3ezo0pS4PJJKfVjUTGrH3nk,9473
@@ -59,7 +61,7 @@ tinybird/tb/modules/logs.py,sha256=uSQi_A6QIFOjAoj1h8XOI_51AQ3uk5UEg2TjYbZxDJA,2
 tinybird/tb/modules/materialization.py,sha256=SaomNeaAzLWtcnsZdetYBxEq0ihY1cRzh23n3Z1P_c4,5643
 tinybird/tb/modules/open.py,sha256=ddABA4guIrBhrCKXYpkH4cfiAcFOG2B1eVePk5BEXto,1799
 tinybird/tb/modules/pipe.py,sha256=xPKtezhnWZ6k_g82r4XpgKslofhuIxb_PvynH4gdUzI,2393
-tinybird/tb/modules/preview.py,sha256=712lVUgFE2a1qCmBGVrU_JyiaRyo5-S0dypcBxmKlnM,4659
+tinybird/tb/modules/preview.py,sha256=SuXpwlag02Mz4m1eJ_HVzBkeFodzq4r0JxiiKlNcD1I,4626
 tinybird/tb/modules/project.py,sha256=sb-561KV6RQiYrq4nHSULFNMOodq8Ywxwp6Dfogs0KY,9171
 tinybird/tb/modules/project_commands.py,sha256=t7h5JJWNA5eGth_Nrj0fak5B9eyVPGeDluF-41OBkhw,1877
 tinybird/tb/modules/py_project.py,sha256=DE3N-GPhcvVulELMINZQmw0zG6xZ1YeVkyJt1vn2E4I,7799
@@ -91,15 +93,14 @@ tinybird/tb/modules/datafile/pipe_checker.py,sha256=dxsCQoA6ruxg1fvF6sMLFowpjaqw
 tinybird/tb/modules/datafile/playground.py,sha256=TB4ebscUaNPqYzn0zBWqFBtK6TyzhcenHeTf62ac-2E,55269
 tinybird/tb/modules/datafile/pull.py,sha256=WbFCv0rp-ThcCcfH6gqs9Be-NawJfEEkY-aU78O93hk,6004
 tinybird/tb/modules/tinyunit/tinyunit.py,sha256=GHdp_6uDcCO2C-Z5bXu4OJQGXMm9Y_yjrcLVYdWy65o,11238
-tinybird/tb/modules/tinyunit/tinyunit_lib.py,sha256=NHoXcCHPDcKWYLzgP3NViho3Ey-6RV-ynPDzySPrTPE,1817
 tinybird/tb_cli_modules/cicd.py,sha256=i2Mw8AbmEVNBcEPYdio7liy3PGqh1ezVFZ0OmJ9ww5o,13809
-tinybird/tb_cli_modules/common.py,sha256=_J0ovBGdMqdrYCMdkw4ub74pMLuMdkm1yAsu_OAFMwQ,77443
+tinybird/tb_cli_modules/common.py,sha256=763GkBOgXIcB48UnuSjnGfxdfoSx5iqCniK15R0Aq5Y,77366
 tinybird/tb_cli_modules/config.py,sha256=0kFDmsDcjKon32rgFGMHHKSbv4j5dOrXtVOlyuAyEkk,11510
 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.2.dev0.dist-info/METADATA,sha256=NUakUIjMH63SvEAurFVKJ1PsHBKbV9WbO-9KdACgETk,12684
-tinybird-4.6.2.dev0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-tinybird-4.6.2.dev0.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-4.6.2.dev0.dist-info/top_level.txt,sha256=ZIQJTPCzMqnfDzM_hEGZrJqDSEcKnIK_49T86DGWpyQ,78
-tinybird-4.6.2.dev0.dist-info/RECORD,,
+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/tb/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())