tinybird 0.0.1.dev212__py3-none-any.whl → 0.0.1.dev213__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.dev212'
-__revision__ = '55498c1'
+__version__ = '0.0.1.dev213'
+__revision__ = '36a1e58'

tinybird/tb/modules/local.py

@@ -1,249 +1,20 @@
-import json
-import os
-import re
 import subprocess
-import time
-from typing import Optional
 
-import boto3
 import click
 import requests
 
-import docker
 from docker.client import DockerClient
-from docker.models.containers import Container
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import coro
-from tinybird.tb.modules.exceptions import CLIException, CLILocalException
+from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.local_common import TB_CONTAINER_NAME, TB_IMAGE_NAME, TB_LOCAL_ADDRESS, TB_LOCAL_PORT
-from tinybird.tb.modules.telemetry import add_telemetry_event
-
-
-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:
-        docker_location_message = ""
-        if docker_host:
-            docker_location_message = f"Trying to connect to Docker-compatible runtime at {docker_host}"
-
-        raise CLILocalException(
-            FeedbackManager.error(
-                message=(
-                    f"No container runtime is running. Make sure a Docker-compatible runtime is installed and running. "
-                    f"{docker_location_message}\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
+from tinybird.tb.modules.local_common import (
+    TB_CONTAINER_NAME,
+    TB_LOCAL_ADDRESS,
+    get_docker_client,
+    get_existing_container_with_matching_env,
+    start_tinybird_local,
+)
 
 
 def stop_tinybird_local(docker_client: DockerClient) -> None:

tinybird/tb/modules/local_common.py

@@ -384,11 +384,15 @@ def get_docker_client() -> DockerClient:
             raise e
         return client
     except Exception:
+        docker_location_message = ""
+        if docker_host:
+            docker_location_message = f"Trying to connect to Docker-compatible runtime at {docker_host}"
+
         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"
+                    f"{docker_location_message}\n\n"
                     "If you're using a custom location, please provide it using the DOCKER_HOST environment variable."
                 )
             )

{tinybird-0.0.1.dev212.dist-info → tinybird-0.0.1.dev213.dist-info}/METADATA

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

{tinybird-0.0.1.dev212.dist-info → tinybird-0.0.1.dev213.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=X4tE9OrfaUy6kO9cqVEzyI9cDcmOF3IAssRRzsTsfEQ,40781
-tinybird/tb/__cli__.py,sha256=vBrFM041EqRzyyRqjgURIks875CemYq2x2CRSJOG_CQ,247
+tinybird/tb/__cli__.py,sha256=_Rr6Wm1SeYKD1LpPgtsU7XL8grX5YitBreg6jpN2MGU,247
 tinybird/tb/check_pypi.py,sha256=i3l2L8IajeB7sreikR7oPlYJki9MtS3c_M4crnmbByc,760
 tinybird/tb/cli.py,sha256=u3eGOhX0MHkuT6tiwaZ0_3twqLmqKXDAOxF7yV_Nn9Q,1075
 tinybird/tb/client.py,sha256=0zUAi9Lclo2JusQKlQnSnSP1XCiCK9I03XtLqmk8e04,56487
@@ -37,8 +37,8 @@ tinybird/tb/modules/infra.py,sha256=fve30Gj3mG9zbquGxS2e4ipcOYOxviWQCpNFfEzJN_Q,
 tinybird/tb/modules/job.py,sha256=AsUCRNzy7HG5oJ4fyk9NpIm5NtNJgBZSy8MtJdXBe5A,3167
 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=9riA3PrCTUXWeDTWMhd14M2-9pFHI6fedpjY4m_lRpU,14359
-tinybird/tb/modules/local_common.py,sha256=msAZDNPPVenNyL9Dqfb0Z5uFC_1O809xdAi7j1iKmJA,17066
+tinybird/tb/modules/local.py,sha256=mLSgMMP3H1MdanVLsFZieeqOANSnctPLey3pJ_L1ZBI,5807
+tinybird/tb/modules/local_common.py,sha256=8CSEVygFi0fIISatYxCStcHizugXCA9WNTLO_zDKmXw,17195
 tinybird/tb/modules/login.py,sha256=qfY17J3FryTPl8A0ucQgxiyJ7jLy81qHdlHXgqohi0c,10170
 tinybird/tb/modules/logout.py,sha256=sniI4JNxpTrVeRCp0oGJuQ3yRerG4hH5uz6oBmjv724,1009
 tinybird/tb/modules/materialization.py,sha256=QJX5kCPhhm6IXBO1JsalVfbQdypCe_eOUDZ_WHJZWS8,5478
@@ -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.dev212.dist-info/METADATA,sha256=MPgP6Z0UEJTibJ_q_hXamGDeTyfSj8SY2Iq4c2hvUAI,1682
-tinybird-0.0.1.dev212.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev212.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev212.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev212.dist-info/RECORD,,
+tinybird-0.0.1.dev213.dist-info/METADATA,sha256=XQKZmS6Dwt6M9bzsn5-JDiKBMA9DunE-kCMu2pAGkYI,1682
+tinybird-0.0.1.dev213.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev213.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev213.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev213.dist-info/RECORD,,