tinybird 0.0.1.dev164__py3-none-any.whl → 0.0.1.dev166__py3-none-any.whl

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.dev164'
-__revision__ = 'f0254a2'
+__version__ = '0.0.1.dev166'
+__revision__ = 'dfe3726'

tinybird/tb/modules/common.py

@@ -303,7 +303,7 @@ line experience. To opt-out, set TB_CLI_TELEMETRY_OPTOUT to '1' or 'true'."""
             return rv
 
         # Get all available commands
-        commands: List[str] = self.list_commands(ctx)
+        commands: List[str] = list_commands(self, ctx)
 
         # Find closest matching command using thefuzz
         matches = process.extract(cmd_name, commands, limit=1)
@@ -358,6 +358,11 @@ line experience. To opt-out, set TB_CLI_TELEMETRY_OPTOUT to '1' or 'true'."""
         return None
 
 
+def list_commands(self, ctx: Context):
+    all_commands = self.list_commands(ctx)
+    return [cmd for cmd in all_commands if not self.get_command(ctx, cmd).hidden]
+
+
 def load_connector_config(ctx: Context, connector_name: str, debug: bool, check_uninstalled: bool = False):
     config_file = Path(getcwd()) / f".tinyb_{connector_name}"
     try:

tinybird/tb/modules/deployment.py

@@ -576,7 +576,10 @@ def create_deployment(
             sys.exit(0)
         elif status == "failed":
             click.echo(FeedbackManager.error(message="Deployment failed"))
-            sys_exit("deployment_error", "Deployment failed" + str(deployment.get("errors")))
+            sys_exit(
+                "deployment_error",
+                f"Deployment failed. Errors: {str(deployment.get('errors') + deployment.get('feedback'))}",
+            )
         else:
             click.echo(FeedbackManager.error(message=f"Unknown deployment result {status}"))
     except Exception as e:
@@ -606,11 +609,18 @@ def create_deployment(
                 if auto:
                     click.echo(FeedbackManager.error(message="Rolling back deployment"))
                     discard_deployment(client.host, HEADERS, wait=wait)
-                sys_exit("deployment_error", "Deployment failed: " + str(deployment.get("errors")))
+                sys_exit(
+                    "deployment_error",
+                    f"Deployment failed. Errors: {str(deployment.get('errors') + deployment.get('feedback'))}",
+                )
 
             if deployment.get("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")
+
             time.sleep(5)
 
         click.echo(FeedbackManager.info(message="✓ Deployment is ready"))

tinybird/tb/modules/local_common.py

@@ -1,12 +1,19 @@
 import hashlib
+import json
 import logging
 import os
 import re
 import subprocess
-from typing import Any, Dict
+import time
+from typing import Any, Dict, Optional
 
+import boto3
+import click
 import requests
 
+import docker
+from docker.client import DockerClient
+from docker.models.containers import Container
 from tinybird.tb.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLILocalException
@@ -118,6 +125,249 @@ def get_local_tokens() -> Dict[str, str]:
             )
         except Exception:
             pass
+        is_ci = (
+            os.getenv("GITHUB_ACTIONS")
+            or os.getenv("TRAVIS")
+            or os.getenv("CIRCLECI")
+            or os.getenv("GITLAB_CI")
+            or os.getenv("CI")
+            or os.getenv("TB_CI")
+        )
+        if not is_ci:
+            yes = click.confirm(
+                FeedbackManager.warning(message="Tinybird local is not running. Do you want to start it? [Y/n]"),
+                prompt_suffix="",
+                show_default=False,
+                default=True,
+            )
+            if yes:
+                click.echo(FeedbackManager.highlight(message="» Starting Tinybird Local..."))
+                docker_client = get_docker_client()
+                start_tinybird_local(docker_client, False)
+                click.echo(FeedbackManager.success(message="✓ Tinybird Local is ready!"))
+                return get_local_tokens()
         raise CLILocalException(
             FeedbackManager.error(message="Tinybird local is not running. Please run `tb local start` first.")
         )
+
+
+def start_tinybird_local(
+    docker_client: DockerClient,
+    use_aws_creds: bool,
+) -> None:
+    """Start the Tinybird container."""
+    pull_show_prompt = False
+    pull_required = False
+    try:
+        local_image = docker_client.images.get(TB_IMAGE_NAME)
+        local_image_id = local_image.attrs["RepoDigests"][0].split("@")[1]
+        remote_image = docker_client.images.get_registry_data(TB_IMAGE_NAME)
+        pull_show_prompt = local_image_id != remote_image.id
+    except Exception:
+        pull_show_prompt = False
+        pull_required = True
+
+    if pull_show_prompt and click.confirm(
+        FeedbackManager.warning(message="△ New version detected, download? [y/N]:"),
+        show_default=False,
+        prompt_suffix="",
+    ):
+        click.echo(FeedbackManager.info(message="* Downloading latest version of Tinybird Local..."))
+        pull_required = True
+
+    if pull_required:
+        docker_client.images.pull(TB_IMAGE_NAME, platform="linux/amd64")
+
+    environment = get_use_aws_creds() if use_aws_creds else {}
+
+    container = get_existing_container_with_matching_env(docker_client, TB_CONTAINER_NAME, environment)
+
+    if container and not pull_required:
+        # Container `start` is idempotent. It's safe to call it even if the container is already running.
+        container.start()
+    else:
+        if container:
+            container.remove(force=True)
+
+        container = docker_client.containers.run(
+            TB_IMAGE_NAME,
+            name=TB_CONTAINER_NAME,
+            detach=True,
+            ports={"7181/tcp": TB_LOCAL_PORT},
+            remove=False,
+            platform="linux/amd64",
+            environment=environment,
+        )
+
+    click.echo(FeedbackManager.info(message="* Waiting for Tinybird Local to be ready..."))
+    while True:
+        container.reload()  # Refresh container attributes
+        health = container.attrs.get("State", {}).get("Health", {}).get("Status")
+        if health == "healthy":
+            break
+        if health == "unhealthy":
+            raise CLILocalException(
+                FeedbackManager.error(
+                    message="Tinybird Local is unhealthy. Try running `tb local restart` in a few seconds."
+                )
+            )
+
+        time.sleep(5)
+
+    # Remove tinybird-local dangling images to avoid running out of disk space
+    images = docker_client.images.list(name=re.sub(r":.*$", "", TB_IMAGE_NAME), all=True, filters={"dangling": True})
+    for image in images:
+        image.remove(force=True)
+
+
+def get_existing_container_with_matching_env(
+    docker_client: DockerClient, container_name: str, required_env: dict[str, str]
+) -> Optional[Container]:
+    """
+    Checks if a container with the given name exists and has matching environment variables.
+    If it exists but environment doesn't match, it returns None.
+
+    Args:
+        docker_client: The Docker client instance
+        container_name: The name of the container to check
+        required_env: Dictionary of environment variables that must be present
+
+    Returns:
+        The container if it exists with matching environment, None otherwise
+    """
+    container = None
+    containers = docker_client.containers.list(all=True, filters={"name": container_name})
+    if containers:
+        container = containers[0]
+
+    if container and required_env:
+        container_info = container.attrs
+        container_env = container_info.get("Config", {}).get("Env", [])
+        env_missing = False
+        for key, value in required_env.items():
+            env_var = f"{key}={value}"
+            if env_var not in container_env:
+                env_missing = True
+                break
+
+        if env_missing:
+            container.remove(force=True)
+            container = None
+
+    return container
+
+
+def get_docker_client() -> DockerClient:
+    """Check if Docker is installed and running."""
+    try:
+        docker_host = os.getenv("DOCKER_HOST")
+        if not docker_host:
+            # Try to get docker host from docker context
+            try:
+                try:
+                    output = subprocess.check_output(["docker", "context", "inspect"], text=True)
+                except Exception as e:
+                    add_telemetry_event(
+                        "docker_error",
+                        error=f"docker_context_inspect_error: {str(e)}",
+                    )
+                    raise e
+                try:
+                    context = json.loads(output)
+                except Exception as e:
+                    add_telemetry_event(
+                        "docker_error",
+                        error=f"docker_context_inspect_parse_output_error: {str(e)}",
+                        data={
+                            "docker_context_inspect_output": output,
+                        },
+                    )
+                    raise e
+                if context and len(context) > 0:
+                    try:
+                        docker_host = context[0].get("Endpoints", {}).get("docker", {}).get("Host")
+                        if docker_host:
+                            os.environ["DOCKER_HOST"] = docker_host
+                    except Exception as e:
+                        add_telemetry_event(
+                            "docker_error",
+                            error=f"docker_context_parse_host_error: {str(e)}",
+                            data={
+                                "context": json.dumps(context),
+                            },
+                        )
+                        raise e
+            except Exception:
+                pass
+        try:
+            client = docker.from_env()  # type: ignore
+        except Exception as e:
+            add_telemetry_event(
+                "docker_error",
+                error=f"docker_get_client_from_env_error: {str(e)}",
+            )
+            raise e
+        try:
+            client.ping()
+        except Exception as e:
+            client_dict_non_sensitive = {k: v for k, v in client.api.__dict__.items() if "auth" not in k}
+            add_telemetry_event(
+                "docker_error",
+                error=f"docker_ping_error: {str(e)}",
+                data={
+                    "client": repr(client_dict_non_sensitive),
+                },
+            )
+            raise e
+        return client
+    except Exception:
+        raise CLILocalException(
+            FeedbackManager.error(
+                message=(
+                    f"No container runtime is running. Make sure a Docker-compatible runtime is installed and running. "
+                    f"Trying to connect to Docker-compatible runtime at {docker_host}\n\n"
+                    "If you're using a custom location, please provide it using the DOCKER_HOST environment variable."
+                )
+            )
+        )
+
+
+def get_use_aws_creds() -> dict[str, str]:
+    credentials: dict[str, str] = {}
+    try:
+        # Get the boto3 session and credentials
+        session = boto3.Session()
+        creds = session.get_credentials()
+
+        if creds:
+            # Create environment variables for the container based on boto credentials
+            credentials["AWS_ACCESS_KEY_ID"] = creds.access_key
+            credentials["AWS_SECRET_ACCESS_KEY"] = creds.secret_key
+
+            # Add session token if it exists (for temporary credentials)
+            if creds.token:
+                credentials["AWS_SESSION_TOKEN"] = creds.token
+
+            # Add region if available
+            if session.region_name:
+                credentials["AWS_DEFAULT_REGION"] = session.region_name
+
+            click.echo(
+                FeedbackManager.success(
+                    message=f"✓ AWS credentials found and will be passed to Tinybird Local (region: {session.region_name or 'not set'})"
+                )
+            )
+        else:
+            click.echo(
+                FeedbackManager.warning(
+                    message="△ No AWS credentials found. S3 operations will not work in Tinybird Local."
+                )
+            )
+    except Exception as e:
+        click.echo(
+            FeedbackManager.warning(
+                message=f"△ Error retrieving AWS credentials: {str(e)}. S3 operations will not work in Tinybird Local."
+            )
+        )
+
+    return credentials

tinybird/tb/modules/test.py

@@ -13,7 +13,6 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
 import click
-import requests
 import yaml
 from requests import Response
 
@@ -22,11 +21,11 @@ from tinybird.tb.client import TinyB
 from tinybird.tb.modules.build import process as build_project
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.config import CLIConfig
-from tinybird.tb.modules.exceptions import CLILocalException, CLITestException
+from tinybird.tb.modules.exceptions import CLITestException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml, parse_xml
-from tinybird.tb.modules.local_common import TB_LOCAL_ADDRESS, get_test_workspace_name
+from tinybird.tb.modules.local_common import get_local_tokens, get_test_workspace_name
 from tinybird.tb.modules.project import Project
 
 yaml.SafeDumper.org_represent_str = yaml.SafeDumper.represent_str  # type: ignore[attr-defined]
@@ -314,13 +313,7 @@ def get_pipe_path(name_or_filename: str, folder: str) -> Path:
 
 def cleanup_test_workspace(client: TinyB, path: str) -> None:
     user_client = deepcopy(client)
-    try:
-        # ruff: noqa: ASYNC210
-        tokens = requests.get(f"{TB_LOCAL_ADDRESS}/tokens").json()
-    except Exception:
-        raise CLILocalException(
-            FeedbackManager.error(message="Tinybird local is not running. Please run `tb local start` first.")
-        )
+    tokens = get_local_tokens()
     try:
         user_token = tokens["user_token"]
         user_client.token = user_token

{tinybird-0.0.1.dev164.dist-info → tinybird-0.0.1.dev166.dist-info}/METADATA

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

{tinybird-0.0.1.dev164.dist-info → tinybird-0.0.1.dev166.dist-info}/RECORD

@@ -12,7 +12,7 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=BZuPM7MFS7vaEKK5tOMR2bwSAgJudPrJt27uVEwZmTY,40512
-tinybird/tb/__cli__.py,sha256=O-Wk9nI9oyyoOis11BRj4KWouMVh94nGgz6nbEPcnaw,247
+tinybird/tb/__cli__.py,sha256=Bncibdl66_JHCDwjy6-b6gYfCvP97569anD3Ydq_nmo,247
 tinybird/tb/check_pypi.py,sha256=rW4QmDRbtgKdUUwJCnBkVjmTjZSZGN-XgZhx7vMkC0w,1009
 tinybird/tb/cli.py,sha256=u3eGOhX0MHkuT6tiwaZ0_3twqLmqKXDAOxF7yV_Nn9Q,1075
 tinybird/tb/client.py,sha256=CSBl_JRuioPyY0H8Ac96dJ9wQXDXfrvK2lwqlOxKGoY,55715
@@ -20,13 +20,13 @@ tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
 tinybird/tb/modules/build.py,sha256=zakH5812Lop-XHjGmDRdOPeofPtoeyb_2un_T6e50xw,19177
 tinybird/tb/modules/cicd.py,sha256=MnShTTJzKBYeajswF2jg7p7ZzupaeCgSriAN05MeEdg,7330
 tinybird/tb/modules/cli.py,sha256=vADGfvo8lOp9-VIYD_d3KVIlcYfQk0ciJawthn-LFaw,14449
-tinybird/tb/modules/common.py,sha256=_mNLBzC7zkveYXgJ02aMJ9L3LrxsAELx84GwEYdWNa0,82955
+tinybird/tb/modules/common.py,sha256=12SMmfOlEwQZGBUR22KNVNdTXhEMc0BjvDJ7bbqhZf4,83122
 tinybird/tb/modules/config.py,sha256=ziqW_t_mRVvWOd85VoB4vKyvgMkEfpXDf9H4v38p2xc,11422
 tinybird/tb/modules/connection.py,sha256=7oOR7x4PhBcm1ETFFCH2YJ_3oeGXjAbmx1cnZX9_L70,9014
 tinybird/tb/modules/copy.py,sha256=2Mm4FWKehOG7CoOhiF1m9UZJgJn0W1_cMolqju8ONYg,5805
 tinybird/tb/modules/create.py,sha256=OHUvuHuvP0iecPPGI4eVOHOgR20qy7a_Sw7sbJKuG8g,17411
 tinybird/tb/modules/datasource.py,sha256=V314rkpdVxVMjsp5qcSCTqDlmp4Vu--qM07BoWh-aqs,17783
-tinybird/tb/modules/deployment.py,sha256=a6CZrYqAM-t6WxGKjgg16ZvncpZBta5gBq7YEBPBoQc,25811
+tinybird/tb/modules/deployment.py,sha256=BAvZy8ghdIwK_eH8J6eJ0W69U2TPtvRmtIThYc2cvOQ,26255
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
 tinybird/tb/modules/dev_server.py,sha256=57FCKuWpErwYUYgHspYDkLWEm9F4pbvVOtMrFXX1fVU,10129
 tinybird/tb/modules/endpoint.py,sha256=XySDt3pk66vxOZ0egUfz4bY8bEk3BjOXkv-L0OIJ3sc,12083
@@ -38,7 +38,7 @@ tinybird/tb/modules/job.py,sha256=n4dSSBgnA8NqD7srGahf2xRj6wxkmX9Vl0J-QJ_a2w0,29
 tinybird/tb/modules/llm.py,sha256=KfsCYmKeW1VQz0iDZhGKCRkQv_Y3kTHh6JuxvofOguE,1076
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
 tinybird/tb/modules/local.py,sha256=SUaGWH9TLDFFF9uCw4y7UW4NsKgnXG8uxTcxz1dbkCM,14230
-tinybird/tb/modules/local_common.py,sha256=9KP8ZrDhFHxTgXoqTnF348D0uof9JugjC-RIN2d9Mh8,4896
+tinybird/tb/modules/local_common.py,sha256=4GHb7h26iTT02vF_eExsLQM26BGgHF_qTpmDKmxK6nY,14216
 tinybird/tb/modules/login.py,sha256=fmXPSdvJnKPv03chptGuu3_Fm6LhP6kUsUKhrmT8rJc,8269
 tinybird/tb/modules/logout.py,sha256=ULooy1cDBD02-r7voZmhV7udA0ML5tVuflJyShrh56Y,1022
 tinybird/tb/modules/materialization.py,sha256=QJX5kCPhhm6IXBO1JsalVfbQdypCe_eOUDZ_WHJZWS8,5478
@@ -51,7 +51,7 @@ tinybird/tb/modules/secret.py,sha256=WsqzxxLh9W_jkuHL2JofMXdIJy0lT5WEI-7bQSIDgAc
 tinybird/tb/modules/shell.py,sha256=Zd_4Ak_5tKVX-cw6B4ag36xZeEGHeh-jZpAsIXkoMoE,14116
 tinybird/tb/modules/table.py,sha256=4XrtjM-N0zfNtxVkbvLDQQazno1EPXnxTyo7llivfXk,11035
 tinybird/tb/modules/telemetry.py,sha256=X0p5AVkM8BNsK_Rhdcg4p2eIf6OHimHO_VLldBqHQ8o,11386
-tinybird/tb/modules/test.py,sha256=Yopg89cRwOQpgRzsb9nvu2Z-UR2as2vBjVa5PF3uiK0,13420
+tinybird/tb/modules/test.py,sha256=891Br7sgRk88Zqqj4UQHWbdIK7aI7QY2wpAaBscPxRw,13134
 tinybird/tb/modules/token.py,sha256=2fmKwu10_M0pqs6YmJVeILR9ZQB0ejRAET86agASbKM,13488
 tinybird/tb/modules/watch.py,sha256=H1FieLTVGRqmZ0hR0vELbQJ9l0CThrFCgGCta-MPuAY,8883
 tinybird/tb/modules/workspace.py,sha256=-XUvL2PB5GcviJ8m30h-ZDc5kwJcm1wy1dreYa2l4Ck,10658
@@ -80,8 +80,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev164.dist-info/METADATA,sha256=q-lifUgG2-tjwbFQ9LlmGX2CybBzR7PWA7dNZA-x_2c,1607
-tinybird-0.0.1.dev164.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev164.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev164.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev164.dist-info/RECORD,,
+tinybird-0.0.1.dev166.dist-info/METADATA,sha256=BAITivfECM2Is3v12uYS8vUupGPgcXdLunIaqiQ3WEQ,1607
+tinybird-0.0.1.dev166.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev166.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev166.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev166.dist-info/RECORD,,