tinybird-cli 6.1.1.dev0__tar.gz → 6.3.0__tar.gz

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.1.1.dev0
+Version: 6.3.0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -43,6 +43,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.3.0
+***********
+
+- `Added` `tb copy run` and `tb pipe copy run` have a new `--on-demand-compute` flag to use on-demand compute instances for copy jobs.
+
+6.2.0
+***********
+
+- `Fixed` `tb push` with `SHARED_WITH` now uses the user token to fetch workspaces, avoiding failures caused by using the wrong token
+
 6.0.2
 ***********
 

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '6.1.1.dev0'
-__revision__ = 'cdfa249'
+__version__ = '6.3.0'
+__revision__ = 'b610ec3'

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/ch_utils/engine.py

@@ -298,7 +298,7 @@ class EngineOption:
         self.required = required
         self.default_value = default_value
         self.is_valid = is_valid
-        self.tb_param = tb_param if tb_param else "_".join(["engine", name])
+        self.tb_param = tb_param or "_".join(["engine", name])
 
 
 class EngineParam:
@@ -314,7 +314,7 @@ class EngineParam:
         self.required = required
         self.default_value = default_value
         self.is_valid = is_valid
-        self.tb_param = tb_param if tb_param else self.build_engine_param_name(name)
+        self.tb_param = tb_param or self.build_engine_param_name(name)
 
     @staticmethod
     def build_engine_param_name(name: str):

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/client.py

@@ -118,7 +118,7 @@ class TinyB:
     ) -> Response:
         url = f"{self.host.strip('/')}/{endpoint.strip('/')}"
 
-        token_to_use = use_token if use_token else self.token
+        token_to_use = use_token or self.token
         if token_to_use:
             url += ("&" if "?" in endpoint else "?") + "token=" + token_to_use
         if self.version:
@@ -191,7 +191,7 @@ class TinyB:
         use_token: Optional[str] = None,
         **kwargs,
     ):
-        token_to_use = use_token if use_token else self.token
+        token_to_use = use_token or self.token
         response = await self._req_raw(endpoint, data, files, method, retries, use_token, **kwargs)
 
         if response.status_code == 403:
@@ -565,8 +565,8 @@ class TinyB:
     async def pipes(self, branch=None, dependencies: bool = False, node_attrs=None, attrs=None) -> List[Dict[str, Any]]:
         params = {
             "dependencies": "true" if dependencies else "false",
-            "attrs": attrs if attrs else "",
-            "node_attrs": node_attrs if node_attrs else "",
+            "attrs": attrs or "",
+            "node_attrs": node_attrs or "",
         }
         response = await self._req(f"/v0/pipes?{urlencode(params)}")
         pipes = response["pipes"]
@@ -635,11 +635,17 @@ class TinyB:
         return await self._req(f"/v0/pipes/{pipe_name_or_id}/nodes/{node_id}/copy", method="DELETE")
 
     async def pipe_run_copy(
-        self, pipe_name_or_id: str, params: Optional[Dict[str, str]] = None, mode: Optional[str] = None
+        self,
+        pipe_name_or_id: str,
+        params: Optional[Dict[str, str]] = None,
+        mode: Optional[str] = None,
+        on_demand_compute: bool = False,
     ):
         params = {**params} if params else {}
         if mode:
             params["_mode"] = mode
+        if on_demand_compute:
+            params["on_demand_compute"] = "true"
         return await self._req(f"/v0/pipes/{pipe_name_or_id}/copy?{urlencode(params)}", method="POST")
 
     async def pipe_resume_copy(self, pipe_name_or_id: str):

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/config.py

@@ -124,7 +124,7 @@ def get_display_host(ui_host: str):
 def get_display_cloud_host(api_host: str) -> str:
     is_local = "localhost" in api_host
     if is_local:
-        port = api_host.split(":")[-1]
+        port = api_host.rsplit(":", maxsplit=1)[-1]
         return f"http://cloud.tinybird.co/local/{port}"
     return CLOUD_HOSTS.get(api_host, api_host)
 

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/datafile_common.py

@@ -445,10 +445,12 @@ class CLIGitRelease:
         # not expected suffixes
         return list(
             filter(
-                lambda d: d.change_type in [c.value for c in self.ChangeType]
-                and d.a_path
-                and d.a_path not in self.NO_DATAFILES_PATHS
-                and Path(d.a_path).resolve().suffix in self.DATAFILES_SUFFIXES,
+                lambda d: (
+                    d.change_type in [c.value for c in self.ChangeType]
+                    and d.a_path
+                    and d.a_path not in self.NO_DATAFILES_PATHS
+                    and Path(d.a_path).resolve().suffix in self.DATAFILES_SUFFIXES
+                ),
                 self.diff(current_ws_commit),
             )
         )
@@ -533,9 +535,7 @@ class CLIGitRelease:
     async def update_release(
         self, tb_client: TinyB, current_ws: Dict[str, Any], commit: Optional[str] = None
     ) -> Dict[str, Any]:
-        release = await tb_client.workspace_commit_update(
-            current_ws["id"], commit if commit else self.head().commit.hexsha
-        )
+        release = await tb_client.workspace_commit_update(current_ws["id"], commit or self.head().commit.hexsha)
         return release
 
 
@@ -3145,24 +3145,23 @@ async def share_and_unshare_datasource(
     datasource_name = datasource.get("name", "")
     datasource_id = datasource.get("id", "")
     workspaces: List[Dict[str, Any]]
+    # We duplicate the client to use the user_token in workspace discovery and sharing operations.
+    user_client: TinyB = deepcopy(client)
+    user_client.token = user_token
 
     # In case we are pushing to a branch, we don't share the datasource
     # FIXME: Have only once way to get the current workspace
     if current_ws:
-        # Force to get all the workspaces the user can access
         workspace = current_ws
-        workspaces = (await client.user_workspaces()).get("workspaces", [])
     else:
         workspace = await client.user_workspace_branches()
-        workspaces = workspace.get("workspaces", [])
 
     if workspace.get("is_branch", False):
         click.echo(FeedbackManager.info_skipping_sharing_datasources_branch(datasource=datasource["name"]))
         return
 
-    # We duplicate the client to use the user_token
-    user_client: TinyB = deepcopy(client)
-    user_client.token = user_token
+    # Use the user token for workspace discovery, as workspace/admin tokens may not list all targets.
+    workspaces = (await user_client.user_workspaces()).get("workspaces", [])
     if not workspaces_current_shared_with:
         for workspace_to_share in workspaces_to_share:
             w: Optional[Dict[str, Any]] = next((w for w in workspaces if w["name"] == workspace_to_share), None)
@@ -5029,7 +5028,7 @@ async def format_engine(
             file_parts.append(DATAFILE_NEW_LINE)
             for arg in sorted(node["engine"].get("args", [])):
                 elem = ", ".join([x.strip() for x in arg[1].split(",")])
-                file_parts.append(f"ENGINE_{arg[0].upper()} {elem if elem else empty}")
+                file_parts.append(f"ENGINE_{arg[0].upper()} {elem or empty}")
                 file_parts.append(DATAFILE_NEW_LINE)
             file_parts.append(DATAFILE_NEW_LINE)
         return file_parts

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/sql.py

@@ -257,7 +257,8 @@ def schema_to_sql_columns(schema: List[Dict[str, Any]], skip_jsonpaths: bool = F
         name = x["normalized_name"] if "normalized_name" in x else x["name"]
         if x["nullable"]:
             if (_type := try_to_fix_nullable_in_simple_aggregating_function(x["type"])) is None:
-                _type = "Nullable(%s)" % x["type"]
+                # Skip wrapping if Nullable already present, e.g. LowCardinality(Nullable(String))
+                _type = x["type"] if "Nullable(" in x["type"] else "Nullable(%s)" % x["type"]
         else:
             _type = x["type"]
         parts = [col_name(name, backquotes=True), _type]
@@ -821,11 +822,11 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
         nullable = column["type"].lower().startswith("nullable")
         column["type"] = column["type"] if not nullable else column["type"][len("Nullable(") : -1]  # ')'
         column["nullable"] = nullable
-        column["codec"] = column["codec"] if column["codec"] else None
+        column["codec"] = column["codec"] or None
         column["name"] = column["name"]
         column["normalized_name"] = column["name"]
-        column["jsonpath"] = column["jsonpath"] if column["jsonpath"] else None
-        default_value = column["default_value"] if column["default_value"] else None
+        column["jsonpath"] = column["jsonpath"] or None
+        default_value = column["default_value"] or None
         if nullable and default_value and default_value.lower() == "default null":
             default_value = None
         column["default_value"] = default_value

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/sql_template.py

@@ -199,7 +199,7 @@ class Comment:
 
 class Placeholder:
     def __init__(self, name=None, line=None):
-        self.name = name if name else "__no_value__"
+        self.name = name or "__no_value__"
         self.line = line or "unknown"
 
     def __str__(self):

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/sql_toolset.py

@@ -3,6 +3,7 @@ import logging
 import re
 import threading
 from collections import defaultdict
+from dataclasses import dataclass
 from datetime import datetime
 from functools import lru_cache
 from typing import FrozenSet, List, Optional, Set, Tuple, Union
@@ -34,7 +35,7 @@ class InvalidFunction(ValueError):
         super().__init__(self.msg)
 
 
-class InvalidResource(ValueError):
+class MissingResource(ValueError):
     def __init__(self, database: str, table: str, default_database: str = ""):
         if default_database and database == default_database:
             database = ""
@@ -74,6 +75,54 @@ def explain_plan(sql: str) -> str:
     return chquery.explain_ast(sql)
 
 
+@dataclass(frozen=True)
+class ColumnInfo:
+    name: str
+    type: str
+    nullable: bool
+    default_specifier: str = ""
+    default_expression: str | None = None
+    codec: str | None = None
+    comment: str | None = None
+    ttl: str | None = None
+    is_primary_key: bool = False
+
+
+@dataclass
+class MaterializedViewTarget:
+    database: Optional[str]
+    table: str
+
+
+def parse_materialized_view_target(create_table_query: str) -> Optional[MaterializedViewTarget]:
+    """
+    Extract target table info from a CREATE MATERIALIZED VIEW statement.
+
+    Parses statements like:
+        CREATE MATERIALIZED VIEW db.view TO target_db.target_table AS SELECT...
+        CREATE MATERIALIZED VIEW db.view TO `target_db`.`target_table` AS SELECT...
+        CREATE MATERIALIZED VIEW db.view TO `target_db`.`target_table` (col1 Type1, col2 Nullable(DateTime64(3))) AS SELECT...
+
+    Returns:
+        MaterializedViewTarget with database (optional) and table,
+        or None if the query is not a CREATE MATERIALIZED VIEW statement.
+    """
+    try:
+        result = chquery.parse_create_materialized_view_target_table(create_table_query)
+    except ValueError:
+        return None
+
+    return MaterializedViewTarget(
+        database=result["database"],
+        table=result["table"],
+    )
+
+
+def get_columns_from_create_query(sql_schema: str) -> list[ColumnInfo]:
+    columns = chquery.get_columns_from_create_query(sql_schema)
+    return [ColumnInfo(**col) for col in columns]
+
+
 def has_join(sql: str) -> bool:
     return any(line.rstrip().startswith("TableJoin") for line in explain_plan(sql).split())
 
@@ -539,7 +588,7 @@ def replace_tables(
                     if (
                         dependent_table[2]
                         and dependent_table[2] not in _enabled_table_functions
-                        and not (dependent_table[2] in ["cluster"] and replacement[0] == VALID_REMOTE)
+                        and not (dependent_table[2] == "cluster" and replacement[0] == VALID_REMOTE)
                     ):
                         raise InvalidFunction(table_function_name=dependent_table[2])
                     if dependent_table[0] or dependent_table[1]:
@@ -586,7 +635,7 @@ def replace_tables(
                             "valid_tables": valid_tables,
                         },
                     )
-                    raise InvalidResource(database, table_name, default_database=default_database)
+                    raise MissingResource(database, table_name, default_database=default_database)
 
         if current_replacements:
             # We need to transform the dictionary into something cacheable, so a sorted tuple of tuples it is

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/syncasync.py

@@ -26,6 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import asyncio
 import asyncio.coroutines
 import functools
 import inspect

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/tb_cli_modules/branch.py

@@ -1014,9 +1014,7 @@ async def datasource_copy_from_main(datasource_name: str, sql: str, sql_from_mai
 
     client = config.get_client()
 
-    response = await client.datasource_query_copy(
-        datasource_name, sql if sql else f"SELECT * FROM main.{datasource_name}"
-    )
+    response = await client.datasource_query_copy(datasource_name, sql or f"SELECT * FROM main.{datasource_name}")
     if "job" not in response:
         raise CLIBranchException(response)
     job_id = response["job"]["job_id"]

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/tb_cli_modules/cicd.py

@@ -405,8 +405,8 @@ async def init_cicd(
 ):
     provider = ask_provider_interactively()
     if provider:
-        path = path if path else getcwd()
-        data_project_dir = data_project_dir if data_project_dir else "."
+        path = path or getcwd()
+        data_project_dir = data_project_dir or "."
         generator = CICDGeneratorBase.build_generator(provider)
         workspace_info = await client.workspace_info()
         token = await client.get_token_by_name("admin token")
@@ -426,7 +426,7 @@ async def init_cicd(
 
 
 async def check_cicd_exists(path: Optional[str] = None) -> Optional[Provider]:
-    path = path if path else getcwd()
+    path = path or getcwd()
     for provider in Provider:
         generator = CICDGeneratorBase.build_generator(provider.name)
         if generator.is_already_generated(path):

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/tb_cli_modules/cli.py

@@ -229,7 +229,7 @@ async def init(
     config = CLIConfig.get_project_config()
     if config.get("token") is None:
         raise AuthNoTokenException
-    folder = folder if folder else getcwd()
+    folder = folder or getcwd()
 
     workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches()).get("workspaces", [])
     current_ws: Dict[str, Any] = next(
@@ -644,7 +644,7 @@ async def pull(ctx: Context, folder: str, auto: bool, match: Optional[str], forc
     """Retrieve latest versions for project files from Tinybird."""
 
     client = ctx.ensure_object(dict)["client"]
-    folder = folder if folder else getcwd()
+    folder = folder or getcwd()
 
     return await folder_pull(client, folder, auto, match, force, fmt=fmt)
 

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/tb_cli_modules/common.py

@@ -695,7 +695,7 @@ async def create_workspace_branch(
         if not branch_name:
             click.echo(FeedbackManager.info_workspace_branch_create_greeting())
             default_name = f"{workspace['name']}_{uuid.uuid4().hex[0:4]}"
-            branch_name = click.prompt("\Branch name", default=default_name, err=True, type=str)
+            branch_name = click.prompt("\nBranch name", default=default_name, err=True, type=str)
         assert isinstance(branch_name, str)
 
         response = await config.get_client().create_workspace_branch(
@@ -1601,7 +1601,7 @@ async def wait_job(
             if "progress_percentage" in res:
                 progress_bar.update(int(round(res["progress_percentage"])) - progress_bar.pos)
             elif res["status"] != "working":
-                progress_bar.update(progress_bar.length if progress_bar.length else 0)
+                progress_bar.update(progress_bar.length or 0)
 
         try:
             # TODO: Simplify this as it's not needed to use two functions for

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/tb_cli_modules/datasource.py

@@ -728,9 +728,7 @@ async def datasource_copy_from_main(
         click.echo(FeedbackManager.error_exception(error="Use --sql or --sql-from-main"))
         return
 
-    response = await client.datasource_query_copy(
-        datasource_name, sql if sql else f"SELECT * FROM main.{datasource_name}"
-    )
+    response = await client.datasource_query_copy(datasource_name, sql or f"SELECT * FROM main.{datasource_name}")
     if "job" not in response:
         raise Exception(response)
     job_id = response["job"]["job_id"]

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/tb_cli_modules/pipe.py

@@ -732,10 +732,22 @@ async def regression_test(
     default=None,
     help="Key and value of the params you want the Copy pipe to be called with. For example: tb pipe copy run <my_copy_pipe> --param foo=bar",
 )
+@click.option(
+    "--on-demand-compute",
+    is_flag=True,
+    default=False,
+    help="Use on-demand compute instances for the copy job.",
+)
 @click.pass_context
 @coro
 async def pipe_copy_run(
-    ctx: click.Context, pipe_name_or_id: str, wait: bool, mode: str, yes: bool, param: Optional[Tuple[str]]
+    ctx: click.Context,
+    pipe_name_or_id: str,
+    wait: bool,
+    mode: str,
+    yes: bool,
+    param: Optional[Tuple[str]],
+    on_demand_compute: bool,
 ):
     """Run an on-demand copy job"""
 
@@ -746,7 +758,7 @@ async def pipe_copy_run(
         client: TinyB = ctx.ensure_object(dict)["client"]
 
         try:
-            response = await client.pipe_run_copy(pipe_name_or_id, params, mode)
+            response = await client.pipe_run_copy(pipe_name_or_id, params, mode, on_demand_compute=on_demand_compute)
 
             job_id = response["job"]["job_id"]
             job_url = response["job"]["job_url"]

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/tb_cli_modules/tinyunit/tinyunit.py

@@ -226,7 +226,7 @@ async def run_test_file(tb_client: TinyB, file: str) -> List[TestResult]:
             pipe = test_case.pipe.name
             params = test_case.pipe.params
             try:
-                sql = test_case.sql if test_case.sql else None
+                sql = test_case.sql or None
                 test_response = await tb_client.pipe_data(pipe, format="json", params=params, sql=sql)
                 results.append(
                     TestResult(
@@ -263,7 +263,7 @@ def test_run_summary(results: List[TestSummaryResults], only_fail: bool = False,
             total_counts[test.status] = total_counts.get(test.status, 0) + 1
 
             # Skip the PASS tests if we only want the failed ones
-            if only_fail and test.status in [PASS]:
+            if only_fail and test.status == PASS:
                 continue
 
             summary.append(

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird/tornado_template.py

@@ -283,7 +283,7 @@ class Template:
         .. versionchanged:: 4.3
            Added ``whitespace`` parameter; deprecated ``compress_whitespace``.
         """
-        name = name if name else "<string>"
+        name = name or "<string>"
         self.name = escape.native_str(name)
 
         if compress_whitespace is not _UNSET:

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.1.1.dev0
+Version: 6.3.0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -43,6 +43,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.3.0
+***********
+
+- `Added` `tb copy run` and `tb pipe copy run` have a new `--on-demand-compute` flag to use on-demand compute instances for copy jobs.
+
+6.2.0
+***********
+
+- `Fixed` `tb push` with `SHARED_WITH` now uses the user token to fetch workspaces, avoiding failures caused by using the wrong token
+
 6.0.2
 ***********
 

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.3.0}/tinybird_cli.egg-info/top_level.txt

@@ -1,5 +1,7 @@
+scripts
 tests
 tests_e2e
 tests_e2e_ingestion
 tests_tb
 tinybird
+tinybird_shared