tinybird 0.0.1.dev73__tar.gz → 0.0.1.dev74__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev73
+Version: 0.0.1.dev74
 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.dev74}/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.dev74'
+__revision__ = '68ada75'

{tinybird-0.0.1.dev73 → tinybird-0.0.1.dev74}/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.dev74}/tinybird/tb/modules/datafile/common.py

@@ -1151,6 +1151,21 @@ def parse(
 
         return raise_deprecation_error
 
+    def not_supported_yet(extra_message: str = "") -> Callable[..., Any]:
+        def inner(func: Callable[..., Any]) -> Callable[..., Any]:
+            @functools.wraps(func)
+            def raise_not_supported_yet_error(*args: Any, **kwargs: Any) -> Any:
+                extra_message_bit = f". {extra_message}" if extra_message else ""
+                raise DatafileSyntaxError(
+                    f"{kwargs['cmd']} is not supported yet{extra_message_bit}",
+                    lineno=kwargs["lineno"],
+                    pos=1,
+                )
+
+            return raise_not_supported_yet_error
+
+        return inner
+
     def assign(attr):
         @multiline_not_supported
         def _fn(x, **kwargs):
@@ -1255,6 +1270,7 @@ def parse(
 
         return _f
 
+    @not_supported_yet(extra_message="You can manage tokens with `tb token` in the meantime.")
     @multiline_not_supported
     def add_token(*args: str, **kwargs: Any) -> None:  # token_name, permissions):
         # lineno = kwargs["lineno"]
@@ -1268,6 +1284,7 @@ def parse(
         # APPEND for datasources
         doc.tokens.append({"token_name": _unquote(args[0]), "permissions": args[1]})
 
+    @not_supported_yet()
     def include(*args: str, **kwargs: Any) -> None:
         f = _unquote(args[0])
         f = eval_var(f)

{tinybird-0.0.1.dev73 → tinybird-0.0.1.dev74}/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.dev74}/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.dev74}/tinybird.egg-info/PKG-INFO

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