tinybird 0.0.1.dev68__tar.gz → 0.0.1.dev69__tar.gz

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev68
+Version: 0.0.1.dev69
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -49,6 +49,15 @@ Requires-Dist: google-cloud-storage==2.4.0; extra == "snowflake"
 Requires-Dist: oauth2client==3.0.0; extra == "snowflake"
 Requires-Dist: chardet<4,>=3.0.2; extra == "snowflake"
 Requires-Dist: pyOpenSSL<20.0.0,>=16.2.0; extra == "snowflake"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Tinybird CLI
 =============

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/datafile.py

@@ -2301,7 +2301,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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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.dev69'
+__revision__ = 'f90d907'

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/cli.py

@@ -147,12 +147,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 +186,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 +203,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 +255,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(

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/datasource.py

@@ -34,7 +34,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 +116,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`
 

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/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"))
 

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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-0.0.1.dev68 → tinybird-0.0.1.dev69}/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)

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/mock.py

@@ -80,7 +80,6 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str) -> N
         prompt = f"<datasource_schema>{datasource_content}</datasource_schema>\n<user_input>{prompt}</user_input>"
         sql = ""
 
-        click.echo(FeedbackManager.highlight(message=f"\n» Creating fixture for {datasource_name}..."))
         response = llm.ask(system_prompt=mock_prompt(rows), prompt=prompt)
         sql = extract_xml(response, "sql")
         result = await tb_client.query(f"{sql} FORMAT JSON")

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/pipe.py

@@ -27,7 +27,7 @@ def pipe(ctx):
 
 
 @pipe.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_",

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/project.py

@@ -40,17 +40,17 @@ class Project:
 
     def get_vendor_files(self) -> List[str]:
         vendor_files: List[str] = []
-        for project_file in glob.glob(f"{self.vendor_path}/**/*.datasource", recursive=True):
+        for project_file in glob.glob(f"{self.vendor_path}/**/*.datasource", recursive=False):
             vendor_files.append(project_file)
         return vendor_files
 
     @property
     def datasources(self) -> List[str]:
-        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.datasource", recursive=True)])
+        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.datasource", recursive=False)])
 
     @property
     def pipes(self) -> List[str]:
-        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.pipe", recursive=True)])
+        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.pipe", recursive=False)])
 
     def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
         try:

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/shell.py

@@ -24,10 +24,17 @@ from tinybird.tb.modules.table import format_table
 class DynamicCompleter(Completer):
     def __init__(self, project: Project):
         self.project = project
-        self.static_commands = ["create", "mock", "test", "select"]
+        self.static_commands = [
+            "create",
+            "mock",
+            "test",
+            "select",
+            "datasource",
+            "pipe",
+            "endpoint",
+            "copy",
+        ]
         self.test_commands = ["create", "run", "update"]
-        self.mock_flags = ["--prompt", "--rows"]
-        self.common_rows = ["10", "50", "100", "500", "1000"]
         self.sql_keywords = ["select", "from", "where", "group by", "order by", "limit"]
 
     def get_completions(self, document, complete_event):
@@ -114,20 +121,6 @@ class DynamicCompleter(Completer):
                     )
             return
 
-        if len(words) == 3 or len(words) == 4:
-            # After datasource or after a flag value, show available flags
-            available_flags = [f for f in self.mock_flags if f not in words]
-            for flag in available_flags:
-                yield Completion(flag, start_position=0, display=flag, style="class:completion.cmd")
-            return
-
-        last_word = words[-1]
-        if last_word == "--prompt":
-            yield Completion('""', start_position=0, display='"Enter your prompt..."', style="class:completion.cmd")
-        elif last_word == "--rows":
-            for rows in self.common_rows:
-                yield Completion(rows, start_position=0, display=rows, style="class:completion.cmd")
-
     def _handle_test_completions(self, words: List[str]):
         if len(words) == 1:
             for cmd in self.test_commands:
@@ -206,7 +199,6 @@ class Shell:
         self.project = project
         self.tb_client = tb_client
         self.prompt_message = "\ntb > "
-        self.commands = ["create", "mock", "test", "tb", "select"]
         self.session: PromptSession = PromptSession(
             completer=DynamicCompleter(project),
             complete_style=CompleteStyle.COLUMN,
@@ -274,7 +266,7 @@ class Shell:
     def handle_mock(self, arg):
         if "mock" in arg.strip().lower():
             arg = arg.replace("mock", "")
-        subprocess.run(f"tb --build mock {arg} --skip", shell=True, text=True)
+        subprocess.run(f"tb --build mock {arg}", shell=True, text=True)
 
     def handle_tb(self, argline):
         click.echo("")
@@ -290,7 +282,7 @@ class Shell:
         else:
             need_skip = ("mock", "test create", "create")
             if any(arg.startswith(cmd) for cmd in need_skip):
-                argline = f"{argline} --skip"
+                argline = f"{argline}"
             subprocess.run(f"tb --build {argline}", shell=True, text=True)
 
     def default(self, argline):
@@ -305,7 +297,7 @@ class Shell:
         else:
             need_skip = ("mock", "test create", "create")
             if any(arg.startswith(cmd) for cmd in need_skip):
-                argline = f"{argline} --skip"
+                argline = f"{argline}"
             subprocess.run(f"tb --build {argline}", shell=True, text=True)
 
     def run_sql(self, query, rows_limit=20):

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/test.py

@@ -207,7 +207,7 @@ async def test_update(ctx: click.Context, pipe: str) -> None:
 
 @test.command(
     name="run",
-    help="Run the test suite, a file, or a test.",
+    help="Run the test suite, a file, or a test",
 )
 @click.argument("name", nargs=-1)
 @click.pass_context

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/token.py

@@ -24,7 +24,7 @@ def token(ctx: Context) -> None:
 
 
 @token.command(name="ls")
-@click.option("--match", default=None, help="Retrieve any token matching the pattern. eg --match _test")
+@click.option("--match", default=None, help="Retrieve any token matching the pattern. For example, --match _test")
 @click.pass_context
 @coro
 async def token_ls(
@@ -52,7 +52,7 @@ async def token_ls(
 
 @token.command(name="rm")
 @click.argument("token_id")
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
+@click.option("--yes", is_flag=True, default=False, help="Don't ask for confirmation")
 @click.pass_context
 @coro
 async def token_rm(ctx: Context, token_id: str, yes: bool) -> None:
@@ -74,7 +74,7 @@ async def token_rm(ctx: Context, token_id: str, yes: bool) -> None:
 
 @token.command(name="refresh")
 @click.argument("token_id")
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
+@click.option("--yes", is_flag=True, default=False, help="Don't ask for confirmation")
 @click.pass_context
 @coro
 async def token_refresh(ctx: Context, token_id: str, yes: bool) -> None:
@@ -347,4 +347,4 @@ async def create_static_token(ctx, name: str):
     except Exception as e:
         raise CLITokenException(FeedbackManager.error_exception(error=e))
 
-    click.echo("The token has been generated successfully.")
+    click.echo("Token has been generated successfully.")

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/workspace.py

@@ -91,12 +91,12 @@ async def workspace_current():
 @click.argument("workspace_name", required=False)
 @click.option("--starter_kit", "starter_kit", type=str, required=False, help="Use a Tinybird starter kit as a template")
 @click.option("--starter-kit", "starter_kit", hidden=True)
-@click.option("--user_token", is_flag=False, default=None, help="When passed, we won't prompt asking for it")
+@click.option("--user_token", is_flag=False, default=None, help="When passed, tb won't prompt asking for the token")
 @click.option(
     "--fork",
     is_flag=True,
     default=False,
-    help="When enabled, we will share all datasource from the current workspace to the new created one",
+    help="When enabled, tb will share all data sources from the current workspace with the new one",
 )
 @click.pass_context
 @coro
@@ -123,16 +123,16 @@ async def create_workspace(
         await create_workspace_interactive(ctx, workspace_name, starter_kit, user_token, fork)
 
 
-@workspace.command(name="delete", short_help="Delete a Workspace for your Tinybird user")
+@workspace.command(name="delete", short_help="Delete a workspace for your Tinybird user")
 @click.argument("workspace_name_or_id")
-@click.option("--user_token", is_flag=False, default=None, help="When passed, we won't prompt asking for it")
+@click.option("--user_token", is_flag=False, default=None, help="When passed, tb won't prompt asking for the token")
 @click.option(
     "--confirm_hard_delete",
     default=None,
-    help="Introduce the name of the workspace in order to confirm you want to run a hard delete over the workspace",
+    help="Enter the name of the workspace to confirm you want to run a hard delete over the workspace",
     hidden=True,
 )
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
+@click.option("--yes", is_flag=True, default=False, help="Don't ask for confirmation")
 @click.pass_context
 @coro
 async def delete_workspace(

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb/modules/workspace_members.py

@@ -60,10 +60,10 @@ def members(ctx: Context) -> None:
     """Workspace members management commands."""
 
 
-@members.command(name="add", short_help="Adds members to the current Workspace")
+@members.command(name="add", short_help="Adds members to the current workspace")
 @click.argument("members_emails")
 @click.option("--role", is_flag=False, default=None, help="Role for the members being added", type=click.Choice(ROLES))
-@click.option("--user_token", is_flag=False, default=None, help="When passed, we won't prompt asking for it")
+@click.option("--user_token", is_flag=False, default=None, help="When passed, tb won't prompt asking for it")
 @click.pass_context
 @coro
 async def add_members_to_workspace(
@@ -111,13 +111,13 @@ async def list_members_in_workspace(ctx: Context) -> None:
     echo_safe_humanfriendly_tables_format_smart_table(users, column_names=["email"])
 
 
-@members.command(name="rm", short_help="Removes members from the current Workspace")
+@members.command(name="rm", short_help="Removes members from the current workspace")
 @click.argument("members_emails")
-@click.option("--user_token", is_flag=False, default=None, help="When passed, we won't prompt asking for it")
+@click.option("--user_token", is_flag=False, default=None, help="When passed, tb won't prompt asking for it")
 @click.pass_context
 @coro
 async def remove_members_from_workspace(ctx: Context, members_emails: str, user_token: Optional[str]) -> None:
-    """Removes members from the current Workspace."""
+    """Removes members from the current workspace."""
 
     cmd_ctx = await get_command_context(ctx)
 
@@ -163,7 +163,7 @@ async def remove_members_from_workspace(ctx: Context, members_emails: str, user_
 @members.command(name="set-role", short_help="Sets the role for existing workspace members")
 @click.argument("role", required=True, type=click.Choice(ROLES))
 @click.argument("members_emails", required=True, type=str)
-@click.option("--user_token", is_flag=False, default=None, help="When passed, we won't prompt asking for it")
+@click.option("--user_token", is_flag=False, default=None, help="When passed, tb won't prompt asking for it")
 @click.pass_context
 @coro
 async def set_workspace_member_role(ctx: Context, role: str, members_emails: str, user_token: Optional[str]) -> None:

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tb_cli_modules/common.py

@@ -637,7 +637,7 @@ 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):
@@ -1183,7 +1183,7 @@ async def sync_data(ctx, datasource_name: str, yes: bool):
     client: TinyB = ctx.obj["client"]
     datasource = await client.get_datasource(datasource_name)
 
-    VALID_DATASOURCES = ["bigquery", "snowflake", "s3", "gcs"]
+    VALID_DATASOURCES = ["bigquery", "snowflake", "s3", "s3_iamrole", "gcs"]
     if datasource["type"] not in VALID_DATASOURCES:
         raise CLIException(FeedbackManager.error_sync_not_supported(valid_datasources=VALID_DATASOURCES))
 

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird/tornado_template.py

@@ -1161,7 +1161,8 @@ def check_valid_expr(expr):
     elif isinstance(expr, ast.Subscript):
         check_valid_expr(expr.value)
         if isinstance(expr.slice, ast.Index):
-            check_valid_expr(expr.slice.value)
+            # TODO: Slice does not seems to have a value attribute
+            check_valid_expr(expr.slice.value)  # type: ignore[attr-defined]
         elif isinstance(expr.slice, ast.Slice):
             if expr.slice.lower is not None:
                 check_valid_expr(expr.slice.lower)

{tinybird-0.0.1.dev68 → tinybird-0.0.1.dev69}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev68
+Version: 0.0.1.dev69
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -49,6 +49,15 @@ Requires-Dist: google-cloud-storage==2.4.0; extra == "snowflake"
 Requires-Dist: oauth2client==3.0.0; extra == "snowflake"
 Requires-Dist: chardet<4,>=3.0.2; extra == "snowflake"
 Requires-Dist: pyOpenSSL<20.0.0,>=16.2.0; extra == "snowflake"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Tinybird CLI
 =============