tinybird 4.4.2.dev0__tar.gz → 4.4.3.dev0__tar.gz

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.4.2.dev0
+Version: 4.4.3.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.4.2
+*******
+
+- `Added` `tb build` and `tb dev` now display git branch, Tinybird branch name, and dashboard URL before building. In local mode, a separate workspace is created per git branch.
+
 4.4.1
 *******
 

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/tinybird/git_settings.py

@@ -71,7 +71,7 @@ VERSION=0.0.0
 # TB_SKIP_REGRESSION=0
 
 # Use `OBFUSCATE_REGEX_PATTERN` and `OBFUSCATE_PATTERN_SEPARATOR` environment variables to define a regex pattern and a separator (in case of a single string with multiple regex) to obfuscate secrets in the CLI output.
-# OBFUSCATE_REGEX_PATTERN="https://(www\.)?[^/]+||^Follow these instructions =>"
+# OBFUSCATE_REGEX_PATTERN="https://(www\\.)?[^/]+||^Follow these instructions =>"
 # OBFUSCATE_PATTERN_SEPARATOR=||
 ##########
 """

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/tinybird/sql_template.py

@@ -20,6 +20,8 @@ from tinybird.context import (
 from .datatypes import testers
 from .tornado_template import VALID_CUSTOM_FUNCTION_NAMES, SecurityException, Template
 
+VALID_ACTIVATE_FEATURES = frozenset(["analyzer", "parallel_replicas", "optimize_aggregation_in_order"])
+
 TB_SECRET_IN_TEST_MODE = "tb_secret_dont_raise"
 TB_SECRET_PREFIX = "tb_secret_"
 CH_PARAM_PREFIX = "param_"
@@ -1463,10 +1465,9 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
         return Expression(f"-- cache_ttl {ttl_expression}\n")
 
     def set_activate(feature):
-        valid_features = ("analyzer", "parallel_replicas")
-        if feature not in valid_features:
+        if feature not in VALID_ACTIVATE_FEATURES:
             raise SQLTemplateException(f"'{feature}' is not a valid 'activate' argument")
-        template_execution_results["activate"] = feature
+        template_execution_results.setdefault("activate", set()).add(feature)
         return Expression(f"-- activate {feature}\n")
 
     def set_disable_feature(feature):

{tinybird-4.4.2.dev0 → tinybird-4.4.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.4.2.dev0'
-__revision__ = '5658fd7'
+__version__ = '4.4.3.dev0'
+__revision__ = '026901c'

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/tinybird/tb/modules/build.py

@@ -12,8 +12,9 @@ from tinybird.datafile.exceptions import ParseException
 from tinybird.datafile.parse_datasource import parse_datasource
 from tinybird.datafile.parse_pipe import parse_pipe
 from tinybird.tb.client import TinyB
+from tinybird.tb.config import CLOUD_HOSTS
 from tinybird.tb.modules.build_common import process
-from tinybird.tb.modules.cli import cli
+from tinybird.tb.modules.cli import cli, get_current_git_branch
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.playground import folder_playground
 from tinybird.tb.modules.feedback_manager import FeedbackManager
@@ -22,6 +23,40 @@ from tinybird.tb.modules.query_output import print_table_formatted
 from tinybird.tb.modules.watch import watch_files, watch_project
 
 
+def _get_dashboard_url(config: Dict[str, Any], branch_name: str, is_local: bool) -> Optional[str]:
+    host = config.get("host", "")
+    cloud_base = CLOUD_HOSTS.get(host)
+    workspace_name = config.get("name", "")
+    if not cloud_base or not workspace_name:
+        return None
+    if is_local:
+        return f"{cloud_base}/{workspace_name}~local~{branch_name}"
+    return f"{cloud_base}/{workspace_name}~{branch_name}"
+
+
+def echo_branch_info(obj: Dict[str, Any]) -> None:
+    local_branch = obj.get("local_branch")
+    cloud_branch = obj.get("branch")
+    if not local_branch and not cloud_branch:
+        return
+    git_branch = obj.get("git_branch") or get_current_git_branch()
+    branch_created = obj.get("branch_created", False)
+    status = "✓ created" if branch_created else "✓ exists"
+    config = obj.get("config", {})
+    if git_branch:
+        click.echo(FeedbackManager.highlight(message=f"» Git branch:            {git_branch}"))
+    if local_branch:
+        click.echo(FeedbackManager.highlight(message=f"» Tinybird Local branch: {local_branch} {status}"))
+        dashboard_url = _get_dashboard_url(config, local_branch, is_local=True)
+    elif cloud_branch:
+        click.echo(FeedbackManager.highlight(message=f"» Tinybird Cloud branch: {cloud_branch} {status}"))
+        dashboard_url = _get_dashboard_url(config, cloud_branch, is_local=False)
+    else:
+        dashboard_url = None
+    if dashboard_url:
+        click.echo(FeedbackManager.gray(message=f"  ↳ {dashboard_url}"))
+
+
 @cli.command()
 @click.option("--watch", is_flag=True, default=False, help="Watch for changes and rebuild automatically")
 @click.option(
@@ -56,6 +91,7 @@ def build(ctx: click.Context, watch: bool, with_connections: bool) -> None:
             )
         )
 
+    echo_branch_info(obj)
     click.echo(FeedbackManager.highlight_building_project())
     process(
         project=project,
@@ -104,6 +140,7 @@ def dev(ctx: click.Context, with_connections: Optional[bool]) -> None:
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
     config: Dict[str, Any] = ctx.ensure_object(dict)["config"]
 
+    echo_branch_info(obj)
     click.echo(FeedbackManager.highlight_building_project())
     process(
         project=project,

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/tinybird/tb/modules/cli.py

@@ -417,7 +417,7 @@ def get_project_type_from_tinybird_config(start_dir: str) -> Optional[str]:
 
 
 def _set_config_to_main_workspace(config: Dict[str, Any], staging: bool) -> None:
-    client = _get_tb_client(config.get("token", ""), config["host"], staging=staging)
+    client, _ = _get_tb_client(config.get("token", ""), config["host"], staging=staging)
     response = client.user_workspaces_and_branches(version="v1")
     workspaces = response.get("workspaces", [])
     if not workspaces:
@@ -618,7 +618,7 @@ def cli(
     config = get_config(host, token, user_token=user_token, config_file=config_temp._path)
     project_type = get_project_type_from_tinybird_config(os.getcwd()) or PROJECT_TYPE_CLI
     ctx.ensure_object(dict)["project_type"] = project_type
-    client = _get_tb_client(config.get("token", ""), config["host"], request_from=project_type)
+    client, _ = _get_tb_client(config.get("token", ""), config["host"], request_from=project_type)
 
     tinybird_dev_mode = get_dev_mode_from_tinybird_config(os.getcwd())
     if tinybird_dev_mode:
@@ -1067,7 +1067,7 @@ def create_ctx_client(
         if method and show_warnings:
             click.echo(FeedbackManager.gray(message=f"Authentication method: {method}"))
 
-        return _get_tb_client(
+        client, branch_created = _get_tb_client(
             config.get("token", ""),
             config["host"],
             staging=staging,
@@ -1075,10 +1075,22 @@ def create_ctx_client(
             create_branch_if_missing=create_branch_if_missing,
             request_from=project_type,
         )
+        ctx.ensure_object(dict)["branch_created"] = branch_created
+        return client
     test = command in command_always_test
     if show_warnings and command:
         click.echo(FeedbackManager.gray(message="Running against Tinybird Local"))
-    return get_tinybird_local_client(config, test=test, staging=staging)
+    local_branch = None
+    if command in ("build", "dev") and not test:
+        git_branch = get_current_git_branch()
+        if git_branch and not is_main_git_branch(git_branch):
+            local_branch = get_tinybird_branch_name_from_git_branch(git_branch)
+            ctx.ensure_object(dict)["git_branch"] = git_branch
+    client, workspace_created = get_tinybird_local_client(config, test=test, staging=staging, branch=local_branch)
+    if local_branch:
+        ctx.ensure_object(dict)["local_branch"] = local_branch
+        ctx.ensure_object(dict)["branch_created"] = workspace_created
+    return client
 
 
 def get_target_env(cloud: bool, branch: Optional[str]) -> str:

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/tinybird/tb/modules/common.py

@@ -363,7 +363,8 @@ def _get_tb_client(
     branch: Optional[str] = None,
     create_branch_if_missing: bool = False,
     request_from: Optional[str] = None,
-) -> TinyB:
+) -> Tuple[TinyB, bool]:
+    """Returns a tuple of (client, branch_created)."""
     resolved_request_from = request_from
     disable_ssl: bool = getenv_bool("TB_DISABLE_SSL_CHECKS", False)
     cloud_client = TinyB(
@@ -377,8 +378,9 @@ def _get_tb_client(
     )
 
     if not branch:
-        return cloud_client
+        return cloud_client, False
 
+    branch_created = False
     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:
@@ -396,6 +398,7 @@ 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)
+        branch_created = True
 
     if not workspace:
         raise CLIException(FeedbackManager.error_exception(error=f"Branch {branch} not found"))
@@ -408,7 +411,7 @@ def _get_tb_client(
         send_telemetry=True,
         staging=staging,
         request_from=resolved_request_from,
-    )
+    ), branch_created
 
 
 def create_tb_client(ctx: Context) -> TinyB:
@@ -416,7 +419,8 @@ def create_tb_client(ctx: Context) -> TinyB:
     token = obj["config"].get("token", "")
     host = obj["config"].get("host", DEFAULT_API_HOST)
     request_from = obj.get("project_type")
-    return _get_tb_client(token, host, request_from=request_from)
+    client, _ = _get_tb_client(token, host, request_from=request_from)
+    return client
 
 
 def _analyze(filename: str, client: TinyB, format: str):
@@ -1679,7 +1683,7 @@ def run_aws_iamrole_connection_flow(
 
     if use_local:
         try:
-            local_client = get_tinybird_local_client(config)
+            local_client, _ = get_tinybird_local_client(config)
         except Exception as e:
             click.echo(FeedbackManager.warning(message=f"Failed to initialize local client: {e}"))
             click.echo(FeedbackManager.warning(message="Continuing without local environment."))
@@ -2404,7 +2408,7 @@ def create_workspace_branch(
         if not branch_name:
             click.echo(FeedbackManager.info_workspace_branch_create_greeting())
             default_name = f"{workspace['name']}_{uuid.uuid4().hex[0:4]}"
-            branch_name = click.prompt("\Branch name", default=default_name, err=True, type=str)
+            branch_name = click.prompt("\nBranch name", default=default_name, err=True, type=str)
         assert isinstance(branch_name, str)
 
         response = config.get_client().create_workspace_branch(

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/tinybird/tb/modules/info.py

@@ -114,7 +114,7 @@ def _clean_error_message(error: str) -> str:
 
 def get_local_info(config: Dict[str, Any], silent: bool = False) -> Tuple[Iterable[Any], List[str]]:
     try:
-        local_config = get_tinybird_local_config(config, test=False, silent=silent)
+        local_config, _ = get_tinybird_local_config(config, test=False, silent=silent)
         local_client = local_config.get_client(host=TB_LOCAL_ADDRESS, staging=False)
         user_email = local_config.get_user_email() or "No user email found"
         token = local_config.get_token() or "No token found"

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/tinybird/tb/modules/local_common.py

@@ -47,14 +47,21 @@ TB_LOCAL_DEFAULT_WORKSPACE_NAME = "Tinybird_Local_Testing"
 
 
 def get_tinybird_local_client(
-    config_obj: Dict[str, Any], test: bool = False, staging: bool = False, silent: bool = False
-) -> TinyB:
-    """Get a Tinybird client connected to the local environment."""
+    config_obj: Dict[str, Any],
+    test: bool = False,
+    staging: bool = False,
+    silent: bool = False,
+    branch: Optional[str] = None,
+) -> tuple[TinyB, bool]:
+    """Get a Tinybird client connected to the local environment.
+
+    Returns a tuple of (client, workspace_created).
+    """
     try:
-        config = get_tinybird_local_config(config_obj, test=test, silent=silent)
+        config, workspace_created = get_tinybird_local_config(config_obj, test=test, silent=silent, branch=branch)
         client = config.get_client(host=TB_LOCAL_ADDRESS, staging=staging)
         load_secrets(config_obj.get("path", ""), client)
-        return client
+        return client, workspace_created
     # if some of the API calls to tinybird local fail due to a JSONDecodeError, it means that container is running but it's unhealthy
     except json.JSONDecodeError:
         raise CLILocalException(
@@ -64,10 +71,14 @@ def get_tinybird_local_client(
         )
 
 
-def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = False, silent: bool = False) -> CLIConfig:
-    """Craft a client config with a workspace name based on the path of the project files
+def get_tinybird_local_config(
+    config_obj: Dict[str, Any], test: bool = False, silent: bool = False, branch: Optional[str] = None
+) -> tuple[CLIConfig, bool]:
+    """Craft a client config with a workspace name based on the path of the project files.
+
+    It uses the tokens from tinybird local.
 
-    It uses the tokens from tinybird local
+    Returns a tuple of (config, workspace_created).
     """
     path = config_obj.get("path")
     config = CLIConfig.get_project_config()
@@ -75,6 +86,7 @@ def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = False, si
     user_token = tokens["user_token"]
     admin_token = tokens["admin_token"]
     default_token = tokens["workspace_admin_token"]
+    workspace_created = False
     # Create a new workspace if path is provided. This is used to isolate the build in a different workspace.
     if path:
         user_client = config.get_client(host=TB_LOCAL_ADDRESS, token=user_token)
@@ -92,6 +104,8 @@ def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = False, si
                     )
 
             ws_name = get_test_workspace_name(path)
+        elif branch:
+            ws_name = branch
         else:
             ws_name = config.get("name") or config_obj.get("name") or get_build_workspace_name(path)
         if not ws_name:
@@ -120,6 +134,7 @@ def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = False, si
             ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
             if not ws:
                 raise AuthNoTokenException()
+            workspace_created = True
 
         ws_token = ws["token"]
         config.set_token(ws_token)
@@ -130,7 +145,7 @@ def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = False, si
         config.set_token_for_host(TB_LOCAL_ADDRESS, default_token)
 
     config.set_user_token(user_token)
-    return config
+    return config, workspace_created
 
 
 def get_build_workspace_name(path: str) -> str:

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/tinybird/tb/modules/preview.py

@@ -62,11 +62,11 @@ def run_preview_cloud(
     check: bool,
     output: str,
 ) -> None:
-    cloud_client = _get_tb_client(config.get("token", ""), config["host"])
+    cloud_client, _ = _get_tb_client(config.get("token", ""), config["host"])
     _delete_preview_branch_if_exists(cloud_client, preview_branch_name)
     _create_preview_branch(cloud_client, preview_branch_name)
 
-    branch_client = _get_tb_client(
+    branch_client, _ = _get_tb_client(
         config.get("token", ""),
         config["host"],
         branch=preview_branch_name,

{tinybird-4.4.2.dev0 → tinybird-4.4.3.dev0}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.4.2.dev0
+Version: 4.4.3.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.4.2
+*******
+
+- `Added` `tb build` and `tb dev` now display git branch, Tinybird branch name, and dashboard URL before building. In local mode, a separate workspace is created per git branch.
+
 4.4.1
 *******