tinybird 0.0.1.dev63__tar.gz → 0.0.1.dev65__tar.gz

{tinybird-0.0.1.dev63 → tinybird-0.0.1.dev65}/PKG-INFO

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

{tinybird-0.0.1.dev63 → tinybird-0.0.1.dev65}/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.dev63'
-__revision__ = '4d0f19d'
+__version__ = '0.0.1.dev65'
+__revision__ = 'bb7c13c'

{tinybird-0.0.1.dev63 → tinybird-0.0.1.dev65}/tinybird/tb/modules/build.py

@@ -4,8 +4,9 @@ import logging
 import sys
 import threading
 import time
+from functools import partial
 from pathlib import Path
-from typing import Optional
+from typing import Callable, Optional
 
 import click
 import requests
@@ -31,9 +32,13 @@ def build(ctx: click.Context, watch: bool) -> None:
     project: Project = ctx.ensure_object(dict)["project"]
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
     click.echo(FeedbackManager.highlight_building_project())
-    process(project=project, tb_client=tb_client, watch=watch)
+    process(project=project, tb_client=tb_client, watch=False)
     if watch:
-        run_watch(project=project, tb_client=tb_client)
+        run_watch(
+            project=project,
+            tb_client=tb_client,
+            process=partial(process, project=project, tb_client=tb_client, watch=True),
+        )
 
 
 @cli.command("dev", help="Build the project server side and watch for changes")
@@ -43,7 +48,7 @@ def dev(ctx: click.Context) -> None:
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
     click.echo(FeedbackManager.highlight_building_project())
     process(project=project, tb_client=tb_client, watch=True)
-    run_watch(project=project, tb_client=tb_client)
+    run_watch(project=project, tb_client=tb_client, process=partial(process, project=project, tb_client=tb_client))
 
 
 def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str] = None) -> None:
@@ -55,7 +60,7 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
     TINYBIRD_API_URL = tb_client.host + "/v1/build"
     logging.debug(TINYBIRD_API_URL)
     TINYBIRD_API_KEY = tb_client.token
-    error = False
+    error: Optional[str] = None
     try:
         files = [
             ("context://", ("cli-version", "1.0.0", "text/plain")),
@@ -129,22 +134,19 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
 
         elif build_result == "failed":
             build_errors = result.get("errors")
-            error = True
             for build_error in build_errors:
                 filename_bit = f"{build_error.get('filename', '')}"
                 error_msg = ((filename_bit + "\n\n") if filename_bit else "") + build_error.get("error")
-                click.echo(FeedbackManager.error(message=error_msg))
+                error = error_msg
         else:
-            error = True
-            click.echo(FeedbackManager.error(message=f"Unknown build result. Error: {result.get('error')}"))
-
+            error = f"Unknown build result. Error: {result.get('error')}"
     except Exception as e:
-        click.echo(FeedbackManager.error_exception(error="Error: " + str(e)))
+        error = str(e)
     finally:
         for fd in fds:
             fd.close()
         if error:
-            raise click.ClickException(FeedbackManager.error(message="Error: Build failed"))
+            raise click.ClickException(error)
 
 
 def append_fixture(
@@ -212,10 +214,10 @@ def process(
         try:
             build_project(project, tb_client, file_changed)
         except click.ClickException as e:
-            click.echo(e)
+            click.echo(FeedbackManager.error(message=e))
             build_failed = True
         try:
-            if file_changed:
+            if file_changed and not build_failed:
                 asyncio.run(folder_build(project, tb_client, filenames=[file_changed]))
                 show_data(tb_client, file_changed, diff)
         except Exception:
@@ -224,7 +226,7 @@ def process(
     time_end = time.time()
     elapsed_time = time_end - time_start
 
-    rebuild_str = "Rebuild" if watch else "Build"
+    rebuild_str = "Rebuild" if watch and file_changed else "Build"
     if build_failed:
         click.echo(FeedbackManager.error(message=f"\n✗ {rebuild_str} failed"))
         if not watch:
@@ -233,7 +235,9 @@ def process(
         click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
 
 
-def run_watch(project: Project, tb_client: TinyB) -> None:
+def run_watch(
+    project: Project, tb_client: TinyB, process: Callable[[bool, Optional[str], Optional[str]], None]
+) -> None:
     shell = Shell(project=project, tb_client=tb_client)
     click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
     watcher_thread = threading.Thread(

{tinybird-0.0.1.dev63 → tinybird-0.0.1.dev65}/tinybird/tb/modules/endpoint.py

@@ -269,7 +269,7 @@ async def endpoint_stats(ctx: click.Context, pipes: Tuple[str, ...], format_: st
             echo_safe_humanfriendly_tables_format_smart_table(table_human_readable, column_names=columns)
 
 
-def build_endpoint_snippet(tb_client: TinyB, pipe_name: str, token: Optional[str], language: str) -> Optional[str]:
+def build_endpoint_snippet(tb_client: TinyB, pipe_name: str, token: str, language: str) -> Optional[str]:
     endpoint_url = build_endpoint_url(tb_client, pipe_name, token)
     if language == "http":
         return endpoint_url
@@ -282,9 +282,9 @@ def build_endpoint_snippet(tb_client: TinyB, pipe_name: str, token: Optional[str
     elif language == "javascript":
         snippet = build_javascript_snippet(endpoint_url, token)
     elif language == "rust":
-        snippet = build_rust_snippet(endpoint_url, token)
+        snippet = build_rust_snippet(endpoint_url)
     elif language == "go":
-        snippet = build_go_snippet(endpoint_url, token)
+        snippet = build_go_snippet(endpoint_url)
 
     if not snippet:
         raise CLIPipeException(FeedbackManager.error(message=f"Language {language} not supported"))

{tinybird-0.0.1.dev63 → tinybird-0.0.1.dev65}/tinybird/tb/modules/mock.py

@@ -51,7 +51,7 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, skip
         if datasource_path.suffix == ".datasource":
             datasource_name = datasource_path.stem
         else:
-            datasource_from_glob = glob.glob(f"**/*/{datasource}.datasource")
+            datasource_from_glob = glob.glob(f"{folder}/**/{datasource}.datasource")
             if datasource_from_glob:
                 datasource_path = Path(datasource_from_glob[0])
 

{tinybird-0.0.1.dev63 → tinybird-0.0.1.dev65}/tinybird/tb/modules/shell.py

@@ -249,11 +249,11 @@ class Shell:
         if cmd in ["exit", "quit"]:
             sys.exit(0)
         elif cmd == "build":
-            self.handle_build(arg)
+            self.handle_build()
         elif cmd == "auth":
-            self.handle_auth(arg)
+            self.handle_auth()
         elif cmd == "workspace":
-            self.handle_workspace(arg)
+            self.handle_workspace()
         elif cmd == "mock":
             self.handle_mock(arg)
         elif cmd == "tb":
@@ -262,27 +262,30 @@ class Shell:
             # Check if it looks like a SQL query or run as a tb command
             self.default(line)
 
-    def handle_build(self, arg):
-        click.echo(FeedbackManager.error(message=f"'tb {arg}' command is not available in watch mode"))
+    def handle_build(self):
+        click.echo(FeedbackManager.error(message="'tb build' command is not available in watch mode"))
 
-    def handle_auth(self, arg):
-        click.echo(FeedbackManager.error(message=f"'tb {arg}' command is not available in watch mode"))
+    def handle_auth(self):
+        click.echo(FeedbackManager.error(message="'tb auth' command is not available in watch mode"))
 
-    def handle_workspace(self, arg):
-        click.echo(FeedbackManager.error(message=f"'tb {arg}' command is not available in watch mode"))
+    def handle_workspace(self):
+        click.echo(FeedbackManager.error(message="'tb workspace' command is not available in watch mode"))
 
     def handle_mock(self, arg):
+        arg = arg.strip().lower()
+        if "mock" in arg:
+            arg = arg.replace("mock", "")
         subprocess.run(f"tb --build mock {arg} --skip", shell=True, text=True)
 
     def handle_tb(self, arg):
         click.echo("")
         arg = arg.strip().lower()
         if arg.startswith("build"):
-            self.handle_build(arg)
+            self.handle_build()
         elif arg.startswith("auth"):
-            self.handle_auth(arg)
+            self.handle_auth()
         elif arg.startswith("workspace"):
-            self.handle_workspace(arg)
+            self.handle_workspace()
         elif arg.startswith("mock"):
             self.handle_mock(arg)
         else:

{tinybird-0.0.1.dev63 → tinybird-0.0.1.dev65}/tinybird/tb/modules/watch.py

@@ -18,12 +18,7 @@ from tinybird.tb.modules.shell import Shell
 
 
 class WatchProjectHandler(PatternMatchingEventHandler):
-    def __init__(
-        self,
-        shell: Shell,
-        project: Project,
-        process: Callable[[bool, Optional[str], Optional[str]], None],
-    ):
+    def __init__(self, shell: Shell, project: Project, process: Callable):
         self.shell = shell
         self.project = project
         self.process = process
@@ -51,7 +46,7 @@ class WatchProjectHandler(PatternMatchingEventHandler):
 
     def _process(self, path: Optional[str] = None) -> None:
         click.echo(FeedbackManager.highlight(message="» Rebuilding project..."))
-        self.process(True, path, self.diff(path))
+        self.process(watch=True, file_changed=path, diff=self.diff(path))
         self.shell.reprint_prompt()
 
     def diff(self, path: Optional[str] = None) -> Optional[str]:

{tinybird-0.0.1.dev63 → tinybird-0.0.1.dev65}/tinybird.egg-info/PKG-INFO

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