tinybird-cli 1.1.1.dev0__tar.gz → 1.1.1.dev2__tar.gz

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 1.1.1.dev0
+Version: 1.1.1.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,10 +19,26 @@ Changelog
 
 ---------
 
+1.1.1.dev2
+************
+
+- `Fixed` Do not print data branching summary in `tb env create <env_name>`
+
+1.1.1.dev1
+************
+
+- `Changed` internal Releases management.
+
+1.1.1.dev0
+************
+
+- `Changed` internal Releases management.
+
 1.1.0
 ************
 
 Released new version 1.1.0 with all these changes:
+
 - `Added` Support `skip` individual regression tests through the regression.yaml configuration file. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html 
 - `Added` Fail `tb env regression-tests` if no tests are run for any pipe, use `skip` to avoid the error
 - `Added` Skip POST requests by default in `tb env regression-tests` until it's supported

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://docs.tinybird.co/cli.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '1.1.1dev0'
-__revision__ = '695ba55'
+__version__ = '1.1.1.dev2'
+__revision__ = '2438918'

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/ch_utils/engine.py

@@ -64,6 +64,10 @@ class TableDetails:
     >>> ed = TableDetails({ "engine_full": "MergeTree() PARTITION BY toYear(timestamp) ORDER BY (timestamp, cityHash64(location)) SAMPLE BY cityHash64(location) SETTINGS index_granularity = 8192, ttl_only_drop_parts = 1, merge_with_ttl_timeout = 1800 TTL toDate(timestamp) + INTERVAL 1 DAY"})
     >>> ed.engine_full
     'MergeTree() PARTITION BY toYear(timestamp) ORDER BY (timestamp, cityHash64(location)) SAMPLE BY cityHash64(location) SETTINGS index_granularity = 8192, ttl_only_drop_parts = 1, merge_with_ttl_timeout = 1800 TTL toDate(timestamp) + INTERVAL 1 DAY'
+
+    >>> x = TableDetails({'database': 'd_01', 'name': 't_01', 'create_table_query': "CREATE TABLE d_01.t_01 (`project_id` String, `project_name` String, `project_repo` String, `owner_id` String, `updated_at` DateTime64(3)) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{layer}-{shard}/d_test_1ad5e496b29246e1ade99117e9180f6f.t_1bac899a56b34b33921fbf468b4500f7', '{replica}', updated_at) PARTITION BY tuple() PRIMARY KEY project_id ORDER BY project_id SETTINGS index_granularity = 32", 'engine': 'ReplicatedReplacingMergeTree', 'partition_key': 'tuple()', 'sorting_key': 'project_id', 'primary_key': 'project_id', 'sampling_key': '', 'engine_full': "ReplicatedReplacingMergeTree('/clickhouse/tables/{layer}-{shard}/d_01.t_01', '{replica}', updated_at) PARTITION BY tuple() PRIMARY KEY project_id ORDER BY project_id SETTINGS index_granularity = 32", 'settings': 'index_granularity = 32', 'ttl': ''})
+    >>> x.primary_key
+
     """
 
     def __init__(self, details: Optional[Dict[str, Any]] = None):
@@ -144,6 +148,8 @@ class TableDetails:
     @property
     def primary_key(self) -> Optional[str]:
         _primary_key = self.details.get("primary_key", None)
+        # When querying `system.tables`, it will return the `sorting_key` as `primary_key` even if it was not specify
+        # So we need to ignore it
         if self.sorting_key == _primary_key:
             return None
         return _primary_key
@@ -615,6 +621,8 @@ def engine_full_from_dict(
     Traceback (most recent call last):
     ...
     ValueError: You can not use 'schema' and 'columns' at the same time
+    >>> engine_full_from_dict('ReplacingMergeTree',  {'partition_key': 'tuple()', 'sorting_key': 'project_id', 'settings': 'index_granularity = 32', 'ver': 'updated_at'}, "`project_id` String, `project_name` String, `project_repo` String, `owner_id` String, `updated_at` DateTime64(3)")
+    'ReplacingMergeTree(updated_at) PARTITION BY (tuple()) ORDER BY (project_id) SETTINGS index_granularity = 32'
     """
 
     if schema is not None and columns is not None:
@@ -653,6 +661,8 @@ def engine_params_from_engine_full(engine_full: str) -> Dict[str, Any]:
     {'ver': 'insert_date'}
     >>> engine_params_from_engine_full("ReplicatedVersionedCollapsingMergeTree('/clickhouse/tables/{layer}-{shard}/test.foo', '{replica}', sign_c,version_c) ORDER BY pk TTL toDate(local_timeplaced) + toIntervalDay(3) SETTINGS index_granularity = 8192")
     {'sign': 'sign_c', 'version': 'version_c'}
+    >>> engine_params_from_engine_full("ReplacingMergeTree(updated_at) PARTITION BY tuple() PRIMARY KEY project_id ORDER BY project_id SETTINGS index_granularity = 32")
+    {'ver': 'updated_at'}
     """
     engine_full = engine_replicated_to_local(engine_full)
     for engine, (params, _options) in ENABLED_ENGINES:

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/client.py

@@ -88,6 +88,7 @@ class TinyB(object):
         version: Optional[str] = None,
         disable_ssl_checks: bool = False,
         send_telemetry: bool = False,
+        semver: Optional[str] = None,
     ):
         ctx = ssl.create_default_context()
         ctx.check_hostname = False
@@ -98,6 +99,7 @@ class TinyB(object):
         self.version = version
         self.disable_ssl_checks = disable_ssl_checks
         self.send_telemetry = send_telemetry
+        self.semver = semver
 
     async def _req(
         self, endpoint: str, data=None, files=None, method: str = "GET", retries: int = LIMIT_RETRIES, **kwargs
@@ -108,6 +110,8 @@ class TinyB(object):
             url += ("&" if "?" in endpoint else "?") + "token=" + self.token
         if self.version:
             url += ("&" if "?" in url else "?") + "cli_version=" + quote(self.version)
+        if self.semver:
+            url += ("&" if "?" in url else "?") + "__tb__semver=" + self.semver
 
         verify_ssl = not self.disable_ssl_checks
         try:
@@ -466,7 +470,6 @@ class TinyB(object):
         populate_condition: Optional[str] = None,
         truncate: bool = True,
         unlink_on_populate_error: bool = False,
-        semver: Optional[str] = None,
     ):
         params: Dict[str, Any] = {
             "truncate": "true" if truncate else "false",
@@ -476,8 +479,6 @@ class TinyB(object):
             params.update({"populate_subset": populate_subset})
         if populate_condition:
             params.update({"populate_condition": populate_condition})
-        if semver:
-            params.update({"semver": semver})
         response = await self._req(
             f"/v0/pipes/{pipe_name}/nodes/{node_name}/population?{urlencode(params)}", method="POST"
         )
@@ -583,12 +584,10 @@ class TinyB(object):
         params = {**params} if params else {}
         return await self._req(f"/v0/pipes/{pipe_name_or_id}/sink?{urlencode(params)}", method="POST")
 
-    async def query(self, sql: str, pipeline: Optional[str] = None, semver: Optional[str] = None):
+    async def query(self, sql: str, pipeline: Optional[str] = None):
         params = {}
         if pipeline:
             params = {"pipeline": pipeline}
-        if semver:
-            params["semver"] = semver
 
         if len(sql) > TinyB.MAX_GET_LENGTH:
             return await self._req(f"/v0/sql?{urlencode(params)}", data=sql, method="POST")
@@ -782,14 +781,11 @@ class TinyB(object):
         backoff_seconds: float = 2.0,
         backoff_multiplier: float = 1,
         maximum_backoff_seconds: float = 2.0,
-        semver: Optional[str] = None,
     ) -> Dict[str, Any]:
         res: Dict[str, Any] = {}
         done: bool = False
         while not done:
             params = {"debug": "blocks,block_log"}
-            if semver:
-                params["semver"] = semver
             res = await self._req(f"/v0/jobs/{job_id}?{urlencode(params)}")
 
             if res["status"] == "error":
@@ -1071,10 +1067,8 @@ class TinyB(object):
     async def regions(self):
         return await self._req("/v0/regions")
 
-    async def datasource_query_copy(self, datasource_name: str, sql_query: str, semver: str):
+    async def datasource_query_copy(self, datasource_name: str, sql_query: str):
         params = {"copy_to": datasource_name}
-        if semver:
-            params["semver"] = semver
         return await self._req(f"/v0/sql_copy?{urlencode(params)}", data=sql_query, method="POST")
 
     async def workspace_commit_update(self, workspace_id: str, commit: str):
@@ -1082,6 +1076,16 @@ class TinyB(object):
             f"/v0/workspaces/{workspace_id}/releases/?commit={commit}&force=true", method="POST", data=""
         )
 
+    async def release_new(self, workspace_id: str, semver: str, commit: str):
+        params = {
+            "commit": commit,
+            "semver": semver,
+        }
+        return await self._req(f"/v0/workspaces/{workspace_id}/releases/?{urlencode(params)}", method="POST", data="")
+
+    async def release_preview(self, workspace_id: str, semver: str):
+        return await self._req(f"/v0/workspaces/{workspace_id}/releases/{semver}?status=preview", method="PUT")
+
     async def release_promote(self, workspace_id: str, semver: str):
         return await self._req(f"/v0/workspaces/{workspace_id}/releases/{semver}?status=live", method="PUT")
 

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/config.py

@@ -22,7 +22,7 @@ PROJECT_PATHS = ["datasources", "datasources/fixtures", "endpoints", "pipes", "t
 MIN_WORKSPACE_ID_LENGTH = 36
 
 
-async def get_config(host: str, token: Optional[str]) -> Dict[str, Any]:
+async def get_config(host: str, token: Optional[str], semver: Optional[str] = None) -> Dict[str, Any]:
     if host:
         host = host.rstrip("/")
 
@@ -39,6 +39,7 @@ async def get_config(host: str, token: Optional[str]) -> Dict[str, Any]:
 
     config["token_passed"] = token
     config["token"] = token or config.get("token", None)
+    config["semver"] = semver or config.get("semver", None)
     config["host"] = host or config.get("host", DEFAULT_API_HOST)
     config["workspaces"] = config.get("workspaces", [])
     return config

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/datafile.py

@@ -488,8 +488,8 @@ class Deployment:
     def deploying(self):
         click.echo(FeedbackManager.info_deployment_deploying_release_header())
 
-    async def update_release(self, commit: Optional[str] = None):
-        if not self.is_git_release or self.dry_run:
+    async def update_release(self, commit: Optional[str] = None, has_semver: Optional[bool] = False):
+        if not self.is_git_release or self.dry_run or has_semver:
             return
         self.cli_git_release = self.cli_git_release or CLIGitRelease()
         release = await self.tb_client.workspace_commit_update(
@@ -3397,6 +3397,9 @@ async def folder_push(
         (workspace for workspace in workspaces if config and workspace.get("id", ".") == config.get("id", "..")), {}
     )
     is_environment = current_ws.get("is_branch", False)
+    has_semver = False
+    if config and config.get("semver"):
+        has_semver = True
 
     deployment = Deployment(current_ws, git_release, tb_client, dry_run)
 
@@ -3454,7 +3457,7 @@ async def folder_push(
         workspace_lib_paths=workspace_lib_paths,
         current_ws=current_ws,
         changed=changed,
-        only_changes=only_changes,
+        only_changes=only_changes or (deployment.is_git_release and has_semver),
         fork_downstream=fork_downstream,
         is_internal=is_internal,
     )
@@ -3483,7 +3486,7 @@ async def folder_push(
         workspace_lib_paths=workspace_lib_paths,
         current_ws=current_ws,
         changed=changed,
-        only_changes=only_changes,
+        only_changes=only_changes or (deployment.is_git_release and has_semver),
         skip_connectors=is_environment,
         fork_downstream=fork_downstream,
         is_internal=is_internal,
@@ -3659,7 +3662,6 @@ async def folder_push(
         if not deployment.dry_run:
             deployment.deploying()
             await push_files(dry_run)
-
     else:
         await push_files(dry_run)
 
@@ -3708,7 +3710,7 @@ async def folder_push(
             if verbose:
                 click.echo(FeedbackManager.info_not_pushing_fixtures())
 
-    await deployment.update_release()
+    await deployment.update_release(has_semver=has_semver)
 
     return to_run
 

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/feedback_manager.py

@@ -78,6 +78,9 @@ class FeedbackManager:
     error_processing_data = error_message("{error} - FAIL")
     error_file_already_exists = error_message("{file} already exists, use --force to override")
     error_invalid_token_for_host = error_message("Invalid token for {host}")
+    error_invalid_release_for_workspace = error_message(
+        "There's no Release with semver {semver} for Workspace {workspace}"
+    )
     error_invalid_token = error_message(
         "Invalid token\n** Run 'tb auth --interactive' to select region. If you belong to a custom region, include your region host in the command:\n** tb auth --host https://<region>.tinybird.co"
     )
@@ -456,7 +459,7 @@ Ready? """
         "** Do you want to override {name} with the formatted version shown above?"
     )
     info_populate_job_url = info_message("** Populating job url {url}")
-    info_data_branch_job_url = info_message("** Data Branch job url {url}")
+    info_data_branch_job_url = info_message("** Environment job url {url}")
     info_regression_tests_branch_job_url = info_message("** Environment regression tests job url {url}")
     info_merge_branch_job_url = info_message("** Merge Environment deployment job url {url}")
     info_copy_from_main_job_url = info_message("** Copy from 'main' Workspace to '{datasource_name}' job url {url}")
@@ -607,6 +610,7 @@ Ready? """
     success_test_endpoint = info_message(
         "** => Test endpoint with:\n** $ curl {host}/v0/pipes/{pipe}.json?token={token}"
     )
+    success_deployment_release = success_message("** => Release {semver} created in deployment status")
     success_test_endpoint_no_token = success_message("** => Test endpoint at {host}/v0/pipes/{pipe}.json")
     success_promote = success_message(
         "**  Release has been promoted to Live. Run `tb release ls` to list Releases in the Workspace. To rollback to the previous Release run `tb release rollback`."
@@ -756,9 +760,12 @@ Ready? """
         "** Workspace '{workspace_name}' release initialized to commit '{release_commit}'.\n Now start working with git, pushing changes to pull requests and let the CI/CD work for you. More details in this guide: https://www.tinybird.co/docs/guides/working-with-git.html."
     )
     success_release_promote = success_message("** Release {semver} promoted to live")
+    success_release_preview = success_message("** Release {semver} in preview status")
     success_release_rollback = success_message("** Workspace rolled back to Release {semver}")
     success_release_delete = success_message("** Release {semver} deleted")
-    success_release_delete_dry_run = success_message("** Release {semver} to delete (dry run)")
+    success_release_delete_dry_run = success_message(
+        "** Release {semver} delete (dry run). The following resources are not used in any other Release and would be deleted:"
+    )
 
     success_delete_token = success_message("** Token '{token}' removed successfully")
     success_refresh_token = success_message("** Token '{token}' refreshed successfully")

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/tb_cli_modules/branch.py

@@ -3,6 +3,7 @@
 # - If it makes sense and only when strictly necessary, you can create utility functions in this file.
 # - But please, **do not** interleave utility functions and command definitions.
 
+from os import getcwd
 from typing import Any, Dict, List, Tuple, Optional
 import click
 from click import Context
@@ -128,6 +129,31 @@ tb deploy
     click.echo(FeedbackManager.info_release_generated(semver=semver))
 
 
+@release.command(name="create", short_help="Create a new Release in deploying status")
+@click.option(
+    "--semver",
+    is_flag=False,
+    required=True,
+    type=str,
+    help="Semver of the new Release. Example: 1.0.0",
+)
+@click.pass_context
+@coro
+async def release_create(ctx: Context, semver: str) -> None:
+    client: TinyB = ctx.ensure_object(dict)["client"]
+    config = ctx.ensure_object(dict)["config"]
+    folder = getcwd()
+    cli_git_release = None
+    try:
+        cli_git_release = CLIGitRelease(path=folder)
+        commit = cli_git_release.head_commit()
+    except CLIGitReleaseException:
+        raise CLIGitReleaseException(FeedbackManager.error_no_git_repo_for_init(repo_path=folder))
+
+    await client.release_new(config["id"], semver, commit)
+    click.echo(FeedbackManager.success_deployment_release(semver=semver))
+
+
 @release.command(name="promote", short_help="Promotes to live status a preview Release")
 @click.option(
     "--semver",
@@ -161,6 +187,35 @@ async def release_promote(ctx: Context, semver: str) -> None:
         raise CLIReleaseException(FeedbackManager.error_exception(error=str(e)))
 
 
+@release.command(name="preview", short_help="Updates the status of a deploying Release to preview")
+@click.option(
+    "--semver", is_flag=False, required=True, type=str, help="Semver of a preview Release to preview. Example: 1.0.0"
+)
+@click.pass_context
+@coro
+async def release_preview(ctx: Context, semver: str) -> None:
+    obj: Dict[str, Any] = ctx.ensure_object(dict)
+    client: TinyB = obj["client"]
+    config = obj["config"]
+
+    if "id" not in config:
+        config = await _get_config(config["host"], config["token"], load_tb_file=False)
+
+    current_main_workspace = await get_current_main_workspace(client, config)
+    if not current_main_workspace:
+        raise CLIReleaseException(FeedbackManager.error_exception(error=str("ERROR!")))
+    # FIXME validate is not environment
+
+    if current_main_workspace["id"] != config["id"]:
+        client = _get_tb_client(current_main_workspace["token"], config["host"])
+
+    try:
+        await client.release_preview(current_main_workspace["id"], semver)
+        click.echo(FeedbackManager.success_release_preview(semver=semver))
+    except Exception as e:
+        raise CLIReleaseException(FeedbackManager.error_exception(error=str(e)))
+
+
 @release.command(name="rollback", short_help="Rollbacks to a previous Release")
 @click.pass_context
 @coro
@@ -484,7 +539,7 @@ async def data_branch(ctx: Context, last_partition: bool, all: bool, ignore_data
             job_id = response["job"]["job_id"]
             job_url = response["job"]["job_url"]
             click.echo(FeedbackManager.info_data_branch_job_url(url=job_url))
-            job_response = await wait_job(client, job_id, job_url, "Data Branching")
+            job_response = await wait_job(client, job_id, job_url, "Environment creation")
             response = job_response["result"]
             is_job = False
             is_summary = "partitions" in response
@@ -494,7 +549,7 @@ async def data_branch(ctx: Context, last_partition: bool, all: bool, ignore_data
         else:
             if not is_job and not is_summary:
                 FeedbackManager.warning_unknown_response(response=response)
-            elif is_summary:
+            elif is_summary and (bool(last_partition) or bool(all)):
                 await print_data_branch_summary(client, None, response)
             click.echo(FeedbackManager.success_workspace_data_branch())
 
@@ -973,17 +1028,10 @@ def datasource(ctx: Context) -> None:
     required=False,
 )
 @click.option("--wait", is_flag=True, default=False, help="Wait for copy job to finish, disabled by default")
-@click.option(
-    "--semver",
-    is_flag=False,
-    required=False,
-    type=str,
-    help="Release semver where to run the copy operation. Example: 1.0.0",
-)
 @click.pass_context
 @coro
 async def datasource_copy_from_main(
-    ctx: Context, datasource_name: str, sql: str, sql_from_main: bool, wait: bool, semver: str
+    ctx: Context, datasource_name: str, sql: str, sql_from_main: bool, wait: bool
 ) -> None:
     """Copy data source from Main."""
 
@@ -1007,7 +1055,7 @@ async def datasource_copy_from_main(
         return
 
     response = await client.datasource_query_copy(
-        datasource_name, sql if sql else f"SELECT * FROM main.{datasource_name}", semver
+        datasource_name, sql if sql else f"SELECT * FROM main.{datasource_name}"
     )
     if "job" not in response:
         raise CLIBranchException(response)

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/tb_cli_modules/cli.py

@@ -83,6 +83,7 @@ DEFAULT_PATTERNS: List[Tuple[str, Union[str, Callable[[str], str]]]] = [
 )
 @click.option("--token", help="Use auth token, defaults to TB_TOKEN envvar, then to the .tinyb file")
 @click.option("--host", help="Use custom host, defaults to TB_HOST envvar, then to https://api.tinybird.co")
+@click.option("--semver", help="Semver of a Release to run the command. Example: 1.0.0")
 @click.option("--gcp-project-id", help="The Google Cloud project ID", hidden=True)
 @click.option(
     "--gcs-bucket", help="The Google Cloud Storage bucket to write temp files when using the connectors", hidden=True
@@ -130,6 +131,7 @@ async def cli(
     debug: bool,
     token: str,
     host: str,
+    semver: str,
     gcp_project_id: str,
     gcs_bucket: str,
     google_application_credentials: str,
@@ -188,6 +190,8 @@ async def cli(
         config_temp.set_token(token)
     if host:
         config_temp.set_host(host)
+    if semver:
+        config_temp.set_semver(semver)
 
     # Overwrite token and host with env vars manually, without resorting to click.
     #
@@ -198,8 +202,10 @@ async def cli(
         token = os.environ.get("TB_TOKEN", "")
     if not host and "TB_HOST" in os.environ:
         host = os.environ.get("TB_HOST", "")
+    if not semver and "TB_SEMVER" in os.environ:
+        semver = os.environ.get("TB_SEMVER", "")
 
-    config = await get_config(host, token)
+    config = await get_config(host, token, semver)
     client = _get_tb_client(config.get("token", None), config["host"])
 
     # If they have passed a token or host as paramter and it's different that record in .tinyb, refresh the workspace id
@@ -255,7 +261,7 @@ async def cli(
 
     logging.debug("debug enabled")
 
-    ctx.ensure_object(dict)["client"] = client
+    ctx.ensure_object(dict)["client"] = _get_tb_client(config.get("token", None), config["host"], semver)
 
     for connector in SUPPORTED_CONNECTORS:
         load_connector_config(ctx, connector, debug, check_uninstalled=True)
@@ -917,14 +923,6 @@ async def diff(
     default="human",
     help="Output format",
 )
-@click.option(
-    "--semver",
-    is_flag=False,
-    required=False,
-    type=str,
-    help="Semver of a preview Release to run the query. Example: 1.0.0",
-    hidden=True,
-)
 @click.option("--stats/--no-stats", default=False, help="Show query stats")
 @click.pass_context
 @coro
@@ -936,7 +934,6 @@ async def sql(
     pipe: Optional[str],
     node: Optional[str],
     format_: str,
-    semver: Optional[str],
     stats: bool,
 ) -> None:
     """Run SQL query over data sources and pipes."""
@@ -954,7 +951,7 @@ async def sql(
                 click.echo(FeedbackManager.error_invalid_query())
                 return
             res = await client.query(
-                f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline, semver=semver
+                f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline
             )
         elif pipe and node:
             datasources: List[Dict[str, Any]] = await client.datasources()
@@ -1001,7 +998,7 @@ async def sql(
                         query = "".join(_node["sql"])
             pipeline = pipe.split("/")[-1].split(".pipe")[0]
             res = await client.query(
-                f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline, semver=semver
+                f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline
             )
     except Exception as e:
         click.echo(FeedbackManager.error_exception(error=str(e)))

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/tb_cli_modules/common.py

@@ -274,15 +274,16 @@ def getenv_bool(key: str, default: bool) -> bool:
     return v.lower() == "true" or v == "1"
 
 
-def _get_tb_client(token: str, host: str) -> TinyB:
+def _get_tb_client(token: str, host: str, semver: Optional[str] = None) -> TinyB:
     disable_ssl: bool = getenv_bool("TB_DISABLE_SSL_CHECKS", False)
-    return TinyB(token, host, version=VERSION, disable_ssl_checks=disable_ssl, send_telemetry=True)
+    return TinyB(token, host, version=VERSION, disable_ssl_checks=disable_ssl, send_telemetry=True, semver=semver)
 
 
 def create_tb_client(ctx: Context) -> TinyB:
     token = ctx.ensure_object(dict)["config"].get("token", "")
     host = ctx.ensure_object(dict)["config"].get("host", DEFAULT_API_HOST)
-    return _get_tb_client(token, host)
+    semver = ctx.ensure_object(dict)["config"].get("semver", "")
+    return _get_tb_client(token, host, semver=semver)
 
 
 async def _analyze(filename: str, client: TinyB, format: str, connector: Optional[Connector] = None):
@@ -488,7 +489,7 @@ async def configure_connector(connector):
         click.echo(FeedbackManager.success_connector_config(connector=connector, file_name=file_name))
 
 
-async def _get_config(host, token, load_tb_file=True):
+async def _get_config(host: str, token: str, load_tb_file: bool = True, semver: Optional[str] = None):
     config = {}
 
     try:
@@ -497,6 +498,13 @@ async def _get_config(host, token, load_tb_file=True):
     except Exception:
         raise CLIAuthException(FeedbackManager.error_invalid_token_for_host(host=host))
 
+    if semver:
+        release_exists = any(release["semver"] == semver for release in response["releases"])
+        if not release_exists:
+            raise CLIAuthException(
+                FeedbackManager.error_invalid_release_for_workspace(semver=semver, workspace=response["name"])
+            )
+
     from_response = load_tb_file
 
     try:
@@ -953,7 +961,7 @@ async def create_workspace_branch(
             assert isinstance(job_id, str)
 
             # Await the job to finish and get the result dict
-            job_response = await wait_job(client, job_id, job_url, "Data Branching")
+            job_response = await wait_job(client, job_id, job_url, "Environment creation")
             if job_response is None:
                 raise CLIException(f"Empty job API response (job_id: {job_id}, job_url: {job_url})")
             else:
@@ -962,7 +970,7 @@ async def create_workspace_branch(
                 is_summary = "partitions" in response
 
         await switch_workspace(ctx, branch_name, only_environments=True)
-        if is_summary:
+        if is_summary and (bool(last_partition) or bool(all)):
             await print_data_branch_summary(client, None, response)
 
     except Exception as e:
@@ -1511,13 +1519,14 @@ def _get_setting_value(connection, setting, sensitive_settings):
     return connection.get(setting, "")
 
 
-async def _get_config_or_load_tb_file(config):
+async def _get_config_or_load_tb_file(config, semver: Optional[str] = None):
     if "id" not in config:
-        config = await _get_config(config["host"], config["token"], load_tb_file=False)
+        config = await _get_config(config["host"], config["token"], load_tb_file=False, semver=semver)
     else:
         config_file = Path(getcwd()) / ".tinyb"
         with open(config_file) as file:
             config = json.loads(file.read())
+    config["semver"] = semver
     return config
 
 
@@ -1634,7 +1643,7 @@ async def print_current_branch(ctx):
 
     response = await client.user_workspaces_and_branches()
 
-    columns = ["name", "id", "main"]
+    columns = ["name", "id", "workspace"]
     table = []
 
     for workspace in response["workspaces"]:
@@ -1909,7 +1918,6 @@ async def wait_job(
     label: str,
     timeout: Optional[int] = None,
     wait_observer: Optional[Callable[[Dict[str, Any], ProgressBar], None]] = None,
-    semver: Optional[str] = None,
 ) -> Dict[str, Any]:
     progress_bar: ProgressBar
     with click.progressbar(
@@ -1932,7 +1940,7 @@ async def wait_job(
 
         try:
             # TODO: Simplify this as it's not needed to use two functions for
-            result = await wait_job_no_ui(tb_client, job_id, timeout, progressbar_cb, semver)
+            result = await wait_job_no_ui(tb_client, job_id, timeout, progressbar_cb)
             if result["status"] != "done":
                 click.echo(FeedbackManager.error_while_running_job(error=result["error"]))
             return result
@@ -1949,12 +1957,9 @@ async def wait_job_no_ui(
     job_id: str,
     timeout: Optional[int] = None,
     status_callback: Optional[Callable[[Dict[str, Any]], None]] = None,
-    semver: Optional[str] = None,
 ) -> Dict[str, Any]:
     try:
-        result = await asyncio.wait_for(
-            tb_client.wait_for_job(job_id, status_callback=status_callback, semver=semver), timeout
-        )
+        result = await asyncio.wait_for(tb_client.wait_for_job(job_id, status_callback=status_callback), timeout)
         if result["status"] != "done":
             raise JobException(result.get("error"))
         return result

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/tb_cli_modules/config.py

@@ -73,6 +73,7 @@ class CLIConfig:
         "token": "TB_TOKEN",
         "user_token": "TB_USER_TOKEN",
         "host": "TB_HOST",
+        "semver": "TB_SEMVER",
     }
 
     DEFAULTS: Dict[str, str] = {"host": DEFAULT_API_HOST if not FeatureFlags.is_localhost() else DEFAULT_LOCALHOST}
@@ -178,6 +179,15 @@ class CLIConfig:
         except KeyError:
             return None
 
+    def set_semver(self, semver: Optional[str]) -> None:
+        self["semver"] = semver
+
+    def get_semver(self) -> Optional[str]:
+        try:
+            return self["semver"]
+        except KeyError:
+            return None
+
     def set_token_for_host(self, token: Optional[str], host: Optional[str]) -> None:
         """Sets the token for the specified host.
 

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/tb_cli_modules/datasource.py

@@ -16,7 +16,7 @@ import humanfriendly
 from tinybird.client import CanNotBeDeletedException, DoesNotExistException, TinyB
 from tinybird.connectors import Connector
 from tinybird.feedback_manager import FeedbackManager
-from tinybird.datafile import get_name_tag_version
+from tinybird.datafile import get_name_tag_version, wait_job
 from tinybird.tb_cli_modules.cli import cli
 from tinybird.tb_cli_modules.common import (
     _analyze,
@@ -747,3 +747,52 @@ async def datasource_exchange(ctx, datasource_a, datasource_b):
         raise CLIDatasourceException(FeedbackManager.error_exception(error=e))
 
     click.echo(FeedbackManager.success_exchange_datasources(datasource_a=datasource_a, datasource_b=datasource_b))
+
+
+@datasource.command(name="copy")
+@click.argument("datasource_name")
+@click.option(
+    "--sql",
+    default=None,
+    help="Freeform SQL query to select what is copied from Main into the Environment Data Source",
+    required=False,
+)
+@click.option(
+    "--sql-from-main",
+    is_flag=True,
+    default=False,
+    help="SQL query selecting * from the same Data Source in Main",
+    required=False,
+)
+@click.option("--wait", is_flag=True, default=False, help="Wait for copy job to finish, disabled by default")
+@click.pass_context
+@coro
+async def datasource_copy_from_main(
+    ctx: Context, datasource_name: str, sql: str, sql_from_main: bool, wait: bool
+) -> None:
+    """Copy data source from Main."""
+
+    client: TinyB = ctx.ensure_object(dict)["client"]
+
+    if sql and sql_from_main:
+        click.echo(FeedbackManager.error_exception(error="Use --sql or --sql-from-main but not both"))
+        return
+
+    if not sql and not sql_from_main:
+        click.echo(FeedbackManager.error_exception(error="Use --sql or --sql-from-main"))
+        return
+
+    response = await client.datasource_query_copy(
+        datasource_name, sql if sql else f"SELECT * FROM main.{datasource_name}"
+    )
+    if "job" not in response:
+        raise Exception(response)
+    job_id = response["job"]["job_id"]
+    job_url = response["job"]["job_url"]
+    if sql:
+        click.echo(FeedbackManager.info_copy_with_sql_job_url(sql=sql, datasource_name=datasource_name, url=job_url))
+    else:
+        click.echo(FeedbackManager.info_copy_from_main_job_url(datasource_name=datasource_name, url=job_url))
+    if wait:
+        base_msg = "Copy from Main Workspace" if sql_from_main else f"Copy from {sql}"
+        await wait_job(client, job_id, job_url, f"{base_msg} to {datasource_name}")

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird/tb_cli_modules/pipe.py

@@ -240,14 +240,6 @@ async def pipe_ls(ctx: Context, prefix: str, match: str, format_: str):
     default=False,
     help="Waits for populate jobs to finish, showing a progress bar. Disabled by default.",
 )
-@click.option(
-    "--semver",
-    is_flag=False,
-    required=False,
-    type=str,
-    help="Semver of a preview Release to run the population. Example: 1.0.0",
-    hidden=True,
-)
 @click.pass_context
 @coro
 async def pipe_populate(
@@ -258,7 +250,6 @@ async def pipe_populate(
     truncate: bool,
     unlink_on_populate_error: bool,
     wait: bool,
-    semver: str,
 ):
     """Populate the result of a Materialized Node into the target Materialized View"""
     cl = create_tb_client(ctx)
@@ -268,7 +259,6 @@ async def pipe_populate(
         populate_condition=sql_condition,
         truncate=truncate,
         unlink_on_populate_error=unlink_on_populate_error,
-        semver=semver,
     )
     if "job" not in response:
         raise CLIPipeException(response)
@@ -280,7 +270,7 @@ async def pipe_populate(
     else:
         click.echo(FeedbackManager.info_populate_job_url(url=job_url))
     if wait:
-        await wait_job(cl, job_id, job_url, "Populating", semver=semver)
+        await wait_job(cl, job_id, job_url, "Populating")
 
 
 @pipe.command(name="new", hidden=True)

{tinybird-cli-1.1.1.dev0 → tinybird-cli-1.1.1.dev2}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 1.1.1.dev0
+Version: 1.1.1.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,10 +19,26 @@ Changelog
 
 ---------
 
+1.1.1.dev2
+************
+
+- `Fixed` Do not print data branching summary in `tb env create <env_name>`
+
+1.1.1.dev1
+************
+
+- `Changed` internal Releases management.
+
+1.1.1.dev0
+************
+
+- `Changed` internal Releases management.
+
 1.1.0
 ************
 
 Released new version 1.1.0 with all these changes:
+
 - `Added` Support `skip` individual regression tests through the regression.yaml configuration file. CI/CD guide at https://www.tinybird.co/docs/guides/continuous-integration.html 
 - `Added` Fail `tb env regression-tests` if no tests are run for any pipe, use `skip` to avoid the error
 - `Added` Skip POST requests by default in `tb env regression-tests` until it's supported