tinybird 4.6.22.dev0__tar.gz → 4.6.24.dev0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.22.dev0
+Version: 4.6.24.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.22
+********
+
+- `Added` ``tb pull`` demotes sink and copy pipes that exceed the workspace's sink/copy pipe plan limit to plain pipes instead of failing, stripping their ``TYPE``/``EXPORT_*``/``TARGET_DATASOURCE``/``COPY_SCHEDULE`` settings and warning that the plan must be upgraded to restore them.
+
+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.24.dev0}/pyproject.toml

@@ -18,34 +18,35 @@ authors = [
 dependencies = [
     "GitPython==3.1.44",
     "Markdown==3.5.1",
-    "aioboto3==14.0.0",
+    "aioboto3~=15.0",
     "aiofiles==24.1.0",
-    "aiohttp==3.11.2",
-    "anthropic==0.55.0",
+    "aiohttp~=3.11",
+    "anthropic~=1.9",
+    "async-lru==2.3.0",
     "aws-msk-iam-sasl-signer-python==1.0.2",
     "cachetools==5.5.0",
     "cffi==1.17.1",
     "chardet==4.0.0",
     "ciso8601==2.2.0",
-    "click==8.1.8",
+    "click~=8.5",
     "clickhouse-cityhash==1.0.2.5",
     "clickhouse-driver==0.2.9",
     "confluent-kafka[avro,json,schemaregistry]==2.12.2",
     "contextvars==2.4",
     "cramjam==2.11.0",
     "croniter==6.2.2",
-    "cryptography==3.4.8",
+    "cryptography~=38.0",
     "datasketch==1.6.5",
     "dnspython==2.8.0",
     "docker==7.1.0",
     "fastavro==1.12.2",
     "fastmcp==2.12.2",
-    "google-cloud-aiplatform==1.148.1",
+    "google-cloud-aiplatform~=1.148",
     "google-cloud-compute==1.48.0",
     "google-cloud-scheduler==2.20.0",
     "google-cloud-secret-manager==2.29.0",
-    "google-cloud-storage==3.4.1",
-    "google_api_core==2.25.2",
+    "google-cloud-storage~=3.4",
+    "google_api_core~=2.25",
     "googleapis_common_protos==1.66.0",
     "grpcio_status==1.67.1",
     "humanfriendly==10.0",
@@ -68,7 +69,7 @@ dependencies = [
     "opentelemetry-sdk==1.38.0",
     "orb-billing==2.17.0",
     "orjson==3.11.5",
-    "packaging==23.2",
+    "packaging~=26.3",
     "passlib==1.7.1",
     "posthog==7.28.0",
     "pre-commit==4.6.2",
@@ -82,10 +83,10 @@ dependencies = [
     "py-spy==0.4.2",
     "pyarrow==23.0.1",
     "pycurl==7.45.7",
-    "pydantic-ai-slim[anthropic]==0.5.0",
-    "pydantic-ai-slim[google]==0.5.0",
-    "pydantic-ai-slim[retries]==0.5.0",
-    "pydantic==2.12.5",
+    "pydantic-ai-slim[anthropic]~=2.0",
+    "pydantic-ai-slim[google]~=2.0",
+    "pydantic-ai-slim[retries]~=2.0",
+    "pydantic~=2.12",
     "pyjwt[crypto]==2.9.0",
     "pympler==1.1",
     "pynacl==1.5.0",
@@ -93,10 +94,10 @@ dependencies = [
     "python-dateutil==2.9.0.post0",
     "python-dotenv==1.1.0",
     "python-ulid==2.7.0",
-    "pyyaml==6.0.1",
+    "pyyaml~=6.0",
     "redis[hiredis]==5.3.1",
     "requests==2.32.4",
-    "sentry-sdk==2.69.1",
+    "sentry-sdk==2.69.2",
     "setproctitle==1.3.3",
     "shandy-sqlfmt==0.11.1",
     "shandy-sqlfmt[jinjafmt]==0.11.1",
@@ -107,7 +108,7 @@ dependencies = [
     "tabulate==0.8.10",
     "thefuzz==0.22.1",
     "tinybird-python-sdk[ai]==0.3.7",
-    "tinybird-toolset==2.6.2",
+    "tinybird-toolset==2.6.6",
     "toposort==1.10",
     "tornado==6.5.5",
     "urllib3==1.26.20",
@@ -124,9 +125,9 @@ deploy = [
     "GitPython==3.1.44",
     "ansible==8.5.0",
     "ara==1.6.1",
-    "boto3==1.36.21",
+    "boto3~=1.40",
     "fabric==3.2.2",
-    "google-auth==2.47.0",
+    "google-auth~=2.47",
     "jsonnet",
     "prettytable==3.8.0",
     "requests==2.32.4",
@@ -141,7 +142,7 @@ devtools = [
 ]
 doc = [
     "Pallets-Sphinx-Themes==2.3.0",
-    "pyOpenSSL<24.0.0",
+    "pyOpenSSL~=23.2",
     "sphinx-autobuild==2024.2.4",
     "sphinx-sitemap",
     "sphinx==7.3.7",
@@ -149,15 +150,15 @@ doc = [
     "sphinxcontrib-jquery==4.1",
 ]
 lint = [
-    "botocore-stubs==1.36.23",
+    "botocore-stubs~=1.40",
     "flake8~=7.3",
     "flake8-async~=26.8",
     "mypy==2.3.1",
-    "ruff==0.16.8",
+    "ruff==0.16.9",
     "types-Markdown",
     "types-PyYAML",
     "types-aiofiles==24.1.0.20241221",
-    "types-boto3-lite==1.36.21",
+    "types-boto3-lite~=1.40",
     "types-cachetools",
     "types-chardet",
     "types-paramiko",
@@ -171,18 +172,19 @@ lint = [
 test = [
     "coverage==7.10.6",
     "freezegun==1.5.5",
-    "google-auth==2.47.0",
+    "google-auth~=2.47",
     "gsutil==4.58",
+    "httpx2~=2.13",
     "hypothesis==6.156.1",
     "oauth2client==3.0.0",
     "py==1.11.0",
-    "pytest-asyncio==0.23.8",
+    "pytest-asyncio~=1.4",
     "pytest-cov==4.1.0",
     "pytest-env==1.1.3",
     "pytest-flakefinder==1.1.0",
     "pytest-timeout==2.3.1",
     "pytest-xdist==3.6.1",
-    "pytest==8.1.2",
+    "pytest~=8.1",
     "rangehttpserver==1.4.0",
     "yappi==1.7.6",
 ]
@@ -204,6 +206,8 @@ colibri = "tinybird.colibri.cli:cli"
 members = [
     "chbackups",
     "data_connector",
+    "gatherer",
+    "tinybird_orchestrator",
 ]
 
 [tool.setuptools]

{tinybird-4.6.22.dev0 → tinybird-4.6.24.dev0}/tinybird/client.py

@@ -47,14 +47,6 @@ class TimeoutException(Exception):
     pass
 
 
-class ReachRetryLimit(Exception):
-    pass
-
-
-class ConnectorNothingToLoad(Exception):
-    pass
-
-
 class JobException(Exception):
     pass
 

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

@@ -1,5 +1,4 @@
 import ast
-import builtins
 import linecache
 import logging
 import re
@@ -1336,8 +1335,10 @@ sqlescape_for_string_expression = sqlescape_generator(
 )
 
 
-def escape_single_quote_str(s):
-    return "'" + s.replace("'", "''") + "'"
+def escape_single_quote_str(s: str) -> str:
+    # ClickHouse string literals treat backslash as an escape char, so it must be doubled too:
+    # otherwise a trailing backslash escapes the closing quote and the following input becomes SQL
+    return "'" + s.replace("\\", "\\\\").replace("'", "''") + "'"
 
 
 def expression_wrapper(x, name, escape_arrays: bool = False):
@@ -1385,16 +1386,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))}
+# Built from the builtins templates can actually resolve: names missing from SAFE_BUILTINS (`type`, `dir`,
+# `property`, `object`, ...) can only be template parameters, so they must be discovered as such to get a
+# value (None or a test-mode placeholder) instead of raising NameError.
+reserved_vars = {"_tt_tmp", "_tt_append", "isinstance", "str", "error", "custom_error", *SAFE_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' as a template parameter name despite being a builtin - https://gitlab.com/tinybird/analytics/-/issues/19119
 reserved_vars.discard("id")
 error_vars = ["error", "custom_error"]
 
@@ -1471,8 +1472,7 @@ 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
+    # Default it here, not in _namespace, so it stays visible to variable extraction.
     namespace.update({"id": None})
     namespace.update(kwargs)
     namespace.update(
@@ -1822,7 +1822,7 @@ def get_var_names(t: Template):
     >>> [v['name'] for v in get_var_names(Template("{% for name in secret_names %}{{tb_secret(name)}}{% end %}"))]
     ['secret_names', 'name', 'tb_secret', 'name']
 
-    Type casting with date function in elif chain (type is in reserved_vars):
+    Type casting with date function in elif chain:
     >>> t = Template("{% if kind == 'int' %}{{Int32(val, 0)}}{% elif kind == 'date' %}{{DateTime(val)}}{% elif kind == 'diff' %}{{date_diff_in_days(val, now)}}{% end %}")
     >>> [v['name'] for v in get_var_names(t)]
     ['kind', 'Int32', 'val', 'kind', 'DateTime', 'val', 'kind', 'date_diff_in_days', 'val', 'now']
@@ -2374,7 +2374,24 @@ def wrap_vars(t, escape_arrays: bool = False):
     return var
 
 
-def get_used_tables_in_template(sql):
+def _constant_table_name(node: ast.expr) -> Optional[str]:
+    """Value of a constant table() argument: a literal or a concatenation of string literals."""
+    if isinstance(node, ast.Constant) and isinstance(node.value, (int, float)):
+        return str(node.value)
+    return _string_literal(node)
+
+
+def _string_literal(node: ast.expr) -> Optional[str]:
+    if isinstance(node, ast.Constant) and isinstance(node.value, str):
+        return node.value
+    if isinstance(node, ast.BinOp) and isinstance(node.op, ast.Add):
+        left, right = _string_literal(node.left), _string_literal(node.right)
+        if left is not None and right is not None:
+            return left + right
+    return None
+
+
+def get_used_tables_in_template(sql: str) -> List[str]:
     """
     >>> get_used_tables_in_template("select * from {{table('test')}}")
     ['test']
@@ -2388,30 +2405,42 @@ def get_used_tables_in_template(sql):
     []
     >>> get_used_tables_in_template("select * from {{table('my.test')}}, {{table('another.one')}}")
     ['my.test', 'another.one']
+
+    Only constant table names can be known without rendering, so anything else is skipped
+    >>> get_used_tables_in_template("select * from {{table(tbl)}}, {{TABLE('b')}}, {{table('my.' + 'c')}}")
+    ['b', 'my.c']
     """
+    return list(_get_used_tables_in_template_cached(sql))
+
+
+# Building the Template dominates the cost and the result only depends on the SQL, which deployments and
+# /v0/sql pipelines scan repeatedly
+@lru_cache(maxsize=2**10)
+def _get_used_tables_in_template_cached(sql: str) -> Tuple[str, ...]:
     try:
         t = Template(sql)
 
         def _n(chunks, tables):
             for x in chunks:
                 if type(x).__name__ == "_Expression":
-                    c = compile(x.expression, "<string>", "exec", dont_inherit=True)
-                    v = [x.lower() for x in c.co_names if x not in _namespace and x not in reserved_vars]
-                    if "table" in v:
-
-                        def _t(*args, **kwargs):
-                            return str(args[0])
-
-                        n = {"table": _t, "TABLE": _t}
-                        e = "_tt_tmp = %s" % x.expression
-                        exec_in(e, n)
-                        tables += [n["_tt_tmp"]]
+                    # Read the names from the AST instead of executing the expression: this runs outside
+                    # generate(), without the restricted builtins, on every pipe, query and deployment.
+                    for node in ast.walk(ast.parse(x.expression)):
+                        if (
+                            isinstance(node, ast.Call)
+                            and isinstance(node.func, ast.Name)
+                            and node.func.id in ("table", "TABLE")
+                            and node.args
+                        ):
+                            name = _constant_table_name(node.args[0])
+                            if name is not None:
+                                tables.append(name)
                 elif type(x).__name__ == "_ControlBlock":
                     _n(x.body.chunks, tables)
 
-        tables = []
+        tables: List[str] = []
         _n(t.file.body.chunks, tables)
-        return tables
+        return tuple(tables)
     except SecurityException as e:
         raise SQLTemplateException(e)
 

{tinybird-4.6.22.dev0 → tinybird-4.6.24.dev0}/tinybird/sql_template_fmt.py

@@ -214,8 +214,8 @@ class TinybirdDialect(ClickHouse):
             ],
         }
 
-        for section in override_rules:
-            for rule in override_rules[section]:
+        for section, rules in override_rules.items():
+            for rule in rules:
                 for rr in self.RULES[section]:
                     if rr.name == rule.name:
                         self.RULES[section].remove(rr)

{tinybird-4.6.22.dev0 → tinybird-4.6.24.dev0}/tinybird/syncasync.py

@@ -260,49 +260,6 @@ def _iscoroutinefunction_or_partial(func: Any) -> bool:
     return asyncio.iscoroutinefunction(func)
 
 
-class ThreadSensitiveContext:
-    """Async context manager to manage context for thread sensitive mode
-    This context manager controls which thread pool executor is used when in
-    thread sensitive mode. By default, a single thread pool executor is shared
-    within a process.
-    In Python 3.7+, the ThreadSensitiveContext() context manager may be used to
-    specify a thread pool per context.
-    In Python 3.6, usage of this context manager has no effect.
-    This context manager is re-entrant, so only the outer-most call to
-    ThreadSensitiveContext will set the context.
-    """
-
-    def __init__(self):
-        self.token = None
-
-    if contextvars:
-
-        async def __aenter__(self):
-            try:
-                SyncToAsync.thread_sensitive_context.get()
-            except LookupError:
-                self.token = SyncToAsync.thread_sensitive_context.set(self)
-
-            return self
-
-        async def __aexit__(self, exc, value, tb):
-            if not self.token:
-                return
-
-            executor = SyncToAsync.context_to_thread_executor.pop(self, None)
-            if executor:
-                executor.shutdown()
-            SyncToAsync.thread_sensitive_context.reset(self.token)
-
-    else:
-
-        async def __aenter__(self):
-            return self
-
-        async def __aexit__(self, exc, value, tb):
-            pass
-
-
 class AsyncToSync:
     """
     Utility class which turns an awaitable that only works on the thread with

{tinybird-4.6.22.dev0 → tinybird-4.6.24.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.24.dev0'
+__revision__ = '5269fe22'

{tinybird-4.6.22.dev0 → tinybird-4.6.24.dev0}/tinybird/tb/client.py

@@ -58,14 +58,6 @@ class TimeoutException(Exception):
     pass
 
 
-class ReachRetryLimit(Exception):
-    pass
-
-
-class ConnectorNothingToLoad(Exception):
-    pass
-
-
 class JobException(Exception):
     pass
 

{tinybird-4.6.22.dev0 → tinybird-4.6.24.dev0}/tinybird/tb/modules/common.py

@@ -1277,11 +1277,11 @@ class ConnectionReplacements:
         """Maps prompt parameters to API parameters."""
 
         api_params = {}
-        for key in params.keys():
+        for key, value in params.items():
             try:
-                api_params[ConnectionReplacements._PARAMS_REPLACEMENTS[service][key]] = params[key]
+                api_params[ConnectionReplacements._PARAMS_REPLACEMENTS[service][key]] = value
             except KeyError:
-                api_params[key] = params[key]
+                api_params[key] = value
 
         api_params["service"] = service
         return api_params

{tinybird-4.6.22.dev0 → tinybird-4.6.24.dev0}/tinybird/tb/modules/create.py

@@ -215,14 +215,12 @@ def create_project_structure(folder: str):
         "connections       →": "Connect to and ingest data from popular sources: Kafka, S3 or GCS.",
     }
 
-    for x in PROJECT_PATHS_DESCRIPTIONS.keys():
+    for x, description in PROJECT_PATHS_DESCRIPTIONS.items():
         try:
             path = x.split("→")[0].strip()
             f = folder_path / path
             f.mkdir()
-            click.echo(
-                FeedbackManager.info(message=f"./{x} ") + FeedbackManager.gray(message=PROJECT_PATHS_DESCRIPTIONS[x])
-            )
+            click.echo(FeedbackManager.info(message=f"./{x} ") + FeedbackManager.gray(message=description))
         except FileExistsError:
             pass
 

{tinybird-4.6.22.dev0 → tinybird-4.6.24.dev0}/tinybird/tb/modules/datafile/pull.py

@@ -1,8 +1,11 @@
+from datetime import datetime
 from pathlib import Path
 from typing import Any, Optional
 
 import click
 
+from tinybird.datafile.common import PipeNodeTypes
+from tinybird.datafile.parse_pipe import parse_pipe
 from tinybird.tb.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.datafile.format_datasource import format_datasource
 from tinybird.tb.modules.datafile.format_pipe import format_pipe
@@ -10,6 +13,52 @@ from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 PULL_EXISTING_FILE_MAX_DEPTH = 5
 
+DEMOTABLE_NODE_TYPES = {
+    PipeNodeTypes.DATA_SINK: ("sink_pipes", "Sink"),
+    PipeNodeTypes.COPY: ("copy_pipes", "Copy"),
+}
+
+
+def _parse_created_at(value: Any) -> datetime:
+    try:
+        return datetime.fromisoformat(str(value))
+    except ValueError:
+        return datetime.min
+
+
+def pipes_over_node_type_limit(pipes: list[dict[str, Any]], node_type: str, limit: Optional[int]) -> set[str]:
+    if limit is None:
+        return set()
+
+    matching_pipes = [p for p in pipes if p.get("type") == node_type]
+    if len(matching_pipes) <= limit:
+        return set()
+
+    matching_pipes.sort(key=lambda p: _parse_created_at(p.get("created_at")))
+    return {p["name"] for p in matching_pipes[limit:]}
+
+
+def pipes_over_plan_limits(pipes: list[dict[str, Any]], limits: dict[str, Any]) -> dict[str, str]:
+    demoted: dict[str, str] = {}
+    for node_type, (limits_key, _label) in DEMOTABLE_NODE_TYPES.items():
+        limit = limits.get(limits_key, {}).get("max")
+        for name in pipes_over_node_type_limit(pipes, node_type, limit):
+            demoted[name] = node_type
+    return demoted
+
+
+def demote_pipe_content(name: str, content: str, node_type: str) -> str:
+    datafile = parse_pipe(name, content=content, replace_includes=False).datafile
+    demoted = False
+    for node in datafile.nodes:
+        if (node.get("type") or "").lower() == node_type:
+            node.pop("type", None)
+            demoted = True
+
+    if not demoted:
+        return content
+    return format_pipe(name, datafile=datafile)
+
 
 def folder_pull(
     client: TinyB,
@@ -61,6 +110,7 @@ def folder_pull(
         get_resource_function: str,
         progress_bar: bool = False,
         fmt: bool = False,
+        demoted_pipe_types: Optional[dict[str, str]] = None,
     ) -> list[Path]:
         def write_resource(k: dict[str, Any]) -> Optional[Path]:
             name = f"{k['name']}.{extension}"
@@ -73,8 +123,19 @@ def folder_pull(
                 else:
                     resource = getattr(client, get_resource_function)(k["name"])
                 resource_to_write = resource
-
-                if fmt:
+                resource_type = k.get("type")
+
+                demoted_node_type = demoted_pipe_types.get(k["name"]) if demoted_pipe_types else None
+                if demoted_node_type:
+                    resource_to_write = demote_pipe_content(name, resource, demoted_node_type)
+                    resource_type = None
+                    label = DEMOTABLE_NODE_TYPES[demoted_node_type][1]
+                    warnings.append(
+                        f"{label} pipe '{k['name']}' exceeds the {demoted_node_type} pipe limit of your current "
+                        f"plan and was pulled as a plain pipe without its {demoted_node_type} configuration. "
+                        "Upgrade your plan and reconfigure it to restore it."
+                    )
+                elif fmt:
                     if extension == "datasource":
                         resource_to_write = format_datasource(name, content=resource)
                     elif extension == "pipe":
@@ -85,7 +146,7 @@ def folder_pull(
                     dest_folder = Path(folder) / "vendor" / k["name"].split(".", 1)[0]
                     name = f"{k['name'].split('.', 1)[1]}.{extension}"
 
-                file_folder = get_file_folder(extension, k.get("type"))
+                file_folder = get_file_folder(extension, resource_type)
                 f = Path(dest_folder) / file_folder if file_folder is not None else Path(dest_folder)
 
                 existing_file = find_existing_resource_file(Path(dest_folder), name)
@@ -128,6 +189,14 @@ def folder_pull(
         pipes = client.pipes()
         connections = client.connections()
 
+        demoted_pipe_types: dict[str, str] = {}
+        if not only_vendored:
+            try:
+                limits = client.workspace_info().get("limits", {})
+            except Exception:
+                limits = {}
+            demoted_pipe_types = pipes_over_plan_limits(pipes, limits)
+
         if only_vendored:
             written_files = write_files(
                 resources=[ds for ds in datasources if "shared_from" in ds],
@@ -154,6 +223,7 @@ def folder_pull(
                     get_resource_function="pipe_file",
                     progress_bar=progress_bar,
                     fmt=fmt,
+                    demoted_pipe_types=demoted_pipe_types,
                 )
             )
             written_files.extend(

{tinybird-4.6.22.dev0 → tinybird-4.6.24.dev0}/tinybird/tb/modules/datasource.py

@@ -677,7 +677,7 @@ def datasource_start(ctx: Context, datasource_name: str) -> None:
 
 @datasource.command(name="delete")
 @click.argument("datasource_name")
-@click.option("--sql-condition", default=None, help="SQL WHERE condition to remove rows", hidden=True, required=True)
+@click.option("--sql-condition", help="SQL WHERE condition to remove rows", hidden=True, required=True)
 @click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
 @click.option(
     "--wait/--no-wait",

{tinybird-4.6.22.dev0 → tinybird-4.6.24.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.24.dev0}/tinybird/tb/modules/exceptions.py

@@ -92,20 +92,6 @@ class CLITokenException(CLIException):
         super().__init__(message, "token_error", **kw_telemetry_event_data)
 
 
-class CLIBuildException(CLIException):
-    """Exceptions generated by the build commands"""
-
-    def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
-        super().__init__(message, "build_error", **kw_telemetry_event_data)
-
-
-class CLIDeploymentException(CLIException):
-    """Exceptions generated by the deployment commands"""
-
-    def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
-        super().__init__(message, "deployment_error", **kw_telemetry_event_data)
-
-
 class CLITestException(CLIException):
     """Exceptions generated by the test commands"""
 
@@ -127,13 +113,6 @@ class CLIMockException(CLIException):
         super().__init__(message, "mock_error", **kw_telemetry_event_data)
 
 
-class CLIAgentException(CLIException):
-    """Exceptions generated by the agent commands"""
-
-    def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
-        super().__init__(message, "agent_error", **kw_telemetry_event_data)
-
-
 class CLILoginException(CLIException):
     """Exceptions generated by the login commands"""