tinybird 4.6.12.dev0__tar.gz → 4.6.13.dev0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.12.dev0
+Version: 4.6.13.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,13 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.12
+********
+
+- `Added` Forward sink pipes support ``{{ tb_secret(...) }}`` in ``EXPORT_*`` metadata (for example ``EXPORT_BUCKET_URI``). Secrets are resolved at deploy time and baked into the sink settings; changing a secret requires a redeploy.
+- `Fixed` Forward deploy now raises an error when a secret used in sink metadata resolves to an empty value.
+- `Fixed` Forward deploy now rejects ``{{ tb_secret(...) }}`` in ``EXPORT_SCHEDULE`` and ``COPY_SCHEDULE``. Use a literal cron expression (for example ``0 * * * *``) or ``@on-demand``.
+
 4.6.11
 ********
 

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

@@ -401,12 +401,15 @@ class Datafile:
         if node.get("mode") and node["mode"] not in ["append", "replace"]:
             raise DatafileValidationError("COPY node mode must be append or replace")
         # copy schedule must be @on-demand or a cron-expression
-        if (
-            node.get("copy_schedule")
-            and node["copy_schedule"] != ON_DEMAND
-            and not croniter.is_valid(node["copy_schedule"])
-        ):
-            raise DatafileValidationError("COPY node schedule must be @on-demand or a valid cron expression.")
+        copy_schedule = node.get("copy_schedule")
+        if copy_schedule and copy_schedule != ON_DEMAND:
+            if isinstance(copy_schedule, str) and "tb_secret" in copy_schedule:
+                raise DatafileValidationError(
+                    "COPY_SCHEDULE does not support { tb_secret(...) }. "
+                    'Use a literal cron expression (for example "0 * * * *") or @on-demand.'
+                )
+            if not croniter.is_valid(copy_schedule):
+                raise DatafileValidationError("COPY node schedule must be @on-demand or a valid cron expression.")
         for key in node.keys():
             if key not in CopyParameters.valid_params():
                 raise DatafileValidationError(
@@ -503,10 +506,16 @@ class Datafile:
 
         # Validate schedule format (common for both Kafka and S3/GCS)
         export_schedule = node.get("export_schedule")
-        if export_schedule and export_schedule != ON_DEMAND and not croniter.is_valid(export_schedule):
-            raise DatafileValidationError(
-                f"Sink node {repr(node['name'])} has invalid export_schedule '{export_schedule}'. Must be @on-demand or a valid cron expression."
-            )
+        if export_schedule and export_schedule != ON_DEMAND:
+            if isinstance(export_schedule, str) and "tb_secret" in export_schedule:
+                raise DatafileValidationError(
+                    f"Sink node {repr(node['name'])}: EXPORT_SCHEDULE does not support {{ tb_secret(...) }}. "
+                    'Use a literal cron expression (for example "0 * * * *") or @on-demand.'
+                )
+            if not croniter.is_valid(export_schedule):
+                raise DatafileValidationError(
+                    f"Sink node {repr(node['name'])} has invalid export_schedule '{export_schedule}'. Must be @on-demand or a valid cron expression."
+                )
 
     def validate(self):
         if self.kind == DatafileKind.pipe:

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

@@ -2911,13 +2911,21 @@ def extract_variables_from_sql(sql: str, params: List[Dict[str, Any]]) -> Dict[s
     return defaults
 
 
-def render_template_with_secrets(name: str, content: str, secrets: Optional[Dict[str, str]] = None) -> str:
+def render_template_with_secrets(
+    name: str,
+    content: str,
+    secrets: Optional[Dict[str, str]] = None,
+    empty_secret_raises: bool = False,
+) -> str:
     """Renders a template with secrets, allowing for default values.
 
     Args:
         name: The name of the template
         content: The template content
         secrets: A dictionary mapping secret names to their values
+        empty_secret_raises: When True, empty secret values or empty defaults raise
+            instead of returning '""'. Used for sink metadata (Forward deploy) where
+            an empty bucket path must not be baked as s3://"".
 
     Returns:
         The rendered template
@@ -2959,6 +2967,26 @@ def render_template_with_secrets(name: str, content: str, secrets: Optional[Dict
         Traceback (most recent call last):
         ...
         tinybird.sql_template.SQLTemplateException: Template Syntax Error: Cannot access secret 'MISSING_SECRET'. Check the secret exists in the Workspace and the token has the required scope.
+
+        >>> render_template_with_secrets(
+        ...     "sink_bucket",
+        ...     "s3://{{ tb_secret('MISSING_SECRET', '') }}",
+        ...     secrets = {},
+        ...     empty_secret_raises=True,
+        ... )
+        Traceback (most recent call last):
+        ...
+        tinybird.sql_template.SQLTemplateException: Template Syntax Error: Secret 'MISSING_SECRET' resolves to an empty value and cannot be used in sink metadata.
+
+        >>> render_template_with_secrets(
+        ...     "sink_bucket",
+        ...     "s3://{{ tb_secret('EMPTY_SECRET', 'fallback') }}",
+        ...     secrets = {'EMPTY_SECRET': ''},
+        ...     empty_secret_raises=True,
+        ... )
+        Traceback (most recent call last):
+        ...
+        tinybird.sql_template.SQLTemplateException: Template Syntax Error: Secret 'EMPTY_SECRET' resolves to an empty value and cannot be used in sink metadata.
     """
     if not secrets:
         secrets = {}
@@ -2974,15 +3002,24 @@ def render_template_with_secrets(name: str, content: str, secrets: Optional[Dict
             The secret value or default
 
         Raises:
-            SQLTemplateException: If the secret is not found and no default is provided
+            SQLTemplateException: If the secret is not found and no default is provided,
+                or if empty_secret_raises is True and the resolved value is empty
         """
         if secret_name in secrets:
             value = secrets[secret_name]
             if isinstance(value, str) and len(value) == 0:
+                if empty_secret_raises:
+                    raise SQLTemplateException(
+                        f"Secret '{secret_name}' resolves to an empty value and cannot be used in sink metadata."
+                    )
                 return '""'
             return value
         elif default is not None:
             if isinstance(default, str) and len(default) == 0:
+                if empty_secret_raises:
+                    raise SQLTemplateException(
+                        f"Secret '{secret_name}' resolves to an empty value and cannot be used in sink metadata."
+                    )
                 return '""'
             return default
         else:

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

@@ -158,7 +158,20 @@ def has_unoptimized_join(sql: str, left_table: Optional[Union[Tuple[str, str], T
             raise UnoptimizedJoinException(sql)
 
 
-def format_where_for_mutation_command(where_clause: str, lightweight: bool = False) -> str:
+def _format_fragment_for_mutation_command(fragment: str) -> str:
+    """Normalize a SQL fragment the way CH stores it in the
+    `system.mutations.command` column: format the expression with CH's own
+    formatter, then escape it as it appears inside the serialized command
+    (string literals keep backslash-escaped quotes)."""
+    formatted = chquery.format(f"""SELECT {fragment}""").split("SELECT ")[1]
+    formatted = formatted.replace("\\", "\\\\").replace("'", "''")
+    quoted = chquery.format(f"SELECT '{formatted}'").split("SELECT ")[1]
+    return quoted[1:-1]
+
+
+def format_where_for_mutation_command(
+    where_clause: str, lightweight: bool = False, partition: Optional[str] = None
+) -> str:
     """
     >>> format_where_for_mutation_command("numnights = 99")
     'DELETE WHERE numnights = 99'
@@ -172,12 +185,18 @@ def format_where_for_mutation_command(where_clause: str, lightweight: bool = Fal
     "DELETE WHERE reservationid = \\\\'\\\\\\\\\\\\'foo\\\\'"
     >>> format_where_for_mutation_command("number < 3", lightweight=True)
     'UPDATE _row_exists = 0 WHERE number < 3'
+    >>> format_where_for_mutation_command("number < 3", lightweight=True, partition="201901")
+    'UPDATE _row_exists = 0 IN PARTITION 201901 WHERE number < 3'
+    >>> format_where_for_mutation_command("number < 3", lightweight=True, partition="'2019-01-01'")
+    "UPDATE _row_exists = 0 IN PARTITION \\\\'2019-01-01\\\\' WHERE number < 3"
     """
-    formatted_condition = chquery.format(f"""SELECT {where_clause}""").split("SELECT ")[1]
-    formatted_condition = formatted_condition.replace("\\", "\\\\").replace("'", "''")
-    quoted_condition = chquery.format(f"SELECT '{formatted_condition}'").split("SELECT ")[1]
-    prefix = "UPDATE _row_exists = 0 WHERE" if lightweight else "DELETE WHERE"
-    return f"{prefix} {quoted_condition[1:-1]}"
+    quoted_condition = _format_fragment_for_mutation_command(where_clause)
+    prefix = "UPDATE _row_exists = 0" if lightweight else "DELETE"
+    # Partition-scoped mutations store the partition expression in the
+    # command (`… IN PARTITION <expr> WHERE <cond>`), normalized by the same
+    # CH formatter, so it must be part of the match.
+    partition_clause = f" IN PARTITION {_format_fragment_for_mutation_command(partition)}" if partition else ""
+    return f"{prefix}{partition_clause} WHERE {quoted_condition}"
 
 
 # Functions that take table/dictionary names as string literal arguments.

{tinybird-4.6.12.dev0 → tinybird-4.6.13.dev0}/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.12.dev0'
-__revision__ = '7bdea3d'
+__version__ = '4.6.13.dev0'
+__revision__ = '9f77ad2'

{tinybird-4.6.12.dev0 → tinybird-4.6.13.dev0}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.12.dev0
+Version: 4.6.13.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,13 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.12
+********
+
+- `Added` Forward sink pipes support ``{{ tb_secret(...) }}`` in ``EXPORT_*`` metadata (for example ``EXPORT_BUCKET_URI``). Secrets are resolved at deploy time and baked into the sink settings; changing a secret requires a redeploy.
+- `Fixed` Forward deploy now raises an error when a secret used in sink metadata resolves to an empty value.
+- `Fixed` Forward deploy now rejects ``{{ tb_secret(...) }}`` in ``EXPORT_SCHEDULE`` and ``COPY_SCHEDULE``. Use a literal cron expression (for example ``0 * * * *``) or ``@on-demand``.
+
 4.6.11
 ********