tinybird-cli 2.0.0.dev1__tar.gz → 2.0.1.dev0__tar.gz

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 2.0.0.dev1
+Version: 2.0.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,10 +19,26 @@ Changelog
 
 ---------
 
+2.0.0
+************
+
+Released new version 2.0.0 with all these changes:
+
+- `Changed` All commands exit with 1 when there's an exception
+- `Removed` Prefixes are not supported anymore ([context](https://www.tinybird.co/changelog/2023-10-09-versions), and [how to migrate](https://www.tinybird.co/docs/guides/staging-and-production-workspaces.html#migrating-from-prefixes))
+- `Removed` `tb pipe create`
+
+
+2.0.0.dev2
+************
+
+- `Changed` All commands exit with 1 when there's an exception
+- `Removed` `tb pipe create`
+
 2.0.0.dev1
 ************
 
-- `Changed` Prefixes are not supported anymore.
+- `Removed` Prefixes are not supported anymore
 
 
 1.3.0

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/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__ = '2.0.0.dev1'
-__revision__ = '166d72b'
+__version__ = '2.0.1.dev0'
+__revision__ = '40c7bee'

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/check_pypi.py

@@ -15,9 +15,9 @@ class CheckPypi:
             disable_ssl: bool = getenv_bool("TB_DISABLE_SSL_CHECKS", False)
             response: requests.Response = await requests_get(PYPY_URL, verify=not disable_ssl)
             if response.status_code != 200:
-                CLIException(FeedbackManager.error_exception(error=response.content.decode("utf-8")))
+                raise CLIException(FeedbackManager.error_exception(error=response.content.decode("utf-8")))
             version = response.json()["info"]["version"]
         except Exception as e:
-            CLIException(FeedbackManager.error_exception(error=str(e)))
+            raise CLIException(FeedbackManager.error_exception(error=str(e)))
 
         return version

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/datafile.py

@@ -1045,7 +1045,7 @@ async def process_file(
                     ]
 
                     if not all(required_params):
-                        raise Exception(FeedbackManager.error_unknown_kafka_connection(datasource=name))
+                        raise click.ClickException(FeedbackManager.error_unknown_kafka_connection(datasource=name))
 
                     connector = await tb_client.connection_create_kafka(**connector_params)
             except Exception as e:
@@ -1076,7 +1076,7 @@ async def process_file(
 
         if service and service.lower() == "bigquery":
             if not await tb_client.check_gcp_read_permissions():
-                raise Exception(FeedbackManager.error_unknown_bq_connection(datasource=datasource["name"]))
+                raise click.ClickException(FeedbackManager.error_unknown_bq_connection(datasource=datasource["name"]))
 
             # Bigquery doesn't have a datalink, so we can stop here
             return params
@@ -1086,7 +1086,7 @@ async def process_file(
         connector_id: Optional[str] = node.get("import_connector", None)
         connector_name: Optional[str] = node.get("import_connection_name", None)
         if not connector_name and not connector_id:
-            raise Exception(FeedbackManager.error_missing_connection_name(datasource=datasource["name"]))
+            raise click.ClickException(FeedbackManager.error_missing_connection_name(datasource=datasource["name"]))
 
         if not connector_id:
             assert isinstance(connector_name, str)
@@ -1107,10 +1107,12 @@ async def process_file(
 
         if service in PREVIEW_CONNECTOR_SERVICES:
             if not params.get("import_bucket_uri", None):
-                raise Exception(FeedbackManager.error_missing_bucket_uri(datasource=datasource["name"]))
+                raise click.ClickException(FeedbackManager.error_missing_bucket_uri(datasource=datasource["name"]))
         else:
             if not params.get("import_external_datasource", None):
-                raise Exception(FeedbackManager.error_missing_external_datasource(datasource=datasource["name"]))
+                raise click.ClickException(
+                    FeedbackManager.error_missing_external_datasource(datasource=datasource["name"])
+                )
 
         return params
 
@@ -1392,7 +1394,7 @@ async def process_file(
             }
         ]
     else:
-        raise Exception(FeedbackManager.error_file_extension(filename=filename))
+        raise click.ClickException(FeedbackManager.error_file_extension(filename=filename))
 
 
 def full_path_by_name(
@@ -2024,7 +2026,7 @@ async def check_pipe(
         node["params"]["type"] = PipeNodeTypes.STANDARD
 
     if populate:
-        raise Exception(FeedbackManager.error_check_pipes_populate())
+        raise click.ClickException(FeedbackManager.error_check_pipes_populate())
 
     runner = PipeCheckerRunner(pipe["name"], host)
     headers = (
@@ -2053,7 +2055,7 @@ async def check_pipe(
         )
 
     if not r or r.status_code != 200:
-        raise Exception(FeedbackManager.error_check_pipes_api(pipe=pipe["name"]))
+        raise click.ClickException(FeedbackManager.error_check_pipes_api(pipe=pipe["name"]))
 
     pipe_requests_to_check: List[Dict[str, str]] = []
     for x in r.json().get("data", []):
@@ -2410,7 +2412,7 @@ async def new_pipe(
             f"/v0/pipes?{urlencode(params)}", method="POST", headers=post_headers, data=json.dumps(body)
         )
     except Exception as e:
-        raise Exception(FeedbackManager.error_pushing_pipe(pipe=p["name"], error=str(e)))
+        raise click.ClickException(FeedbackManager.error_pushing_pipe(pipe=p["name"], error=str(e)))
 
     datasource = data.get("datasource", None)
     created_datasource = data.get("created_datasource", None)
@@ -2505,7 +2507,7 @@ async def new_pipe(
                 r = await tb_client.create_token(token_name, f"PIPES:{tk['permissions']}:{p['name']}", "P", p["name"])
                 token = r["token"]  # type: ignore
             except Exception as e:
-                raise Exception(FeedbackManager.error_creating_pipe(error=e))
+                raise click.ClickException(FeedbackManager.error_creating_pipe(error=e))
         else:
             click.echo(FeedbackManager.info_create_found_token(token=token_name))
             scopes = [f"PIPES:{tk['permissions']}:{p['name']}"]
@@ -2516,7 +2518,7 @@ async def new_pipe(
                 r = await tb_client.alter_tokens(token_name, scopes)
                 token = r["token"]  # type: ignore
             except Exception as e:
-                raise Exception(FeedbackManager.error_creating_pipe(error=e))
+                raise click.ClickException(FeedbackManager.error_creating_pipe(error=e))
         click.echo(FeedbackManager.success_test_endpoint(host=host, pipe=p["name"], token=token))
 
 
@@ -2679,7 +2681,7 @@ async def new_ds(
                     )
 
         except Exception as e:
-            raise Exception(FeedbackManager.error_creating_datasource(error=str(e)))
+            raise click.ClickException(FeedbackManager.error_creating_datasource(error=str(e)))
         return
 
     if not force:
@@ -2779,7 +2781,7 @@ async def new_ds(
             if current_connector["name"] != ds_params["connection"]:
                 param = "connection"
                 datafile_param = ImportReplacements.get_datafile_param_for_linker_param(service, param) or param
-                raise Exception(FeedbackManager.error_updating_connector_not_supported(param=datafile_param))
+                raise click.ClickException(FeedbackManager.error_updating_connector_not_supported(param=datafile_param))
 
             linkers = current_connector.get("linkers", [])
             linker = next((linker for linker in linkers if linker["datasource_id"] == existing_ds["id"]), None)
@@ -2827,7 +2829,7 @@ async def new_ds(
             await client.datasource_delete(ds_name)
             click.echo(FeedbackManager.success_delete_datasource(datasource=ds_name))
         except Exception:
-            raise Exception(FeedbackManager.error_removing_datasource(datasource=ds_name))
+            raise click.ClickException(FeedbackManager.error_removing_datasource(datasource=ds_name))
         return
     else:
         if alter_error_message:
@@ -2942,7 +2944,7 @@ async def exec_file(
     elif r["resource"] == "tokens":
         await new_token(r, tb_client, force)
     else:
-        raise Exception(FeedbackManager.error_unknown_resource(resource=r["resource"]))
+        raise click.ClickException(FeedbackManager.error_unknown_resource(resource=r["resource"]))
 
 
 def get_name_version(ds: str) -> Dict[str, Any]:
@@ -3769,7 +3771,7 @@ async def check_fixtures_data(
         else:
             click.echo(FeedbackManager.warning_fixture_not_found(datasource_name=name))
     else:
-        raise Exception(FeedbackManager.error_unknown_resource(resource=resource["resource"]))
+        raise click.ClickException(FeedbackManager.error_unknown_resource(resource=resource["resource"]))
 
 
 DATAFILE_NEW_LINE = "\n"
@@ -4187,7 +4189,7 @@ async def folder_pull(
                         if verbose:
                             click.echo(FeedbackManager.info_skip_already_exists())
                 except Exception as e:
-                    raise Exception(FeedbackManager.error_exception(error=e))
+                    raise click.ClickException(FeedbackManager.error_exception(error=e))
         return
 
     try:

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/feedback_manager.py

@@ -235,7 +235,6 @@ class FeedbackManager:
     error_missing_datasource_name = error_message(
         "Missing datasource name for pipe creation after the DATASOURCE label"
     )
-    error_no_test_results = error_message("Error: No test results to show")
     error_running_test = error_message("There was a problem running test file {file} (use -v for more info)")
     error_processing_blocks = error_message("There was been an error while processing some blocks: {error}")
     error_switching_to_main = error_message(
@@ -342,6 +341,7 @@ Ready? """
         "You are going to manually update workspace release commit reference manually, this is just for special ocasions. Do you want to update current commit release reference '{current_commit}' to '{new_commit}'?"
     )
 
+    warning_no_test_results = warning_message("Warning: No test results to show")
     warning_using_environment_token = warning_message("** You're using the token defined in $TB_TOKEN.")
     warning_using_environment_host = warning_message("** You're using the token defined in $TB_HOST.")
 

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/tb_cli_modules/branch.py

@@ -396,8 +396,7 @@ async def create_branch(
     ctx: Context, env_name: str, last_partition: bool, all: bool, ignore_datasources: List[str], wait: bool
 ) -> None:
     if last_partition and all:
-        click.echo(FeedbackManager.error_exception(error="Use --last-partition or --all but not both"))
-        return
+        raise CLIException(FeedbackManager.error_exception(error="Use --last-partition or --all but not both"))
     await create_workspace_branch(ctx, env_name, last_partition, all, list(ignore_datasources), wait)
 
 
@@ -413,8 +412,7 @@ async def delete_branch(ctx: Context, env_name_or_id: str, yes: bool) -> None:
     config, _, _ = await get_config_and_hosts(ctx)
 
     if env_name_or_id == MAIN_BRANCH:
-        click.echo(FeedbackManager.error_not_allowed_in_main_branch())
-        return
+        raise CLIException(FeedbackManager.error_not_allowed_in_main_branch())
 
     try:
         workspace_branches = await get_current_workspace_branches(client, config)
@@ -453,7 +451,7 @@ async def delete_branch(ctx: Context, env_name_or_id: str, yes: bool) -> None:
                 if workspace_main:
                     await switch_to_workspace_by_user_workspace_data(ctx, workspace_main)
                 else:
-                    click.echo(FeedbackManager.error_switching_to_main())
+                    raise CLIException(FeedbackManager.error_switching_to_main())
 
 
 @env.command(
@@ -490,12 +488,10 @@ async def delete_branch(ctx: Context, env_name_or_id: str, yes: bool) -> None:
 @coro
 async def data_branch(ctx: Context, last_partition: bool, all: bool, ignore_datasources: List[str], wait: bool) -> None:
     if last_partition and all:
-        click.echo(FeedbackManager.error_exception(error="Use --last-partition or --all but not both"))
-        return
+        raise CLIException(FeedbackManager.error_exception(error="Use --last-partition or --all but not both"))
 
     if not last_partition and not all:
-        click.echo(FeedbackManager.error_exception(error="Use --last-partition or --all"))
-        return
+        raise CLIException(FeedbackManager.error_exception(error="Use --last-partition or --all"))
 
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     client = obj["client"]
@@ -506,8 +502,7 @@ async def data_branch(ctx: Context, last_partition: bool, all: bool, ignore_data
         raise CLIException(FeedbackManager.error_unable_to_identify_main_workspace())
 
     if current_main_workspace["id"] == config["id"]:
-        click.echo(FeedbackManager.error_not_allowed_in_main_branch())
-        return
+        raise CLIException(FeedbackManager.error_not_allowed_in_main_branch())
 
     try:
         response = await client.branch_workspace_data(config["id"], last_partition, all, ignore_datasources)
@@ -597,7 +592,7 @@ async def regression_tests(
             raise CLIException(FeedbackManager.error_unable_to_identify_main_workspace())
 
         if current_main_workspace["id"] == config["id"]:
-            click.echo(FeedbackManager.error_not_allowed_in_main_branch())
+            raise CLIException(FeedbackManager.error_not_allowed_in_main_branch())
             return
         try:
             response = await client.branch_regression_tests_file(
@@ -647,7 +642,7 @@ async def _run_regression(
         raise CLIException(FeedbackManager.error_unable_to_identify_main_workspace())
 
     if current_main_workspace["id"] == config["id"]:
-        click.echo(FeedbackManager.error_not_allowed_in_main_branch())
+        raise CLIException(FeedbackManager.error_not_allowed_in_main_branch())
         return
     try:
         response = await client.branch_regression_tests(
@@ -1025,20 +1020,17 @@ async def datasource_copy_from_main(
     config = ctx.ensure_object(dict)["config"]
 
     if sql and sql_from_main:
-        click.echo(FeedbackManager.error_exception(error="Use --sql or --sql-from-main but not both"))
-        return
+        raise CLIException(FeedbackManager.error_exception(error="Use --sql or --sql-from-main but not both"))
 
     if not sql and not sql_from_main:
-        click.echo(FeedbackManager.error_exception(error="Use --sql or --sql-from-main"))
-        return
+        raise CLIException(FeedbackManager.error_exception(error="Use --sql or --sql-from-main"))
 
     current_main_workspace = await get_current_main_workspace(client, config)
     if not current_main_workspace:
         raise CLIException(FeedbackManager.error_unable_to_identify_main_workspace())
 
     if current_main_workspace["id"] == config["id"] and sql_from_main:
-        click.echo(FeedbackManager.error_not_allowed_in_main_branch())
-        return
+        raise CLIException(FeedbackManager.error_not_allowed_in_main_branch())
 
     response = await client.datasource_query_copy(
         datasource_name, sql if sql else f"SELECT * FROM main.{datasource_name}"
@@ -1088,8 +1080,7 @@ async def deploy_env(ctx: Context, semver: str, wait: bool, verbose: bool, dry_r
         raise CLIException(FeedbackManager.error_unable_to_identify_main_workspace())
 
     if current_main_workspace["id"] == config["id"]:
-        click.echo(FeedbackManager.error_not_allowed_in_main_branch())
-        return
+        raise CLIException(FeedbackManager.error_not_allowed_in_main_branch())
 
     workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches()).get("workspaces", [])
     current_ws: Dict[str, Any] = next(

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/tb_cli_modules/cli.py

@@ -319,8 +319,7 @@ async def init(
     )
 
     if current_ws.get("is_branch"):
-        click.echo(FeedbackManager.error_not_allowed_in_branch())
-        return
+        raise CLIException(FeedbackManager.error_not_allowed_in_branch())
 
     await folder_init(client, folder, generate_datasources, generate_releases=True, force=force)
 
@@ -328,6 +327,7 @@ async def init(
         return
 
     cli_git_release = None
+    error = False
     try:
         cli_git_release = CLIGitRelease(path=folder)
     except CLIGitReleaseException:
@@ -358,6 +358,7 @@ async def init(
         final_response = FeedbackManager.error_release_already_set(
             workspace=current_ws["name"], commit=current_ws["release"]["commit"]
         )
+        error = True
 
     elif override_commit:
         if click.confirm(
@@ -425,6 +426,8 @@ async def init(
                     client, current_ws, config, path=cli_git_release.working_dir(), data_project_dir=data_project_dir
                 )
 
+    if error:
+        raise CLIException(final_response)
     click.echo(final_response)
 
 
@@ -861,22 +864,19 @@ async def diff(
         for workspace in response["workspaces"]:
             if config["id"] == workspace["id"]:
                 if not workspace.get("is_branch"):
-                    click.echo(FeedbackManager.error_not_a_branch())
-                    return
+                    raise CLIException(FeedbackManager.error_not_a_branch())
 
                 origin = workspace["main"]
                 workspace = await get_current_main_workspace(client, config)
 
                 if not workspace:
-                    click.echo(FeedbackManager.error_workspace(workspace=origin))
-                    return
+                    raise CLIException(FeedbackManager.error_workspace(workspace=origin))
 
                 ws_client = _get_tb_client(workspace["token"], config["host"])
                 break
 
         if not ws_client:
-            click.echo(FeedbackManager.error_workspace(workspace=origin))
-            return
+            raise CLIException(FeedbackManager.error_workspace(workspace=origin))
         changed = await diff_command(
             list(filename) if filename else None, fmt, ws_client, no_color, with_print=not only_resources_changed
         )
@@ -924,12 +924,10 @@ async def sql(
         if query:
             q = query.lower().strip()
             if q.startswith("insert"):
-                click.echo(FeedbackManager.error_invalid_query())
                 click.echo(FeedbackManager.info_append_data())
-                return
+                raise CLIException(FeedbackManager.error_invalid_query())
             if q.startswith("delete"):
-                click.echo(FeedbackManager.error_invalid_query())
-                return
+                raise CLIException(FeedbackManager.error_invalid_query())
             res = await client.query(
                 f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline
             )
@@ -979,12 +977,10 @@ async def sql(
                 f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline
             )
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error=str(e)))
-        return
+        raise CLIException(FeedbackManager.error_exception(error=str(e)))
 
     if "error" in res:
-        click.echo(FeedbackManager.error_exception(error=res["error"]))
-        return
+        raise CLIException(FeedbackManager.error_exception(error=res["error"]))
 
     if stats:
         stats_query = f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT JSON"
@@ -1292,7 +1288,7 @@ async def materialize(
         await _populate(pipe, node_name, f_pipe)
         click.echo(FeedbackManager.success_created_matview(name=datasource_name))
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error=str(e)))
+        raise CLIException(FeedbackManager.error_exception(error=str(e)))
 
 
 def __patch_click_output():

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/tb_cli_modules/common.py

@@ -427,8 +427,7 @@ fi
 
 async def configure_connector(connector):
     if connector not in SUPPORTED_CONNECTORS:
-        click.echo(FeedbackManager.error_invalid_connector(connectors=", ".join(SUPPORTED_CONNECTORS)))
-        return
+        raise CLIException(FeedbackManager.error_invalid_connector(connectors=", ".join(SUPPORTED_CONNECTORS)))
 
     file_name = f".tinyb_{connector}"
     config_file = Path(getcwd()) / file_name
@@ -815,8 +814,7 @@ async def get_available_starterkits(ctx: Context) -> List[Dict[str, Any]]:
         ctx_dict["available_starterkits"] = available_starterkits
         return available_starterkits
     except Exception as ex:
-        click.echo(FeedbackManager.error_exception(error=ex))
-        return []
+        raise CLIException(FeedbackManager.error_exception(error=ex))
 
 
 async def get_starterkit(ctx: Context, name: str) -> Optional[Dict[str, Any]]:
@@ -1095,7 +1093,7 @@ async def print_branch_regression_tests_summary(client, job_id, host, response=N
                 for failure in step["run"]["failed"]:
                     click.echo(f"❌ FAILED {failure['name']}\n")
     if failed:
-        raise click.ClickException(
+        raise CLIException(
             "Check Failures Detail above for more information. If the results are expected, skip asserts or increase thresholds, see 💡 Hints above (note skip asserts flags are applied to all regression tests, so use them when it makes sense).\n\nIf you are using the CI template for GitHub or GitLab you can add skip asserts flags as labels to the MR and they are automatically applied. Find available flags to skip asserts and thresholds here => https://www.tinybird.co/docs/guides/continuous-integration.html#run-the-tests"
         )
 
@@ -1147,8 +1145,7 @@ async def deploy_environment(
             )
             await switch_workspace(ctx, config["name"], only_environments=True)
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error=str(e)))
-        await switch_workspace(ctx, config["name"], only_environments=True)
+        raise CLIException(FeedbackManager.error_exception(error=str(e)))
 
 
 class MergeBranchStatus:
@@ -1277,8 +1274,7 @@ async def push_data(
     if connector and sql:
         load_connector_config(ctx, connector, False, check_uninstalled=False)
         if connector not in ctx.obj:
-            click.echo(FeedbackManager.error_connector_not_configured(connector=connector))
-            return
+            raise CLIException(FeedbackManager.error_connector_not_configured(connector=connector))
         else:
             _connector: Connector = ctx.obj[connector]
             click.echo(FeedbackManager.info_starting_export_process(connector=connector))
@@ -1346,19 +1342,18 @@ async def push_data(
         try:
             datasource = await client.get_datasource(datasource_name)
         except DoesNotExistException:
-            click.echo(FeedbackManager.error_datasource_does_not_exist(datasource=datasource_name))
+            raise CLIException(FeedbackManager.error_datasource_does_not_exist(datasource=datasource_name))
         except Exception as e:
-            click.echo(FeedbackManager.error_exception(error=str(e)))
-            return
+            raise CLIException(FeedbackManager.error_exception(error=str(e)))
 
         total_rows = (datasource.get("statistics", {}) or {}).get("row_count", 0)
         appended_rows = 0
         parser = None
 
         if "error" in res and res["error"]:
-            click.echo(FeedbackManager.error_exception(error=res["error"]))
+            raise CLIException(FeedbackManager.error_exception(error=res["error"]))
         if "errors" in res and res["errors"]:
-            click.echo(FeedbackManager.error_exception(error=res["errors"]))
+            raise CLIException(FeedbackManager.error_exception(error=res["errors"]))
         if "blocks" in res and res["blocks"]:
             for block in res["blocks"]:
                 if "process_return" in block and block["process_return"] is not None:
@@ -1386,10 +1381,9 @@ async def push_data(
         output = await gather_with_concurrency(concurrency, *tasks)
         parser, total_rows, appended_rows = list(output)[-1]
     except OperationCanNotBePerformed as e:
-        click.echo(FeedbackManager.error_operation_can_not_be_performed(error=e))
+        raise CLIException(FeedbackManager.error_operation_can_not_be_performed(error=e))
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error=e))
-        sys.exit(1)
+        raise CLIException(FeedbackManager.error_exception(error=e))
     else:
         click.echo(FeedbackManager.success_progress_blocks())
         if mode == "append":
@@ -1554,9 +1548,9 @@ async def switch_workspace(ctx, workspace_name_or_id, only_environments=False):
 
         if not workspace:
             if only_environments:
-                click.echo(FeedbackManager.error_branch(branch=workspace_name_or_id))
+                raise CLIException(FeedbackManager.error_branch(branch=workspace_name_or_id))
             else:
-                click.echo(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
+                raise CLIException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
             return
 
         client = _get_tb_client(workspace["token"], config["host"])
@@ -1577,8 +1571,7 @@ async def switch_workspace(ctx, workspace_name_or_id, only_environments=False):
         await write_config(config)
         click.echo(FeedbackManager.success_now_using_config(name=config["name"], id=config["id"]))
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error=str(e)))
-        return
+        raise CLIException(FeedbackManager.error_exception(error=str(e)))
 
 
 async def switch_to_workspace_by_user_workspace_data(ctx, user_workspace_data: Dict):
@@ -1605,8 +1598,7 @@ async def switch_to_workspace_by_user_workspace_data(ctx, user_workspace_data: D
         await write_config(config)
         click.echo(FeedbackManager.success_now_using_config(name=config["name"], id=config["id"]))
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error=str(e)))
-        return
+        raise CLIException(FeedbackManager.error_exception(error=str(e)))
 
 
 async def print_current_workspace(ctx):
@@ -1943,14 +1935,14 @@ async def wait_job(
             # 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)
             if result["status"] != "done":
-                click.echo(FeedbackManager.error_while_running_job(error=result["error"]))
+                raise CLIException(FeedbackManager.error_while_running_job(error=result["error"]))
             return result
         except asyncio.TimeoutError:
-            raise click.ClickException(FeedbackManager.error_while_running_job(error="Reach timeout, job cancelled"))
+            raise CLIException(FeedbackManager.error_while_running_job(error="Reach timeout, job cancelled"))
         except JobException as e:
-            raise click.ClickException(FeedbackManager.error_while_running_job(error=str(e)))
+            raise CLIException(FeedbackManager.error_while_running_job(error=str(e)))
         except Exception as e:
-            raise click.ClickException(FeedbackManager.error_getting_job_info(error=str(e), url=job_url))
+            raise CLIException(FeedbackManager.error_getting_job_info(error=str(e), url=job_url))
 
 
 async def wait_job_no_ui(

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/tb_cli_modules/datasource.py

@@ -113,7 +113,7 @@ async def datasource_ls(ctx: Context, match: Optional[str], format_: str):
     elif format_ == "json":
         click.echo(json.dumps({"datasources": table_machine_readable}, indent=2))
     else:
-        click.echo(FeedbackManager.error_datasource_ls_type)
+        raise CLIDatasourceException(FeedbackManager.error_datasource_ls_type())
 
 
 @datasource.command(name="append")
@@ -163,12 +163,10 @@ async def datasource_append(
     """
 
     if not url and not connector:
-        click.echo(FeedbackManager.error_missing_url_or_connector(datasource=datasource_name))
-        return
+        raise CLIDatasourceException(FeedbackManager.error_missing_url_or_connector(datasource=datasource_name))
 
     if incremental and not connector:
-        click.echo(FeedbackManager.error_incremental_not_supported())
-        return
+        raise CLIDatasourceException(FeedbackManager.error_incremental_not_supported())
 
     if incremental:
         date = None
@@ -255,8 +253,7 @@ async def datasource_analyze(ctx, url_or_file, connector):
     if connector:
         load_connector_config(ctx, connector, False, check_uninstalled=False)
         if connector not in ctx.obj:
-            click.echo(FeedbackManager.error_connector_not_configured(connector=connector))
-            return
+            raise CLIDatasourceException(FeedbackManager.error_connector_not_configured(connector=connector))
         else:
             _connector = ctx.obj[connector]
 
@@ -396,9 +393,11 @@ async def datasource_truncate(ctx, datasource_name, yes, cascade):
                     try:
                         await client.datasource_truncate(cascade_ds)
                     except DoesNotExistException:
-                        click.echo(FeedbackManager.error_datasource_does_not_exist(datasource=datasource_name))
+                        raise CLIDatasourceException(
+                            FeedbackManager.error_datasource_does_not_exist(datasource=datasource_name)
+                        )
                     except Exception as e:
-                        click.echo(FeedbackManager.error_exception(error=e))
+                        raise CLIDatasourceException(FeedbackManager.error_exception(error=e))
                     click.echo(FeedbackManager.success_truncate_datasource(datasource=cascade_ds))
 
 
@@ -453,8 +452,7 @@ async def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait,
                     try:
                         res = await client._req(f"v0/jobs/{job_id}")
                     except Exception:
-                        click.echo(FeedbackManager.error_job_status(url=job_url))
-                        break
+                        raise CLIDatasourceException(FeedbackManager.error_job_status(url=job_url))
                     if res["status"] == "done":
                         print("\n")
                         click.echo(
@@ -465,8 +463,7 @@ async def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait,
                         break
                     elif res["status"] == "error":
                         print("\n")
-                        click.echo(FeedbackManager.error_exception(error=res["error"]))
-                        break
+                        raise CLIDatasourceException(FeedbackManager.error_exception(error=res["error"]))
                     await asyncio.sleep(1)
                     i += 1
                     progress_line(i)
@@ -499,8 +496,7 @@ async def generate_datasource(ctx: Context, connector: str, filenames, force: bo
     if connector:
         load_connector_config(ctx, connector, False, check_uninstalled=False)
         if connector not in ctx.ensure_object(dict):
-            click.echo(FeedbackManager.error_connector_not_configured(connector=connector))
-            return
+            raise CLIDatasourceException(FeedbackManager.error_connector_not_configured(connector=connector))
         else:
             _connector = ctx.ensure_object(dict)[connector]
 
@@ -571,7 +567,7 @@ async def datasource_connect(ctx, connection, datasource_name, topic, group, aut
         datasource_id = resp["datasource"]["id"]
         click.echo(FeedbackManager.success_datasource_kafka_connected(id=datasource_id))
     else:
-        click.echo(FeedbackManager.error_unknown_connection_service(service=service))
+        raise CLIDatasourceException(FeedbackManager.error_unknown_connection_service(service=service))
 
 
 @datasource.command(name="share")
@@ -607,12 +603,10 @@ async def datasource_share(ctx: Context, datasource_name: str, workspace_name_or
     current_workspace = next((workspace for workspace in workspaces if workspace["id"] == config["id"]), None)
 
     if not destination_workspace:
-        click.echo(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
-        return
+        raise CLIDatasourceException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
 
     if not current_workspace:
-        click.echo(FeedbackManager.error_not_authenticated())
-        return
+        raise CLIDatasourceException(FeedbackManager.error_not_authenticated())
 
     if not user_token:
         user_token = ask_for_user_token("share a Data Source", ui_host)
@@ -638,8 +632,7 @@ async def datasource_share(ctx: Context, datasource_name: str, workspace_name_or
                 )
             )
         except Exception as e:
-            click.echo(FeedbackManager.error_exception(error=str(e)))
-            return
+            raise CLIDatasourceException(FeedbackManager.error_exception(error=str(e)))
 
 
 @datasource.command(name="unshare")
@@ -675,12 +668,10 @@ async def datasource_unshare(ctx: Context, datasource_name: str, workspace_name_
     current_workspace = next((workspace for workspace in workspaces if workspace["id"] == config["id"]), None)
 
     if not destination_workspace:
-        click.echo(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
-        return
+        raise CLIDatasourceException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
 
     if not current_workspace:
-        click.echo(FeedbackManager.error_not_authenticated())
-        return
+        raise CLIDatasourceException(FeedbackManager.error_not_authenticated())
 
     if not user_token:
         user_token = ask_for_user_token("unshare a Data Source", ui_host)
@@ -706,8 +697,7 @@ async def datasource_unshare(ctx: Context, datasource_name: str, workspace_name_
                 )
             )
         except Exception as e:
-            click.echo(FeedbackManager.error_exception(error=str(e)))
-            return
+            raise CLIDatasourceException(FeedbackManager.error_exception(error=str(e)))
 
 
 @datasource.command(name="sync")

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/tb_cli_modules/job.py

@@ -11,6 +11,7 @@ from tinybird.feedback_manager import FeedbackManager
 from tinybird.client import DoesNotExistException, TinyB
 
 from tinybird.tb_cli_modules.cli import cli
+from tinybird.tb_cli_modules.exceptions import CLIException
 from tinybird.tb_cli_modules.common import coro, echo_safe_humanfriendly_tables_format_smart_table
 
 
@@ -72,9 +73,9 @@ async def job_cancel(ctx: Context, job_id: str) -> None:
     try:
         result = await client.job_cancel(job_id)
     except DoesNotExistException:
-        click.echo(FeedbackManager.error_job_does_not_exist(job_id=job_id))
+        raise CLIException(FeedbackManager.error_job_does_not_exist(job_id=job_id))
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error=e))
+        raise CLIException(FeedbackManager.error_exception(error=e))
     else:
         current_job_status = result["status"]
         if current_job_status == "cancelling":
@@ -82,5 +83,5 @@ async def job_cancel(ctx: Context, job_id: str) -> None:
         elif current_job_status == "cancelled":
             click.echo(FeedbackManager.success_job_cancellation_cancelled(job_id=job_id))
         else:
-            click.echo(FeedbackManager.error_job_cancelled_but_status_unknown(job_id=job_id))
+            raise CLIException(FeedbackManager.error_job_cancelled_but_status_unknown(job_id=job_id))
     click.echo("\n")

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/tb_cli_modules/pipe.py

@@ -66,7 +66,9 @@ SQL >
             file.write(pipefile)
         click.echo(FeedbackManager.success_generated_pipe(file=f))
     else:
-        click.echo(FeedbackManager.error_exception(error=f"File {f} already exists, use --force to override"))
+        raise CLIPipeException(
+            FeedbackManager.error_exception(error=f"File {f} already exists, use --force to override")
+        )
 
 
 @pipe.command(name="stats")
@@ -122,8 +124,7 @@ async def pipe_stats(ctx: click.Context, pipes: Tuple[str, ...], format_: str):
     res = await client.query(sql)
 
     if res and "error" in res:
-        click.echo(FeedbackManager.error_exception(error=str(res["error"])))
-        return
+        raise CLIPipeException(FeedbackManager.error_exception(error=str(res["error"])))
 
     columns = ["version", "name", "request count", "error count", "avg latency"]
     table_human_readable: List[Tuple] = []
@@ -204,7 +205,7 @@ async def pipe_ls(ctx: Context, match: str, format_: str):
     elif format_ == "json":
         click.echo(json.dumps({"pipes": table_machine_readable}, indent=2))
     else:
-        click.echo(FeedbackManager.error_pipe_ls_type)
+        raise CLIPipeException(FeedbackManager.error_pipe_ls_type())
 
 
 @pipe.command(name="populate")
@@ -264,20 +265,6 @@ async def pipe_populate(
         await wait_job(cl, job_id, job_url, "Populating")
 
 
-@pipe.command(name="new", hidden=True)
-@click.argument("pipe_name")
-@click.argument("sql")
-@click.pass_context
-@coro
-async def pipe_create(ctx: click.Context, pipe_name: str, sql: str):
-    """Create a new pipe"""
-    click.echo(FeedbackManager.warning_deprecated(warning="This command is deprecated."))
-    client: TinyB = ctx.ensure_object(dict)["client"]
-    host = ctx.ensure_object(dict)["config"].get("host", DEFAULT_API_HOST)
-    res = await client.pipe_create(pipe_name, sql)
-    click.echo(FeedbackManager.success_created_pipe(pipe=pipe_name, node_id=res["nodes"][0]["id"], host=host))
-
-
 @pipe.command(name="append")
 @click.argument("pipe_name_or_uid")
 @click.argument("sql")
@@ -444,8 +431,7 @@ async def print_pipe(ctx: Context, pipe: str, query: str, format_: str):
     try:
         res = await client.pipe_data(pipe, format=req_format, sql=query, params=params)
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error=str(e)))
-        return
+        raise CLIPipeException(FeedbackManager.error_exception(error=str(e)))
 
     if not format_:
         stats = res["statistics"]

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/tb_cli_modules/test.py

@@ -9,6 +9,7 @@ from tinybird.feedback_manager import FeedbackManager
 from typing import Iterable, List, Tuple
 
 from tinybird.tb_cli_modules.cli import cli
+from tinybird.tb_cli_modules.exceptions import CLIException
 from tinybird.tb_cli_modules.common import coro, create_tb_client
 from tinybird.tb_cli_modules.tinyunit.tinyunit import (
     TestSummaryResults,
@@ -37,8 +38,7 @@ async def test_run(ctx: click.Context, file: Tuple[str, ...], verbose: bool, onl
     try:
         tb_client = create_tb_client(ctx)
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error=e))
-        raise e
+        raise CLIException(FeedbackManager.error_exception(error=e))
 
     file_list: Iterable[str] = file if len(file) > 0 else glob.glob("./tests/**/*.y*ml", recursive=True)
     file_list = [f for f in file_list if not f.endswith("regression.yaml")]
@@ -47,12 +47,12 @@ async def test_run(ctx: click.Context, file: Tuple[str, ...], verbose: bool, onl
             test_result = await run_test_file(tb_client, test_file)
             results.append(TestSummaryResults(filename=test_file, results=test_result))
         except Exception as e:
-            click.echo(FeedbackManager.error_running_test(file=test_file))
             if verbose:
                 click.echo(FeedbackManager.error_exception(error=e))
+            raise CLIException(FeedbackManager.error_running_test(file=test_file))
 
     if len(results) <= 0:
-        click.echo(FeedbackManager.error_no_test_results())
+        click.echo(FeedbackManager.warning_no_test_results())
     else:
         test_run_summary(results, only_fail=only_fail, verbose_level=int(verbose))
 

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/tb_cli_modules/tinyunit/tinyunit.py

@@ -150,7 +150,7 @@ def parse_file(file: str) -> Iterable[TestCase]:
                     properties.get("pipe", None),
                 )
         except Exception as e:
-            click.echo(
+            raise CLIException(
                 f"""Error: {FeedbackManager.error_exception(error=e)} reading file, check "{file}"->"{definition.get('name')}" """
             )
 
@@ -184,7 +184,7 @@ def generate_file(file: str, overwrite: bool = False) -> None:
             yaml.safe_dump(definitions, f)
         click.echo(FeedbackManager.success_generated_local_file(file=p))
     else:
-        click.echo(FeedbackManager.error_file_already_exists(file=p))
+        raise CLIException(FeedbackManager.error_file_already_exists(file=p))
 
     return
 

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird/tb_cli_modules/workspace.py

@@ -26,7 +26,7 @@ from tinybird.tb_cli_modules.common import (
     echo_safe_humanfriendly_tables_format_smart_table,
     get_current_main_workspace,
 )
-from tinybird.tb_cli_modules.exceptions import CLIException, CLIWorkspaceException
+from tinybird.tb_cli_modules.exceptions import CLIWorkspaceException
 
 
 @cli.group()
@@ -51,7 +51,7 @@ async def workspace_ls(ctx: Context) -> None:
 
     current_main_workspace = await get_current_main_workspace(client, config)
     if not current_main_workspace:
-        raise CLIException(FeedbackManager.error_unable_to_identify_main_workspace())
+        raise CLIWorkspaceException(FeedbackManager.error_unable_to_identify_main_workspace())
 
     columns = ["name", "id", "role", "plan", "current"]
     table = []
@@ -114,7 +114,7 @@ async def clear_workspace(ctx: Context, yes: bool, dry_run: bool) -> None:
     for workspace in response["workspaces"]:
         if config["id"] == workspace["id"]:
             if workspace.get("is_branch"):
-                click.echo(FeedbackManager.error_not_allowed_in_branch())
+                raise CLIWorkspaceException(FeedbackManager.error_not_allowed_in_branch())
                 return
             else:
                 click.echo(FeedbackManager.info_current_workspace())
@@ -154,10 +154,12 @@ async def clear_workspace(ctx: Context, yes: bool, dry_run: bool) -> None:
                 except DoesNotExistException:
                     click.echo(FeedbackManager.info_removing_datasource_not_found(datasource=ds_name))
                 except CanNotBeDeletedException as e:
-                    click.echo(FeedbackManager.error_datasource_can_not_be_deleted(datasource=ds_name, error=e))
+                    raise CLIWorkspaceException(
+                        FeedbackManager.error_datasource_can_not_be_deleted(datasource=ds_name, error=e)
+                    )
                 except Exception as e:
                     if "is a Shared Data Source" in str(e):
-                        click.echo(FeedbackManager.error_operation_can_not_be_performed(error=e))
+                        raise CLIWorkspaceException(FeedbackManager.error_operation_can_not_be_performed(error=e))
                     else:
                         raise CLIWorkspaceException(FeedbackManager.error_exception(error=e))
             else:
@@ -182,8 +184,7 @@ async def create_workspace(
 ) -> None:
     if starter_kit:
         if not await is_valid_starterkit(ctx, starter_kit):
-            click.echo(FeedbackManager.error_starterkit_name(starterkit_name=starter_kit))
-            return
+            raise CLIWorkspaceException(FeedbackManager.error_starterkit_name(starterkit_name=starter_kit))
 
     if not user_token:
         _, _, ui_host = await get_config_and_hosts(ctx)
@@ -244,5 +245,4 @@ async def delete_workspace(
             await client.delete_workspace(workspace_to_delete["id"], confirm_hard_delete)
             click.echo(FeedbackManager.success_workspace_deleted(workspace_name=workspace_to_delete["name"]))
         except Exception as e:
-            click.echo(FeedbackManager.error_exception(error=str(e)))
-            return
+            raise CLIWorkspaceException(FeedbackManager.error_exception(error=str(e)))

{tinybird-cli-2.0.0.dev1 → tinybird-cli-2.0.1.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 2.0.0.dev1
+Version: 2.0.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,10 +19,26 @@ Changelog
 
 ---------
 
+2.0.0
+************
+
+Released new version 2.0.0 with all these changes:
+
+- `Changed` All commands exit with 1 when there's an exception
+- `Removed` Prefixes are not supported anymore ([context](https://www.tinybird.co/changelog/2023-10-09-versions), and [how to migrate](https://www.tinybird.co/docs/guides/staging-and-production-workspaces.html#migrating-from-prefixes))
+- `Removed` `tb pipe create`
+
+
+2.0.0.dev2
+************
+
+- `Changed` All commands exit with 1 when there's an exception
+- `Removed` `tb pipe create`
+
 2.0.0.dev1
 ************
 
-- `Changed` Prefixes are not supported anymore.
+- `Removed` Prefixes are not supported anymore
 
 
 1.3.0