tinybird-cli 5.2.1.dev0__tar.gz → 5.2.1.dev3__tar.gz

{tinybird-cli-5.2.1.dev0 → tinybird-cli-5.2.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.2.1.dev0
+Version: 5.2.1.dev3
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,21 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.2.1.dev3
+************
+
+- `Added` `tb branch ls --sort` option to list branches sorted by branch name.
+
+5.2.1.dev2
+************
+
+- `Added` `tb push` prevents pushing pipes that have nodes with the same name as the pipe.
+
+5.2.1.dev1
+************
+
+- `Fixed` error messages when using `tb push` with already taken names for other resources.
+
 5.2.0
 ******
 

{tinybird-cli-5.2.1.dev0 → tinybird-cli-5.2.1.dev3}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '5.2.1.dev0'
-__revision__ = '83349b1'
+__version__ = '5.2.1.dev3'
+__revision__ = 'ca0c2bb'

{tinybird-cli-5.2.1.dev0 → tinybird-cli-5.2.1.dev3}/tinybird/datafile.py

@@ -814,7 +814,6 @@ def parse_pipe(
         )
     except ModuleNotFoundError:
         pass
-
     return doc
 
 
@@ -2627,6 +2626,10 @@ async def new_pipe(
     copy_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "copy"), None)
     sink_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "sink"), None)
 
+    for node in p["nodes"]:
+        if node["params"]["name"] == p["name"]:
+            raise click.ClickException(FeedbackManager.error_pipe_node_same_name(name=p["name"]))
+
     if pipe_exists:
         if force or run_tests:
             # TODO: this should create a different node and rename it to the final one on success
@@ -3817,6 +3820,18 @@ def get_project_filenames(folder: str, with_vendor=False) -> List[str]:
     return filenames
 
 
+async def name_matches_existing_resource(resource: str, name: str, tb_client: TinyB):
+    if resource == "datasources":
+        current_pipes: List[Dict[str, Any]] = await tb_client.pipes()
+        if name in [x["name"] for x in current_pipes]:
+            return True
+    else:
+        current_datasources: List[Dict[str, Any]] = await tb_client.datasources()
+        if name in [x["name"] for x in current_datasources]:
+            return True
+    return False
+
+
 def is_new(
     name: str,
     changed: Dict[str, str],
@@ -4018,6 +4033,7 @@ async def folder_push(
         fork: Optional[bool] = False,
     ):
         if name in to_run:
+            resource = to_run[name]["resource"]
             if not dry_run:
                 if should_push_file(name, remote_resource_names, latest_datasource_versions, force, run_tests):
                     if name not in resource_versions:
@@ -4089,11 +4105,19 @@ async def folder_push(
                             )
                         )
                     else:
-                        click.echo(
-                            FeedbackManager.warning_name_already_exists(
-                                name=name if to_run[name]["version"] is None else f'{name}__v{to_run[name]["version"]}'
+                        if await name_matches_existing_resource(resource, name, tb_client):
+                            if resource == "pipes":
+                                click.echo(FeedbackManager.error_pipe_cannot_be_pushed(name=name))
+                            else:
+                                click.echo(FeedbackManager.error_datasource_cannot_be_pushed(name=name))
+                        else:
+                            click.echo(
+                                FeedbackManager.warning_name_already_exists(
+                                    name=name
+                                    if to_run[name]["version"] is None
+                                    else f'{name}__v{to_run[name]["version"]}'
+                                )
                             )
-                        )
             else:
                 if should_push_file(name, remote_resource_names, latest_datasource_versions, force, run_tests):
                     if name not in resource_versions:
@@ -4110,7 +4134,13 @@ async def folder_push(
                             )
                         )
                 else:
-                    click.echo(FeedbackManager.warning_dry_name_already_exists(name=name))
+                    if await name_matches_existing_resource(resource, name, tb_client):
+                        if resource == "pipes":
+                            click.echo(FeedbackManager.warning_pipe_cannot_be_pushed(name=name))
+                        else:
+                            click.echo(FeedbackManager.warning_datasource_cannot_be_pushed(name=name))
+                    else:
+                        click.echo(FeedbackManager.warning_dry_name_already_exists(name=name))
 
     async def push_files(
         dependency_graph: GraphDependencies,

{tinybird-cli-5.2.1.dev0 → tinybird-cli-5.2.1.dev3}/tinybird/datatypes.py

@@ -30,6 +30,28 @@ float64_max = 2**52  # 51 bits is the fractional part of float 64 ieee754
 datetime64_type_pattern = r"^DateTime64(\([1-9](, ?'.+')?\))?$"
 datetime_type_pattern = r"^DateTime(\(('.+')?)?\)?$"
 
+# List from https://github.com/tinybirdco/ClickHousePrivate/blob/153473d9c1c871974688a1d72dcff7a13fc2076c/src/DataTypes/Serializations/SerializationBool.cpp#L216
+bool_allowed_values = {
+    "true",
+    "false",
+    "True",
+    "False",
+    "T",
+    "F",
+    "Y",
+    "N",
+    "Yes",
+    "No",
+    "On",
+    "Off",
+    "Enable",
+    "Disable",
+    "Enabled",
+    "Disabled",
+    "1",
+    "0",
+}
+
 
 def is_type_datetime64(type_to_check):
     """
@@ -143,6 +165,10 @@ def float64_test(x):
     return "_" not in x and type_test(x, float) and -float64_max < float(x) < float64_max
 
 
+def bool_test(x):
+    return x in bool_allowed_values
+
+
 def test_numeric_testers(fn, n):
     """
     >>> test_numeric_testers(int32_test, (2**31)-1)
@@ -266,6 +292,7 @@ testers = {
     "UInt256": uint256_test,
     "Float32": float_test,
     "Float64": float_test,
+    "Bool": bool_test,
     "Array(Int32)": array_test(int),
     "Array(Float32)": array_test(float),
     "Array(String)": array_test(str),

{tinybird-cli-5.2.1.dev0 → tinybird-cli-5.2.1.dev3}/tinybird/feedback_manager.py

@@ -69,6 +69,15 @@ class FeedbackManager:
         "{number} files need to be formatted, run the commands below to fix them."
     )
     error_pipe_already_exists = error_message("{pipe} already exists")
+    error_pipe_node_same_name = error_message(
+        "Error in node '{name}'. The Pipe is already using that name. Nodes can't have the same exact name as the Pipe they belong to."
+    )
+    error_pipe_cannot_be_pushed = error_message(
+        "Failed pushing pipe. Top level object names must be unique. {name} cannot have same name as an existing datasource."
+    )
+    error_datasource_cannot_be_pushed = error_message(
+        "Failed pushing datasource. Top level object names must be unique. {name} cannot have same name as an existing pipe."
+    )
     error_datasource_already_exists = error_message("{datasource} already exists")
     error_datasource_already_exists_and_alter_failed = error_message(
         "{datasource} already exists and the migration can't be executed to match the new definition: {alter_error_message}"
@@ -500,6 +509,12 @@ Ready? """
     )
     warning_name_already_exists = warning_message("** Warning: {name} already exists, skipping")
     warning_dry_name_already_exists = warning_message("** [DRY RUN] {name} already exists, skipping")
+    warning_datasource_cannot_be_pushed = warning_message(
+        "** [DRY RUN] Failed pushing datasource. Top level object names must be unique. {name} cannot have same name as an existing pipe."
+    )
+    warning_pipe_cannot_be_pushed = warning_message(
+        "** [DRY RUN] Failed pushing pipe. Top level object names must be unique. {name} cannot have same name as an existing datasource."
+    )
     warning_fixture_not_found = warning_message("** Warning: No fixture found for the datasource {datasource_name}")
     warning_update_version = warning_message(
         '** UPDATE AVAILABLE: please run "pip install tinybird-cli=={latest_version}" to update or `export TB_VERSION_WARNING=0` to skip the check.'

{tinybird-cli-5.2.1.dev0 → tinybird-cli-5.2.1.dev3}/tinybird/tb_cli_modules/branch.py

@@ -273,8 +273,9 @@ def branch() -> None:
 
 
 @branch.command(name="ls")
+@click.option("--sort/--no-sort", default=False, help="Sort the table rows by name")
 @coro
-async def branch_ls() -> None:
+async def branch_ls(sort: bool) -> None:
     """List all the branches available using the workspace token"""
 
     config = CLIConfig.get_project_config()
@@ -298,10 +299,18 @@ async def branch_ls() -> None:
     for branch in response["environments"]:
         table.append((branch["name"], branch["id"], config["id"] == branch["id"]))
 
+    current_branch = [row for row in table if row[2]]
+    other_branches = [row for row in table if not row[2]]
+
+    if sort:
+        other_branches.sort(key=lambda x: x[0])
+
+    sorted_table = current_branch + other_branches
+
     await print_current_workspace(config)
 
     click.echo(FeedbackManager.info_branches())
-    echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
+    echo_safe_humanfriendly_tables_format_smart_table(sorted_table, column_names=columns)
 
 
 @branch.command(name="use")

{tinybird-cli-5.2.1.dev0 → tinybird-cli-5.2.1.dev3}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.2.1.dev0
+Version: 5.2.1.dev3
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,21 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.2.1.dev3
+************
+
+- `Added` `tb branch ls --sort` option to list branches sorted by branch name.
+
+5.2.1.dev2
+************
+
+- `Added` `tb push` prevents pushing pipes that have nodes with the same name as the pipe.
+
+5.2.1.dev1
+************
+
+- `Fixed` error messages when using `tb push` with already taken names for other resources.
+
 5.2.0
 ******