tinybird 0.0.1.dev191__tar.gz → 0.0.1.dev192__tar.gz

{tinybird-0.0.1.dev191 → tinybird-0.0.1.dev192}/PKG-INFO

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

{tinybird-0.0.1.dev191 → tinybird-0.0.1.dev192}/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.dev191'
-__revision__ = 'c8535c7'
+__version__ = '0.0.1.dev192'
+__revision__ = '116c2dc'

{tinybird-0.0.1.dev191 → tinybird-0.0.1.dev192}/tinybird/tb/modules/build.py

@@ -258,7 +258,6 @@ def show_data(tb_client: TinyB, filename: str, diff: Optional[str] = None):
     table_name = diff
     resource_path = Path(filename)
     resource_name = resource_path.stem
-    resource_content = resource_path.read_text()
 
     pipeline = resource_name if filename.endswith(".pipe") else None
 
@@ -269,7 +268,7 @@ def show_data(tb_client: TinyB, filename: str, diff: Optional[str] = None):
 
     res = asyncio.run(tb_client.query(sql, pipeline=pipeline))
     print_table_formatted(res, table_name)
-    if Project.is_endpoint(resource_content):
+    if Project.get_pipe_type(filename) == "endpoint":
         example_params = {
             "format": "json",
             "pipe": resource_name,

{tinybird-0.0.1.dev191 → tinybird-0.0.1.dev192}/tinybird/tb/modules/deployment.py

@@ -15,7 +15,7 @@ from tinybird.tb.modules.common import (
     get_display_cloud_host,
     sys_exit,
 )
-from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.feedback_manager import FeedbackManager, bcolors
 from tinybird.tb.modules.project import Project
 
 
@@ -229,10 +229,17 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
 
             last_deployment = result.get("deployment")
             if last_deployment.get("status") == "deleted":
-                click.echo(FeedbackManager.success(message="✓ Deployment is live!"))
+                click.echo(FeedbackManager.success(message=f"✓ Deployment #{candidate_deployment.get('id')} is live!"))
                 break
 
             time.sleep(5)
+    if last_deployment.get("id") == "0":
+        # This is the first deployment, so we prompt the user to ingest data
+        click.echo(
+            FeedbackManager.info(
+                message="A deployment with no data is useless. Learn how to ingest at https://www.tinybird.co/docs/forward/get-data-in"
+            )
+        )
 
 
 # TODO(eclbg): This logic should be in the server, and there should be a dedicated endpoint for discarding a
@@ -590,8 +597,8 @@ def create_deployment(
         if status == "success":
             host = get_display_cloud_host(client.host)
             click.echo(
-                FeedbackManager.gray(message="Deployment URL: ")
-                + FeedbackManager.info(message=f"{host}/{config.get('name')}/deployments/{deployment.get('id')}")
+                FeedbackManager.info(message="Deployment URL: ")
+                + f"{bcolors.UNDERLINE}{host}/{config.get('name')}/deployments/{deployment.get('id')}{bcolors.ENDC}"
             )
 
             if wait:
@@ -655,40 +662,46 @@ def create_deployment(
 
 def print_changes(result: dict, project: Project) -> None:
     deployment = result.get("deployment", {})
-    resources_columns = ["status", "name", "path"]
+    resources_columns = ["status", "name", "type", "path"]
     resources: list[list[Union[str, None]]] = []
     tokens_columns = ["Change", "Token name", "Added permissions", "Removed permissions"]
     tokens: list[Tuple[str, str, str, str]] = []
 
     for ds in deployment.get("new_datasource_names", []):
-        resources.append(["new", ds, project.get_resource_path(ds, "datasource")])
+        resources.append(["new", ds, "datasource", project.get_resource_path(ds, "datasource")])
 
     for p in deployment.get("new_pipe_names", []):
-        resources.append(["new", p, project.get_resource_path(p, "pipe")])
+        path = str(project.get_resource_path(p, "pipe"))
+        pipe_type = project.get_pipe_type(path)
+        resources.append(["new", p, pipe_type, path])
 
     for dc in deployment.get("new_data_connector_names", []):
-        resources.append(["new", dc, project.get_resource_path(dc, "connection")])
+        resources.append(["new", dc, "connection", project.get_resource_path(dc, "connection")])
 
     for ds in deployment.get("changed_datasource_names", []):
-        resources.append(["modified", ds, project.get_resource_path(ds, "datasource")])
+        resources.append(["modified", ds, "datasource", project.get_resource_path(ds, "datasource")])
 
     for p in deployment.get("changed_pipe_names", []):
-        resources.append(["modified", p, project.get_resource_path(p, "pipe")])
+        path = str(project.get_resource_path(p, "pipe"))
+        pipe_type = project.get_pipe_type(path)
+        resources.append(["modified", p, pipe_type, path])
 
     for dc in deployment.get("changed_data_connector_names", []):
-        resources.append(["modified", dc, project.get_resource_path(dc, "connection")])
+        resources.append(["modified", dc, "connection", project.get_resource_path(dc, "connection")])
 
     for ds in deployment.get("disconnected_data_source_names", []):
-        resources.append(["modified", ds, project.get_resource_path(ds, "datasource")])
+        resources.append(["modified", ds, "datasource", project.get_resource_path(ds, "datasource")])
 
     for ds in deployment.get("deleted_datasource_names", []):
-        resources.append(["deleted", ds, project.get_resource_path(ds, "datasource")])
+        resources.append(["deleted", ds, "datasource", project.get_resource_path(ds, "datasource")])
 
     for p in deployment.get("deleted_pipe_names", []):
-        resources.append(["deleted", p, project.get_resource_path(p, "pipe")])
+        path = str(project.get_resource_path(p, "pipe"))
+        pipe_type = project.get_pipe_type(path)
+        resources.append(["deleted", p, pipe_type, path])
 
     for dc in deployment.get("deleted_data_connector_names", []):
-        resources.append(["deleted", dc, project.get_resource_path(dc, "connection")])
+        resources.append(["deleted", dc, "connection", project.get_resource_path(dc, "connection")])
 
     for token_change in deployment.get("token_changes", []):
         token_name = token_change.get("token_name")
@@ -707,9 +720,9 @@ def print_changes(result: dict, project: Project) -> None:
         click.echo(FeedbackManager.info(message="\n* Changes to be deployed:"))
         echo_safe_humanfriendly_tables_format_smart_table(resources, column_names=resources_columns)
     else:
-        click.echo(FeedbackManager.info(message="\n* No changes to be deployed"))
+        click.echo(FeedbackManager.gray(message="\n* No changes to be deployed"))
     if tokens:
         click.echo(FeedbackManager.info(message="\n* Changes in tokens to be deployed:"))
         echo_safe_humanfriendly_tables_format_smart_table(tokens, column_names=tokens_columns)
     else:
-        click.echo(FeedbackManager.info(message="* No changes in tokens to be deployed"))
+        click.echo(FeedbackManager.gray(message="* No changes in tokens to be deployed"))

{tinybird-0.0.1.dev191 → tinybird-0.0.1.dev192}/tinybird/tb/modules/project.py

@@ -51,7 +51,9 @@ class Project:
         return project_files
 
     def get_resource_path(self, resource_name: str, resource_type: str) -> Optional[str]:
-        full_path = next((p for p in self.get_project_files() if p.endswith(resource_name + f".{resource_type}")), "")
+        full_path = next(
+            (p for p in self.get_project_files() if p.endswith("/" + resource_name + f".{resource_type}")), ""
+        )
         if not full_path:
             return None
         return Path(full_path).relative_to(self.path).as_posix()
@@ -114,8 +116,15 @@ class Project:
         return datafiles
 
     @staticmethod
-    def is_endpoint(content: str) -> bool:
-        return re.search(r"TYPE endpoint", content, re.IGNORECASE) is not None
+    def get_pipe_type(path: str) -> str:
+        content = Path(path).read_text()
+        if re.search(r"TYPE endpoint", content, re.IGNORECASE):
+            return "endpoint"
+        elif re.search(r"TYPE materialized", content, re.IGNORECASE):
+            return "materialization"
+        elif re.search(r"TYPE copy", content, re.IGNORECASE):
+            return "copy"
+        return "pipe"
 
     @staticmethod
     def is_kafka_connection(content: str) -> bool:

{tinybird-0.0.1.dev191 → tinybird-0.0.1.dev192}/tinybird.egg-info/PKG-INFO

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