tinybird 4.6.2.dev0__tar.gz → 4.6.3.dev0__tar.gz

{tinybird-4.6.2.dev0 → tinybird-4.6.3.dev0}/PKG-INFO

@@ -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 → tinybird-4.6.3.dev0}/tinybird/client.py

@@ -770,14 +770,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 +782,6 @@ class TinyB:
         workspace_id: str,
         last_partition: bool,
         all: bool,
-        ignore_datasources: Optional[List[str]] = None,
     ):
         params = {}
         if last_partition:
@@ -793,8 +789,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-4.6.3.dev0/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-4.6.2.dev0 → tinybird-4.6.3.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.2.dev0'
-__revision__ = '41da03f'
+__version__ = '4.6.3.dev0'
+__revision__ = '78e5916'

{tinybird-4.6.2.dev0 → tinybird-4.6.3.dev0}/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-4.6.2.dev0 → tinybird-4.6.3.dev0}/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-4.6.2.dev0 → tinybird-4.6.3.dev0}/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-4.6.2.dev0 → tinybird-4.6.3.dev0}/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-4.6.2.dev0 → tinybird-4.6.3.dev0}/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-4.6.2.dev0 → tinybird-4.6.3.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-4.6.2.dev0 → tinybird-4.6.3.dev0}/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 → tinybird-4.6.3.dev0}/tinybird.egg-info/PKG-INFO

@@ -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 → tinybird-4.6.3.dev0}/tinybird.egg-info/SOURCES.txt

@@ -28,6 +28,8 @@ tinybird/datafile/exceptions.py
 tinybird/datafile/parse_connection.py
 tinybird/datafile/parse_datasource.py
 tinybird/datafile/parse_pipe.py
+tinybird/iterating/__init__.py
+tinybird/iterating/data_branch_modes.py
 tinybird/tb/__cli__.py
 tinybird/tb/check_pypi.py
 tinybird/tb/cli.py
@@ -102,7 +104,6 @@ tinybird/tb/modules/datafile/pipe_checker.py
 tinybird/tb/modules/datafile/playground.py
 tinybird/tb/modules/datafile/pull.py
 tinybird/tb/modules/tinyunit/tinyunit.py
-tinybird/tb/modules/tinyunit/tinyunit_lib.py
 tinybird/tb_cli_modules/auth.py
 tinybird/tb_cli_modules/branch.py
 tinybird/tb_cli_modules/cicd.py
@@ -121,5 +122,4 @@ tinybird/tb_cli_modules/telemetry.py
 tinybird/tb_cli_modules/test.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/tb_cli_modules/tinyunit/tinyunit.py

tinybird-4.6.2.dev0/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())

tinybird-4.6.2.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())