tinybird 0.0.1.dev310__tar.gz → 0.0.1.dev312__tar.gz

{tinybird-0.0.1.dev310 → tinybird-0.0.1.dev312}/PKG-INFO

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

{tinybird-0.0.1.dev310 → tinybird-0.0.1.dev312}/tinybird/service_datasources.py

@@ -516,14 +516,14 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
         {
             "name": "tinybird.vcpu_time",
             "description": "vCPU time metrics from your workspace.",
-            "dateColumn": "minute_slot",
+            "dateColumn": "second_slot",
             "engine": {
                 "engine": "AggregatingMergeTree",
-                "sorting_key": "organization_id, minute_slot",
-                "partition_key": "toStartOfDay(minute_slot)",
+                "sorting_key": "organization_id, second_slot",
+                "partition_key": "toStartOfDay(second_slot)",
             },
             "columns": [
-                {"name": "minute_slot", "type": "DateTime"},
+                {"name": "second_slot", "type": "DateTime"},
                 {"name": "organization_id", "type": "String"},
                 {"name": "vcpu_time", "type": "Float64"},
             ],
@@ -1042,14 +1042,14 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
         {
             "name": "organization.vcpu_time",
             "description": "vCPU time metrics from your workspace.",
-            "dateColumn": "minute_slot",
+            "dateColumn": "second_slot",
             "engine": {
                 "engine": "AggregatingMergeTree",
-                "sorting_key": "organization_id, minute_slot",
-                "partition_key": "toStartOfDay(minute_slot)",
+                "sorting_key": "organization_id, second_slot",
+                "partition_key": "toStartOfDay(second_slot)",
             },
             "columns": [
-                {"name": "minute_slot", "type": "DateTime"},
+                {"name": "second_slot", "type": "DateTime"},
                 {"name": "organization_id", "type": "String"},
                 {"name": "workspace_id", "type": "String"},
                 {"name": "vcpu_time", "type": "Float64"},

{tinybird-0.0.1.dev310 → tinybird-0.0.1.dev312}/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.dev310'
-__revision__ = '8861705'
+__version__ = '0.0.1.dev312'
+__revision__ = '2324ba4'

{tinybird-0.0.1.dev310 → tinybird-0.0.1.dev312}/tinybird/tb/modules/deployment.py

@@ -382,6 +382,7 @@ def create_deployment_cmd(
     template: Optional[str] = None,
     verbose: bool = False,
 ) -> None:
+    output = ctx.ensure_object(dict)["output"]
     project: Project = ctx.ensure_object(dict)["project"]
     if template:
         if project.get_project_files():
@@ -416,6 +417,7 @@ def create_deployment_cmd(
         check,
         allow_destructive_operations,
         ingest_hint=not is_web_analytics_starter_kit,
+        output=output,
     )
     show_web_analytics_starter_kit_hints(client, is_web_analytics_starter_kit)
 

{tinybird-0.0.1.dev310 → tinybird-0.0.1.dev312}/tinybird/tb/modules/deployment_common.py

@@ -10,6 +10,7 @@ import requests
 
 from tinybird.tb.client import TinyB
 from tinybird.tb.modules.common import (
+    echo_json,
     echo_safe_humanfriendly_tables_format_smart_table,
     get_display_cloud_host,
     sys_exit,
@@ -223,6 +224,7 @@ def create_deployment(
     check: Optional[bool] = None,
     allow_destructive_operations: Optional[bool] = None,
     ingest_hint: Optional[bool] = True,
+    output: Optional[str] = "human",
 ) -> None:
     # TODO: This code is duplicated in build_server.py
     # Should be refactored to be shared
@@ -274,7 +276,10 @@ def create_deployment(
 
         result = api_post(TINYBIRD_API_URL, headers=HEADERS, files=files, params=params)
 
-        print_changes(result, project)
+        print_changes(result, project, output)
+
+        if output == "json" and check:
+            echo_json(result.get("deployment", {}), 8)
 
         deployment = result.get("deployment", {})
         feedback = deployment.get("feedback", [])
@@ -386,6 +391,15 @@ def create_deployment(
 
         if auto:
             promote_deployment(client.host, HEADERS, wait=wait, ingest_hint=ingest_hint)
+            # Fetch the final deployment state after promotion for JSON output
+            if output == "json":
+                url = f"{client.host}/v1/deployments/{deployment.get('id')}"
+                res = api_fetch(url, HEADERS)
+                deployment = res.get("deployment")
+
+    # Output JSON at the appropriate time based on the execution path
+    if output == "json" and deployment:
+        echo_json(deployment, 8)
 
 
 def _build_data_movement_message(kind: str, source_mv_name: Optional[str]) -> str:
@@ -397,7 +411,7 @@ def _build_data_movement_message(kind: str, source_mv_name: Optional[str]) -> st
         return ""
 
 
-def print_changes(result: dict, project: Project) -> None:
+def print_changes(result: dict, project: Project, output: Optional[str] = "human") -> None:
     deployment = result.get("deployment", {})
     resources_columns = ["status", "name", "type", "path"]
     resources: list[list[Union[str, None]]] = []

{tinybird-0.0.1.dev310 → tinybird-0.0.1.dev312}/tinybird/tb/modules/local.py

@@ -10,7 +10,9 @@ from docker.client import DockerClient
 
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import echo_json, update_cli
+from tinybird.tb.modules.exceptions import CLILocalException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.info import get_local_info
 from tinybird.tb.modules.local_common import (
     TB_CONTAINER_NAME,
     TB_LOCAL_ADDRESS,
@@ -18,6 +20,19 @@ from tinybird.tb.modules.local_common import (
     get_existing_container_with_matching_env,
     start_tinybird_local,
 )
+from tinybird.tb.modules.local_logs import (
+    check_memory_sufficient,
+    clickhouse_is_ready,
+    container_is_ready,
+    container_is_starting,
+    container_is_stopping,
+    container_is_unhealthy,
+    container_stats,
+    events_is_ready,
+    local_authentication_is_ready,
+    redis_is_ready,
+    server_is_ready,
+)
 
 
 def stop_tinybird_local(docker_client: DockerClient) -> None:
@@ -76,30 +91,69 @@ def stop() -> None:
 @click.pass_context
 def status(ctx: click.Context) -> None:
     """Check status of Tinybird Local"""
+
+    click.echo(FeedbackManager.highlight(message="» Checking status..."))
     docker_client = get_docker_client()
     container = get_existing_container_with_matching_env(docker_client, TB_CONTAINER_NAME, {})
 
-    if container:
-        status = container.status
-        health = container.attrs.get("State", {}).get("Health", {}).get("Status")
-
-        if status == "running" and health == "healthy":
-            click.echo(FeedbackManager.success(message="✓ Tinybird Local is ready!"))
-            click.echo(FeedbackManager.highlight(message="\n» Tinybird Local:"))
-            from tinybird.tb.modules.info import get_local_info
-
-            config = ctx.ensure_object(dict).get("config", {})
-            get_local_info(config)
-        elif status == "restarting" or (status == "running" and health == "starting"):
-            click.echo(FeedbackManager.highlight(message="* Tinybird Local is starting..."))
-        elif status == "removing":
-            click.echo(FeedbackManager.highlight(message="* Tinybird Local is stopping..."))
+    try:
+        if container:
+            if container_is_ready(container):
+                stats = container_stats(container, docker_client)
+                click.echo(FeedbackManager.info(message=f"✓ Tinybird Local container ({stats})"))
+
+                # Check memory sufficiency
+                is_sufficient, warning_msg = check_memory_sufficient(container, docker_client)
+                if not is_sufficient and warning_msg:
+                    click.echo(FeedbackManager.warning(message=f"△ {warning_msg}"))
+
+                if not clickhouse_is_ready(container):
+                    raise Exception("Clickhouse is not ready.")
+                click.echo(FeedbackManager.info(message="✓ Clickhouse"))
+
+                if not redis_is_ready(container):
+                    raise Exception("Redis is not ready.")
+                click.echo(FeedbackManager.info(message="✓ Redis"))
+
+                if not server_is_ready(container):
+                    raise Exception("Server is not ready.")
+                click.echo(FeedbackManager.info(message="✓ Server"))
+
+                if not events_is_ready(container):
+                    raise Exception("Events is not ready.")
+                click.echo(FeedbackManager.info(message="✓ Events"))
+
+                if not local_authentication_is_ready(container):
+                    raise Exception("Tinybird Local authentication is not ready.")
+                click.echo(FeedbackManager.info(message="✓ Tinybird Local authentication"))
+
+                click.echo(FeedbackManager.success(message="✓ Tinybird Local is ready!"))
+                click.echo(FeedbackManager.highlight(message="\n» Tinybird Local:"))
+                config = ctx.ensure_object(dict).get("config", {})
+                get_local_info(config)
+            elif container_is_starting(container):
+                click.echo(FeedbackManager.highlight(message="* Tinybird Local is starting..."))
+            elif container_is_stopping(container):
+                click.echo(FeedbackManager.highlight(message="* Tinybird Local is stopping..."))
+            elif container_is_unhealthy(container):
+                is_sufficient, warning_msg = check_memory_sufficient(container, docker_client)
+                if not is_sufficient and warning_msg:
+                    click.echo(FeedbackManager.warning(message=f"△ {warning_msg}"))
+                click.echo(
+                    FeedbackManager.error(
+                        message="* Tinybird Local is unhealthy. Try running `tb local restart` in a few seconds."
+                    )
+                )
+            else:
+                click.echo(
+                    FeedbackManager.error(message="✗ Tinybird Local is not running. Run 'tb local start' to start it")
+                )
         else:
             click.echo(
-                FeedbackManager.info(message="✗ Tinybird Local is not running. Run 'tb local start' to start it")
+                FeedbackManager.error(message="✗ Tinybird Local is not running. Run 'tb local start' to start it")
             )
-    else:
-        click.echo(FeedbackManager.info(message="✗ Tinybird Local is not running. Run 'tb local start' to start it"))
+    except Exception as e:
+        raise CLILocalException(FeedbackManager.error(message=f"Tinybird Local is not ready. Reason: {e}"))
 
 
 @local.command()