tinybird 4.6.13.dev0__tar.gz → 4.6.15__tar.gz

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.13.dev0
+Version: 4.6.15
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,28 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.15
+********
+
+- `Fixed` ``tb deploy`` waits for the old deployment to delete to avoid clashing with a new deployment submission.
+
+4.6.14
+********
+
+- `Changed` ``tb datasource append`` and ``tb datasource replace`` submit local CSV, NDJSON, and Parquet files through the v1 import endpoint by default. ``tb datasource append --events`` also submits its request body through v1. These asynchronous imports print the queued job ID; pass ``--wait`` to wait for completion. Remote URL imports continue to use their existing route.
+
+4.6.14
+********
+
+- `Fixed` `tb migrate-to-forward` correctly finds and offers to delete all branches, not just those created by the user running the migration.
+
+4.6.13
+********
+
+- `Fixed` `tb deploy` and `tb build` now reject pipes that declare a parameter without a valid name (e.g. a numeric-literal cast like ``{{Float32(1682892000.0)}}``), instead of creating an unusable parameter.
+- `Added` ``tb datasource append`` and ``tb datasource replace`` support the experimental ``--experimental=use_v1`` option for local CSV, NDJSON, and Parquet files. It submits the import through the v1 endpoint and prints the queued job ID; pass ``--wait`` to wait for completion.
+- `Fixed` Forward builds branch with vendored files without incorrectly detecting drift.
+
 4.6.12
 ********
 
@@ -69,6 +91,7 @@ Changelog
 
 - `Removed` `tinybird.bi_stats_rt` from `tb logs` sources. The BI Connector `bi_stats` / `bi_stats_rt` service datasources are deprecated.
 
+
 4.6.9
 *******
 
@@ -77,6 +100,7 @@ Changelog
 4.6.8
 *******
 
+- `Changed` Upgraded Tornado to 6.5.5.
 - `Fixed` Tinybird Local CLI commands to respect Git branch local workspaces correctly.
 
 4.6.7

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/ch_utils/engine.py

@@ -476,6 +476,9 @@ def engine_options(columns, options: List[EngineOption], args: Dict):
         if option_value:
             if o.sql.lower() == "settings":
                 engine_settings = f"{o.sql} {option_value}"
+            # Conditional TTLs fail if we wrap the value in parentheses
+            elif o.sql.lower() == "ttl":
+                options_values.append(f"{o.sql} {option_value}")
             else:
                 options_values.append(f"{o.sql} ({option_value})")
 
@@ -536,7 +539,9 @@ def engine_full_from_dict(
     >>> engine_full_from_dict('MergeTree', {'sorting_key': 'local_date, cod_store'}, schema=schema)
     'MergeTree() ORDER BY (local_date, cod_store)'
     >>> engine_full_from_dict('MergeTree', {'partition_key': 'toDate(timestamp)', 'sorting_key': 'local_date, cod_store', 'settings': 'index_granularity = 32, index_granularity_bytes = 2048', 'ttl': 'toDate(local_date) + INTERVAL 1 DAY'}, schema=schema)
-    'MergeTree() PARTITION BY (toDate(timestamp)) ORDER BY (local_date, cod_store) TTL (toDate(local_date) + INTERVAL 1 DAY) SETTINGS index_granularity = 32, index_granularity_bytes = 2048'
+    'MergeTree() PARTITION BY (toDate(timestamp)) ORDER BY (local_date, cod_store) TTL toDate(local_date) + INTERVAL 1 DAY SETTINGS index_granularity = 32, index_granularity_bytes = 2048'
+    >>> engine_full_from_dict('MergeTree', {'sorting_key': 'timestamp', 'ttl': 'timestamp + INTERVAL 1 DAY DELETE WHERE is_deleted = 1'}, schema=schema)
+    'MergeTree() ORDER BY (timestamp) TTL timestamp + INTERVAL 1 DAY DELETE WHERE is_deleted = 1'
 
     >>> schema = ''
     >>> engine_full_from_dict('CollapsingMergeTree', {'sign': 'sign_column'}, schema=schema)

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/client.py

@@ -411,7 +411,7 @@ class TinyB:
         sql_condition: Optional[str] = None,
         format: str = "csv",
         replace_options: Optional[Set[str]] = None,
-    ):
+    ) -> Dict[str, Any]:
         params = {"name": table_name, "url": url, "mode": mode, "debug": "blocks_block_log", "format": format}
 
         if sql_condition:
@@ -437,35 +437,38 @@ class TinyB:
         datasource_name: str,
         file: Union[str, Path],
         mode: str = "append",
-        status_callback=None,
+        status_callback=None,  # noqa: ARG002 - kept for v0 caller compatibility
         sql_condition: Optional[str] = None,
         format: str = "csv",
         replace_options: Optional[Set[str]] = None,
     ):
-        params = {"name": datasource_name, "mode": mode, "format": format, "debug": "blocks_block_log"}
-
+        # V1 returns the import job immediately, so waiting and progress reporting
+        # belong to the caller.
+        async with aiofiles.open(file, "rb") as content:
+            file_content = await content.read()
+        v1_params = {"format": format}
         if sql_condition:
-            params["replace_condition"] = sql_condition
+            v1_params["replace_condition"] = sql_condition
         if replace_options:
             for option in list(replace_options):
-                params[option] = "true"
-
-        async with aiofiles.open(file, "rb") as content:
-            file_content = await content.read()
-            if format == "csv":
-                files = {"csv": ("csv", file_content)}
-            else:
-                files = {"ndjson": ("ndjson", file_content)}
-
-            res = await self._req(
-                f"v0/datasources?{urlencode(params, safe='')}",
-                files=files,
-                method="POST",
-            )
-            if status_callback:
-                status_callback(res)
-
-            return res
+                v1_params[option] = "true"
+        content_types = {
+            "csv": "text/csv",
+            "ndjson": "application/x-ndjson",
+            "parquet": "application/vnd.apache.parquet",
+        }
+        headers = {"Content-Type": content_types[format]}
+        if str(file).endswith(".gz"):
+            headers["Content-Encoding"] = "gzip"
+        res = await self._req(
+            f"/v1/datasources/{quote(datasource_name, safe='')}/{mode}?{urlencode(v1_params, safe='')}",
+            data=file_content,
+            headers=headers,
+            method="POST",
+        )
+        if not isinstance(res, dict):
+            raise RuntimeError("We couldn't confirm that your import started. Please try again.")
+        return res
 
     async def datasource_truncate(self, datasource_name: str):
         return await self._req(f"/v0/datasources/{datasource_name}/truncate", method="POST", data="")

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/config.py

@@ -49,11 +49,7 @@ LEGACY_HOSTS = {
     "https://ui.europe-west2.gcp.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west2",
     "https://ui.ap-east.aws.tinybird.co": "https://app.tinybird.co/aws/ap-east-1",
     "https://ui.ap-east-1.aws.tinybird.co": "https://app.tinybird.co/aws/ap-east-1",
-    "https://ui.split.tinybird.co": "https://app.tinybird.co/aws/split-us-east",
-    "https://ui.split.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/split-us-west-2",
     "https://ui.northamerica-northeast2.gcp.tinybird.co": "https://app.tinybird.co/gcp/northamerica-northeast2",
-    "https://api.split.tinybird.co": "https://app.tinybird.co/aws/split-us-east",
-    "https://api.split.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/split-us-west-2",
     "https://ui.wadus1.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus1",
     "https://ui.wadus2.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus2",
     "https://ui.wadus3.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus3",

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/datafile/common.py

@@ -278,6 +278,12 @@ REQUIRED_DYNAMODB_PARAMS = {
 }
 DYNAMODB_PARAMS = REQUIRED_DYNAMODB_PARAMS
 
+REQUIRED_POSTGRES_PARAMS = {
+    "pg_connection_name",
+    "pg_table",
+}
+POSTGRES_PARAMS = REQUIRED_POSTGRES_PARAMS
+
 
 def extract_column_names_from_sorting_key_part(part: str) -> List[str]:
     """
@@ -602,6 +608,13 @@ class Datafile:
                     raise DatafileValidationError(
                         f"Invalid import schedule '{node['import_schedule']}'. Only {sorted(VALID_BLOB_STORAGE_CRON_VALUES)} values are allowed"
                     )
+            # Validate Postgres params
+            if any(param in node for param in POSTGRES_PARAMS) and (
+                missing := [param for param in REQUIRED_POSTGRES_PARAMS if param not in node]
+            ):
+                raise DatafileValidationError(
+                    f"Some Postgres params have been provided, but the following required ones are missing: {missing}"
+                )
 
         else:
             # We cannot validate a datafile whose kind is unknown
@@ -2068,6 +2081,8 @@ def parse(
             "import_query": assign_var("import_query"),  # Deprecated, BQ and SFK
             "import_table_arn": assign_var("import_table_arn"),  # Only for DynamoDB
             "import_export_bucket": assign_var("import_export_bucket"),  # For DynamoDB
+            "pg_connection_name": assign_var("pg_connection_name"),
+            "pg_table": assign_var("pg_table"),
             "shared_with": shared_with,
             "export_service": export_service,  # Deprecated
             "forward_query": forward_query,
@@ -2091,6 +2106,7 @@ def parse(
             "sql": sql("sql"),
             "version": version,
             "deployment_method": assign_var("deployment_method", allowed_values={"alter"}),
+            "export_service": export_service,  # Deprecated
             "export_connection_name": assign_var("export_connection_name"),
             "export_schedule": assign_var("export_schedule"),
             "export_bucket_uri": assign_var("export_bucket_uri"),
@@ -2127,6 +2143,12 @@ def parse(
             "gcs_secret": assign_var("gcs_hmac_secret"),
             "gcs_hmac_access_id": assign_var("gcs_hmac_access_id"),
             "gcs_hmac_secret": assign_var("gcs_hmac_secret"),
+            "pg_host": assign_var("pg_host"),
+            "pg_port": assign_var("pg_port"),
+            "pg_database": assign_var("pg_database"),
+            "pg_user": assign_var("pg_user"),
+            "pg_password": assign_var("pg_password"),
+            "pg_ssl_mode": assign_var("pg_ssl_mode"),
             "include": include,
         },
     }

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/datafile/parse_pipe.py

@@ -11,7 +11,11 @@ from tinybird.datafile.common import (
     parse,
 )
 from tinybird.datafile.exceptions import IncludeFileNotFoundException, ParseException
-from tinybird.sql_template import get_template_and_variables, render_sql_template
+from tinybird.sql_template import (
+    get_template_and_variables,
+    render_sql_template,
+    validate_template_parameter_names,
+)
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tornado_template import UnClosedIfError
 
@@ -52,20 +56,38 @@ def parse_pipe(
             if "type" in node:
                 node["type"] = node["type"].lower()
             sql = node.get("sql", "")
-            if sql.strip()[0] == "%":
+            source_sql = sql.strip()
+            if not source_sql:
+                raise click.ClickException(
+                    FeedbackManager.error_parsing_node(node=node["name"], pipe=filename, error="Empty query")
+                )
+            if source_sql.startswith("%"):
                 secrets_list: Optional[List[str]] = None
                 if secrets:
                     secrets_list = list(secrets.keys())
+                # Reject parameters declared without a usable name (e.g. a numeric
+                # literal cast like `{{Float32(1682892000.0)}}`) before rendering.
+                validate_template_parameter_names(sql[1:], node_id=node["name"])
                 # Setting test_mode=True to ignore errors on required parameters and
                 # secrets_in_test_mode=False to raise errors on missing secrets
                 sql, _, variable_warnings = render_sql_template(
-                    sql[1:],
+                    source_sql[1:],
                     name=node["name"],
                     secrets=secrets_list,
                     test_mode=True,
                     secrets_in_test_mode=ignore_secrets,
                 )
                 doc.warnings = variable_warnings
+                if not sql.strip():
+                    raise click.ClickException(
+                        FeedbackManager.error_parsing_node(
+                            node=node["name"],
+                            pipe=filename,
+                            error="Template renders to an empty query without parameters",
+                        )
+                    )
+            else:
+                sql = source_sql
             # 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
 
@@ -79,13 +101,15 @@ def parse_pipe(
             )
         )
     except ValueError as e:
-        t, template_variables, _ = get_template_and_variables(sql, name=node["name"])
+        source_sql = node.get("sql", "")
+        source_sql_stripped = source_sql.strip()
+        t, template_variables, _ = get_template_and_variables(source_sql, name=node["name"])
 
-        if sql.strip()[0] != "%" and len(template_variables) > 0:
+        if not source_sql_stripped.startswith("%") and len(template_variables) > 0:
             raise click.ClickException(FeedbackManager.error_template_start(filename=filename))
         raise click.ClickException(
             FeedbackManager.error_parsing_file(
-                filename=filename, lineno="", error=f"{str(e)} + SQL(value error): {sql}"
+                filename=filename, lineno="", error=f"{str(e)} + SQL(value error): {source_sql}"
             )
         )
     except UnClosedIfError as e:

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/feedback_manager.py

@@ -242,10 +242,11 @@ class FeedbackManager:
     error_organization_index = error_message(
         "Error selecting organization '{organization_index}'. Select a valid index or 0 to cancel"
     )
-    warning_none_organization = warning_message(
-        "Tinybird is now based on organizations. Please, go to the UI ({ui_host}) to follow the migration process. \nYour workspace will be created any way."
-    )
     error_while_fetching_orgs = error_message("Error while fetching organizations: {error}")
+    error_classic_workspace_creation_deprecated = error_message(
+        "The Classic experience is deprecated. New workspaces should be created in Forward. "
+        "Migration guide: https://www.tinybird.co/docs/forward/guides/migrate-from-classic"
+    )
     error_deleted_include = error_message(
         "Related include file {include_file} was deleted and it's used in {filename}. Delete or remove dependency from {filename}."
     )
@@ -864,6 +865,9 @@ class FeedbackManager:
     success_total_rows = success_message("** Total rows in {datasource}: {total_rows}")
     success_appended_datasource = success_message("** Data appended to Data Source '{datasource}' successfully!")
     success_replaced_datasource = success_message("** Data replaced in Data Source '{datasource}' successfully!")
+    success_import_job_queued = success_message("** {operation} import job queued: {job_id}")
+    success_import_job_completed = success_message("** {operation} import completed: {job_id}")
+    info_import_job_status = info_message("Check status: tb job details {job_id}")
     success_auth = success_message(
         "** Auth successful! \n** Configuration written to .tinyb file, consider adding it to .gitignore"
     )

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/service_datasources.py

@@ -19,12 +19,12 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
     return [
         {
             "name": "tinybird.pipe_stats_rt",
-            "description": "Contains information about all requests made to your API endpoints in real time. This data source has a TTL of 7 days. If you need to query data older than 7 days you must use the aggregated by day data available at tinybird.pipe_stats.",
+            "description": "Contains information about all requests made to your API endpoints in real time. This data source has a TTL of 3 months. If you need to query data older than 3 months you must use the aggregated by day data available at tinybird.pipe_stats.",
             "dateColumn": "start_datetime",
             "engine": {
                 "engine": "MergeTree",
                 "sorting_key": "pipe_id, start_datetime",
-                "ttl": "start_datetime + toIntervalDay(7)",
+                "ttl": "start_datetime + toIntervalMonth(3)",
             },
             "columns": [
                 {"name": "start_datetime", "type": "DateTime"},
@@ -48,6 +48,7 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "client_ip", "type": "Nullable(String)"},
                 {"name": "resource_tags", "type": "Array(String)"},
                 {"name": "memory_usage", "type": "UInt64"},
+                {"name": "replica", "type": "String"},
             ],
         },
         {
@@ -333,6 +334,25 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "job_metadata", "type": "String"},
             ],
         },
+        {
+            "name": "tinybird.rate_limits_log",
+            "description": "Endpoint concurrency limiter transitions in your workspace.",
+            "dateColumn": "timestamp",
+            "engine": {
+                "engine": "MergeTree",
+                "sorting_key": "timestamp, pipe_name",
+                "partition_key": "toYYYYMM(timestamp)",
+            },
+            "columns": [
+                {"name": "timestamp", "type": "DateTime64(3)"},
+                {"name": "workspace_id", "type": "String"},
+                {"name": "workspace_name", "type": "String"},
+                {"name": "pipe_name", "type": "String"},
+                {"name": "rate_limit_type", "type": "LowCardinality(String)"},
+                {"name": "action", "type": "LowCardinality(String)"},
+                {"name": "limit_metadata", "type": "String"},
+            ],
+        },
         {
             "name": "tinybird.hook_log",
             "description": "Log of hook executions and their results.",
@@ -518,22 +538,6 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "origin", "type": "String"},
             ],
         },
-        {
-            "name": "organization.processed_data",
-            "description": "Information related to all processed data per day per workspace.",
-            "dateColumn": "date",
-            "engine": {
-                "engine": "SummingMergeTree",
-                "sorting_key": "database, date",
-                "partition_key": "toYYYYMM(date)",
-            },
-            "columns": [
-                {"name": "date", "type": "Date"},
-                {"name": "database", "type": "String"},
-                {"name": "read_bytes", "type": "UInt64"},
-                {"name": "written_bytes", "type": "UInt64"},
-            ],
-        },
         {
             "name": "organization.datasources_storage",
             "description": "Similar to tinybird.datasources_storage but with data for all Organization Workspaces.",
@@ -659,7 +663,7 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
             "engine": {
                 "engine": "MergeTree",
                 "sorting_key": "workspace_id, pipe_id, start_datetime",
-                "ttl": "start_datetime + toIntervalDay(7)",
+                "ttl": "start_datetime + toIntervalMonth(3)",
             },
             "columns": [
                 {"name": "workspace_id", "type": "String"},
@@ -683,6 +687,7 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "user_agent", "type": "Nullable(String)"},
                 {"name": "resource_tags", "type": "Array(String)"},
                 {"name": "memory_usage", "type": "UInt64"},
+                {"name": "replica", "type": "String"},
             ],
         },
         {
@@ -726,6 +731,25 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "job_metadata", "type": "String"},
             ],
         },
+        {
+            "name": "organization.rate_limits_log",
+            "description": "Endpoint concurrency limiter transitions across the organization.",
+            "dateColumn": "timestamp",
+            "engine": {
+                "engine": "MergeTree",
+                "sorting_key": "workspace_id, timestamp, pipe_name",
+                "partition_key": "toYYYYMM(timestamp)",
+            },
+            "columns": [
+                {"name": "timestamp", "type": "DateTime64(3)"},
+                {"name": "workspace_id", "type": "String"},
+                {"name": "workspace_name", "type": "String"},
+                {"name": "pipe_name", "type": "String"},
+                {"name": "rate_limit_type", "type": "LowCardinality(String)"},
+                {"name": "action", "type": "LowCardinality(String)"},
+                {"name": "limit_metadata", "type": "String"},
+            ],
+        },
         {
             "name": "organization.sinks_ops_log",
             "description": "Historic Logs for all Sink job executions across the organization",

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/sql_template.py

@@ -1396,7 +1396,7 @@ _namespace = {
 }
 
 
-reserved_vars = set(["_tt_tmp", "_tt_append", "isinstance", "str", "error", "custom_error", *list(vars(builtins))])
+reserved_vars = {"_tt_tmp", "_tt_append", "isinstance", "str", "error", "custom_error", *list(vars(builtins))}
 for p in DEFAULT_PARAM_NAMES:  # we handle these in an specific manner
     reserved_vars.discard(p)  # `format` is part of builtins
 # Allow 'id' to be used as a template parameter - https://gitlab.com/tinybird/analytics/-/issues/19119
@@ -2263,7 +2263,12 @@ def get_var_names_and_types(t: Template, node_id: Optional[str] = None) -> List[
             vars_out.extend(
                 parse_statement_code_if_new_vars(statement_code, skip_names=typed_names | statement_expr_names)
             )
-            return vars_out
+            # Inside a {% %} statement a type function with a literal first arg
+            # (e.g. {% set x = Float32(1.5) %}) is a plain value cast: the
+            # assigned variable is the parameter, the literal is not. Drop
+            # these artifacts so they don't surface as bogus params nor get
+            # rejected by validate_template_parameter_names.
+            return [vd for vd in vars_out if isinstance(vd["name"], str) and vd["name"]]
 
         def _n(chunks: list, vars_out: list[dict[str, Any]]) -> None:
             for x in chunks:
@@ -2310,6 +2315,43 @@ def get_var_names_and_types_cached(t: Template):
     return get_var_names_and_types(t)
 
 
+def validate_template_parameter_names(sql: str, node_id: Optional[str] = None) -> None:
+    """Reject template parameters that don't have a usable name.
+
+    Type functions such as ``{{Float32(x)}}`` double as casts, so a literal
+    first argument (e.g. ``{{Float32(1682892000.0)}}`` or ``{{String('')}}``)
+    is parsed as a parameter whose name is a number or an empty string instead
+    of an identifier. Such a "parameter" can never be supplied by a caller and
+    breaks parameter metadata consumers, so it must be rejected at write time.
+
+    Raises ``ValueError`` with the same wording used elsewhere for invalid names.
+
+    Templates that fail to parse are left untouched: there are no parameters to
+    validate, and reporting/deferring those errors is the job of the existing
+    render/validation flow (some paths, e.g. ``ignore_sql_errors``, tolerate
+    unparseable SQL on purpose). This keeps the check strictly additive. The
+    only exception is the invalid-name ``ValueError`` that extraction itself
+    raises (e.g. for a list literal used as first argument), which is exactly
+    what this validator exists to report.
+    """
+    try:
+        params = get_var_names_and_types(Template(sql), node_id=node_id)
+    except SQLTemplateException:
+        # Template-level problem (e.g. a SecurityException converted by
+        # get_var_names_and_types), not an invalid parameter name.
+        return
+    except ValueError:
+        # Extraction itself rejects some invalid names (e.g. a list literal
+        # as first argument) with the same ValueError this function raises.
+        raise
+    except Exception:
+        return
+    for param in params:
+        name = param.get("name")
+        if not isinstance(name, str) or not name:
+            raise ValueError(f'"{name}" can not be used as a variable name')
+
+
 def wrap_vars(t, escape_arrays: bool = False):
     def _n(chunks, v):
         for x in chunks:
@@ -2851,6 +2893,13 @@ def render_sql_template(
                 documentation="/cli/advanced-templates.html",
             )
         raise SQLTemplateException(str(e), documentation="/cli/advanced-templates.html")
+    except KeyError as e:
+        key = e.args[0] if e.args else "unknown"
+        raise SQLTemplateException(
+            f"Missing key '{key}' while rendering the template. "
+            "Ensure every object accessed in the template has this key.",
+            documentation="/cli/advanced-templates.html",
+        )
     except IndexError as e:
         # This happens when trying to access string indices on empty strings
         if "string index out of range" in str(e):

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/sql_toolset.py

@@ -493,7 +493,6 @@ def replace_tables_chquery_cached(
     sorted_replacements: Optional[tuple] = None,
     default_database: str = "",
     output_one_line: bool = False,
-    timestamp: Optional[datetime] = None,
     function_allow_list: Optional[FrozenSet[str]] = None,
     settings_allow_list: Optional[FrozenSet[str]] = None,
 ) -> str:
@@ -536,7 +535,6 @@ def replace_tables(
             sql,
             None,
             output_one_line=output_one_line,
-            timestamp=timestamp,
             function_allow_list=hashable_list,
             settings_allow_list=hashable_settings_list,
         )
@@ -610,7 +608,6 @@ def replace_tables(
             sql,
             None,
             output_one_line=output_one_line,
-            timestamp=timestamp,
             function_allow_list=hashable_list,
             settings_allow_list=hashable_settings_list,
         )
@@ -643,13 +640,12 @@ def replace_tables(
 
         if current_replacements:
             # We need to transform the dictionary into something cacheable, so a sorted tuple of tuples it is
-            r = tuple(sorted([(k, v) for k, v in current_replacements.items()]))
+            r = tuple(sorted(current_replacements.items()))
             sql = replace_tables_chquery_cached(
                 sql,
                 r,
                 default_database=default_database,
                 output_one_line=output_one_line,
-                timestamp=timestamp,
                 function_allow_list=hashable_list,
                 settings_allow_list=hashable_settings_list,
             )
@@ -658,7 +654,6 @@ def replace_tables(
                 sql,
                 None,
                 output_one_line=output_one_line,
-                timestamp=timestamp,
                 function_allow_list=hashable_list,
                 settings_allow_list=hashable_settings_list,
             )

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '4.6.13.dev0'
-__revision__ = '9f77ad2'
+__version__ = '4.6.15'
+__revision__ = '026318e'

{tinybird-4.6.13.dev0 → tinybird-4.6.15}/tinybird/tb/client.py

@@ -435,7 +435,7 @@ class TinyB:
         sql_condition: Optional[str] = None,
         format: str = "csv",
         replace_options: Optional[Set[str]] = None,
-    ):
+    ) -> Dict[str, Any]:
         params = {"name": table_name, "url": url, "mode": mode, "debug": "blocks_block_log", "format": format}
 
         if sql_condition:
@@ -466,23 +466,46 @@ class TinyB:
         format: str = "csv",
         replace_options: Optional[Set[str]] = None,
     ):
-        params = {"name": datasource_name, "mode": mode, "format": format, "debug": "blocks_block_log"}
-
+        # Keep this argument for SDK compatibility; v1 returns before import completion.
+        del status_callback
+        with open(file, "rb") as content:
+            file_content = content.read()
+        content_types = {
+            "csv": "text/csv",
+            "ndjson": "application/x-ndjson",
+            "parquet": "application/vnd.apache.parquet",
+        }
+        headers = {"Content-Type": content_types[format]}
+        if str(file).endswith(".gz"):
+            headers["Content-Encoding"] = "gzip"
+        v1_params = {"format": format}
         if sql_condition:
-            params["replace_condition"] = sql_condition
+            v1_params["replace_condition"] = sql_condition
         if replace_options:
             for option in list(replace_options):
-                params[option] = "true"
+                v1_params[option] = "true"
+        res = self._req(
+            f"/v1/datasources/{quote(datasource_name, safe='')}/{mode}?{urlencode(v1_params, safe='')}",
+            data=file_content,
+            headers=headers,
+            method="POST",
+        )
+        if not isinstance(res, dict):
+            raise RuntimeError("We couldn't confirm that your import started. Please try again.")
+        if "error" in res:
+            raise Exception(res["error"])
+        return res
 
-        with open(file, "rb") as content:
-            file_content = content.read()
-        if format == "csv":
-            files = {"csv": ("csv", file_content)}
-        else:
-            files = {"ndjson": ("ndjson", file_content)}
-        res = self._req(f"v0/datasources?{urlencode(params, safe='')}", files=files, method="POST")
-        if status_callback:
-            status_callback(res)
+    def datasource_append_events(self, datasource_name: str, events: str) -> dict:
+        """Submit NDJSON event data through the asynchronous v1 append route."""
+        res = self._req(
+            f"/v1/datasources/{quote(datasource_name, safe='')}/append?format=ndjson",
+            data=events.encode(),
+            headers={"Content-Type": "application/x-ndjson"},
+            method="POST",
+        )
+        if "error" in res:
+            raise Exception(res["error"])
         return res
 
     def datasource_truncate(self, datasource_name: str):
@@ -810,8 +833,8 @@ class TinyB:
     def user_workspace_branches(self, version: str = "v0"):
         return self._req(f"/{version}/user/workspaces/?with_environments=true&only_environments=true")
 
-    def branches(self):
-        return self._req("/v1/environments")
+    def branches(self, version: str = "v1"):
+        return self._req(f"/{version}/environments")
 
     def releases(self, workspace_id):
         return self._req(f"/v0/workspaces/{workspace_id}/releases")