tinybird 0.0.1.dev324__tar.gz → 0.0.1.dev325__tar.gz

{tinybird-0.0.1.dev324 → tinybird-0.0.1.dev325}/PKG-INFO

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

{tinybird-0.0.1.dev324 → tinybird-0.0.1.dev325}/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.dev324'
-__revision__ = 'b4c5779'
+__version__ = '0.0.1.dev325'
+__revision__ = '0faab58'

{tinybird-0.0.1.dev324 → tinybird-0.0.1.dev325}/tinybird/tb/modules/copy.py

@@ -12,12 +12,11 @@ from click import Context
 
 from tinybird.datafile.common import get_name_version
 from tinybird.tb.client import AuthNoTokenException, TinyB
-from tinybird.tb.config import get_display_cloud_host
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import echo_safe_humanfriendly_tables_format_smart_table, wait_job
 from tinybird.tb.modules.exceptions import CLIPipeException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.local_common import TB_LOCAL_ADDRESS
+from tinybird.tb.modules.job_common import echo_job_url
 
 
 @cli.group()
@@ -92,26 +91,15 @@ def copy_run(ctx: click.Context, pipe_name_or_id: str, wait: bool, mode: str, pa
     click.echo(FeedbackManager.highlight(message=f"\n» Running on-demand copy '{pipe_name_or_id}'"))
     client: TinyB = ctx.ensure_object(dict)["client"]
     config = ctx.ensure_object(dict)["config"]
-    env = ctx.ensure_object(dict)["env"]
 
     try:
         response = client.pipe_run(pipe_name_or_id, "copy", params, mode)
         job_id = response["job"]["job_id"]
         job_url = response["job"]["job_url"]
-
-        # In Tinybird Local, base URL is http://localhost:8001 internally, we need to replace it with the public one.
-        if env == "local":
-            job_url = f"{job_url.replace('http://localhost:8001', TB_LOCAL_ADDRESS)}?token={client.token}"
-
+        echo_job_url(client.token, client.host, config.get("name") or "", job_url)
         target_datasource_id = response["tags"]["copy_target_datasource"]
         target_datasource = client.get_datasource(target_datasource_id)
         target_datasource_name = target_datasource["name"]
-        click.echo(FeedbackManager.gray(message="Job URL: ") + FeedbackManager.info(message=f"{job_url}"))
-        ui_host = get_display_cloud_host(client.host)
-        click.echo(
-            FeedbackManager.gray(message="Job dashboard URL: ")
-            + FeedbackManager.info(message=f"{ui_host}/{config.get('name')}/jobs")
-        )
         click.echo(FeedbackManager.success(message=f"✓ Copy to '{target_datasource_name}' job created"))
 
         if wait:

{tinybird-0.0.1.dev324 → tinybird-0.0.1.dev325}/tinybird/tb/modules/deployment_common.py

@@ -16,6 +16,7 @@ from tinybird.tb.modules.common import (
     sys_exit,
 )
 from tinybird.tb.modules.feedback_manager import FeedbackManager, bcolors
+from tinybird.tb.modules.job_common import echo_job_url
 from tinybird.tb.modules.project import Project
 
 
@@ -199,6 +200,7 @@ def create_deployment(
     allow_destructive_operations: Optional[bool] = None,
     ingest_hint: Optional[bool] = True,
     output: Optional[str] = "human",
+    env: Optional[str] = "cloud",
 ) -> None:
     # TODO: This code is duplicated in build_server.py
     # Should be refactored to be shared
@@ -299,13 +301,30 @@ def create_deployment(
             )
 
         status = result.get("result")
-        if status == "success":
-            host = get_display_cloud_host(client.host)
+        host = get_display_cloud_host(client.host)
+        if status in ["success", "failed"]:
             click.echo(
-                FeedbackManager.info(message="Deployment URL: ")
+                FeedbackManager.gray(message="Deployment URL: ")
                 + f"{bcolors.UNDERLINE}{host}/{config.get('name')}/deployments/{deployment.get('id')}{bcolors.ENDC}"
             )
+            jobs = client.jobs()
+            deployment_job = next(
+                (
+                    job
+                    for job in jobs
+                    if job.get("kind") == "deployment" and job.get("deployment_id") == deployment.get("id")
+                ),
+                None,
+            )
+            if deployment_job:
+                echo_job_url(
+                    token=client.token,
+                    host=client.host,
+                    workspace_name=config.get("name") or "",
+                    job_url=deployment_job.get("job_url") or "",
+                )
 
+        if status == "success":
             if wait:
                 click.echo(FeedbackManager.info(message="\n* Deployment submitted"))
             else:

tinybird-0.0.1.dev325/tinybird/tb/modules/job_common.py

@@ -0,0 +1,15 @@
+import click
+
+from tinybird.tb.config import get_display_cloud_host
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.local_common import TB_LOCAL_ADDRESS
+
+
+def echo_job_url(token: str, host: str, workspace_name: str, job_url: str):
+    if "localhost" in host:
+        job_url = f"{job_url.replace('http://localhost:8001', TB_LOCAL_ADDRESS)}?token={token}"
+    click.echo(FeedbackManager.gray(message="Job API URL: ") + FeedbackManager.info(message=f"{job_url}"))
+    ui_host = get_display_cloud_host(host)
+    click.echo(
+        FeedbackManager.gray(message="Jobs URL: ") + FeedbackManager.info(message=f"{ui_host}/{workspace_name}/jobs")
+    )

{tinybird-0.0.1.dev324 → tinybird-0.0.1.dev325}/tinybird/tb/modules/sink.py

@@ -7,12 +7,11 @@ from click import Context
 
 from tinybird.datafile.common import get_name_version
 from tinybird.tb.client import AuthNoTokenException, TinyB
-from tinybird.tb.config import get_display_cloud_host
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import echo_safe_humanfriendly_tables_format_smart_table, wait_job
 from tinybird.tb.modules.exceptions import CLIPipeException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.local_common import TB_LOCAL_ADDRESS
+from tinybird.tb.modules.job_common import echo_job_url
 
 
 @cli.group()
@@ -87,23 +86,12 @@ def sink_run(ctx: click.Context, pipe_name_or_id: str, wait: bool, mode: str, pa
     click.echo(FeedbackManager.highlight(message=f"\n» Running sink '{pipe_name_or_id}'"))
     client: TinyB = ctx.ensure_object(dict)["client"]
     config = ctx.ensure_object(dict)["config"]
-    env = ctx.ensure_object(dict)["env"]
 
     try:
         response = client.pipe_run(pipe_name_or_id, "sink", params, mode)
         job_id = response["job"]["id"]
         job_url = response["job"]["job_url"]
-
-        # In Tinybird Local, base URL is http://localhost:8001 internally, we need to replace it with the public one.
-        if env == "local":
-            job_url = f"{job_url.replace('http://localhost:8001', TB_LOCAL_ADDRESS)}?token={client.token}"
-        click.echo(FeedbackManager.gray(message="Job URL: ") + FeedbackManager.info(message=f"{job_url}"))
-
-        ui_host = get_display_cloud_host(client.host)
-        click.echo(
-            FeedbackManager.gray(message="Job dashboard URL: ")
-            + FeedbackManager.info(message=f"{ui_host}/{config.get('name')}/jobs")
-        )
+        echo_job_url(client.token, client.host, config.get("name") or "", job_url)
         click.echo(FeedbackManager.success(message="✓ Sink job created"))
 
         if wait:

{tinybird-0.0.1.dev324 → tinybird-0.0.1.dev325}/tinybird.egg-info/PKG-INFO

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

{tinybird-0.0.1.dev324 → tinybird-0.0.1.dev325}/tinybird.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ tinybird/tb/modules/feedback_manager.py
 tinybird/tb/modules/info.py
 tinybird/tb/modules/infra.py
 tinybird/tb/modules/job.py
+tinybird/tb/modules/job_common.py
 tinybird/tb/modules/llm.py
 tinybird/tb/modules/llm_utils.py
 tinybird/tb/modules/local.py