tinybird 0.0.1.dev310__py3-none-any.whl → 0.0.1.dev311__py3-none-any.whl

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/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.dev311'
+__revision__ = 'd56057f'

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/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.dist-info → tinybird-0.0.1.dev311.dist-info}/METADATA

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

{tinybird-0.0.1.dev310.dist-info → tinybird-0.0.1.dev311.dist-info}/RECORD

@@ -4,7 +4,7 @@ tinybird/datatypes.py,sha256=r4WCvspmrXTJHiPjjyOTiZyZl31FO3Ynkwq4LQsYm6E,11059
 tinybird/feedback_manager.py,sha256=XY8d83pRlq-LH7xHMApkaEebfXEWLjDzrGe1prpcTHE,69778
 tinybird/git_settings.py,sha256=Sw_8rGmribEFJ4Z_6idrVytxpFYk7ez8ei0qHULzs3E,3934
 tinybird/prompts.py,sha256=F8ic_mGId50MDJmg5ec8i5BDavxz9SWtocLXqgO0IRY,45689
-tinybird/service_datasources.py,sha256=jFjRYbGykd76UcFNX7rry4bdPNDxl4SIbMkMVClyk54,54711
+tinybird/service_datasources.py,sha256=V0W1zErPmfdeekM-w3GYZG1zR_0iI_IQiQeyDh873bM,54711
 tinybird/sql.py,sha256=7pkwQMUVy0CH5zFgLMZyCx1BeaJSQYC05EmOb9vO3Ls,48694
 tinybird/sql_template.py,sha256=qz1Q-d8jlGpU8w-jcwn_NM4ApFtJAhEL-3_3-JELrl4,102979
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
@@ -18,7 +18,7 @@ tinybird/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1w
 tinybird/datafile/parse_connection.py,sha256=tRyn2Rpr1TeWet5BXmMoQgaotbGdYep1qiTak_OqC5E,1825
 tinybird/datafile/parse_datasource.py,sha256=ssW8QeFSgglVFi3sDZj_HgkJiTJ2069v2JgqnH3CkDE,1825
 tinybird/datafile/parse_pipe.py,sha256=8e9LMecSQVWHC4AXf8cdxoQ1nxUR4fTObYxTctO_EXQ,3816
-tinybird/tb/__cli__.py,sha256=PsaXQzmkEgsfLDtULkAsUwi2_fl1jOdNztKb1bHvnR0,247
+tinybird/tb/__cli__.py,sha256=rRHcV-HJBPgHc4EDQ0U2EqmbFK64tZ3kgAY6tUFAO4c,247
 tinybird/tb/check_pypi.py,sha256=Gp0HkHHDFMSDL6nxKlOY51z7z1Uv-2LRexNTZSHHGmM,552
 tinybird/tb/cli.py,sha256=Os4uApzYYVPXcYFdaReQs9E12q9DOuYOUVFoOgt7i7U,1047
 tinybird/tb/client.py,sha256=VYbllzIsmBS4b56Ix-vsyLbhpbe7MVRxR1sIo6xU2qA,53544
@@ -33,8 +33,8 @@ tinybird/tb/modules/connection.py,sha256=axp8Fny1_4PSLJGN4UF6WygyRbQtM3Lbt6thxHK
 tinybird/tb/modules/copy.py,sha256=dPZkcIDvxjJrlQUIvToO0vsEEEs4EYumbNV77-BzNoU,4404
 tinybird/tb/modules/create.py,sha256=j0WvO6LxuGW1ZOYVuvR1FxFls2oMmKePYNTRJMSXfuU,20135
 tinybird/tb/modules/datasource.py,sha256=pExdYfLQ5e88RqgJ-dbd30k1TJ4LDb_POtSc7fnlJDA,47365
-tinybird/tb/modules/deployment.py,sha256=v0layOmG0IMnuXc3RT39mpGfa5M8yPlrL9F089fJFCo,15964
-tinybird/tb/modules/deployment_common.py,sha256=68qoCoOQFqRFyvxWwYmKiuVb37z7txBhEvzSOJGUHMc,20664
+tinybird/tb/modules/deployment.py,sha256=ffYuMA-N8XNdaTL3NNBTdJxqhKwBfl3E8YY1uUJIJso,16034
+tinybird/tb/modules/deployment_common.py,sha256=9UFyT69ODV_WT3t8QT_9SysUi4UQLOnF0XmTBtpb734,21282
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
 tinybird/tb/modules/dev_server.py,sha256=4PzRoE47vrHJ2ccdA57fd03r4KDgCz4EcayW52gZlA0,10881
 tinybird/tb/modules/endpoint.py,sha256=ksRj6mfDb9Xv63PhTkV_uKSosgysHElqagg3RTt21Do,11958
@@ -122,8 +122,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.dev310.dist-info/METADATA,sha256=8rqBQagupBkyWHMUi5ITIFqonzEIFUXPRVTFKSpkRKM,1881
-tinybird-0.0.1.dev310.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev310.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev310.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev310.dist-info/RECORD,,
+tinybird-0.0.1.dev311.dist-info/METADATA,sha256=4UVOr7H95wJwE4NAMhdGRQH4OSqH9GYO9Q7YJrzzhyU,1881
+tinybird-0.0.1.dev311.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev311.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev311.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev311.dist-info/RECORD,,