tinybird 0.0.1.dev153__tar.gz → 0.0.1.dev155__tar.gz

{tinybird-0.0.1.dev153 → tinybird-0.0.1.dev155}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev153
+Version: 0.0.1.dev155
 Summary: Tinybird Command Line Tool
-Home-page: https://www.tinybird.co/docs/cli/introduction.html
+Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
 Author-email: support@tinybird.co
 Requires-Python: >=3.9, <3.14

{tinybird-0.0.1.dev153 → tinybird-0.0.1.dev155}/tinybird/tb/__cli__.py

@@ -1,8 +1,8 @@
 
 __name__ = 'tinybird'
 __description__ = 'Tinybird Command Line Tool'
-__url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
+__url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev153'
-__revision__ = '24d7d4a'
+__version__ = '0.0.1.dev155'
+__revision__ = '4d0ff0d'

{tinybird-0.0.1.dev153 → tinybird-0.0.1.dev155}/tinybird/tb/modules/build.py

@@ -184,7 +184,7 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
             build_errors = result.get("errors")
             full_error_msg = ""
             for build_error in build_errors:
-                filename_bit = build_error.get("filename", "")
+                filename_bit = build_error.get("filename", build_error.get("resource", ""))
                 error_bit = build_error.get("error") or build_error.get("message") or ""
                 error_msg = ((filename_bit + "\n") if filename_bit else "") + error_bit
                 full_error_msg += error_msg + "\n\n"

{tinybird-0.0.1.dev153 → tinybird-0.0.1.dev155}/tinybird/tb/modules/local.py

@@ -7,6 +7,7 @@ from typing import Optional
 
 import boto3
 import click
+import requests
 
 import docker
 from docker.client import DockerClient
@@ -15,7 +16,8 @@ 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.feedback_manager import FeedbackManager
-from tinybird.tb.modules.local_common import TB_CONTAINER_NAME, TB_IMAGE_NAME, TB_LOCAL_PORT
+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(
@@ -131,16 +133,70 @@ def get_docker_client() -> DockerClient:
         if not docker_host:
             # Try to get docker host from docker context
             try:
-                output = subprocess.check_output(["docker", "context", "inspect"], text=True)
-                context = json.loads(output)
+                try:
+                    output = subprocess.check_output(["docker", "context", "inspect"], text=True)
+                except Exception as e:
+                    add_telemetry_event(
+                        "docker_error",
+                        data={
+                            "error_kind": "docker_context_inspect_error",
+                            "exception": str(e),
+                        },
+                    )
+                    raise e
+                try:
+                    context = json.loads(output)
+                except Exception as e:
+                    add_telemetry_event(
+                        "docker_error",
+                        data={
+                            "error_kind": "docker_context_inspect_parse_output_error",
+                            "exception": str(e),
+                            "docker_context_inspect_output": output,
+                        },
+                    )
+                    raise e
                 if context and len(context) > 0:
-                    docker_host = context[0].get("Endpoints", {}).get("docker", {}).get("Host")
-                    if docker_host:
-                        os.environ["DOCKER_HOST"] = docker_host
+                    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",
+                            data={
+                                "error_kind": "docker_context_parse_host_error",
+                                "exception": str(e),
+                                "context": json.dumps(context),
+                            },
+                        )
+                        raise e
             except Exception:
                 pass
-        client = docker.from_env()  # type: ignore
-        client.ping()
+        try:
+            client = docker.from_env()  # type: ignore
+        except Exception as e:
+            add_telemetry_event(
+                "docker_error",
+                data={
+                    "error_kind": "docker_get_client_from_env_error",
+                    "exception": 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",
+                data={
+                    "error_kind": "docker_ping_error",
+                    "exception": str(e),
+                    "client": repr(client_dict_non_sensitive),
+                },
+            )
+            raise e
         return client
     except Exception:
         raise CLILocalException(
@@ -342,3 +398,10 @@ async def restart(use_aws_creds: bool) -> None:
     click.echo(FeedbackManager.info(message="✓ Tinybird Local stopped"))
     start_tinybird_local(docker_client, use_aws_creds)
     click.echo(FeedbackManager.success(message="✓ Tinybird Local is ready!"))
+
+
+@local.command()
+def version() -> None:
+    """Show Tinybird Local version"""
+    response = requests.get(f"{TB_LOCAL_ADDRESS}/version")
+    click.echo(FeedbackManager.success(message=f"✓ Tinybird Local version: {response.text}"))

{tinybird-0.0.1.dev153 → tinybird-0.0.1.dev155}/tinybird/tb/modules/local_common.py

@@ -2,6 +2,7 @@ import hashlib
 import logging
 import os
 import re
+import subprocess
 from typing import Any, Dict
 
 import requests
@@ -10,6 +11,7 @@ from tinybird.tb.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLILocalException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.telemetry import add_telemetry_event
 
 TB_IMAGE_NAME = "tinybirdco/tinybird-local:latest"
 TB_CONTAINER_NAME = "tinybird-local"
@@ -37,6 +39,22 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = Fal
         # ruff: noqa: ASYNC210
         tokens = requests.get(f"{TB_LOCAL_ADDRESS}/tokens").json()
     except Exception:
+        try:
+            # Check if tinybird-local is running with docker, in case it's a config issue
+            output = subprocess.check_output(["docker", "ps"], text=True)  # noqa: ASYNC221
+            header_row = next((line for line in output.splitlines() if "CONTAINER ID" in line), "")
+            tb_local_row = next(
+                (line for line in output.splitlines() if TB_CONTAINER_NAME in line),
+                f"{TB_CONTAINER_NAME} not found in output",
+            )
+            add_telemetry_event(
+                "docker_debug",
+                data={
+                    "docker_ps_output": header_row + tb_local_row,
+                },
+            )
+        except Exception:
+            pass
         raise CLILocalException(
             FeedbackManager.error(message="Tinybird local is not running. Please run `tb local start` first.")
         )

{tinybird-0.0.1.dev153 → tinybird-0.0.1.dev155}/tinybird.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev153
+Version: 0.0.1.dev155
 Summary: Tinybird Command Line Tool
-Home-page: https://www.tinybird.co/docs/cli/introduction.html
+Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
 Author-email: support@tinybird.co
 Requires-Python: >=3.9, <3.14