tinybird-cli 6.2.1.dev0__tar.gz → 6.3.1.dev0__tar.gz

{tinybird_cli-6.2.1.dev0 → tinybird_cli-6.3.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.2.1.dev0
+Version: 6.3.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -43,6 +43,11 @@ 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
 ***********
 

{tinybird_cli-6.2.1.dev0 → tinybird_cli-6.3.1.dev0}/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.2.1.dev0'
-__revision__ = '0284e51'
+__version__ = '6.3.1.dev0'
+__revision__ = 'b610ec3'

{tinybird_cli-6.2.1.dev0 → tinybird_cli-6.3.1.dev0}/tinybird/client.py

@@ -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.2.1.dev0 → tinybird_cli-6.3.1.dev0}/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.2.1.dev0 → tinybird_cli-6.3.1.dev0}/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]

{tinybird_cli-6.2.1.dev0 → tinybird_cli-6.3.1.dev0}/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())
 
@@ -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.2.1.dev0 → tinybird_cli-6.3.1.dev0}/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.2.1.dev0 → tinybird_cli-6.3.1.dev0}/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(

{tinybird_cli-6.2.1.dev0 → tinybird_cli-6.3.1.dev0}/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.2.1.dev0 → tinybird_cli-6.3.1.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.2.1.dev0
+Version: 6.3.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -43,6 +43,11 @@ 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
 ***********
 

{tinybird_cli-6.2.1.dev0 → tinybird_cli-6.3.1.dev0}/tinybird_cli.egg-info/top_level.txt

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