tinybird 0.0.1.dev68__py3-none-any.whl → 0.0.1.dev70__py3-none-any.whl

tinybird/ch_utils/engine.py

@@ -456,7 +456,7 @@ ENABLED_ENGINES = [
         MERGETREE_OPTIONS,
     ),
     # AggregatingMergeTree()
-    engine_config("AggregatingMergeTree", options=REPLACINGMERGETREE_OPTIONS),
+    engine_config("AggregatingMergeTree", options=MERGETREE_OPTIONS),
     # CollapsingMergeTree(sign)
     engine_config(
         "CollapsingMergeTree",
@@ -631,9 +631,7 @@ def engine_full_from_dict(
 
     >>> schema = 'sign_column Int8'
     >>> engine_full_from_dict('AggregatingMergeTree', {}, schema=schema)
-    Traceback (most recent call last):
-    ...
-    ValueError: Missing required option 'sorting_key'
+    'AggregatingMergeTree() ORDER BY (tuple())'
 
     >>> columns=[]
     >>> columns.append({'name': 'key_column', 'type': 'Int8', 'codec': None, 'default_value': None, 'nullable': False, 'normalized_name': 'key_column'})

tinybird/context.py

@@ -20,5 +20,4 @@ engine: ContextVar[str] = ContextVar("engine")
 wait_parameter: ContextVar[bool] = ContextVar("wait_parameter")
 api_host: ContextVar[str] = ContextVar("api_host")
 ff_split_to_array_escape: ContextVar[bool] = ContextVar("ff_split_to_array_escape")
-ff_preprocess_parameters_circuit_breaker: ContextVar[bool] = ContextVar("ff_preprocess_parameters_circuit_breaker")
 ff_column_json_backticks_circuit_breaker: ContextVar[bool] = ContextVar("ff_column_json_backticks_circuit_breaker")

tinybird/sql_template.py

@@ -14,7 +14,6 @@ from tornado.util import ObjectDict, exec_in, unicode_type
 
 from tinybird.context import (
     ff_column_json_backticks_circuit_breaker,
-    ff_preprocess_parameters_circuit_breaker,
     ff_split_to_array_escape,
 )
 
@@ -2244,14 +2243,13 @@ def render_sql_template(
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: Required parameter is not defined. Check the parameters test. Please provide a value or set a default value in the pipe code.
     """
     escape_split_to_array = ff_split_to_array_escape.get(False)
-    bypass_preprocess_variables = ff_preprocess_parameters_circuit_breaker.get(False)
 
     t, template_variables, variable_warnings = get_template_and_variables(
         sql, name, escape_arrays=escape_split_to_array
     )
     template_variables_with_types = get_var_names_and_types_cached(t)
 
-    if not bypass_preprocess_variables and variables is not None:
+    if variables is not None:
         processed_variables = preprocess_variables(variables, template_variables_with_types)
         variables.update(processed_variables)
 

tinybird/sql_toolset.py

@@ -3,7 +3,7 @@ import logging
 from collections import defaultdict
 from datetime import datetime
 from functools import lru_cache
-from typing import FrozenSet, List, Optional, Set, Tuple
+from typing import FrozenSet, List, Optional, Set, Tuple, Union
 
 from chtoolset import query as chquery
 from toposort import toposort
@@ -172,7 +172,7 @@ def tables_or_sql(replacement: dict, table_functions=False) -> set:
         return {replacement}
 
 
-def _separate_as_tuple_if_contains_database_and_table(definition: str) -> str | Tuple[str, str]:
+def _separate_as_tuple_if_contains_database_and_table(definition: str) -> Union[str, Tuple[str, str]]:
     if "." in definition:
         database_and_table_separated = definition.split(".")
         return database_and_table_separated[0], database_and_table_separated[1]
@@ -255,7 +255,7 @@ def replace_tables(
         function_allow_list=function_allow_list,
     )
     seen_tables = set()
-    table: Tuple[str, str] | Tuple[str, str, str]
+    table: Union[Tuple[str, str], Tuple[str, str, str]]
     if function_allow_list is None:
         _enabled_table_functions = ENABLED_TABLE_FUNCTIONS
     else:

tinybird/tb/__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__ = '0.0.1.dev68'
-__revision__ = 'e28d545'
+__version__ = '0.0.1.dev70'
+__revision__ = 'f8064d4'

tinybird/tb/modules/auth.py

@@ -30,7 +30,7 @@ from tinybird.tb.modules.regions import Region
 @click.option("--token", help="Use auth token, defaults to TB_TOKEN envvar, then to the .tinyb file")
 @click.option(
     "--host",
-    help="Set custom host if it's different than https://api.tinybird.co. Check https://www.tinybird.co/docs/api-reference/overview#regions-and-endpoints for the available list of regions",
+    help="Set custom host if it's different than https://api.tinybird.co. Check https://www.tinybird.co/docs/api-reference#regions-and-endpoints for the available list of regions",
 )
 @click.option(
     "--region", envvar="TB_REGION", help="Set region. Run 'tb auth ls' to show available regions. Overrides host."

tinybird/tb/modules/build.py

@@ -15,7 +15,7 @@ from tinybird.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import push_data
 from tinybird.tb.modules.datafile.build import folder_build
-from tinybird.tb.modules.datafile.fixture import get_fixture_dir
+from tinybird.tb.modules.datafile.fixture import get_fixture_dir, persist_fixture
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.shell import Shell, print_table_formatted
@@ -210,6 +210,8 @@ def process(
     build_failed = False
     if file_changed and file_changed.endswith(".ndjson"):
         rebuild_fixture(project, tb_client, file_changed)
+    elif file_changed and file_changed.endswith(".sql"):
+        rebuild_fixture_sql(project, tb_client, file_changed)
     else:
         try:
             build_project(project, tb_client, file_changed)
@@ -247,3 +249,12 @@ def run_watch(
     )
     watcher_thread.start()
     shell.run()
+
+
+def rebuild_fixture_sql(project: Project, tb_client: TinyB, sql_file: str) -> None:
+    sql_path = Path(sql_file)
+    datasource_name = sql_path.stem
+    sql = sql_path.read_text()
+    result = asyncio.run(tb_client.query(f"{sql} FORMAT JSON"))
+    data = result.get("data", [])
+    persist_fixture(datasource_name, data, project.folder)

tinybird/tb/modules/cli.py

@@ -127,6 +127,7 @@ async def cli(
         ctx.ensure_object(dict)["client"] = client
 
     ctx.ensure_object(dict)["project"] = project
+    ctx.ensure_object(dict)["env"] = get_target_env(cloud, build)
 
 
 @cli.command(hidden=True)
@@ -147,12 +148,12 @@ async def pull(ctx: Context, force: bool, fmt: bool) -> None:
 @click.option("--no-deps", is_flag=True, default=False, help="Print only data sources with no pipes using them")
 @click.option("--match", default=None, help="Retrieve any resource matching the pattern")
 @click.option("--pipe", default=None, help="Retrieve any resource used by pipe")
-@click.option("--datasource", default=None, help="Retrieve resources depending on this Data Source")
+@click.option("--datasource", default=None, help="Retrieve resources depending on this data source")
 @click.option(
     "--check-for-partial-replace",
     is_flag=True,
     default=False,
-    help="Retrieve dependant Data Sources that will have their data replaced if a partial replace is executed in the Data Source selected",
+    help="Retrieve dependant data sources that will have their data replaced if a partial replace is executed in the data source selected",
 )
 @click.option("--recursive", is_flag=True, default=False, help="Calculate recursive dependencies")
 @click.pass_context
@@ -186,7 +187,7 @@ async def dependencies(
 
 @cli.command(
     name="diff",
-    short_help="Diffs local datafiles to the corresponding remote files in the workspace. For the case of .datasource files it just diffs VERSION and SCHEMA, since ENGINE, KAFKA or other metadata is considered immutable.",
+    short_help="Diff local datafiles to the corresponding remote files in the workspace. For the case of .datasource files it just diffs VERSION and SCHEMA, since ENGINE, KAFKA or other metadata is considered immutable.",
 )
 @click.argument("filename", type=click.Path(exists=True), nargs=-1, required=False)
 @click.option(
@@ -203,7 +204,7 @@ async def dependencies(
     "--main",
     is_flag=True,
     default=False,
-    help="Diffs local datafiles to the corresponding remote files in the main workspace. Only works when authenticated on a Branch.",
+    help="Diff local datafiles to the corresponding remote files in the main workspace. Only works when authenticated on a Branch.",
     hidden=True,
 )
 @click.pass_context
@@ -255,7 +256,7 @@ async def diff(
 @cli.command()
 @click.argument("query", required=False)
 @click.option("--rows_limit", default=100, help="Max number of rows retrieved")
-@click.option("--pipeline", default=None, help="The name of the Pipe to run the SQL Query")
+@click.option("--pipeline", default=None, help="The name of the pipe to run the SQL Query")
 @click.option("--pipe", default=None, help="The path to the .pipe file to run the SQL Query of a specific NODE")
 @click.option("--node", default=None, help="The NODE name")
 @click.option(
@@ -393,7 +394,7 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, b
 
     commands_always_cloud = ["pull"]
     commands_always_build = ["build", "test", "dev"]
-    commands_always_local = ["create", "mock"]
+    commands_always_local = ["create"]
     if (
         (cloud or command in commands_always_cloud)
         and command not in commands_always_build
@@ -407,3 +408,11 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, b
     if not build and command not in commands_always_local and command not in commands_always_build:
         click.echo(FeedbackManager.gray(message="Running against Tinybird Local\n"))
     return await get_tinybird_local_client(config, build=build)
+
+
+def get_target_env(cloud: bool, build: bool) -> str:
+    if cloud:
+        return "cloud"
+    if build:
+        return "build"
+    return "local"

tinybird/tb/modules/common.py

@@ -571,7 +571,7 @@ def region_from_host(region_name_or_host, regions):
 
 def ask_for_user_token(action: str, ui_host: str) -> str:
     return click.prompt(
-        f'\nUse the token called "user token" in order to {action}. Copy it from {ui_host}/tokens and paste it here',
+        f'\nUse the token called "user token" to {action}. Copy it from {ui_host}/tokens and paste it here',
         hide_input=True,
         show_default=False,
         default=None,
@@ -591,13 +591,13 @@ async def check_user_token(ctx: Context, token: str):
     if not is_authenticated.get("is_valid", False):
         raise CLIWorkspaceException(
             FeedbackManager.error_exception(
-                error='Invalid token. Please, be sure you are using the "user token" instead of the "admin your@email" token.'
+                error='Invalid token. Make sure you are using the "user token" instead of the "admin your@email" token.'
             )
         )
     if is_authenticated.get("is_valid") and not is_authenticated.get("is_user", False):
         raise CLIWorkspaceException(
             FeedbackManager.error_exception(
-                error='Invalid user authentication. Please, be sure you are using the "user token" instead of the "admin your@email" token.'
+                error='Invalid user authentication. Make sure you are using the "user token" instead of the "admin your@email" token.'
             )
         )
 
@@ -614,13 +614,13 @@ async def check_user_token_with_client(client: TinyB, token: str):
     if not is_authenticated.get("is_valid", False):
         raise CLIWorkspaceException(
             FeedbackManager.error_exception(
-                error='Invalid token. Please, be sure you are using the "user token" instead of the "admin your@email" token.'
+                error='Invalid token. Make sure you are using the "user token" instead of the "admin your@email" token.'
             )
         )
     if is_authenticated.get("is_valid") and not is_authenticated.get("is_user", False):
         raise CLIWorkspaceException(
             FeedbackManager.error_exception(
-                error='Invalid user authentication. Please, be sure you are using the "user token" instead of the "admin your@email" token.'
+                error='Invalid user authentication. Make sure you are using the "user token" instead of the "admin your@email" token.'
             )
         )
 
@@ -1153,17 +1153,17 @@ def validate_kafka_bootstrap_servers(host_and_port):
 
 def validate_kafka_key(s):
     if not isinstance(s, str):
-        raise CLIException("Key format is not correct, it should be a string")
+        raise CLIException("Key format is not correct, it must be a string")
 
 
 def validate_kafka_secret(s):
     if not isinstance(s, str):
-        raise CLIException("Password format is not correct, it should be a string")
+        raise CLIException("Password format is not correct, it must be a string")
 
 
 def validate_string_connector_param(param, s):
     if not isinstance(s, str):
-        raise CLIConnectionException(param + " format is not correct, it should be a string")
+        raise CLIConnectionException(param + " format is not correct, it must be a string")
 
 
 async def validate_connection_name(client, connection_name, service):
@@ -1434,7 +1434,7 @@ async def try_update_config_with_remote(
 def ask_for_admin_token_interactively(ui_host: str, default_token: Optional[str]) -> str:
     return (
         click.prompt(
-            f'\nCopy the "admin your@email" token from {ui_host}/tokens and paste it here {"OR press enter to use the token from .tinyb file" if default_token else ""}',
+            f'\nCopy the "admin your@email" token from {ui_host}/tokens and paste it here {"OR press enter to use the token from the .tinyb file" if default_token else ""}',
             hide_input=True,
             show_default=False,
             default=default_token,

tinybird/tb/modules/datafile/build_common.py

@@ -94,7 +94,7 @@ async def update_tags_in_resource(rs: Dict[str, Any], resource_type: str, client
             resource_name = persisted_ds.get("name", "")
         except DoesNotExistException:
             click.echo(
-                FeedbackManager.error_tag_generic("Could not get the latest Data Source info for updating its tags.")
+                FeedbackManager.error_tag_generic("Could not get the latest data source info for updating its tags.")
             )
     elif resource_type == "pipe":
         pipe_name = rs["name"]

tinybird/tb/modules/datafile/build_datasource.py

@@ -60,7 +60,7 @@ async def new_ds(
 
     if engine_param.lower() == "join":
         deprecation_notice = FeedbackManager.warning_deprecated(
-            warning="Data Sources with Join engine are deprecated and will be removed in the next major release of tinybird-cli. Use MergeTree instead."
+            warning="Data sources with Join engine are deprecated and will be removed in the next major release of tinybird-cli. Use MergeTree instead."
         )
         click.echo(deprecation_notice)
 

tinybird/tb/modules/datafile/common.py

@@ -20,6 +20,7 @@ from string import Template
 from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, cast
 
 import click
+from croniter import croniter
 from mypy_extensions import KwArg, VarArg
 
 from tinybird.ch_utils.engine import ENABLED_ENGINES
@@ -200,6 +201,20 @@ class Datafile:
     def set_kind(self, kind: DatafileKind):
         self.kind = kind
 
+    def validate_copy_node(self, node: Dict[str, Any]):
+        if "target_datasource" not in node:
+            raise DatafileValidationError("COPY node missing target datasource")
+        # copy mode must be append or replace
+        if node.get("mode") and node["mode"] not in ["append", "replace"]:
+            raise DatafileValidationError("COPY node mode must be append or replace")
+        # copy schedule must be @on-demand or a cron-expression
+        if (
+            node.get("copy_schedule")
+            and node["copy_schedule"] != ON_DEMAND
+            and not croniter.is_valid(node["copy_schedule"])
+        ):
+            raise DatafileValidationError("COPY node schedule must be @on-demand or a valid cron expression.")
+
     def validate(self):
         if self.kind == DatafileKind.pipe:
             # TODO(eclbg):
@@ -208,7 +223,7 @@ class Datafile:
             #  [x] Materialized nodes have target datasource
             #  [x] Only one materialized node
             #  [x] Only one node of any specific type
-            #  [ ] ...
+            #  (rbarbadillo): there's a HUGE amount of validations in api_pipes.py, we should somehow merge them
             for node in self.nodes:
                 if "sql" not in node:
                     raise DatafileValidationError(f"SQL missing for node {repr(node['name'])}")
@@ -220,6 +235,8 @@ class Datafile:
                         raise DatafileValidationError("Multiple non-standard nodes in pipe. There can only be one")
                 if node.get("type", "").lower() == PipeNodeTypes.MATERIALIZED and "datasource" not in node:
                     raise DatafileValidationError(f"Materialized node {repr(node['name'])} missing target datasource")
+                if node.get("type", "").lower() == PipeNodeTypes.COPY:
+                    self.validate_copy_node(node)
         elif self.kind == DatafileKind.datasource:
             # TODO(eclbg):
             #  [x] Just one node

tinybird/tb/modules/datafile/fixture.py

@@ -8,6 +8,13 @@ def get_fixture_dir(folder: str) -> Path:
     return Path(folder) / "fixtures"
 
 
+def persist_fixture_sql(fixture_name: str, sql: str, folder: str) -> Path:
+    fixture_dir = get_fixture_dir(folder)
+    fixture_file = fixture_dir / f"{fixture_name}.sql"
+    fixture_file.write_text(sql)
+    return fixture_file
+
+
 def persist_fixture(fixture_name: str, data: Union[List[Dict[str, Any]], str], folder: str, format="ndjson") -> Path:
     fixture_dir = get_fixture_dir(folder)
     fixture_file = fixture_dir / f"{fixture_name}.{format}"

tinybird/tb/modules/datafile/pipe_checker.py

@@ -412,7 +412,7 @@ class PipeCheckerRunner:
             )
 
         result = PipeCheckerTextTestResult(
-            self.checker_stream_result_class(sys.stdout),  # type: ignore
+            self.checker_stream_result_class(sys.stdout),
             descriptions=True,
             verbosity=2,
             custom_output=custom_output,

tinybird/tb/modules/datasource.py

@@ -5,6 +5,7 @@
 
 import asyncio
 import json
+import os
 import re
 from typing import Optional
 
@@ -23,8 +24,10 @@ from tinybird.tb.modules.common import (
     push_data,
 )
 from tinybird.tb.modules.datafile.common import get_name_version
+from tinybird.tb.modules.datafile.fixture import persist_fixture
 from tinybird.tb.modules.exceptions import CLIDatasourceException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.project import Project
 
 
 @cli.group()
@@ -34,7 +37,7 @@ def datasource(ctx):
 
 
 @datasource.command(name="ls")
-@click.option("--match", default=None, help="Retrieve any resources matching the pattern. eg --match _test")
+@click.option("--match", default=None, help="Retrieve any resources matching the pattern. For example, --match _test")
 @click.option(
     "--format",
     "format_",
@@ -116,7 +119,7 @@ async def datasource_append(
     concurrency: int,
 ):
     """
-    Appends data to an existing Data Source from URL, local file  or a connector
+    Appends data to an existing data source from URL, local file  or a connector
 
     - Load from URL `tb datasource append [datasource_name] https://url_to_csv`
 
@@ -391,3 +394,63 @@ async def datasource_data(ctx: Context, datasource: str, limit: int):
         echo_safe_humanfriendly_tables_format_smart_table(
             data=[d.values() for d in res["data"]], column_names=res["data"][0].keys()
         )
+
+
+@datasource.command(name="export")
+@click.argument("datasource")
+@click.option(
+    "--format",
+    "format_",
+    type=click.Choice(["csv", "ndjson"], case_sensitive=False),
+    default="ndjson",
+    help="Output format (csv or ndjson)",
+)
+@click.option("--rows", type=int, default=100, help="Number of rows to export (default: 100)")
+@click.option("--where", type=str, default=None, help="Condition to filter data")
+@click.option("--target", type=str, help="Target file path (default: datasource_name.{format})")
+@click.pass_context
+@coro
+async def datasource_export(
+    ctx: Context,
+    datasource: str,
+    format_: str,
+    rows: int,
+    where: Optional[str],
+    target: Optional[str],
+):
+    """Export data from a datasource to a file in CSV or NDJSON format
+
+    Example usage:
+    - Export all rows as CSV: tb datasource export my_datasource
+    - Export 1000 rows as NDJSON: tb datasource export my_datasource --format ndjson --rows 1000
+    - Export to specific file: tb datasource export my_datasource --output ./data/export.csv
+    """
+    client: TinyB = ctx.ensure_object(dict)["client"]
+    project: Project = ctx.ensure_object(dict)["project"]
+
+    # Determine output filename if not provided
+    if not target:
+        target = f"{datasource}.{format_}"
+
+    # Build query with optional row limit
+    query = f"SELECT * FROM {datasource} WHERE {where or 1} LIMIT {rows}"
+
+    click.echo(FeedbackManager.highlight(message=f"\n» Exporting {datasource} to {target}"))
+
+    try:
+        if format_ == "csv":
+            query += " FORMAT CSVWithNames"
+        else:
+            query += " FORMAT JSONEachRow"
+
+        res = await client.query(query)
+
+        fixture_path = persist_fixture(datasource, res, project.folder)
+        file_size = os.path.getsize(fixture_path)
+
+        click.echo(
+            FeedbackManager.success(message=f"✓ Exported data to {target} ({humanfriendly.format_size(file_size)})")
+        )
+
+    except Exception as e:
+        raise CLIDatasourceException(FeedbackManager.error(message=str(e)))

tinybird/tb/modules/deployment.py

@@ -44,12 +44,15 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     if candidate_deployment.get("live"):
         click.echo(FeedbackManager.error(message="Candidate deployment is already live"))
     else:
-        click.echo(FeedbackManager.success(message="Promoting deployment"))
+        click.echo(FeedbackManager.success(message="Setting candidate deployment as live"))
 
         TINYBIRD_API_URL = f"{host}/v1/deployments/{candidate_deployment.get('id')}/set-live"
         r = requests.post(TINYBIRD_API_URL, headers=headers)
         result = r.json()
         logging.debug(json.dumps(result, indent=2))
+        if result.get("error"):
+            click.echo(FeedbackManager.error(message=result.get("error")))
+            sys.exit(1)
 
     click.echo(FeedbackManager.success(message="Removing old deployment"))
 
@@ -57,6 +60,9 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     r = requests.delete(TINYBIRD_API_URL, headers=headers)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
+    if result.get("error"):
+        click.echo(FeedbackManager.error(message=result.get("error")))
+        sys.exit(1)
 
     click.echo(FeedbackManager.success(message="Deployment promotion successfully started"))
 
@@ -110,6 +116,9 @@ def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
         r = requests.post(TINYBIRD_API_URL, headers=headers)
         result = r.json()
         logging.debug(json.dumps(result, indent=2))
+        if result.get("error"):
+            click.echo(FeedbackManager.error(message=result.get("error")))
+            sys.exit(1)
 
     click.echo(FeedbackManager.success(message="Removing current deployment"))
 
@@ -117,6 +126,9 @@ def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     r = requests.delete(TINYBIRD_API_URL, headers=headers)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
+    if result.get("error"):
+        click.echo(FeedbackManager.error(message=result.get("error")))
+        sys.exit(1)
 
     click.echo(FeedbackManager.success(message="Deployment rollback successfully started"))
 
@@ -254,13 +266,13 @@ def deployment_rollback(ctx: click.Context, wait: bool) -> None:
 @click.option(
     "--wait/--no-wait",
     is_flag=True,
-    default=False,
+    default=True,
     help="Wait for deploy to finish. Disabled by default.",
 )
 @click.option(
     "--auto/--no-auto",
     is_flag=True,
-    default=False,
+    default=True,
     help="Auto-promote the deployment. Only works if --wait is enabled. Disabled by default.",
 )
 @click.option(
@@ -299,6 +311,7 @@ def create_deployment(
     }
     project: Project = ctx.ensure_object(dict)["project"]
     client = ctx.ensure_object(dict)["client"]
+    config = ctx.ensure_object(dict)["config"]
     TINYBIRD_API_URL = f"{client.host}/v1/deploy"
     TINYBIRD_API_KEY = client.token
 
@@ -345,8 +358,21 @@ def create_deployment(
         deploy_result = result.get("result")
         if deploy_result == "success":
             print_changes(result, project)
-            click.echo(FeedbackManager.success(message="Deployment submitted successfully"))
-            deployment = result.get("deployment")
+            deployment = result.get("deployment", {})
+            # We show the url in the case of region is public
+            if client.host == "https://api.europe-west2.gcp.tinybird.co":
+                click.echo(
+                    FeedbackManager.gray(message="Deployment URL: ")
+                    + FeedbackManager.info(
+                        message=f"https://cloud.tinybird.co/gcp/europe-west2/{config.get('name')}/deployments/{deployment.get('id')}"
+                    )
+                )
+
+            if wait:
+                click.echo(FeedbackManager.info(message="\n✓ Deployment submitted successfully"))
+            else:
+                click.echo(FeedbackManager.success(message="\n✓ Deployment submitted successfully"))
+
             feedback = deployment.get("feedback", [])
             for f in feedback:
                 click.echo(

tinybird/tb/modules/endpoint.py

@@ -29,7 +29,7 @@ def endpoint(ctx):
 
 
 @endpoint.command(name="ls")
-@click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. eg --match _test")
+@click.option("--match", default=None, help="Retrieve any resource matching the pattern. For example, --match _test")
 @click.option(
     "--format",
     "format_",

tinybird/tb/modules/fmt.py

@@ -58,7 +58,7 @@ async def fmt(
         elif (".pipe" in extensions) or (".incl" in extensions):
             result = await format_pipe(filename, line_length, skip_eval=True)
         else:
-            click.echo("Unsupported file type. Supported files types are: .pipe, .incl and .datasource")
+            click.echo("Unsupported file type. Supported files types are: .pipe and .datasource")
             return None
 
         if diff:

tinybird/tb/modules/materialization.py

@@ -23,7 +23,7 @@ def materialization(ctx):
 
 
 @materialization.command(name="ls")
-@click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. eg --match _test")
+@click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. For example, --match _test")
 @click.option(
     "--format",
     "format_",
@@ -79,16 +79,16 @@ async def materialization_ls(ctx: click.Context, match: str, format_: str):
     "--sql-condition",
     type=str,
     default=None,
-    help="Populate with a SQL condition to be applied to the trigger Data Source of the Materialized View. For instance, `--sql-condition='date == toYYYYMM(now())'` it'll populate taking all the rows from the trigger Data Source which `date` is the current month. Use it together with --populate. --sql-condition is not taken into account if the --subset param is present. Including in the ``sql_condition`` any column present in the Data Source ``engine_sorting_key`` will make the populate job process less data.",
+    help="Populate with a SQL condition to be applied to the trigger data source of the materialized view. For instance, `--sql-condition='date == toYYYYMM(now())'` it'll populate taking all the rows from the trigger data source which `date` is the current month. Use it together with --populate. --sql-condition is not taken into account if the --subset param is present. Including in the ``sql_condition`` any column present in the data source ``engine_sorting_key`` will make the populate job process less data.",
 )
 @click.option(
-    "--truncate", is_flag=True, default=False, help="Truncates the materialized Data Source before populating it."
+    "--truncate", is_flag=True, default=False, help="Truncates the materialized data source before populating it."
 )
 @click.option(
     "--unlink-on-populate-error",
     is_flag=True,
     default=False,
-    help="If the populate job fails the Materialized View is unlinked and new data won't be ingested in the Materialized View. First time a populate job fails, the Materialized View is always unlinked.",
+    help="If the populate job fails the materialized view is unlinked and new data won't be ingested in the materialized view. First time a populate job fails, the materialized view is always unlinked.",
 )
 @click.option(
     "--wait",
@@ -107,7 +107,7 @@ async def pipe_populate(
     unlink_on_populate_error: bool,
     wait: bool,
 ):
-    """Populate the result of a Materialized Node into the target Materialized View"""
+    """Populate the result of a Materialized Node into the target materialized view"""
     cl = create_tb_client(ctx)
 
     pipe = await cl.pipe(pipe_name)