tinybird 0.0.1.dev73__tar.gz → 0.0.1.dev75__tar.gz

{tinybird-0.0.1.dev73 → tinybird-0.0.1.dev75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev73
+Version: 0.0.1.dev75
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev73 → tinybird-0.0.1.dev75}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev73'
-__revision__ = 'a843588'
+__version__ = '0.0.1.dev75'
+__revision__ = '0985575'

{tinybird-0.0.1.dev73 → tinybird-0.0.1.dev75}/tinybird/tb/modules/build.py

@@ -7,6 +7,7 @@ import time
 from functools import partial
 from pathlib import Path
 from typing import Callable, Optional
+from urllib.parse import urlencode
 
 import click
 import requests
@@ -191,6 +192,7 @@ 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
 
@@ -201,6 +203,17 @@ 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):
+        example_params = {
+            "format": "json",
+            "pipe": resource_name,
+            "q": "",
+            "token": tb_client.token,
+        }
+        endpoint_url = asyncio.run(tb_client._req(f"/examples/query.http?{urlencode(example_params)}"))
+        if endpoint_url:
+            endpoint_url = endpoint_url.replace("http://localhost:8001", tb_client.host)
+            click.echo(FeedbackManager.gray(message="\nTest endpoint at ") + FeedbackManager.info(message=endpoint_url))
 
 
 def process(

{tinybird-0.0.1.dev73 → tinybird-0.0.1.dev75}/tinybird/tb/modules/datafile/build_pipe.py

@@ -1,5 +1,4 @@
 import json
-import logging
 from copy import deepcopy
 from typing import Any, Dict, List, Optional, Set
 from urllib.parse import urlencode
@@ -9,7 +8,7 @@ import requests
 from croniter import croniter
 
 from tinybird.client import DoesNotExistException, TinyB
-from tinybird.tb.modules.common import requests_delete, requests_get, wait_job
+from tinybird.tb.modules.common import requests_delete, requests_get
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.common import ON_DEMAND, CopyModes, CopyParameters, PipeNodeTypes, PipeTypes
 from tinybird.tb.modules.exceptions import CLIPipeException
@@ -66,50 +65,10 @@ async def new_pipe(
         current_pipe = next((play for play in playgrounds if play["name"] == p["name"] + "__tb__playground"), None)
         pipe_exists = current_pipe is not None
 
-    is_materialized = any([node.get("params", {}).get("type", None) == "materialized" for node in p["nodes"]])
-    copy_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "copy"), None)
-    sink_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "sink"), None)
-    stream_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "stream"), None)
-
     for node in p["nodes"]:
         if node["params"]["name"] == p["name"]:
             raise click.ClickException(FeedbackManager.error_pipe_node_same_name(name=p["name"]))
 
-    if pipe_exists:
-        if force or run_tests:
-            # TODO: this should create a different node and rename it to the final one on success
-            if check and not populate:
-                if not is_materialized and not copy_node and not sink_node and not stream_node:
-                    pass
-                else:
-                    if is_materialized:
-                        await check_materialized(
-                            p,
-                            host,
-                            token,
-                            tb_client,
-                            override_datasource=override_datasource,
-                            current_pipe=current_pipe,
-                        )
-                    if copy_node:
-                        await check_copy_pipe(pipe=current_pipe, copy_node=copy_node, tb_client=tb_client)
-                    if sink_node:
-                        await check_sink_pipe(pipe=current_pipe, sink_node=sink_node, tb_client=tb_client)
-                    if stream_node:
-                        await check_stream_pipe(pipe=current_pipe, stream_node=stream_node, tb_client=tb_client)
-            if run_tests:
-                logging.info(f"skipping force override of {p['name']}")
-                return
-        else:
-            raise click.ClickException(FeedbackManager.error_pipe_already_exists(pipe=p["name"]))
-    elif not pipe_exists and check:
-        if is_materialized:
-            await check_materialized(
-                p, host, token, tb_client, override_datasource=override_datasource, current_pipe=current_pipe
-            )
-        if copy_node:
-            await check_copy_pipe(pipe=current_pipe, copy_node=copy_node, tb_client=tb_client)
-
     params = {}
     params.update(cli_params)
     if force:
@@ -136,17 +95,6 @@ async def new_pipe(
     if p["nodes"]:
         body["nodes"] = [parse_node(n) for n in p["nodes"]]
 
-    if copy_node:
-        body["target_datasource"] = copy_node.get("target_datasource", None)
-        # We will update the schedule cron later
-        body["schedule_cron"] = None
-
-    if sink_node:
-        body.update(sink_node.get("export_params", {}))
-
-    if stream_node:
-        body.update(stream_node.get("export_params", {}))
-
     post_headers = {"Content-Type": "application/json"}
 
     post_headers.update(headers)
@@ -176,71 +124,6 @@ async def new_pipe(
     except Exception as e:
         raise click.ClickException(FeedbackManager.error_pushing_pipe(pipe=p["name"], error=str(e)))
 
-    datasource = data.get("datasource", None)
-
-    if datasource and populate and not copy_node:
-        job_url = data.get("job", {}).get("job_url", None)
-        job_id = data.get("job", {}).get("job_id", None)
-        if populate_subset:
-            click.echo(FeedbackManager.info_populate_subset_job_url(url=job_url, subset=populate_subset))
-        elif populate_condition:
-            click.echo(
-                FeedbackManager.info_populate_condition_job_url(url=job_url, populate_condition=populate_condition)
-            )
-        else:
-            click.echo(FeedbackManager.info_populate_job_url(url=job_url))
-
-        if wait_populate:
-            result = await wait_job(tb_client, job_id, job_url, "Populating")
-            click.echo(FeedbackManager.info_populate_job_result(result=result))
-    else:
-        if data.get("type") == "default" and not skip_tokens and not as_standard and not copy_node and not sink_node:
-            # FIXME: set option to add last node as endpoint in the API
-            endpoint_node = next(
-                (node for node in data.get("nodes", []) if node.get("type") == "endpoint"), data.get("nodes", [])[-1]
-            )
-            try:
-                data = await tb_client._req(
-                    f"/v0/pipes/{p['name']}/nodes/{endpoint_node.get('id')}/endpoint?{urlencode(cli_params)}",
-                    method="POST",
-                    headers=headers,
-                )
-            except Exception as e:
-                raise Exception(
-                    FeedbackManager.error_creating_endpoint(
-                        node=endpoint_node.get("name"), pipe=p["name"], error=str(e)
-                    )
-                )
-
-    if copy_node:
-        pipe_id = data["id"]
-        node = next((node for node in data["nodes"] if node["node_type"] == "copy"), None)
-        if node:
-            copy_params = {"pipe_name_or_id": pipe_id, "node_id": node["id"]}
-            try:
-                target_datasource = copy_node.get(CopyParameters.TARGET_DATASOURCE, None)
-                schedule_cron = copy_node.get(CopyParameters.COPY_SCHEDULE, None)
-                mode = copy_node.get("mode", CopyModes.APPEND)
-                schedule_cron = None if schedule_cron == ON_DEMAND else schedule_cron
-                current_target_datasource_id = data["copy_target_datasource"]
-                target_datasource_response = await tb_client.get_datasource(target_datasource)
-                target_datasource_to_send = (
-                    target_datasource
-                    if target_datasource_response.get("id", target_datasource) != current_target_datasource_id
-                    else None
-                )
-                copy_params[CopyParameters.TARGET_DATASOURCE] = target_datasource_to_send
-                current_schedule = data.get("schedule", {})
-                current_schedule_cron = current_schedule.get("cron", None) if current_schedule else None
-                schedule_cron_should_be_removed = current_schedule_cron and not schedule_cron
-                copy_params["schedule_cron"] = "None" if schedule_cron_should_be_removed else schedule_cron
-                copy_params["mode"] = mode
-                await tb_client.pipe_update_copy(**copy_params)
-            except Exception as e:
-                raise Exception(
-                    FeedbackManager.error_setting_copy_node(node=copy_node.get("name"), pipe=p["name"], error=str(e))
-                )
-
     if p["tokens"] and not skip_tokens and not as_standard and data.get("type") in ["endpoint", "copy"]:
         # search for token with specified name and adds it if not found or adds permissions to it
         t = None

{tinybird-0.0.1.dev73 → tinybird-0.0.1.dev75}/tinybird/tb/modules/deployment.py

@@ -339,36 +339,34 @@ def create_deployment(
         result = r.json()
         logging.debug(json.dumps(result, indent=2))
 
-        if check:
-            print_changes(result, project)
-            feedback = result.get("deployment", {}).get("feedback", [])
-            for f in feedback:
+        print_changes(result, project)
+
+        feedback = result.get("deployment", {}).get("feedback", [])
+        for f in feedback:
+            click.echo(FeedbackManager.warning(message=f"△ {f.get('level')}: {f.get('resource')}: {f.get('message')}"))
+
+        deploy_errors = result.get("deployment", {}).get("errors")
+        for deploy_error in deploy_errors:
+            if deploy_error.get("filename", None):
                 click.echo(
-                    FeedbackManager.warning(message=f"△ {f.get('level')}: {f.get('resource')}: {f.get('message')}")
+                    FeedbackManager.error(message=f"{deploy_error.get('filename')}\n\n{deploy_error.get('error')}")
                 )
+            else:
+                click.echo(FeedbackManager.error(message=f"{deploy_error.get('error')}"))
 
-            status = result.get("result")
+        status = result.get("result")
+        if check:
             if status == "success":
                 click.echo(FeedbackManager.success(message="\n✓ Deployment is valid"))
-            else:
-                click.echo(FeedbackManager.error(message="\n✗ Deployment is not valid"))
-                deploy_errors = result.get("errors")
-                for deploy_error in deploy_errors:
-                    if deploy_error.get("filename", None):
-                        click.echo(
-                            FeedbackManager.error(
-                                message=f"{deploy_error.get('filename')}\n\n{deploy_error.get('error')}"
-                            )
-                        )
-                    else:
-                        click.echo(FeedbackManager.error(message=f"{deploy_error.get('error')}"))
-            return
-
-        deploy_result = result.get("result")
-        if deploy_result == "success":
-            print_changes(result, project)
+                sys.exit(0)
+
+            click.echo(FeedbackManager.error(message="\n✗ Deployment is not valid"))
+            sys.exit(1)
+
+        status = result.get("result")
+        if status == "success":
             deployment = result.get("deployment", {})
-            # We show the url in the case of region is public
+            # TODO: This is a hack to show the url in the case of region is public. The URL should be returned by the API
             if client.host == "https://api.europe-west2.gcp.tinybird.co":
                 click.echo(
                     FeedbackManager.gray(message="Deployment URL: ")
@@ -381,25 +379,10 @@ def create_deployment(
                 click.echo(FeedbackManager.info(message="\n✓ Deployment submitted successfully"))
             else:
                 click.echo(FeedbackManager.success(message="\n✓ Deployment submitted successfully"))
-
-            feedback = deployment.get("feedback", [])
-            for f in feedback:
-                click.echo(
-                    FeedbackManager.warning(message=f"△ {f.get('level')}: {f.get('resource')}: {f.get('message')}")
-                )
-
-        elif deploy_result == "failed":
+        elif status == "failed":
             click.echo(FeedbackManager.error(message="Deployment failed"))
-            deploy_errors = result.get("errors")
-            for deploy_error in deploy_errors:
-                if deploy_error.get("filename", None):
-                    click.echo(
-                        FeedbackManager.error(message=f"{deploy_error.get('filename')}\n\n{deploy_error.get('error')}")
-                    )
-                else:
-                    click.echo(FeedbackManager.error(message=f"{deploy_error.get('error')}"))
         else:
-            click.echo(FeedbackManager.error(message=f"Unknown build result {deploy_result}"))
+            click.echo(FeedbackManager.error(message=f"Unknown build result {status}"))
     except Exception as e:
         click.echo(FeedbackManager.error_exception(error=e))
     finally:

{tinybird-0.0.1.dev73 → tinybird-0.0.1.dev75}/tinybird/tb/modules/project.py

@@ -1,5 +1,6 @@
 import glob
 import os
+import re
 from pathlib import Path
 from typing import Dict, List, Optional
 
@@ -78,3 +79,7 @@ class Project:
             if datafile := self.get_datafile(filename):
                 datafiles[filename] = datafile
         return datafiles
+
+    @staticmethod
+    def is_endpoint(content: str) -> bool:
+        return re.search(r"TYPE endpoint", content, re.IGNORECASE) is not None

{tinybird-0.0.1.dev73 → tinybird-0.0.1.dev75}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev73
+Version: 0.0.1.dev75
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird