tinybird 0.0.1.dev314__tar.gz → 0.0.1.dev316__tar.gz

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev314
+Version: 0.0.1.dev316
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/datafile/common.py

@@ -2127,6 +2127,9 @@ def parse(
     return ParseResult(datafile=doc, warnings=warnings)
 
 
+# TODO: This class is duplicated in tinybird/datafile_common.py with a slightly different
+# _REPLACEMENTS tuple. The duplication happened during the CLI/server code split (commit
+# f86d02cdd7). Consider extracting shared code into a common module that both files can import.
 class ImportReplacements:
     _REPLACEMENTS: Tuple[Tuple[str, str, Optional[str]], ...] = (
         ("import_strategy", "mode", "replace"),
@@ -2146,7 +2149,7 @@ class ImportReplacements:
         return [x[0] for x in ImportReplacements._REPLACEMENTS]
 
     @staticmethod
-    def get_api_param_for_datafile_param(connector_service: str, key: str) -> Tuple[Optional[str], Optional[str]]:
+    def get_api_param_for_datafile_param(key: str) -> Tuple[Optional[str], Optional[str]]:
         """Returns the API parameter name and default value for a given
         datafile parameter.
         """

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/service_datasources.py

@@ -528,6 +528,30 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "vcpu_time", "type": "Float64"},
             ],
         },
+        {
+            "name": "tinybird.query_validator_log",
+            "description": "Log of failed queries executions in the next available ClickHouse version and their results.",
+            "dateColumn": "run_validation",
+            "engine": {
+                "engine": "MergeTree",
+                "sorting_key": "database, host, run_validation, query_hash",
+                "partition_key": "toYYYYMM(run_validation)",
+            },
+            "columns": [
+                {"name": "host", "type": "LowCardinality(String)"},
+                {"name": "version", "type": "LowCardinality(String)"},
+                {"name": "query_hash", "type": "UInt64"},
+                {"name": "query_last_execution", "type": "DateTime"},
+                {"name": "region", "type": "String"},
+                {"name": "workspace", "type": "String"},
+                {"name": "database", "type": "String"},
+                {"name": "pipe_name", "type": "String"},
+                {"name": "query_id", "type": "String"},
+                {"name": "error_code", "type": "Int16"},
+                {"name": "error", "type": "String"},
+                {"name": "run_validation", "type": "DateTime"},
+            ],
+        },
     ]
 
 

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/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__ = '0.0.1.dev314'
-__revision__ = 'c7acb8a'
+__version__ = '0.0.1.dev316'
+__revision__ = 'aceca33'

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/cli.py

@@ -1,4 +1,5 @@
 import tinybird.tb.modules.agent
+import tinybird.tb.modules.branch
 import tinybird.tb.modules.build
 import tinybird.tb.modules.cli
 import tinybird.tb.modules.common
@@ -9,7 +10,6 @@ import tinybird.tb.modules.datasource
 import tinybird.tb.modules.deployment
 import tinybird.tb.modules.deprecations
 import tinybird.tb.modules.endpoint
-import tinybird.tb.modules.environment
 import tinybird.tb.modules.info
 import tinybird.tb.modules.infra
 import tinybird.tb.modules.job

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/modules/agent/tools/execute_query.py

@@ -148,7 +148,7 @@ def execute_query(
         ctx.deps.thinking_animation.stop()
         click.echo(FeedbackManager.error(message=error))
         ctx.deps.thinking_animation.start()
-        if "not found" in error.lower() and cloud:
+        if "not found" in error.lower() and cloud_or_local == "cloud":
             return f"Error executing query: {error}. Please run the query against Tinybird local instead of cloud."
         else:
             return f"Error executing query: {error}. Please try again."

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/modules/agent/tools/request_endpoint.py

@@ -87,7 +87,7 @@ def request_endpoint(
         click.echo(FeedbackManager.error(message=error))
         ctx.deps.thinking_animation.start()
         not_found_errors = ["not found", "does not exist"]
-        if any(not_found_error in error.lower() for not_found_error in not_found_errors) and cloud:
+        if any(not_found_error in error.lower() for not_found_error in not_found_errors) and cloud_or_local == "cloud":
             return f"Error executing query: {error}. Please run the query against Tinybird local instead of cloud."
         else:
             return f"Error executing query: {error}. Please try again."

tinybird-0.0.1.dev314/tinybird/tb/modules/environment.py → tinybird-0.0.1.dev316/tinybird/tb/modules/branch.py

@@ -23,16 +23,16 @@ from tinybird.tb.modules.exceptions import CLIBranchException, CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
-@cli.group(hidden=True)
-def environment() -> None:
-    """Environment commands. Custom environments is an experimental feature in beta."""
+@cli.group()
+def branch() -> None:
+    """Branch commands. Custom branches is an experimental feature in beta."""
     pass
 
 
-@environment.command(name="ls")
+@branch.command(name="ls")
 @click.option("--sort/--no-sort", default=False, help="Sort the table rows by name")
 def branch_ls(sort: bool) -> None:
-    """List all the environments available in the current workspace"""
+    """List all the branches available in the current workspace"""
 
     config = CLIConfig.get_project_config()
     _ = try_update_config_with_remote(config, only_if_needed=True)
@@ -66,17 +66,17 @@ def branch_ls(sort: bool) -> None:
 
     sorted_table = current_branch + other_branches
 
-    click.echo(FeedbackManager.info(message="\n** Environments:"))
+    click.echo(FeedbackManager.info(message="\n** Branches:"))
     echo_safe_humanfriendly_tables_format_smart_table(sorted_table, column_names=columns)
 
 
-@environment.command(name="create", short_help="Create a new environment in the current Workspace")
-@click.argument("environment_name", required=False)
+@branch.command(name="create", short_help="Create a new branch in the current Workspace")
+@click.argument("branch_name", required=False)
 @click.option(
     "--last-partition",
     is_flag=True,
     default=False,
-    help="Attach the last modified partition from the current workspace to the new environment",
+    help="Attach the last modified partition from the current workspace to the new branch",
 )
 @click.option(
     "-i",
@@ -92,17 +92,15 @@ def branch_ls(sort: bool) -> None:
     default=True,
     help="Wait for data branch jobs to finish, showing a progress bar. Disabled by default.",
 )
-def create_environment(
-    environment_name: Optional[str], last_partition: bool, ignore_datasources: List[str], wait: bool
-) -> None:
-    create_workspace_branch(environment_name, last_partition, False, list(ignore_datasources), wait)
+def create_branch(branch_name: Optional[str], last_partition: bool, ignore_datasources: List[str], wait: bool) -> None:
+    create_workspace_branch(branch_name, last_partition, False, list(ignore_datasources), wait)
 
 
-@environment.command(name="rm", short_help="Removes an environment from the workspace. It can't be recovered.")
+@branch.command(name="rm", short_help="Removes an branch from the workspace. It can't be recovered.")
 @click.argument("branch_name_or_id")
 @click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
-def delete_environment(branch_name_or_id: str, yes: bool) -> None:
-    """Remove an environment"""
+def delete_branch(branch_name_or_id: str, yes: bool) -> None:
+    """Remove an branch"""
 
     config = CLIConfig.get_project_config()
     _ = try_update_config_with_remote(config)

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/modules/build.py

@@ -3,7 +3,7 @@ import time
 from copy import deepcopy
 from functools import partial
 from pathlib import Path
-from typing import Any, Callable, Dict, List
+from typing import Any, Callable, Dict, List, Optional
 from urllib.parse import urlencode
 
 import click
@@ -35,10 +35,10 @@ def build(ctx: click.Context, watch: bool) -> None:
     project: Project = ctx.ensure_object(dict)["project"]
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
     config: Dict[str, Any] = ctx.ensure_object(dict)["config"]
-    is_environment = bool(ctx.ensure_object(dict)["environment"])
+    is_branch = bool(ctx.ensure_object(dict)["branch"])
 
-    # TODO: Explain that you can use custom environments too once they are open for everyone
-    if obj["env"] == "cloud" and not is_environment:
+    # TODO: Explain that you can use custom branches too once they are open for everyone
+    if obj["env"] == "cloud" and not is_branch:
         raise click.ClickException(FeedbackManager.error_build_only_supported_in_local())
 
     if project.has_deeper_level():
@@ -51,7 +51,7 @@ def build(ctx: click.Context, watch: bool) -> None:
         )
 
     click.echo(FeedbackManager.highlight_building_project())
-    process(project=project, tb_client=tb_client, watch=False, config=config, is_environment=is_environment)
+    process(project=project, tb_client=tb_client, watch=False, config=config, is_branch=is_branch)
     if watch:
         run_watch(
             project=project,
@@ -63,7 +63,7 @@ def build(ctx: click.Context, watch: bool) -> None:
                 tb_client=tb_client,
                 watch=True,
                 config=config,
-                is_environment=is_environment,
+                is_branch=is_branch,
             ),
         )
 
@@ -74,13 +74,20 @@ def build(ctx: click.Context, watch: bool) -> None:
 @click.pass_context
 def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
     obj: Dict[str, Any] = ctx.ensure_object(dict)
-    is_environment = bool(ctx.ensure_object(dict)["environment"])
-    # TODO: Explain that you can use custom environments too once they are open for everyone
-    if obj["env"] == "cloud" and not is_environment:
+    branch: Optional[str] = ctx.ensure_object(dict)["branch"]
+    is_branch = bool(branch)
+
+    if obj["env"] == "cloud" and not is_branch:
         raise click.ClickException(FeedbackManager.error_build_only_supported_in_local())
 
     if data_origin == "cloud":
+        click.echo(
+            FeedbackManager.warning(
+                message="--data-origin=cloud is deprecated and will be removed in a future version. Create an branch and use `tb --branch <branch_name> dev`"
+            )
+        )
         return dev_cloud(ctx)
+
     project: Project = ctx.ensure_object(dict)["project"]
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
     config: Dict[str, Any] = ctx.ensure_object(dict)["config"]
@@ -88,7 +95,7 @@ def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
     build_status = BuildStatus()
     if ui:
         server_thread = threading.Thread(
-            target=start_server, args=(project, tb_client, process, build_status), daemon=True
+            target=start_server, args=(project, tb_client, process, build_status, branch), daemon=True
         )
         server_thread.start()
         # Wait for the server to start
@@ -101,25 +108,28 @@ def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
         watch=True,
         config=config,
         build_status=build_status,
-        is_environment=is_environment,
+        is_branch=is_branch,
     )
     run_watch(
         project=project,
         tb_client=tb_client,
         config=config,
+        branch=branch,
         process=partial(
             process,
             project=project,
             tb_client=tb_client,
             build_status=build_status,
             config=config,
-            is_environment=is_environment,
+            is_branch=is_branch,
         ),
     )
 
 
-def run_watch(project: Project, tb_client: TinyB, process: Callable, config: dict[str, Any]) -> None:
-    shell = Shell(project=project, tb_client=tb_client, playground=False)
+def run_watch(
+    project: Project, tb_client: TinyB, process: Callable, config: dict[str, Any], branch: Optional[str] = None
+) -> None:
+    shell = Shell(project=project, tb_client=tb_client, branch=branch)
     click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
     watcher_thread = threading.Thread(
         target=watch_project,

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/modules/build_common.py

@@ -33,16 +33,16 @@ def process(
     exit_on_error: bool = True,
     load_fixtures: bool = True,
     project_with_vendors: Optional[Project] = None,
-    is_environment: bool = False,
+    is_branch: bool = False,
 ) -> Optional[str]:
     time_start = time.time()
 
     # Build vendored workspaces before build
-    if not project_with_vendors and not is_environment:
+    if not project_with_vendors and not is_branch:
         build_vendored_workspaces(project=project, tb_client=tb_client, config=config)
 
     # Ensure SHARED_WITH workspaces exist before build
-    if not is_environment:
+    if not is_branch:
         build_shared_with_workspaces(project=project, tb_client=tb_client, config=config)
 
     build_failed = False

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/modules/cli.py

@@ -76,7 +76,7 @@ VERSION = f"{__cli__.__version__} (rev {__cli__.__revision__})"
 )
 @click.option("--show-tokens", is_flag=True, default=False, help="Enable the output of tokens.")
 @click.option("--cloud/--local", is_flag=True, default=False, help="Run against cloud or local.")
-@click.option("--environment", help="Run against a custom environment.")
+@click.option("--branch", help="Run against a branch.")
 @click.option("--staging", is_flag=True, default=False, help="Run against a staging deployment.")
 @click.option(
     "--output", type=click.Choice(["human", "json", "csv"], case_sensitive=False), default="human", help="Output format"
@@ -104,7 +104,7 @@ def cli(
     version_warning: bool,
     show_tokens: bool,
     cloud: bool,
-    environment: Optional[str],
+    branch: Optional[str],
     staging: bool,
     output: str,
     max_depth: int,
@@ -205,27 +205,27 @@ def cli(
     client = create_ctx_client(
         ctx,
         config,
-        cloud or bool(environment),
+        cloud or bool(branch),
         staging,
         project=project,
         show_warnings=version_warning,
-        environment=environment,
+        branch=branch,
     )
 
     if client:
         ctx.ensure_object(dict)["client"] = client
 
-    ctx.ensure_object(dict)["env"] = get_target_env(cloud, environment)
-    ctx.ensure_object(dict)["environment"] = environment
+    ctx.ensure_object(dict)["env"] = get_target_env(cloud, branch)
+    ctx.ensure_object(dict)["branch"] = branch
     ctx.ensure_object(dict)["output"] = output
 
     is_prompt_mode = prompt is not None
 
     if is_agent_mode or is_prompt_mode:
-        if any(arg in sys.argv for arg in ["--cloud", "--local"]):
+        if any(arg in sys.argv for arg in ["--cloud", "--local", "--branch"]):
             raise CLIException(
                 FeedbackManager.error(
-                    message="Tinybird Code does not support --cloud or --local flags. It will choose the correct environment based on your prompts."
+                    message="Tinybird Code does not support --cloud, --local or --branch flags. It will choose the correct environment based on your prompts."
                 )
             )
 
@@ -501,7 +501,7 @@ def create_ctx_client(
     staging: bool,
     project: Project,
     show_warnings: bool = True,
-    environment: Optional[str] = None,
+    branch: Optional[str] = None,
 ):
     commands_without_ctx_client = [
         "auth",
@@ -515,6 +515,7 @@ def create_ctx_client(
         "tag",
         "push",
         "branch",
+        "environment",
         "diff",
         "fmt",
         "init",
@@ -523,8 +524,8 @@ def create_ctx_client(
     if not command or command in commands_without_ctx_client:
         return None
 
-    commands_always_cloud = ["infra", "environment"]
-    commands_always_local = ["dev", "create"]
+    commands_always_cloud = ["infra", "branch", "environment"]
+    commands_always_local = ["create"]
     command_always_test = ["test"]
 
     if (
@@ -547,7 +548,7 @@ def create_ctx_client(
         if method and show_warnings:
             click.echo(FeedbackManager.gray(message=f"Authentication method: {method}"))
 
-        return _get_tb_client(config.get("token", ""), config["host"], staging=staging, environment=environment)
+        return _get_tb_client(config.get("token", ""), config["host"], staging=staging, branch=branch)
     local = command in commands_always_local
     test = command in command_always_test
     if show_warnings and not local and command not in commands_always_local and command:
@@ -555,8 +556,8 @@ def create_ctx_client(
     return get_tinybird_local_client(config, test=test, staging=staging)
 
 
-def get_target_env(cloud: bool, environment: Optional[str]) -> str:
-    if cloud or bool(environment):
+def get_target_env(cloud: bool, branch: Optional[str]) -> str:
+    if cloud or bool(branch):
         return "cloud"
     return "local"
 

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/modules/common.py

@@ -30,7 +30,6 @@ import requests
 from click import Context
 from click._termui_impl import ProgressBar
 from humanfriendly.tables import format_pretty_table
-from packaging.version import Version
 from thefuzz import process
 
 from tinybird.tb.client import (
@@ -61,7 +60,6 @@ from tinybird.tb.modules.exceptions import (
     CLIAuthException,
     CLIConnectionException,
     CLIException,
-    CLIReleaseException,
     CLIWorkspaceException,
 )
 from tinybird.tb.modules.feedback_manager import FeedbackManager, warning_message
@@ -378,7 +376,7 @@ def getenv_bool(key: str, default: bool) -> bool:
     return v.lower() == "true" or v == "1"
 
 
-def _get_tb_client(token: str, host: str, staging: bool = False, environment: Optional[str] = None) -> TinyB:
+def _get_tb_client(token: str, host: str, staging: bool = False, branch: Optional[str] = None) -> TinyB:
     disable_ssl: bool = getenv_bool("TB_DISABLE_SSL_CHECKS", False)
     cloud_client = TinyB(
         token,
@@ -389,13 +387,13 @@ def _get_tb_client(token: str, host: str, staging: bool = False, environment: Op
         staging=staging,
     )
 
-    if not environment:
+    if not branch:
         return cloud_client
 
     workspaces = cloud_client.user_workspaces_and_branches(version="v1")
-    workspace = next((w for w in workspaces.get("workspaces", []) if w.get("name") == environment), None)
+    workspace = next((w for w in workspaces.get("workspaces", []) if w.get("name") == branch), None)
     if not workspace:
-        raise CLIException(FeedbackManager.error_exception(error=f"Environment {environment} not found"))
+        raise CLIException(FeedbackManager.error_exception(error=f"Branch {branch} not found"))
 
     return TinyB(
         workspace.get("token", ""),
@@ -1603,130 +1601,6 @@ def _get_current_main_workspace_common(
     return current
 
 
-def is_post_semver(new_version: Version, current_version: Version) -> bool:
-    """
-    Check if only the post part of the semantic version has changed.
-
-    Args:
-    new_version (Version): The new version to check.
-    current_version (Version): The current version to compare with.
-
-    Returns:
-    bool: True if only the post part of the version has changed, False otherwise.
-
-    Examples:
-    >>> is_post_semver(Version("0.0.0-2"), Version("0.0.0-1"))
-    True
-    >>> is_post_semver(Version("0.0.0-1"), Version("0.0.0-1"))
-    False
-    >>> is_post_semver(Version("0.0.1-1"), Version("0.0.0-1"))
-    False
-    >>> is_post_semver(Version("0.1.0-1"), Version("0.0.0-1"))
-    False
-    >>> is_post_semver(Version("1.0.0-1"), Version("0.0.0-1"))
-    False
-    >>> is_post_semver(Version("0.0.1-1"), Version("0.0.0"))
-    False
-    """
-    if (
-        new_version.major == current_version.major
-        and new_version.minor == current_version.minor
-        and new_version.micro == current_version.micro
-    ):
-        return new_version.post is not None and new_version.post != current_version.post
-
-    return False
-
-
-def is_major_semver(new_version: Version, current_version: Version) -> bool:
-    """
-    Check if only the major part of the semantic version has changed.
-
-    Args:
-    new_version (Version): The new version to check.
-    current_version (Version): The current version to compare with.
-
-    Returns:
-    bool: True if only the major part of the version has changed, False otherwise.
-
-    Examples:
-    >>> is_major_semver(Version("1.0.0"), Version("0.0.0"))
-    True
-    >>> is_major_semver(Version("0.0.0"), Version("0.0.0"))
-    False
-    >>> is_major_semver(Version("1.0.1"), Version("1.0.0"))
-    False
-    >>> is_major_semver(Version("2.0.0-1"), Version("1.0.1-2"))
-    True
-    """
-
-    return new_version.major != current_version.major
-
-
-def print_release_summary(config: CLIConfig, semver: Optional[str], info: bool = False, dry_run=False):
-    if not semver:
-        click.echo(FeedbackManager.info_release_no_rollback())
-        return
-    try:
-        client = config.get_client()
-        response = client.release_rm(config["id"], semver, confirmation=config["name"], dry_run=True)
-    except Exception as e:
-        raise CLIReleaseException(FeedbackManager.error_exception(error=str(e)))
-    else:
-        columns = ["name", "id", "notes"]
-        if not response:
-            click.echo(FeedbackManager.info_release_no_rollback())
-            return
-
-        if len(response["datasources"]) or len(response["pipes"]):
-            semver = response.get("semver", semver)
-            if info:
-                if dry_run:
-                    click.echo(FeedbackManager.info_release_rm_resources_dry_run(semver=semver))
-                else:
-                    click.echo(FeedbackManager.info_release_rm_resources())
-            else:
-                click.echo(FeedbackManager.info_release_rollback(semver=semver))
-
-        if len(response["datasources"]):
-            click.echo("\nDatasources:")
-            rows = [
-                [ds, response["datasources"][ds], response["notes"].get(response["datasources"][ds], "")]
-                for ds in response["datasources"]
-            ]
-            echo_safe_humanfriendly_tables_format_smart_table(rows, column_names=columns)
-
-        if len(response["pipes"]):
-            click.echo("\nPipes:")
-            rows = [
-                [pipe, response["pipes"][pipe], response["notes"].get(response["pipes"][pipe], "")]
-                for pipe in response["pipes"]
-            ]
-            echo_safe_humanfriendly_tables_format_smart_table(rows, column_names=columns)
-
-
-def get_oldest_rollback(config: CLIConfig, client: TinyB) -> Optional[str]:
-    oldest_rollback_response = client.release_oldest_rollback(config["id"])
-    return oldest_rollback_response.get("semver") if oldest_rollback_response else None
-
-
-def remove_release(
-    dry_run: bool, config: CLIConfig, semver: Optional[str], client: TinyB, force: bool, show_print=True
-):
-    if semver == OLDEST_ROLLBACK:
-        semver = get_oldest_rollback(config, client)
-    if show_print:
-        print_release_summary(config, semver, info=True, dry_run=True)
-    if not dry_run:
-        if semver:
-            response = client.release_rm(
-                config["id"], semver, confirmation=config["name"], dry_run=dry_run, force=force
-            )
-            click.echo(FeedbackManager.success_release_delete(semver=response.get("semver")))
-        else:
-            click.echo(FeedbackManager.info_no_release_deleted())
-
-
 def run_aws_iamrole_connection_flow(
     client: TinyB,
     service: str,

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/modules/datafile/build.py

@@ -1048,7 +1048,7 @@ def process_file(
             #
             # Note: any unknown import_ parameter is leaved as is.
             for key in ImportReplacements.get_datafile_parameter_keys():
-                replacement, default_value = ImportReplacements.get_api_param_for_datafile_param(service, key)
+                replacement, default_value = ImportReplacements.get_api_param_for_datafile_param(key)
                 if not replacement:
                     continue  # We should not reach this never, but just in case...
 

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/modules/datafile/playground.py

@@ -1200,7 +1200,7 @@ def process_file(
             #
             # Note: any unknown import_ parameter is leaved as is.
             for key in ImportReplacements.get_datafile_parameter_keys():
-                replacement, default_value = ImportReplacements.get_api_param_for_datafile_param(service, key)
+                replacement, default_value = ImportReplacements.get_api_param_for_datafile_param(key)
                 if not replacement:
                     continue  # We should not reach this never, but just in case...
 

{tinybird-0.0.1.dev314 → tinybird-0.0.1.dev316}/tinybird/tb/modules/deployment_common.py

@@ -338,10 +338,13 @@ def create_deployment(
                 sys_exit("deployment_error", "Error parsing deployment from response")
                 return
 
-            if deployment.get("status") == "failed":
+            status = deployment.get("status")
+            errors = deployment.get("errors")
+            feedback = deployment.get("feedback")
+
+            if status == "failed":
                 click.echo(FeedbackManager.error(message="Deployment failed"))
-                deploy_errors = deployment.get("errors")
-                for deploy_error in deploy_errors:
+                for deploy_error in errors:
                     click.echo(FeedbackManager.error(message=f"* {deploy_error}"))
 
                 if auto:
@@ -349,15 +352,26 @@ def create_deployment(
                     discard_deployment(client.host, HEADERS, wait=wait)
                 sys_exit(
                     "deployment_error",
-                    f"Deployment failed. Errors: {str(deployment.get('errors') + deployment.get('feedback', []))}",
+                    f"Deployment failed. Errors: {str(errors + (feedback or []))}",
                 )
 
-            if deployment.get("status") == "data_ready":
+            if status == "data_ready":
                 break
 
-            if deployment.get("status") in ["deleting", "deleted"]:
-                click.echo(FeedbackManager.error(message="Deployment was deleted by another process"))
-                sys_exit("deployment_error", "Deployment was deleted by another process")
+            if status in ["deleting", "deleted"]:
+                errors = deployment.get("errors")
+                if errors:
+                    verb = "is being" if status == "deleting" else "was"
+                    click.echo(
+                        FeedbackManager.error(
+                            message=f"Deployment failed and {verb} deleted automatically. Deployment errors:"
+                        )
+                    )
+                    for error in errors:
+                        click.echo(FeedbackManager.error(message=f"* {error}"))
+                sys_exit(
+                    "deployment_error", f"Deployment deleted after failure. Errors: {str(errors + (feedback or []))}"
+                )
 
             time.sleep(5)