tinybird 0.0.1.dev191__py3-none-any.whl → 0.0.1.dev193__py3-none-any.whl

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.dev193'
+__revision__ = '1b9821e'

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/tb/modules/datasource.py

@@ -127,7 +127,7 @@ async def datasource_ls(ctx: Context, match: Optional[str], format_: str):
 
 @datasource.command(name="append")
 @click.argument("datasource_name", required=False)
-@click.argument("data", nargs=-1, required=False)
+@click.argument("data", required=False)
 @click.option("--url", type=str, help="URL to append data from")
 @click.option("--file", type=str, help="Local file to append data from")
 @click.option("--events", type=str, help="Events to append data from")
@@ -159,15 +159,30 @@ async def datasource_append(
 
     # If data is passed as argument, we detect if it's a JSON object, a URL or a file
     if data:
-        try:
-            json.loads(data)
+        VALID_EXTENSIONS = [
+            "csv",
+            "csv.gz",
+            "ndjson",
+            "ndjson.gz",
+            "jsonl",
+            "jsonl.gz",
+            "json",
+            "json.gz",
+            "parquet",
+            "parquet.gz",
+        ]
+        is_file_or_url = data and (data.startswith("http") or any(data.endswith(f".{ext}") for ext in VALID_EXTENSIONS))
+        if is_file_or_url:
+            try:
+                if urlparse(data).scheme in ("http", "https"):
+                    url = data
+            except Exception:
+                pass
+
+            if not url:
+                file = data
+        else:
             events = data
-        except Exception:
-            pass
-        if urlparse(data).scheme in ("http", "https"):
-            url = data
-        if not events and not url:
-            file = data
 
     # If data is not passed as argument, we use the data from the options
     if not data:

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

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

{tinybird-0.0.1.dev191.dist-info → tinybird-0.0.1.dev193.dist-info}/RECORD

@@ -12,12 +12,12 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=X4tE9OrfaUy6kO9cqVEzyI9cDcmOF3IAssRRzsTsfEQ,40781
-tinybird/tb/__cli__.py,sha256=IuO2njWcdIXnuscWmXWEMTbCM9GnrTyYky59OtsEi3I,247
+tinybird/tb/__cli__.py,sha256=rqSzdlg51t2GUpwT8SnAfh-khtwhZTHokHMinOPEY-s,247
 tinybird/tb/check_pypi.py,sha256=rW4QmDRbtgKdUUwJCnBkVjmTjZSZGN-XgZhx7vMkC0w,1009
 tinybird/tb/cli.py,sha256=u3eGOhX0MHkuT6tiwaZ0_3twqLmqKXDAOxF7yV_Nn9Q,1075
 tinybird/tb/client.py,sha256=CO-dQw8h28X6T6IO-Z79yPBKaJQT1Rwya5b6gexvw58,56491
 tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
-tinybird/tb/modules/build.py,sha256=KvF0s8hGgY_rZs7jSqYiauCk3MAlCmW_gQtnsJDJWBk,19411
+tinybird/tb/modules/build.py,sha256=Deuq1Qk7c5Uapz92Vn9Bp7CrjDylRWER5hBvKGS3QxE,19370
 tinybird/tb/modules/cicd.py,sha256=Njb6eZOHHbUkoJJx6KoixO9PsfA_T-3Ybkya9-50Ca8,7328
 tinybird/tb/modules/cli.py,sha256=LW77oBqvZ6QB5X96158Kp13Tl24vKdxlyWvsSawpmCo,15399
 tinybird/tb/modules/common.py,sha256=2NRDRll0czmYjwLh3qv3DYL9aP8XgRkRAv5S3meCGfM,84062
@@ -25,8 +25,8 @@ tinybird/tb/modules/config.py,sha256=ziqW_t_mRVvWOd85VoB4vKyvgMkEfpXDf9H4v38p2xc
 tinybird/tb/modules/connection.py,sha256=z1xWP2gtjKEbjc4ZF1aD7QUgl8V--wf2IRNy-4sRFm8,9779
 tinybird/tb/modules/copy.py,sha256=2Mm4FWKehOG7CoOhiF1m9UZJgJn0W1_cMolqju8ONYg,5805
 tinybird/tb/modules/create.py,sha256=2uW-4t7c7e4xkZ-GpK_8XaA-nuXwklq7rTks4k6qrtI,20917
-tinybird/tb/modules/datasource.py,sha256=Uomj3bpVL5m4A0_ezWFXvQAjVER4EfmDz5gFkfGR7eo,37027
-tinybird/tb/modules/deployment.py,sha256=OGJdriqywhCtsG7rKLFtVSLjoEbbva1Nb29-jQBk3wM,27432
+tinybird/tb/modules/datasource.py,sha256=7r7wxU56Cabkg-rqNVOPkANHtMtZ03A1mWCCuK9t-8Q,37436
+tinybird/tb/modules/deployment.py,sha256=aVVg-ZqpZSNp8f8RQflAKijQsyRs9W6tys-xzHUUrMI,28169
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
 tinybird/tb/modules/dev_server.py,sha256=57FCKuWpErwYUYgHspYDkLWEm9F4pbvVOtMrFXX1fVU,10129
 tinybird/tb/modules/endpoint.py,sha256=XySDt3pk66vxOZ0egUfz4bY8bEk3BjOXkv-L0OIJ3sc,12083
@@ -45,7 +45,7 @@ tinybird/tb/modules/materialization.py,sha256=QJX5kCPhhm6IXBO1JsalVfbQdypCe_eOUD
 tinybird/tb/modules/mock.py,sha256=IyHweMUM6bUH8IhyiX2tTMpdVpTFUeAJ41lZ5P42-HQ,5303
 tinybird/tb/modules/open.py,sha256=OuctINN77oexpSjth9uoIZPCelKO4Li-yyVxeSnk1io,1371
 tinybird/tb/modules/pipe.py,sha256=AQKEDagO6e3psPVjJkS_MDbn8aK-apAiLp26k7jgAV0,2432
-tinybird/tb/modules/project.py,sha256=iIEaBQsdLXyzJ_45Paf1jwbSrtTwWv131VCuPsTQttA,5215
+tinybird/tb/modules/project.py,sha256=eUO8WKfnBIEz9WofOdgXDiEl26dLJdK-3i3O8OHUOLk,5514
 tinybird/tb/modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb/modules/secret.py,sha256=WsqzxxLh9W_jkuHL2JofMXdIJy0lT5WEI-7bQSIDgAc,2921
 tinybird/tb/modules/shell.py,sha256=Zd_4Ak_5tKVX-cw6B4ag36xZeEGHeh-jZpAsIXkoMoE,14116
@@ -80,8 +80,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.dev191.dist-info/METADATA,sha256=6DYh0XzR-JKDXhw_nDCp0ZXErl2PTGkPEBMDqKLTLB8,1608
-tinybird-0.0.1.dev191.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev191.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev191.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev191.dist-info/RECORD,,
+tinybird-0.0.1.dev193.dist-info/METADATA,sha256=sn2-N11dklKkdkf6j2ZpXPDnjI2p8rDTLyzRV7JVp6Q,1608
+tinybird-0.0.1.dev193.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev193.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev193.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev193.dist-info/RECORD,,