tinybird 0.0.1.dev322__tar.gz → 0.0.1.dev324__tar.gz

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

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

{tinybird-0.0.1.dev322 → tinybird-0.0.1.dev324}/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.dev322'
-__revision__ = '2e027b9'
+__version__ = '0.0.1.dev324'
+__revision__ = 'b4c5779'

{tinybird-0.0.1.dev322 → tinybird-0.0.1.dev324}/tinybird/tb/client.py

@@ -300,33 +300,33 @@ class TinyB:
         response = self._req(f"/v0/connectors?{urlencode(params)}")
         return response["connectors"]
 
-    def connections(self, connector: Optional[str] = None):
+    def connections(self, connector: Optional[str] = None, datasources: Optional[List[Dict[str, Any]]] = None):
         response = self._req("/v0/connectors")
         connectors = response["connectors"]
+        connectors_to_return = []
+        for c in connectors:
+            if connector and c["service"] != connector:
+                continue
+            if connector == "gcscheduler":
+                continue
+            if datasources and len(datasources) > 0:
+                datasource_ids = [linker["datasource_id"] for linker in c["linkers"]]
+                datasource_names = [ds["name"] for ds in datasources if ds["id"] in datasource_ids]
+                connected_datasources = ", ".join(datasource_names) if len(datasource_names) > 0 else ""
+            else:
+                connected_datasources = str(len(c["linkers"]))
 
-        if connector:
-            return [
+            connectors_to_return.append(
                 {
                     "id": c["id"],
                     "service": c["service"],
                     "name": c["name"],
-                    "connected_datasources": len(c["linkers"]),
+                    "connected_datasources": connected_datasources,
                     **c["settings"],
                 }
-                for c in connectors
-                if c["service"] == connector
-            ]
-        return [
-            {
-                "id": c["id"],
-                "service": c["service"],
-                "name": c["name"],
-                "connected_datasources": len(c["linkers"]),
-                **c["settings"],
-            }
-            for c in connectors
-            if c["service"] != "gcscheduler"
-        ]
+            )
+
+        return connectors_to_return
 
     def get_datasource(self, ds_name: str, used_by: bool = False) -> Dict[str, Any]:
         params = {

{tinybird-0.0.1.dev322 → tinybird-0.0.1.dev324}/tinybird/tb/modules/connection.py

@@ -121,7 +121,8 @@ def connection_ls(ctx: Context, service: Optional[DataConnectorType] = None) ->
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     client: TinyB = obj["client"]
 
-    connections = client.connections(connector=service)
+    datasources = client.datasources()
+    connections = client.connections(connector=service, datasources=datasources)
     columns = []
     table = []
 

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

@@ -12,10 +12,12 @@ 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
 
 
 @cli.group()
@@ -89,15 +91,27 @@ def copy_run(ctx: click.Context, pipe_name_or_id: str, wait: bool, mode: str, pa
     params = dict(key_value.split("=") for key_value in param) if param else {}
     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}"
+
         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.dev322 → tinybird-0.0.1.dev324}/tinybird/tb/modules/sink.py

@@ -7,10 +7,12 @@ 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
 
 
 @cli.group()
@@ -84,12 +86,24 @@ def sink_run(ctx: click.Context, pipe_name_or_id: str, wait: bool, mode: str, pa
     params = dict(key_value.split("=") for key_value in param) if param else {}
     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")
+        )
         click.echo(FeedbackManager.success(message="✓ Sink job created"))
 
         if wait:

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

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