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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 1.1.1.dev1
+Version: 1.1.1.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,11 @@ Changelog
 
 ---------
 
+1.1.1.dev2
+************
+
+- `Fixed` Do not print data branching summary in `tb env create <env_name>`
+
 1.1.1.dev1
 ************
 

{tinybird-cli-1.1.1.dev1 → 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.1.dev1'
-__revision__ = '30cfac6'
+__version__ = '1.1.1.dev2'
+__revision__ = '2438918'

{tinybird-cli-1.1.1.dev1 → 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.dev1 → tinybird-cli-1.1.1.dev2}/tinybird/feedback_manager.py

@@ -459,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}")

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

@@ -539,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
@@ -549,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())
 

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

@@ -961,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:
@@ -970,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:
@@ -1643,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"]:

{tinybird-cli-1.1.1.dev1 → 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.dev1
+Version: 1.1.1.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,11 @@ Changelog
 
 ---------
 
+1.1.1.dev2
+************
+
+- `Fixed` Do not print data branching summary in `tb env create <env_name>`
+
 1.1.1.dev1
 ************