tinybird-cli 4.0.2.dev0__tar.gz → 4.1.1__tar.gz

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 4.0.2.dev0
+Version: 4.1.1
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,15 +18,26 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.1.1
+************
+
+- `Fixed` workspace info gathering when switching branches. We were prioritizing the general workspace properties over the user ones.
+
+4.1.0
+************
+
+- `Added` `tb token create` command to be able to create static and JWT tokens from the CLI. You can check more information at https://www.tinybird.co/blog-posts/jwt-api-endpoints-public-beta
+- `Fixed` `tb init --git` to pin `tinybird-cli>=4,<5` in `requirements.txt` to avoid issues with the latest version of the CLI. 
+
 4.0.0
 ************
 
-This is a major release, please read the commands affected below and consider updating your scripts and workflow before upgrading to these version.
+This is a major release, please read the commands affected below and consider updating your scripts and workflow before upgrading to this version.
 
 - `Deprecated` `--semver` flag and `tb release` commands are now deprecated. You can keep using `tb deploy` to integrate and deploy from git. Changes are deployed to the main Workspace instead of to a Release.
-- `Removed` `--cicd` flag and CI/CD templates generation from `tb init`. You can still use the git integration, just create your own pipelines. You can use the ones in this repo as an exmple https://github.com/tinybirdco/ci
+- `Removed` `--cicd` flag and CI/CD templates generation from `tb init`. You can still use the git integration, just create your own pipelines. You can use the ones in this repo as an example https://github.com/tinybirdco/ci
 - `Removed` `tb env` command is removed, use `tb branch` instead.
-- `Deprecated` .datasource files with `ENGINE "Join"` are deprecated, use `Engine "MergeeTree"` instead.
+- `Deprecated` .datasource files with `ENGINE "Join"` is deprecated, use `Engine "MergeeTree"` instead.
 - `Deprecated` `tb materialize`
 - `Removed` Drop the `--timeout` flag from `tb push` which made the populate job to timeout. You can use now `--wait` to wait for the job to finish or nothing to just create the job and return.
 - `Removed` Support for `KEY` directive is removed. The `KEY` was used to create a Data Source with Join engine by the given `KEY` column name. Join engines are also deprecated, you can use a regular `MergeTree` Data Source instead and adapt the pipes SQL accordingly.

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '4.0.2.dev0'
-__revision__ = 'dbd0d5c'
+__version__ = '4.1.1'
+__revision__ = 'b6a6857'

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/client.py

@@ -209,11 +209,21 @@ class TinyB(object):
         return None
 
     async def create_token(
-        self, name: str, scope: str, origin_code: Optional[str], origin_resource_name_or_id: Optional[str]
+        self, name: str, scope: List[str], origin_code: Optional[str], origin_resource_name_or_id: Optional[str] = None
     ):
         origin = origin_code or "C"  # == Origins.CUSTOM  if none specified
+        params = {
+            "name": name,
+            "origin": origin,
+        }
+        if origin_resource_name_or_id:
+            params["resource_id"] = origin_resource_name_or_id
+
+        # TODO: We should support sending multiple scopes in the body of the request
+        url = f"/v0/tokens?{urlencode(params)}"
+        url = url + "&" + "&".join([f"scope={scope}" for scope in scope])
         return await self._req(
-            f"/v0/tokens?name={name}&scope={scope}&origin={origin}&resource_id={origin_resource_name_or_id}",
+            url,
             method="POST",
             data="",
         )
@@ -1163,6 +1173,11 @@ class TinyB(object):
         params = self._token_to_params(token)
         return await self._req(f"/v0/tokens?{params}", method="POST", data="")
 
+    async def create_jwt_token(self, name: str, expiration_time: int, scopes: List[Dict[str, Any]]):
+        url_params = {"name": name, "expiration_time": expiration_time}
+        body = json.dumps({"scopes": scopes})
+        return await self._req(f"/v0/tokens?{urlencode(url_params)}", method="POST", data=body)
+
     async def token_update(self, token: Dict[str, Any]):
         name = token["name"]
         params = self._token_to_params(token)

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/context.py

@@ -7,6 +7,7 @@ hfi_frequency: ContextVar[float] = ContextVar("hfi_frequency")
 hfi_frequency_gatherer: ContextVar[float] = ContextVar("hfi_frequency_gatherer")
 use_gatherer: ContextVar[bool] = ContextVar("use_gatherer")
 allow_gatherer_fallback: ContextVar[bool] = ContextVar("allow_gatherer_fallback")
+gatherer_allow_s3_backup_on_user_errors: ContextVar[bool] = ContextVar("gatherer_allow_s3_backup_on_user_errors")
 disable_template_security_validation: ContextVar[bool] = ContextVar("disable_template_security_validation")
 origin: ContextVar[str] = ContextVar("origin")
 request_id: ContextVar[str] = ContextVar("request_id")

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/datafile.py

@@ -773,7 +773,7 @@ def parse_pipe(
         for node in doc.nodes:
             sql = node.get("sql", "")
             if sql.strip()[0] == "%":
-                sql, _ = render_sql_template(sql[1:], test_mode=True, name=node["name"])
+                sql, _, _ = render_sql_template(sql[1:], test_mode=True, name=node["name"])
             # it'll fail with a ModuleNotFoundError when the toolset is not available but it returns the parsed doc
             from tinybird.sql_toolset import format_sql as toolset_format_sql
 
@@ -785,7 +785,7 @@ def parse_pipe(
             )
         )
     except ValueError as e:
-        t, template_variables = get_template_and_variables(sql, name=node["name"])
+        t, template_variables, _ = get_template_and_variables(sql, name=node["name"])
 
         if sql.strip()[0] != "%" and len(template_variables) > 0:
             raise click.ClickException(FeedbackManager.error_template_start(filename=filename))
@@ -1492,7 +1492,7 @@ async def process_file(
             is_template = False
             if sql[0] == "%":
                 try:
-                    sql_rendered, _ = render_sql_template(sql[1:], test_mode=True)
+                    sql_rendered, _, _ = render_sql_template(sql[1:], test_mode=True)
                 except Exception as e:
                     raise click.ClickException(
                         FeedbackManager.error_parsing_node(node=node["name"], pipe=name, error=str(e))
@@ -2785,7 +2785,7 @@ async def new_pipe(
                 click.echo(FeedbackManager.info_create_not_found_token(token=token_name))
                 try:
                     r = await tb_client.create_token(
-                        token_name, f"PIPES:{tk['permissions']}:{p['name']}", "P", p["name"]
+                        token_name, [f"PIPES:{tk['permissions']}:{p['name']}"], "P", p["name"]
                     )
                     token = r["token"]  # type: ignore
                 except Exception as e:
@@ -2896,7 +2896,7 @@ async def new_ds(
                 token_name = tk["token_name"]
                 click.echo(FeedbackManager.info_create_not_found_token(token=token_name))
                 # DS == token_origin.Origins.DATASOURCE
-                await client.create_token(token_name, f"DATASOURCES:{tk['permissions']}:{ds_name}", "DS", ds_name)
+                await client.create_token(token_name, [f"DATASOURCES:{tk['permissions']}:{ds_name}"], "DS", ds_name)
             else:
                 click.echo(FeedbackManager.info_create_found_token(token=token_name))
                 scopes = [f"DATASOURCES:{tk['permissions']}:{ds_name}"]

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/feedback_manager.py

@@ -348,6 +348,13 @@ class FeedbackManager:
         "{connector} Data sources require a post-release deployment. Increment the post-release number of the semver (for example: 0.0.1 -> 0.0.1-1) to do so. You can read more about post-releases at https://www.tinybird.co/docs/production/deployment-strategies"
     )
 
+    error_number_of_scopes_and_resources_mismatch = error_message(
+        "The number of --scope and --resource options must be the same"
+    )
+    error_number_of_fixed_params_and_resources_mismatch = error_message(
+        "The number of --fixed-params options must not exceed the number of --scope and --resource options."
+    )
+
     info_incl_relative_path = info_message("** Relative path {path} does not exist, skipping.")
     info_ignoring_incl_file = info_message(
         "** Ignoring file {filename}. .incl files are not checked independently. They are checked as part of the file that includes them. Please check the file that includes this .incl file."
@@ -422,6 +429,9 @@ Ready? """
         "You are going to manually update workspace commit reference manually, this is just for special occasions. Do you want to update current commit reference '{current_commit}' to '{new_commit}'?"
     )
 
+    warning_exchange = warning_message(
+        "Warning: Do you want to exchange Data Source {datasource_a} by Data Source {datasource_b}?"
+    )
     warning_no_test_results = warning_message("Warning: No test results to show")
     warning_using_branch_token = warning_message("** You're using the token defined in $TB_TOKEN.")
     warning_using_branch_host = warning_message("** You're using the token defined in $TB_HOST.")

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/sql_template.py

@@ -42,6 +42,24 @@ class SQLTemplateException(ValueError):
 
 
 DEFAULT_PARAM_NAMES = ["format", "q"]
+RESERVED_PARAM_NAMES = [
+    "__tb__semver",
+    "debug_source_tables",
+    "debug",
+    "explain",
+    "finalize_aggregations",
+    "output_format_json_quote_64bit_integers",
+    "output_format_json_quote_denormals",
+    "output_format_parquet_string_as_string",
+    "pipeline",
+    "playground",
+    "q",
+    "query_id",
+    "release_replacements",
+    "tag",
+    "template_parameters",
+    "token",
+]
 
 parameter_types = [
     "String",
@@ -1771,6 +1789,8 @@ def get_template_and_variables(sql: str, name: Optional[str], escape_arrays: boo
     it is important to NOT MODIFY THESE OBJECTS.
     Neither render_sql_template() or generate() modify them, so neither should you
     """
+    variable_warnings = []
+
     try:
         t = Template(sql, name)
         template_variables = get_var_names(t)
@@ -1780,10 +1800,12 @@ def get_template_and_variables(sql: str, name: Optional[str], escape_arrays: boo
                 name = variable["name"]
                 line = variable["line"]
                 raise ValueError(f'"{name}" can not be used as a variable name, line {line}')
+            if variable["name"] in RESERVED_PARAM_NAMES:
+                variable_warnings.append(variable["name"])
 
         wrap_vars(t, escape_arrays=escape_arrays)
 
-        return t, template_variables
+        return t, template_variables, variable_warnings
     except SecurityException as e:
         raise SQLTemplateException(e)
 
@@ -1836,96 +1858,96 @@ def render_sql_template(
     variables: Optional[dict] = None,
     test_mode: bool = False,
     name: Optional[str] = None,
-) -> Tuple[str, dict]:
+) -> Tuple[str, dict, list]:
     """
     >>> render_sql_template("select * from table where f = {{Float32(foo)}}", { 'foo': -1 })
-    ("select * from table where f = toFloat32('-1.0')", {})
+    ("select * from table where f = toFloat32('-1.0')", {}, [])
     >>> render_sql_template("{% if defined(open) %}ERROR{% else %}YEAH!{% end %}")
-    ('YEAH!', {})
+    ('YEAH!', {}, [])
     >>> render_sql_template("{% if defined(close) %}ERROR{% else %}YEAH!{% end %}")
-    ('YEAH!', {})
+    ('YEAH!', {}, [])
     >>> render_sql_template("{% if defined(input) %}ERROR{% else %}YEAH!{% end %}")
-    ('YEAH!', {})
+    ('YEAH!', {}, [])
     >>> render_sql_template("{% if defined(print) %}ERROR{% else %}YEAH!{% end %}")
-    ('YEAH!', {})
+    ('YEAH!', {}, [])
     >>> render_sql_template("select * from table where str = {{foo}}", { 'foo': 'test' })
-    ("select * from table where str = 'test'", {})
+    ("select * from table where str = 'test'", {}, [])
     >>> render_sql_template("select * from table where f = {{foo}}", { 'foo': 1.0 })
-    ('select * from table where f = 1.0', {})
+    ('select * from table where f = 1.0', {}, [])
     >>> render_sql_template("select {{Boolean(foo)}} from table", { 'foo': True })
-    ('select 1 from table', {})
+    ('select 1 from table', {}, [])
     >>> render_sql_template("select {{Boolean(foo)}} from table", { 'foo': False })
-    ('select 0 from table', {})
+    ('select 0 from table', {}, [])
     >>> render_sql_template("select * from table where f = {{Float32(foo)}}", { 'foo': 1 })
-    ("select * from table where f = toFloat32('1.0')", {})
+    ("select * from table where f = toFloat32('1.0')", {}, [])
     >>> render_sql_template("select * from table where f = {{foo}}", { 'foo': "';drop table users;" })
-    ("select * from table where f = '\\\\';drop table users;'", {})
+    ("select * from table where f = '\\\\';drop table users;'", {}, [])
     >>> render_sql_template("select * from {{symbol(foo)}}", { 'foo': 'table-name' })
-    ('select * from `table-name`', {})
+    ('select * from `table-name`', {}, [])
     >>> render_sql_template("select * from {{symbol(foo)}}", { 'foo': '"table-name"' })
-    ('select * from `table-name`', {})
+    ('select * from `table-name`', {}, [])
     >>> render_sql_template("select * from {{table(foo)}}", { 'foo': '"table-name"' })
-    ('select * from table-name', {})
+    ('select * from table-name', {}, [])
     >>> render_sql_template("select * from {{Int32(foo)}}", { 'foo': 'non_int' })
     Traceback (most recent call last):
     ...
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: Error validating 'non_int' to type Int32
     >>> render_sql_template("select * from table where f = {{Float32(foo)}}", test_mode=True)
-    ("select * from table where f = toFloat32('0.0')", {})
+    ("select * from table where f = toFloat32('0.0')", {}, [])
     >>> render_sql_template("SELECT * FROM query_log__dev where a = {{test}}", test_mode=True)
-    ("SELECT * FROM query_log__dev where a = '__placeholder__'", {})
+    ("SELECT * FROM query_log__dev where a = '__placeholder__'", {}, [])
     >>> render_sql_template("SELECT {{test}}", {'token':'testing'})
     Traceback (most recent call last):
     ...
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: expression "test" evaluated to null
     >>> render_sql_template('{% if test %}SELECT 1{% else %} select 2 {% end %}')
-    (' select 2 ', {})
+    (' select 2 ', {}, [])
     >>> render_sql_template('{% if Int32(test, 1) %}SELECT 1{% else %} select 2 {% end %}')
-    ('SELECT 1', {})
+    ('SELECT 1', {}, [])
     >>> render_sql_template('{% for v in test %}SELECT {{v}} {% end %}',test_mode=True)
-    ("SELECT '__placeholder__' SELECT '__placeholder__' SELECT '__placeholder__' ", {})
+    ("SELECT '__placeholder__' SELECT '__placeholder__' SELECT '__placeholder__' ", {}, [])
     >>> render_sql_template("select {{Int32(foo, 1)}}", test_mode=True)
-    ("select toInt32('1')", {})
+    ("select toInt32('1')", {}, [])
     >>> render_sql_template("SELECT count() c FROM test_table where a > {{Float32(myvar)}} {% if defined(my_condition) %} and c = Int32({{my_condition}}){% end %}", {'myvar': 1.0})
-    ("SELECT count() c FROM test_table where a > toFloat32('1.0') ", {})
+    ("SELECT count() c FROM test_table where a > toFloat32('1.0') ", {}, [])
     >>> render_sql_template("SELECT count() c FROM where {{sql_and(a=a, b=b)}}", {'a': '1', 'b': '2'})
-    ("SELECT count() c FROM where a = '1' and b = '2'", {})
+    ("SELECT count() c FROM where a = '1' and b = '2'", {}, [])
     >>> render_sql_template("SELECT count() c FROM where {{sql_and(a=a, b=b)}}", {'b': '2'})
-    ("SELECT count() c FROM where b = '2'", {})
+    ("SELECT count() c FROM where b = '2'", {}, [])
     >>> render_sql_template("SELECT count() c FROM where {{sql_and(a=Int(a, defined=False), b=Int(b, defined=False))}}", {'b': '2'})
-    ('SELECT count() c FROM where b = 2', {})
+    ('SELECT count() c FROM where b = 2', {}, [])
     >>> render_sql_template("SELECT count() c FROM where {{sql_and(a__in=Array(a), b=b)}}", {'a': 'a,b,c','b': '2'})
-    ("SELECT count() c FROM where a in ['a','b','c'] and b = '2'", {})
+    ("SELECT count() c FROM where a in ['a','b','c'] and b = '2'", {}, [])
     >>> render_sql_template("SELECT count() c FROM where {{sql_and(a__not_in=Array(a), b=b)}}", {'a': 'a,b,c','b': '2'})
-    ("SELECT count() c FROM where a not in ['a','b','c'] and b = '2'", {})
+    ("SELECT count() c FROM where a not in ['a','b','c'] and b = '2'", {}, [])
     >>> render_sql_template("SELECT c FROM where a > {{Date(start)}}", test_mode=True)
-    ("SELECT c FROM where a > '2019-01-01'", {})
+    ("SELECT c FROM where a > '2019-01-01'", {}, [])
     >>> render_sql_template("SELECT c FROM where a > {{DateTime(start)}}", test_mode=True)
-    ("SELECT c FROM where a > '2019-01-01 00:00:00'", {})
+    ("SELECT c FROM where a > '2019-01-01 00:00:00'", {}, [])
     >>> render_sql_template("SELECT c FROM where a > {{DateTime(start)}}", {'start': '2018-09-07 23:55:00'})
-    ("SELECT c FROM where a > '2018-09-07 23:55:00'", {})
+    ("SELECT c FROM where a > '2018-09-07 23:55:00'", {}, [])
     >>> render_sql_template('SELECT * FROM tracker {% if defined(start) %} {{DateTime(start)}} and {{DateTime(end)}} {% end %}', {'start': '2019-08-01 00:00:00', 'end': '2019-08-02 00:00:00'})
-    ("SELECT * FROM tracker  '2019-08-01 00:00:00' and '2019-08-02 00:00:00' ", {})
+    ("SELECT * FROM tracker  '2019-08-01 00:00:00' and '2019-08-02 00:00:00' ", {}, [])
     >>> render_sql_template('SELECT * from test limit {{Int(limit)}}', test_mode=True)
-    ('SELECT * from test limit 0', {})
+    ('SELECT * from test limit 0', {}, [])
     >>> render_sql_template('SELECT {{symbol(attr)}} from test', test_mode=True)
-    ('SELECT `placeholder` from test', {})
+    ('SELECT `placeholder` from test', {}, [])
     >>> render_sql_template('SELECT {{Array(foo)}}', {'foo': 'a,b,c,d'})
-    ("SELECT ['a','b','c','d']", {})
+    ("SELECT ['a','b','c','d']", {}, [])
     >>> render_sql_template("SELECT {{Array(foo, 'Int32')}}", {'foo': '1,2,3,4'})
-    ('SELECT [1,2,3,4]', {})
+    ('SELECT [1,2,3,4]', {}, [])
     >>> render_sql_template("SELECT {{Array(foo, 'Int32')}}", test_mode=True)
-    ('SELECT [0,0]', {})
+    ('SELECT [0,0]', {}, [])
     >>> render_sql_template("SELECT {{Array(foo)}}", test_mode=True)
-    ("SELECT ['__placeholder__0','__placeholder__1']", {})
+    ("SELECT ['__placeholder__0','__placeholder__1']", {}, [])
     >>> render_sql_template("{{max_threads(2)}} SELECT 1")
-    ('-- max_threads 2\\n SELECT 1', {'max_threads': 2})
+    ('-- max_threads 2\\n SELECT 1', {'max_threads': 2}, [])
     >>> render_sql_template("SELECT {{String(foo)}}", test_mode=True)
-    ("SELECT '__placeholder__'", {})
+    ("SELECT '__placeholder__'", {}, [])
     >>> render_sql_template("SELECT {{String(foo, 'test')}}", test_mode=True)
-    ("SELECT 'test'", {})
+    ("SELECT 'test'", {}, [])
     >>> render_sql_template("SELECT {{String(foo, 'test')}}", {'foo': 'tt'})
-    ("SELECT 'tt'", {})
+    ("SELECT 'tt'", {}, [])
     >>> render_sql_template("SELECT {{String(format, 'test')}}", {'format': 'tt'})
     Traceback (most recent call last):
     ...
@@ -1943,25 +1965,25 @@ def render_sql_template(
     ...
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: Missing column() default value, use `column(column_name, 'default_column_name')`
     >>> render_sql_template("SELECT {{column(agg)}}", {'agg': 'foo'})
-    ('SELECT `foo`', {})
+    ('SELECT `foo`', {}, [])
     >>> render_sql_template("SELECT {{column(agg)}}", {'agg': '"foo"'})
-    ('SELECT `foo`', {})
+    ('SELECT `foo`', {}, [])
     >>> render_sql_template('{% if not defined(test) %}error("This is an error"){% end %}', {})
-    ('error("This is an error")', {})
+    ('error("This is an error")', {}, [])
     >>> render_sql_template('{% if not defined(test) %}custom_error({error: "This is an error"}){% end %}', {})
-    ('custom_error({error: "This is an error"})', {})
+    ('custom_error({error: "This is an error"})', {}, [])
     >>> render_sql_template("SELECT {{String(foo + 'abcd')}}", test_mode=True)
-    ("SELECT '__placeholder__'", {})
+    ("SELECT '__placeholder__'", {}, [])
     >>> render_sql_template("SELECT {{columns(agg)}}", {})
     Traceback (most recent call last):
     ...
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: Missing columns() default value, use `columns(column_names, 'default_column_name')`
     >>> render_sql_template("SELECT {{columns(agg, 'a,b,c')}} FROM table", {})
-    ('SELECT `a`,`b`,`c` FROM table', {})
+    ('SELECT `a`,`b`,`c` FROM table', {}, [])
     >>> render_sql_template("SELECT {{columns(agg, 'a,b,c')}} FROM table", {'agg': 'foo'})
-    ('SELECT `foo` FROM table', {})
+    ('SELECT `foo` FROM table', {}, [])
     >>> render_sql_template("SELECT {{columns('a,b,c')}} FROM table", {})
-    ('SELECT `a`,`b`,`c` FROM table', {})
+    ('SELECT `a`,`b`,`c` FROM table', {}, [])
     >>> render_sql_template("% {% if whatever(passenger_count) %}{% end %}", test_mode=True)
     Traceback (most recent call last):
     ...
@@ -1971,13 +1993,13 @@ def render_sql_template(
     ...
     SyntaxError: invalid syntax
     >>> render_sql_template("SELECT * FROM dim_fecha_evento where foo like {{sql_unescape(String(pepe), '%')}}", {"pepe": 'raul_el_bueno_is_the_best_%'})
-    ("SELECT * FROM dim_fecha_evento where foo like 'raul_el_bueno_is_the_best_%'", {})
+    ("SELECT * FROM dim_fecha_evento where foo like 'raul_el_bueno_is_the_best_%'", {}, [])
     >>> render_sql_template("SELECT * FROM table WHERE field={{String(field_filter)}}", {"field_filter": 'action."test run"'})
-    ('SELECT * FROM table WHERE field=\\'action.\\\\"test run\\\\"\\'', {})
+    ('SELECT * FROM table WHERE field=\\'action.\\\\"test run\\\\"\\'', {}, [])
     >>> render_sql_template("SELECT {{Int128(foo)}} as x, {{Int128(bar)}} as y", {'foo': -170141183460469231731687303715884105728, 'bar': 170141183460469231731687303715884105727})
-    ("SELECT toInt128('-170141183460469231731687303715884105728') as x, toInt128('170141183460469231731687303715884105727') as y", {})
+    ("SELECT toInt128('-170141183460469231731687303715884105728') as x, toInt128('170141183460469231731687303715884105727') as y", {}, [])
     >>> render_sql_template("SELECT {{Int256(foo)}} as x, {{Int256(bar)}} as y", {'foo': -57896044618658097711785492504343953926634992332820282019728792003956564819968, 'bar': 57896044618658097711785492504343953926634992332820282019728792003956564819967})
-    ("SELECT toInt256('-57896044618658097711785492504343953926634992332820282019728792003956564819968') as x, toInt256('57896044618658097711785492504343953926634992332820282019728792003956564819967') as y", {})
+    ("SELECT toInt256('-57896044618658097711785492504343953926634992332820282019728792003956564819968') as x, toInt256('57896044618658097711785492504343953926634992332820282019728792003956564819967') as y", {}, [])
     >>> render_sql_template('% SELECT * FROM {% import os %}{{ os.popen("whoami").read() }}')
     Traceback (most recent call last):
     ...
@@ -1999,21 +2021,21 @@ def render_sql_template(
     ...
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: Invalid BinOp: Pow()
     >>> render_sql_template("% SELECT {{Array(click_selector, 'String', 'pre,pro')}}")
-    ("% SELECT ['pre','pro']", {})
+    ("% SELECT ['pre','pro']", {}, [])
     >>> render_sql_template("% SELECT {{Array(click_selector, 'String', 'pre,pro')}}", {'click_selector': 'hi,hello'})
-    ("% SELECT ['hi','hello']", {})
+    ("% SELECT ['hi','hello']", {}, [])
     >>> render_sql_template("% SELECT now() > {{DateTime64(variable, '2020-09-09 10:10:10.000')}}", {})
-    ("% SELECT now() > '2020-09-09 10:10:10.000'", {})
+    ("% SELECT now() > '2020-09-09 10:10:10.000'", {}, [])
     >>> render_sql_template("% SELECT {% if defined(x) %} x, 1", {})
     Traceback (most recent call last):
     ...
     tinybird.tornado_template.UnClosedIfError: Missing {% end %} block for if at line 1
     >>> render_sql_template("% SELECT * FROM employees WHERE 0 {% for kv in JSON(payload) %} OR department = {{kv['dp']}} {% end %}")
-    ('% SELECT * FROM employees WHERE 0 ', {})
+    ('% SELECT * FROM employees WHERE 0 ', {}, [])
     >>> render_sql_template("% SELECT * FROM employees WHERE 0 {% for kv in JSON(payload, '[{\\"dp\\":\\"Sales\\"}]') %} OR department = {{kv['dp']}} {% end %}")
-    ("% SELECT * FROM employees WHERE 0  OR department = 'Sales' ", {})
+    ("% SELECT * FROM employees WHERE 0  OR department = 'Sales' ", {}, [])
     >>> render_sql_template("% SELECT * FROM employees WHERE 0 {% for kv in JSON(payload) %} OR department = {{kv['dp']}} {% end %}", { 'payload': '[{"dp":"Design"},{"dp":"Marketing"}]'})
-    ("% SELECT * FROM employees WHERE 0  OR department = 'Design'  OR department = 'Marketing' ", {})
+    ("% SELECT * FROM employees WHERE 0  OR department = 'Design'  OR department = 'Marketing' ", {}, [])
     >>> render_sql_template("% {% for kv in JSON(payload) %} department = {{kv['dp']}} {% end %}", test_mode=True)
     Traceback (most recent call last):
     ...
@@ -2023,22 +2045,26 @@ def render_sql_template(
     ...
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: Error parsing JSON: '' - Expecting value: line 1 column 1 (char 0)
     >>> render_sql_template("% {% if defined(test) %}{% set _groupByCSV = ','.join(test) %} SELECT test as aa, {{Array(test, 'String')}} as test, {{_groupByCSV}} as a {% end %}", {"test": "1,2"})
-    ("%  SELECT test as aa, ['1','2'] as test, '1,2' as a ", {})
+    ("%  SELECT test as aa, ['1','2'] as test, '1,2' as a ", {}, [])
     >>> render_sql_template("% {% if defined(test) %}{% set _groupByCSV = ','.join(test) %} SELECT test as aa, {{Array(test, 'String')}} as test, {{_groupByCSV}} as a {% end %}", {"test": ["1","2"]})
-    ("%  SELECT test as aa, ['1','2'] as test, '1,2' as a ", {})
+    ("%  SELECT test as aa, ['1','2'] as test, '1,2' as a ", {}, [])
     >>> render_sql_template("% {% if defined(test) %}{% set _total = sum(test) %} SELECT test as aa, {{Array(test, 'Int32')}} as test, {{_total}} as a {% end %}", {"test": "1,2"})
-    ('%  SELECT test as aa, [1,2] as test, 3 as a ', {})
+    ('%  SELECT test as aa, [1,2] as test, 3 as a ', {}, [])
     >>> render_sql_template("% {% if defined(test) %}{% set _groupByCSV = ','.join(test) %} SELECT test as aa, {{Array(test, 'String')}} as test, {{_groupByCSV}} as a {% end %}", {"test": ["1","2"]})
-    ("%  SELECT test as aa, ['1','2'] as test, '1,2' as a ", {})
+    ("%  SELECT test as aa, ['1','2'] as test, '1,2' as a ", {}, [])
     >>> render_sql_template("% SELECT {% if defined(x) %} x, 1")
     Traceback (most recent call last):
     ...
     tinybird.tornado_template.UnClosedIfError: Missing {% end %} block for if at line 1
+    >>> render_sql_template("select * from table where str = {{pipeline}}", { 'pipeline': 'test' })
+    ("select * from table where str = 'test'", {}, ['pipeline'])
     """
     escape_split_to_array = ff_split_to_array_escape.get(False)
     bypass_preprocess_variables = ff_preprocess_parameters_circuit_breaker.get(False)
 
-    t, template_variables = get_template_and_variables(sql, name, escape_arrays=escape_split_to_array)
+    t, template_variables, variable_warnings = get_template_and_variables(
+        sql, name, escape_arrays=escape_split_to_array
+    )
 
     if not bypass_preprocess_variables and variables is not None:
         processed_variables = preprocess_variables(variables, t)
@@ -2070,7 +2096,7 @@ def render_sql_template(
         v.update(type_fns)
 
     try:
-        return generate(t, **v)
+        return *generate(t, **v), variable_warnings
     except NameError as e:
         raise SQLTemplateException(e, documentation="/cli/advanced-templates.html#defined")
     except SQLTemplateException:

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/tb_cli_modules/cicd.py

@@ -17,7 +17,7 @@ class Provider(Enum):
 
 WORKFLOW_VERSION = "v3.1.0"
 
-DEFAULT_REQUIREMENTS_FILE = "tinybird-cli>=3,<4"
+DEFAULT_REQUIREMENTS_FILE = "tinybird-cli>=4,<5"
 
 GITHUB_CI_YML = """
     ##################################################

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/tb_cli_modules/common.py

@@ -222,7 +222,8 @@ async def get_current_workspace_branches(config: CLIConfig) -> List[Dict[str, An
     client = config.get_client()
     user_branches: List[Dict[str, Any]] = (await client.user_workspace_branches()).get("workspaces", [])
     all_branches: List[Dict[str, Any]] = (await client.branches()).get("environments", [])
-    branches = all_branches + [branch for branch in user_branches if branch not in all_branches]
+    branches = user_branches + [branch for branch in all_branches if branch not in user_branches]
+
     return [branch for branch in branches if branch.get("main") == current_main_workspace["id"]]
 
 

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/tb_cli_modules/datasource.py

@@ -738,15 +738,17 @@ async def datasource_sync(ctx, datasource_name: str, yes: bool):
 @datasource.command(name="exchange", hidden=True)
 @click.argument("datasource_a", required=True)
 @click.argument("datasource_b", required=True)
+@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
 @click.pass_context
 @coro
-async def datasource_exchange(ctx, datasource_a, datasource_b):
+async def datasource_exchange(ctx, datasource_a: str, datasource_b: str, yes: bool):
     """Exchange two data sources"""
 
     client = ctx.obj["client"]
 
     try:
-        await client.datasource_exchange(datasource_a, datasource_b)
+        if yes or click.confirm(FeedbackManager.warning_exchange(datasource_a=datasource_a, datasource_b=datasource_b)):
+            await client.datasource_exchange(datasource_a, datasource_b)
     except Exception as e:
         raise CLIDatasourceException(FeedbackManager.error_exception(error=e))
 

tinybird-cli-4.1.1/tinybird/tb_cli_modules/token.py

@@ -0,0 +1,335 @@
+from datetime import datetime, timedelta, timezone
+from typing import Any, Dict, List, Optional
+
+import click
+import pyperclip
+from click import Context
+from humanfriendly import parse_timespan
+
+from tinybird.client import TinyB
+from tinybird.feedback_manager import FeedbackManager
+from tinybird.tb_cli_modules.cli import cli
+from tinybird.tb_cli_modules.common import (
+    DoesNotExistException,
+    coro,
+    echo_safe_humanfriendly_tables_format_smart_table,
+)
+from tinybird.tb_cli_modules.exceptions import CLITokenException
+
+
+@cli.group()
+@click.pass_context
+def token(ctx: Context) -> None:
+    """Token commands."""
+
+
+@token.command(name="ls")
+@click.option("--match", default=None, help="Retrieve any token matching the pattern. eg --match _test")
+@click.pass_context
+@coro
+async def token_ls(
+    ctx: Context,
+    match: Optional[str] = None,
+) -> None:
+    """List static tokens."""
+
+    obj: Dict[str, Any] = ctx.ensure_object(dict)
+    client: TinyB = obj["client"]
+
+    try:
+        tokens = await client.token_list(match)
+        columns = ["id", "name", "description"]
+        table = list(map(lambda token: [token.get(key, "") for key in columns], tokens))
+
+        click.echo(FeedbackManager.info_tokens())
+        echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
+        click.echo("\n")
+    except Exception as e:
+        raise CLITokenException(FeedbackManager.error_exception(error=e))
+
+
+@token.command(name="rm")
+@click.argument("token_id")
+@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
+@click.pass_context
+@coro
+async def token_rm(ctx: Context, token_id: str, yes: bool) -> None:
+    """Remove a static token."""
+
+    obj: Dict[str, Any] = ctx.ensure_object(dict)
+    client: TinyB = obj["client"]
+    if yes or click.confirm(FeedbackManager.warning_confirm_delete_token(token=token_id)):
+        try:
+            await client.token_delete(token_id)
+        except DoesNotExistException:
+            raise CLITokenException(FeedbackManager.error_token_does_not_exist(token_id=token_id))
+        except Exception as e:
+            raise CLITokenException(FeedbackManager.error_exception(error=e))
+        click.echo(FeedbackManager.success_delete_token(token=token_id))
+
+
+@token.command(name="refresh")
+@click.argument("token_id")
+@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
+@click.pass_context
+@coro
+async def token_refresh(ctx: Context, token_id: str, yes: bool) -> None:
+    """Refresh a static token."""
+
+    obj: Dict[str, Any] = ctx.ensure_object(dict)
+    client: TinyB = obj["client"]
+    if yes or click.confirm(FeedbackManager.warning_confirm_refresh_token(token=token_id)):
+        try:
+            await client.token_refresh(token_id)
+        except DoesNotExistException:
+            raise CLITokenException(FeedbackManager.error_token_does_not_exist(token=token_id))
+        except Exception as e:
+            raise CLITokenException(FeedbackManager.error_exception(error=e))
+        click.echo(FeedbackManager.success_refresh_token(token=token_id))
+
+
+@token.command(name="scopes")
+@click.argument("token_id")
+@click.pass_context
+@coro
+async def token_scopes(ctx: Context, token_id: str) -> None:
+    """List static token scopes."""
+
+    obj: Dict[str, Any] = ctx.ensure_object(dict)
+    client: TinyB = obj["client"]
+
+    try:
+        scopes = await client.token_scopes(token_id)
+        columns = ["type", "resource", "filter"]
+        table = list(map(lambda scope: [scope.get(key, "") for key in columns], scopes))
+        click.echo(FeedbackManager.info_token_scopes(token=token_id))
+        echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
+        click.echo("\n")
+    except Exception as e:
+        raise CLITokenException(FeedbackManager.error_exception(error=e))
+
+
+@token.command(name="copy")
+@click.argument("token_id")
+@click.pass_context
+@coro
+async def token_copy(ctx: Context, token_id: str) -> None:
+    """Copy a static token."""
+
+    obj: Dict[str, Any] = ctx.ensure_object(dict)
+    client: TinyB = obj["client"]
+
+    try:
+        token = await client.token_get(token_id)
+        pyperclip.copy(token["token"].strip())
+    except DoesNotExistException:
+        raise CLITokenException(FeedbackManager.error_token_does_not_exist(token=token_id))
+    except Exception as e:
+        raise CLITokenException(FeedbackManager.error_exception(error=e))
+    click.echo(FeedbackManager.success_copy_token(token=token_id))
+
+
+def parse_ttl(ctx, param, value):
+    if value is None:
+        return None
+    try:
+        seconds = parse_timespan(value)
+        return timedelta(seconds=seconds)
+    except ValueError:
+        raise click.BadParameter(f"Invalid time to live format: {value}")
+
+
+def parse_fixed_params(fixed_params_list):
+    parsed_params = []
+    for fixed_param in fixed_params_list:
+        param_dict = {}
+        for param in fixed_param.split(","):
+            key, value = param.split("=")
+            param_dict[key] = value
+        parsed_params.append(param_dict)
+    return parsed_params
+
+
+@token.group()
+@click.pass_context
+def create(ctx: Context) -> None:
+    """Token creation commands.
+
+    You can create two types of tokens: JWT or Static.
+
+    * JWT tokens have a TTL and can only have the PIPES:READ scope.Their main use case is allow your users to call your endpoints without exposing your API key.
+
+    * Static tokens do not have a TTL and can have any valid scope (DATASOURCES:READ, DATASOURCES:APPEND, DATASOURCES:CREATE, DATASOURCES:DROP, PIPES:CREATE, PIPES:READ, PIPES:DROP).
+
+    Examples:
+
+    tb token create jwt my_jwt_token --ttl 1h --scope PIPES:READ --resource my_pipe
+
+    tb token create static my_static_token --scope PIPES:READ --resource my_pipe
+
+    tb token create static my_static_token --scope DATASOURCES:READ --resource my_datasource
+
+    tb token create static my_static_token --scope DATASOURCES:READ --resource my_datasource --filters "column_name=value"
+
+    """
+
+
+@create.command(name="jwt")
+@click.argument("name")
+@click.option("--ttl", type=str, callback=parse_ttl, required=True, help="Time to live (e.g., '1h', '30min', '1d')")
+@click.option(
+    "--scope",
+    multiple=True,
+    type=click.Choice(["PIPES:READ"]),
+    required=True,
+    help="Scope of the token (only PIPES:READ is allowed for JWT tokens)",
+)
+@click.option("--resource", multiple=True, required=True, help="Resource associated with the scope")
+@click.option(
+    "--fixed-params", multiple=True, help="Fixed parameters in key=value format, multiple values separated by commas"
+)
+@click.pass_context
+@coro
+async def create_jwt_token(ctx: Context, name: str, ttl: timedelta, scope, resource, fixed_params) -> None:
+    """Create a JWT token with a TTL specify."""
+
+    obj: Dict[str, Any] = ctx.ensure_object(dict)
+    client: TinyB = obj["client"]
+
+    expiration_time = int((ttl + datetime.now(timezone.utc)).timestamp())
+    if len(scope) != len(resource):
+        raise CLITokenException(FeedbackManager.error_number_of_scopes_and_resources_mismatch())
+
+    # Ensure the number of fixed-params does not exceed the number of scope/resource pairs
+    if fixed_params and len(fixed_params) > len(scope):
+        raise CLITokenException(FeedbackManager.error_number_of_fixed_params_and_resources_mismatch())
+
+    # Parse fixed params
+    parsed_fixed_params = parse_fixed_params(fixed_params) if fixed_params else []
+
+    # Create a list of fixed params for each scope/resource pair, defaulting to empty dict if not provided
+    fixed_params_list: List[Dict[str, Any]] = [{}] * len(scope)
+    for i, params in enumerate(parsed_fixed_params):
+        fixed_params_list[i] = params
+
+    scopes = []
+    for sc, res, fparams in zip(scope, resource, fixed_params_list):
+        scopes.append(
+            {
+                "type": sc,
+                "resource": res,
+                "fixed_params": fparams,
+            }
+        )
+
+    try:
+        response = await client.create_jwt_token(name, expiration_time, scopes)
+    except Exception as e:
+        raise CLITokenException(FeedbackManager.error_exception(error=e))
+
+    click.echo("The token has been generated successfully.")
+    click.echo(
+        f"The token will expire at: {datetime.fromtimestamp(expiration_time).strftime('%Y-%m-%d %H:%M:%S')} UTC "
+    )
+    click.echo(f"The token is: {response['token']}")
+
+
+# Valid scopes for static tokens
+valid_scopes = [
+    "DATASOURCES:READ",
+    "DATASOURCES:APPEND",
+    "DATASOURCES:CREATE",
+    "DATASOURCES:DROP",
+    "PIPES:CREATE",
+    "PIPES:READ",
+    "PIPES:DROP",
+]
+
+
+# As we are passing dynamic options to the command, we need to create a custom class to handle the help message
+class DynamicOptionsCommand(click.Command):
+    def get_help(self, ctx):
+        # Usage
+        usage = "Usage: tb token create static [OPTIONS] NAME\n\n"
+        dynamic_options_help = usage
+
+        # Description
+        dynamic_options_help += "  Create a static token that will live forever.\n\n"
+
+        # Options
+        dynamic_options_help += "Options:\n"
+        dynamic_options_help += f"  --scope [{','.join(valid_scopes)}]   Scope for the token [Required]\n"
+        dynamic_options_help += "  --resource TEXT    Resource you want to associate the scope with\n"
+        dynamic_options_help += "  --filter TEXT  SQL condition used to filter the values when calling with this token (eg. --filter=value > 0) \n"
+        dynamic_options_help += "  -h, --help            Show this message and exit.\n"
+
+        return dynamic_options_help
+
+
+@create.command(
+    name="static", context_settings=dict(ignore_unknown_options=True, allow_extra_args=True), cls=DynamicOptionsCommand
+)
+@click.argument("name")
+@click.pass_context
+@coro
+async def create_static_token(ctx, name: str):
+    """Create a static token."""
+    obj: Dict[str, Any] = ctx.ensure_object(dict)
+    client: TinyB = obj["client"]
+
+    args = ctx.args
+    scopes: List[Dict[str, str]] = []
+    current_scope = None
+
+    # We parse the arguments to get the scopes, resources and filters
+    # The arguments should be in the format --scope <scope> --resource <resource> --filter <filter>
+    i = 0
+    while i < len(args):
+        if args[i] == "--scope":
+            if current_scope:
+                scopes.append(current_scope)
+                current_scope = {}
+            current_scope = {"scope": args[i + 1]}
+            i += 2
+        elif args[i] == "--resource":
+            if current_scope is None:
+                raise click.BadParameter("Resource must follow a scope")
+            if "resource" in current_scope:
+                raise click.BadParameter(
+                    "Resource already defined for this scope. The format is --scope <scope> --resource <resource> --filter <filter>"
+                )
+            current_scope["resource"] = args[i + 1]
+            i += 2
+        elif args[i] == "--filter":
+            if current_scope is None:
+                raise click.BadParameter("Filter must follow a scope")
+            if "filter" in current_scope:
+                raise click.BadParameter(
+                    "Filter already defined for this scope. The format is --scope <scope> --resource <resource> --filter <filter>"
+                )
+            current_scope["filter"] = args[i + 1]
+            i += 2
+        else:
+            raise click.BadParameter(f"Unknown parameter {args[i]}")
+
+    if current_scope:
+        scopes.append(current_scope)
+
+    # Parse the scopes like `SCOPE:RESOURCE:FILTER` or `SCOPE:RESOURCE` or `SCOPE` as that's what the API expsects
+    scoped_parsed: List[str] = []
+    for scope in scopes:
+        if scope.get("resource") and scope.get("filter"):
+            scoped_parsed.append(f"{scope.get('scope')}:{scope.get('resource')}:{scope.get('filter')}")
+        elif scope.get("resource"):
+            scoped_parsed.append(f"{scope.get('scope')}:{scope.get('resource')}")
+        elif "scope" in scope:
+            scoped_parsed.append(scope.get("scope", ""))
+        else:
+            raise CLITokenException("Unknown error")
+
+    try:
+        await client.create_token(name, scoped_parsed, origin_code=None)
+    except Exception as e:
+        raise CLITokenException(FeedbackManager.error_exception(error=e))
+
+    click.echo("The token has been generated successfully.")

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird/tornado_template.py

@@ -892,7 +892,15 @@ def _parse(reader: _TemplateReader, template, in_block=None, in_loop=None):
             reader.consume(2)
             if not contents:
                 reader.raise_parse_error("Empty expression")
-            body.chunks.append(_Expression(contents, line))
+
+            try:
+                body.chunks.append(_Expression(contents, line))
+            except SyntaxError:
+                operator, _, _ = contents.partition(" ")
+
+                if "from" in operator:
+                    reader.raise_parse_error('"from" is a forbidden word')
+                raise
             continue
 
         # Block

{tinybird-cli-4.0.2.dev0 → tinybird-cli-4.1.1}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 4.0.2.dev0
+Version: 4.1.1
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,15 +18,26 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.1.1
+************
+
+- `Fixed` workspace info gathering when switching branches. We were prioritizing the general workspace properties over the user ones.
+
+4.1.0
+************
+
+- `Added` `tb token create` command to be able to create static and JWT tokens from the CLI. You can check more information at https://www.tinybird.co/blog-posts/jwt-api-endpoints-public-beta
+- `Fixed` `tb init --git` to pin `tinybird-cli>=4,<5` in `requirements.txt` to avoid issues with the latest version of the CLI. 
+
 4.0.0
 ************
 
-This is a major release, please read the commands affected below and consider updating your scripts and workflow before upgrading to these version.
+This is a major release, please read the commands affected below and consider updating your scripts and workflow before upgrading to this version.
 
 - `Deprecated` `--semver` flag and `tb release` commands are now deprecated. You can keep using `tb deploy` to integrate and deploy from git. Changes are deployed to the main Workspace instead of to a Release.
-- `Removed` `--cicd` flag and CI/CD templates generation from `tb init`. You can still use the git integration, just create your own pipelines. You can use the ones in this repo as an exmple https://github.com/tinybirdco/ci
+- `Removed` `--cicd` flag and CI/CD templates generation from `tb init`. You can still use the git integration, just create your own pipelines. You can use the ones in this repo as an example https://github.com/tinybirdco/ci
 - `Removed` `tb env` command is removed, use `tb branch` instead.
-- `Deprecated` .datasource files with `ENGINE "Join"` are deprecated, use `Engine "MergeeTree"` instead.
+- `Deprecated` .datasource files with `ENGINE "Join"` is deprecated, use `Engine "MergeeTree"` instead.
 - `Deprecated` `tb materialize`
 - `Removed` Drop the `--timeout` flag from `tb push` which made the populate job to timeout. You can use now `--wait` to wait for the job to finish or nothing to just create the job and return.
 - `Removed` Support for `KEY` directive is removed. The `KEY` was used to create a Data Source with Join engine by the given `KEY` column name. Join engines are also deprecated, you can use a regular `MergeTree` Data Source instead and adapt the pipes SQL accordingly.

tinybird-cli-4.0.2.dev0/tinybird/tb_cli_modules/token.py

@@ -1,127 +0,0 @@
-from typing import Any, Dict, Optional
-
-import click
-import pyperclip
-from click import Context
-
-from tinybird.client import TinyB
-from tinybird.feedback_manager import FeedbackManager
-from tinybird.tb_cli_modules.cli import cli
-from tinybird.tb_cli_modules.common import (
-    DoesNotExistException,
-    coro,
-    echo_safe_humanfriendly_tables_format_smart_table,
-)
-from tinybird.tb_cli_modules.exceptions import CLITokenException
-
-
-@cli.group()
-@click.pass_context
-def token(ctx: Context) -> None:
-    """Token commands."""
-
-
-@token.command(name="ls")
-@click.option("--match", default=None, help="Retrieve any token matching the pattern. eg --match _test")
-@click.pass_context
-@coro
-async def token_ls(
-    ctx: Context,
-    match: Optional[str] = None,
-) -> None:
-    """List tokens."""
-
-    obj: Dict[str, Any] = ctx.ensure_object(dict)
-    client: TinyB = obj["client"]
-
-    try:
-        tokens = await client.token_list(match)
-        columns = ["id", "name", "description"]
-        table = list(map(lambda token: [token.get(key, "") for key in columns], tokens))
-
-        click.echo(FeedbackManager.info_tokens())
-        echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
-        click.echo("\n")
-    except Exception as e:
-        raise CLITokenException(FeedbackManager.error_exception(error=e))
-
-
-@token.command(name="rm")
-@click.argument("token_id")
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
-@click.pass_context
-@coro
-async def token_rm(ctx: Context, token_id: str, yes: bool) -> None:
-    """Remove a token."""
-
-    obj: Dict[str, Any] = ctx.ensure_object(dict)
-    client: TinyB = obj["client"]
-    if yes or click.confirm(FeedbackManager.warning_confirm_delete_token(token=token_id)):
-        try:
-            await client.token_delete(token_id)
-        except DoesNotExistException:
-            raise CLITokenException(FeedbackManager.error_token_does_not_exist(token_id=token_id))
-        except Exception as e:
-            raise CLITokenException(FeedbackManager.error_exception(error=e))
-        click.echo(FeedbackManager.success_delete_token(token=token_id))
-
-
-@token.command(name="refresh")
-@click.argument("token_id")
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
-@click.pass_context
-@coro
-async def token_refresh(ctx: Context, token_id: str, yes: bool) -> None:
-    """Refresh a token."""
-
-    obj: Dict[str, Any] = ctx.ensure_object(dict)
-    client: TinyB = obj["client"]
-    if yes or click.confirm(FeedbackManager.warning_confirm_refresh_token(token=token_id)):
-        try:
-            await client.token_refresh(token_id)
-        except DoesNotExistException:
-            raise CLITokenException(FeedbackManager.error_token_does_not_exist(token=token_id))
-        except Exception as e:
-            raise CLITokenException(FeedbackManager.error_exception(error=e))
-        click.echo(FeedbackManager.success_refresh_token(token=token_id))
-
-
-@token.command(name="scopes")
-@click.argument("token_id")
-@click.pass_context
-@coro
-async def token_scopes(ctx: Context, token_id: str) -> None:
-    """List token scopes."""
-
-    obj: Dict[str, Any] = ctx.ensure_object(dict)
-    client: TinyB = obj["client"]
-
-    try:
-        scopes = await client.token_scopes(token_id)
-        columns = ["type", "resource", "filter"]
-        table = list(map(lambda scope: [scope.get(key, "") for key in columns], scopes))
-        click.echo(FeedbackManager.info_token_scopes(token=token_id))
-        echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
-        click.echo("\n")
-    except Exception as e:
-        raise CLITokenException(FeedbackManager.error_exception(error=e))
-
-
-@token.command(name="copy")
-@click.argument("token_id")
-@click.pass_context
-@coro
-async def token_copy(ctx: Context, token_id: str) -> None:
-    """Copy a token."""
-
-    obj: Dict[str, Any] = ctx.ensure_object(dict)
-    client: TinyB = obj["client"]
-
-    try:
-        token = await client.token_get(token_id)
-        pyperclip.copy(token["token"].strip())
-    except DoesNotExistException:
-        raise CLITokenException(FeedbackManager.error_token_does_not_exist(token=token_id))
-    except Exception as e:
-        raise CLITokenException(FeedbackManager.error_exception(error=e))
-    click.echo(FeedbackManager.success_copy_token(token=token_id))