tinybird 0.0.1.dev38__tar.gz → 0.0.1.dev40__tar.gz

{tinybird-0.0.1.dev38 → tinybird-0.0.1.dev40}/PKG-INFO

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

{tinybird-0.0.1.dev38 → tinybird-0.0.1.dev40}/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.dev38'
-__revision__ = '3c8961f'
+__version__ = '0.0.1.dev40'
+__revision__ = '4f6c174'

{tinybird-0.0.1.dev38 → tinybird-0.0.1.dev40}/tinybird/tb/modules/build.py

@@ -16,7 +16,7 @@ from tinybird.tb.modules.datafile.fixture import build_fixture_name, get_fixture
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
-from tinybird.tb.modules.shell import Shell
+from tinybird.tb.modules.shell import Shell, print_table_formatted
 from tinybird.tb.modules.watch import watch_project
 
 
@@ -36,20 +36,23 @@ def build(ctx: click.Context, watch: bool) -> None:
 
     def process(file_changed: Optional[str] = None) -> None:
         if file_changed and file_changed.endswith(".ndjson"):
-            rebuild_fixture(project, tb_client, file_changed)
+            rebuild_fixture(project, file_changed)
         else:
             build_project(project, tb_client)
+            new_tb_client = asyncio.run(get_tinybird_local_client(str(project.path)))
+            try:
+                if file_changed:
+                    build_and_print_resource(new_tb_client, file_changed)
+            except Exception:
+                pass
 
     process()
     time_end = time.time()
     elapsed_time = time_end - time_start
-    if project.get_config()["user_email"] == "javi@tinybird.co":
-        click.echo(FeedbackManager.success(message="\n✓ Build completed in 0.0000001s"))
-    else:
-        click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
+    click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
 
     if watch:
-        shell = Shell(project=project, client=tb_client)
+        shell = Shell(project=project)
         click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
         watcher_thread = threading.Thread(
             target=watch_project,
@@ -112,6 +115,7 @@ def build_project(project: Project, tb_client: TinyB) -> None:
                     click.echo(FeedbackManager.info(message=f"✓ {pipe_path} created"))
 
             try:
+                new_tb_client = asyncio.run(get_tinybird_local_client(str(project.path)))
                 for filename in project_files:
                     if filename.endswith(".datasource"):
                         ds_path = Path(filename)
@@ -124,7 +128,7 @@ def build_project(project: Project, tb_client: TinyB) -> None:
                             fixture_path = fixture_folder / f"{ds_name}.ndjson"
 
                         if fixture_path.exists():
-                            append_fixture(tb_client, ds_name, str(fixture_path))
+                            append_fixture(new_tb_client, ds_name, str(fixture_path))
             except Exception:
                 pass
 
@@ -150,7 +154,6 @@ def append_fixture(
     datasource_name: str,
     url: str,
 ):
-    asyncio.run(tb_client.datasource_truncate(datasource_name))
     asyncio.run(
         push_data(
             tb_client,
@@ -163,18 +166,31 @@ def append_fixture(
     )
 
 
-def rebuild_fixture(project: Project, tb_client: TinyB, fixture: str) -> None:
-    fixture_path = Path(fixture)
-    datasources_path = Path(project.folder) / "datasources"
-    ds_name = fixture_path.stem
+def rebuild_fixture(project: Project, fixture: str) -> None:
+    try:
+        tb_client = asyncio.run(get_tinybird_local_client(str(project.path)))
+        fixture_path = Path(fixture)
+        datasources_path = Path(project.folder) / "datasources"
+        ds_name = fixture_path.stem
 
-    if ds_name not in project.datasources:
-        try:
-            ds_name = "_".join(fixture_path.stem.split("_")[:-1])
-        except Exception:
-            pass
+        if ds_name not in project.datasources:
+            try:
+                ds_name = "_".join(fixture_path.stem.split("_")[:-1])
+            except Exception:
+                pass
+
+        ds_path = datasources_path / f"{ds_name}.datasource"
+
+        if ds_path.exists():
+            asyncio.run(tb_client.datasource_truncate(ds_name))
+            append_fixture(tb_client, ds_name, str(fixture_path))
+    except Exception as e:
+        click.echo(FeedbackManager.error_exception(error=e))
 
-    ds_path = datasources_path / f"{ds_name}.datasource"
 
-    if ds_path.exists():
-        append_fixture(tb_client, ds_name, str(fixture_path))
+def build_and_print_resource(tb_client: TinyB, filename: str):
+    resource_path = Path(filename)
+    name = resource_path.stem
+    pipeline = name if filename.endswith(".pipe") else None
+    res = asyncio.run(tb_client.query(f"SELECT * FROM {name} FORMAT JSON", pipeline=pipeline))
+    print_table_formatted(res, name)

{tinybird-0.0.1.dev38 → tinybird-0.0.1.dev40}/tinybird/tb/modules/mock.py

@@ -47,7 +47,7 @@ async def mock(datasource: str, rows: int, prompt: str, folder: str) -> None:
         datasource_path = Path(folder) / datasource_path
 
         prompt_path = Path(folder) / "fixtures" / f"{datasource_name}.prompt"
-        if not prompt:
+        if not prompt or prompt == "Use the datasource schema to generate sample data":
             # load the prompt from the fixture.prompt file if it exists
             if prompt_path.exists():
                 prompt = prompt_path.read_text()

{tinybird-0.0.1.dev38 → tinybird-0.0.1.dev40}/tinybird/tb/modules/shell.py

@@ -14,9 +14,9 @@ from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.shortcuts import CompleteStyle
 from prompt_toolkit.styles import Style
 
-from tinybird.client import TinyB
 from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager, bcolors
+from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.table import format_table
 
@@ -174,10 +174,9 @@ def _(event):
 
 
 class Shell:
-    def __init__(self, project: Project, client: TinyB):
+    def __init__(self, project: Project):
         self.history = self.get_history()
         self.project = project
-        self.client = client
         self.prompt_message = "\ntb > "
         self.commands = ["create", "mock", "test", "tb", "select"]
         self.session: PromptSession = PromptSession(
@@ -286,8 +285,9 @@ class Shell:
                 loop = asyncio.new_event_loop()
                 asyncio.set_event_loop(loop)
                 try:
+                    tb_client = asyncio.run(get_tinybird_local_client(str(self.project.path)))
                     return loop.run_until_complete(
-                        self.client.query(f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT JSON")
+                        tb_client.query(f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT JSON")
                     )
                 finally:
                     loop.close()

{tinybird-0.0.1.dev38 → tinybird-0.0.1.dev40}/tinybird.egg-info/PKG-INFO

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