tinybird 4.6.22.dev0__tar.gz → 4.6.23.dev0__tar.gz

{tinybird-4.6.22.dev0 → tinybird-4.6.23.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.22.dev0
+Version: 4.6.23.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.21
+********
+
+- `Fixed` ``tb deployment discard`` now discards the deployment that is not live, instead of assuming the live deployment is listed first. Previously, if removing the old deployment failed after a promotion, the command refused to discard it.
+
 4.6.20
 ********
 

{tinybird-4.6.22.dev0 → tinybird-4.6.23.dev0}/pyproject.toml

@@ -22,6 +22,7 @@ dependencies = [
     "aiofiles==24.1.0",
     "aiohttp==3.11.2",
     "anthropic==0.55.0",
+    "async-lru==2.3.0",
     "aws-msk-iam-sasl-signer-python==1.0.2",
     "cachetools==5.5.0",
     "cffi==1.17.1",

{tinybird-4.6.22.dev0 → tinybird-4.6.23.dev0}/tinybird/sql_template.py

@@ -1385,17 +1385,16 @@ _namespace = {
     "close": None,
     "print": None,
     "input": None,
-    # Keep customer parameters named `type`/`dir` usable without restoring the unsafe builtins.
-    "type": None,
-    "dir": None,
 }
 
 
 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
+# Allow 'id', 'type' and 'dir' as template parameter names despite being builtins.
 reserved_vars.discard("id")
+reserved_vars.discard("type")
+reserved_vars.discard("dir")
 error_vars = ["error", "custom_error"]
 
 
@@ -1471,9 +1470,8 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
         return Expression(f"-- disable {feature}\n")
 
     namespace.update(_namespace)
-    # This is to fix the issue https://gitlab.com/tinybird/analytics/-/issues/19119
-    # We need to do the override here because if we modify the _namespace, we would filter out parameters from the users
-    namespace.update({"id": None})
+    # Default these here, not in _namespace, so they stay visible to variable extraction.
+    namespace.update({"id": None, "type": None, "dir": None})
     namespace.update(kwargs)
     namespace.update(
         {

{tinybird-4.6.22.dev0 → tinybird-4.6.23.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.22.dev0'
-__revision__ = '3a75e0ef'
+__version__ = '4.6.23.dev0'
+__revision__ = '2456d09e'

{tinybird-4.6.22.dev0 → tinybird-4.6.23.dev0}/tinybird/tb/modules/deployment_common.py

@@ -335,13 +335,12 @@ def discard_deployment(host: Optional[str], headers: dict, wait: bool, request_f
         click.echo(FeedbackManager.error(message="Only one deployment found. Cannot discard the only deployment."))
         return
 
-    current_deployment, deployment_to_discard = deployments[0], deployments[1]
+    live_deployment = next((deployment for deployment in deployments if deployment.get("live")), deployments[0])
+    deployment_to_discard = next(deployment for deployment in deployments if deployment is not live_deployment)
 
-    # NOTE(eclbg): we never get here. We wrote this code when we though we'd enable promoting back and forth between
-    # staging and live, but the current CLI commands don't allow getting in that state
-    if current_deployment.get("status") != "data_ready":
+    if live_deployment.get("status") != "data_ready":
         click.echo(FeedbackManager.error(message="Previous deployment is not ready"))
-        deploy_errors = current_deployment.get("errors", [])
+        deploy_errors = live_deployment.get("errors", [])
         for deploy_error in deploy_errors:
             click.echo(FeedbackManager.error(message=f"* {deploy_error}"))
         return
@@ -359,7 +358,6 @@ def discard_deployment(host: Optional[str], headers: dict, wait: bool, request_f
         click.echo(FeedbackManager.error(message=result.get("error")))
         sys_exit("deployment_error", result.get("error", "Unknown error"))
 
-    deployment_to_discard = deployments[1]
     click.echo(FeedbackManager.success(message="Discard process successfully started"))
 
     if wait:

{tinybird-4.6.22.dev0 → tinybird-4.6.23.dev0}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.22.dev0
+Version: 4.6.23.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.21
+********
+
+- `Fixed` ``tb deployment discard`` now discards the deployment that is not live, instead of assuming the live deployment is listed first. Previously, if removing the old deployment failed after a promotion, the command refused to discard it.
+
 4.6.20
 ********