tinybird 0.0.1.dev22__tar.gz → 0.0.1.dev23__tar.gz

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/PKG-INFO

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

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/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.dev22'
-__revision__ = 'fad51ec'
+__version__ = '0.0.1.dev23'
+__revision__ = '944a540'

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/build.py

@@ -120,7 +120,7 @@ def build(
             click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s\n"))
             ok = True
         except Exception as e:
-            click.echo(FeedbackManager.error(message=str(e)))
+            click.echo(FeedbackManager.error_exception(error=e))
             ok = False
         return ok
 

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/common.py

@@ -529,6 +529,29 @@ async def check_user_token(ctx: Context, token: str):
         )
 
 
+async def check_user_token_with_client(client: TinyB, token: str):
+    try:
+        user_client: TinyB = deepcopy(client)
+        user_client.token = token
+
+        is_authenticated = await user_client.check_auth_login()
+    except Exception as e:
+        raise CLIWorkspaceException(FeedbackManager.error_exception(error=str(e)))
+
+    if not is_authenticated.get("is_valid", False):
+        raise CLIWorkspaceException(
+            FeedbackManager.error_exception(
+                error='Invalid token. Please, be sure you are using the "user token" instead of the "admin your@email" token.'
+            )
+        )
+    if is_authenticated.get("is_valid") and not is_authenticated.get("is_user", False):
+        raise CLIWorkspaceException(
+            FeedbackManager.error_exception(
+                error='Invalid user authentication. Please, be sure you are using the "user token" instead of the "admin your@email" token.'
+            )
+        )
+
+
 async def get_available_starterkits(ctx: Context) -> List[Dict[str, Any]]:
     ctx_dict = ctx.ensure_object(dict)
     available_starterkits = ctx_dict.get("available_starterkits", None)

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/config.py

@@ -321,12 +321,8 @@ class CLIConfig:
         The data is cached between calls, given the same `working_dir`.
         """
         working_dir = working_dir or os.getcwd()
-        result = CLIConfig._projects.get(working_dir)
-        if not result:
-            path: str = os.path.join(working_dir, ".tinyb")
-            result = CLIConfig(path, parent=CLIConfig.get_global_config())
-            CLIConfig._projects[working_dir] = result
-        return result
+        path: str = os.path.join(working_dir, ".tinyb")
+        return CLIConfig(path, parent=CLIConfig.get_global_config())
 
     @staticmethod
     def get_llm_config(working_dir: Optional[str] = None) -> Dict[str, Any]:

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/create.py

@@ -9,7 +9,7 @@ import requests
 from tinybird.client import TinyB
 from tinybird.tb.modules.cicd import init_cicd
 from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.common import _generate_datafile, check_user_token, coro, generate_datafile
+from tinybird.tb.modules.common import _generate_datafile, check_user_token_with_client, coro, generate_datafile
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.fixture import build_fixture_name, persist_fixture
 from tinybird.tb.modules.exceptions import CLIException
@@ -37,7 +37,7 @@ from tinybird.tb.modules.llm import LLM
 )
 @click.option(
     "--folder",
-    default=None,
+    default=".",
     type=click.Path(exists=True, file_okay=False),
     help="Folder where datafiles will be placed",
 )
@@ -56,21 +56,24 @@ async def create(
     folder = folder or getcwd()
     try:
         config = CLIConfig.get_project_config(folder)
+        tb_client = config.get_client()
         user_token: Optional[str] = None
-
         if prompt:
             try:
                 user_token = config.get_user_token()
                 if not user_token:
                     raise CLIException("No user token found")
-                await check_user_token(ctx, token=user_token)
-            except Exception:
-                click.echo(FeedbackManager.error(message="This action requires authentication. Run 'tb login' first."))
+                await check_user_token_with_client(tb_client, token=user_token)
+            except Exception as e:
+                click.echo(
+                    FeedbackManager.error(
+                        message=f"This action requires authentication. Run 'tb login' first. Error: {e}"
+                    )
+                )
                 return
-
-        tb_client = config.get_client()
+        local_client: TinyB = ctx.ensure_object(dict)["client"]
         click.echo(FeedbackManager.gray(message="Creating new project structure..."))
-        await project_create(tb_client, user_token, data, prompt, folder)
+        await project_create(local_client, user_token, data, prompt, folder)
         click.echo(FeedbackManager.success(message="✓ Scaffolding completed!\n"))
 
         click.echo(FeedbackManager.gray(message="\nCreating CI/CD files for GitHub and GitLab..."))
@@ -156,7 +159,7 @@ async def create(
                 has_json_path = "`json:" in datasource_content
                 if has_json_path:
                     sql = await llm.generate_sql_sample_data(schema=datasource_content, rows=rows, prompt=prompt)
-                    result = await tb_client.query(f"{sql} FORMAT JSON")
+                    result = await local_client.query(f"{sql} FORMAT JSON")
                     data = result.get("data", [])
                     fixture_name = build_fixture_name(
                         datasource_path.absolute().as_posix(), datasource_name, datasource_content

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/datafile/build.py

@@ -15,7 +15,6 @@ from tinybird.client import TinyB
 from tinybird.sql import parse_table_structure, schema_to_sql_columns
 from tinybird.sql_template import get_used_tables_in_template, render_sql_template
 from tinybird.tb.modules.common import get_ca_pem_content
-from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.build_common import update_tags_in_resource
 from tinybird.tb.modules.datafile.build_datasource import is_datasource, new_ds
 from tinybird.tb.modules.datafile.build_pipe import (
@@ -45,6 +44,7 @@ from tinybird.tb.modules.datafile.exceptions import AlreadyExistsException, Incl
 from tinybird.tb.modules.datafile.parse_datasource import parse_datasource
 from tinybird.tb.modules.datafile.parse_pipe import parse_pipe
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.local_common import get_tinybird_local_config
 
 
 async def folder_build(
@@ -58,7 +58,7 @@ async def folder_build(
     local_ws: Optional[Dict[str, Any]] = None,
     watch: bool = False,
 ):
-    config = CLIConfig.get_project_config()
+    config = await get_tinybird_local_config(folder)
     build = True
     dry_run = False
     force = True

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/datafile/build_pipe.py

@@ -624,8 +624,17 @@ def is_endpoint_with_no_dependencies(
 
 
 def is_endpoint(resource: Optional[Dict[str, Any]]) -> bool:
-    if resource and len(resource.get("tokens", [])) != 0 and resource.get("resource") == "pipes":
+    if not resource:
+        return False
+    if resource.get("resource") != "pipes":
+        return False
+
+    if len(resource.get("tokens", [])) != 0:
         return True
+
+    if any(node.get("params", {}).get("type", None) == "endpoint" for node in resource.get("nodes", [])):
+        return True
+
     return False
 
 

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/datafile/common.py

@@ -1664,11 +1664,10 @@ def find_file_by_name(
     if os.path.isfile(os.path.join(folder, pipe)):
         return pipe, None
 
-    if os.path.isfile(f / "endpoints" / pipe):
-        return pipe, None
-
-    if os.path.isfile(f / "pipes" / pipe):
-        return pipe, None
+    pipe_paths = ["endpoints", "materializations", "sinks", "copies", "playgrounds", "pipes"]
+    for pipe_path in pipe_paths:
+        if os.path.isfile(f / pipe_path / pipe):
+            return pipe, None
 
     token = name + ".token"
     if os.path.isfile(f / "tokens" / token):

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/local_common.py

@@ -16,7 +16,12 @@ TB_LOCAL_HOST = f"http://localhost:{TB_LOCAL_PORT}"
 
 async def get_tinybird_local_client(path: Optional[str] = None) -> TinyB:
     """Get a Tinybird client connected to the local environment."""
-    config = CLIConfig.get_project_config()
+    config = await get_tinybird_local_config(path)
+    return config.get_client(host=TB_LOCAL_HOST)
+
+
+async def get_tinybird_local_config(path: Optional[str] = None) -> CLIConfig:
+    config = CLIConfig.get_project_config(path)
     try:
         # ruff: noqa: ASYNC210
         tokens = requests.get(f"{TB_LOCAL_HOST}/tokens").json()
@@ -52,4 +57,4 @@ async def get_tinybird_local_client(path: Optional[str] = None) -> TinyB:
         config.set_token_for_host(TB_LOCAL_HOST, default_token)
 
     config.set_user_token(user_token)
-    return config.get_client(host=TB_LOCAL_HOST)
+    return config

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/mock.py

@@ -5,7 +5,7 @@ from pathlib import Path
 import click
 
 from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.common import CLIException, check_user_token, coro
+from tinybird.tb.modules.common import CLIException, check_user_token_with_client, coro
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.fixture import build_fixture_name, persist_fixture
 from tinybird.tb.modules.feedback_manager import FeedbackManager
@@ -55,11 +55,11 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, fold
         try:
             if not user_token:
                 raise CLIException("No user token found")
-            await check_user_token(ctx, token=user_token)
+            await check_user_token_with_client(user_client, token=user_token)
         except Exception:
             click.echo(FeedbackManager.error(message="This action requires authentication. Run 'tb login' first."))
             return
-
+        user_client.token = user_token
         llm = LLM(user_token=user_token, client=user_client)
         tb_client = await get_tinybird_local_client(os.path.abspath(folder))
         sql = await llm.generate_sql_sample_data(datasource_content, rows=rows, prompt=prompt)

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird/tb/modules/test.py

@@ -223,6 +223,16 @@ async def test_run(name: Tuple[str, ...], folder: str) -> None:
             except Exception as e:
                 click.echo(FeedbackManager.error(message=f"✗ {test_file_path.name} - {test['name']}"))
                 click.echo(FeedbackManager.error(message=f"Output and expected output are different: \n{e}"))
+                return False
+        return True
 
+    tests_failed = False
     for test_file in file_list:
-        await run_test(test_file)
+        if not await run_test(test_file):
+            tests_failed = True
+
+    if tests_failed:
+        click.echo(FeedbackManager.error(message="✗ Some tests failed"))
+        exit(1)
+    else:
+        click.echo(FeedbackManager.success(message="✓ All tests passed"))

tinybird-0.0.1.dev23/tinybird/tb/modules/watch.py

@@ -0,0 +1,112 @@
+import asyncio
+import os
+import time
+from typing import Any, Callable, List, Optional, Union
+
+import click
+from watchdog.events import DirMovedEvent, FileMovedEvent, FileSystemEventHandler
+from watchdog.observers import Observer
+
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.shell import Shell
+
+
+class FileChangeHandler(FileSystemEventHandler):
+    def __init__(self, filenames: List[str], process: Callable[[List[str]], None], build_ok: bool):
+        self.unprocessed_filenames = [os.path.abspath(f) for f in filenames]
+        self.process = process
+        self.build_ok = build_ok
+
+    @property
+    def filenames(self) -> List[str]:
+        return [f for f in self.unprocessed_filenames if os.path.exists(f)]
+
+    def should_process(self, event: Any) -> Optional[str]:
+        if event.is_directory:
+            return False
+
+        def should_process_path(path: str) -> bool:
+            if not os.path.exists(path):
+                return False
+            is_vendor = "vendor/" in path
+            if is_vendor:
+                return False
+            return any(path.endswith(ext) for ext in [".datasource", ".pipe", ".ndjson"])
+
+        if should_process_path(event.src_path):
+            return event.src_path
+
+        if should_process_path(event.dest_path):
+            return event.dest_path
+
+        return None
+
+    def on_modified(self, event: Any) -> None:
+        if path := self.should_process(event):
+            filename = path.split("/")[-1]
+            click.echo(FeedbackManager.highlight(message=f"\n\n⟲ Changes detected in {filename}\n"))
+            try:
+                to_process = [path] if self.build_ok else self.filenames
+                self.process(to_process)
+                self.build_ok = True
+            except Exception as e:
+                click.echo(FeedbackManager.error_exception(error=e))
+
+    def on_moved(self, event: Union[DirMovedEvent, FileMovedEvent]) -> None:
+        if path := self.should_process(event):
+            is_new_file = False
+            if path not in self.unprocessed_filenames:
+                is_new_file = True
+                self.unprocessed_filenames.append(path)
+
+            filename = path.split("/")[-1]
+            if is_new_file:
+                click.echo(FeedbackManager.highlight(message=f"\n\n⟲ New file detected: {filename}\n"))
+            else:
+                click.echo(FeedbackManager.highlight(message=f"\n\n⟲ Changes detected in {filename}\n"))
+            try:
+                should_rebuild_all = is_new_file or not self.build_ok
+                to_process = self.filenames if should_rebuild_all else [path]
+                self.process(to_process)
+                self.build_ok = True
+            except Exception as e:
+                click.echo(FeedbackManager.error_exception(error=e))
+
+
+def watch_files(
+    filenames: List[str],
+    process: Callable,
+    shell: Shell,
+    folder: str,
+    build_ok: bool,
+) -> None:
+    # Handle both sync and async process functions
+    async def process_wrapper(files: List[str]) -> None:
+        click.echo("⚡ Rebuilding...")
+        time_start = time.time()
+        if asyncio.iscoroutinefunction(process):
+            await process(files, watch=True)
+        else:
+            process(files, watch=True)
+        time_end = time.time()
+        elapsed_time = time_end - time_start
+        click.echo(
+            FeedbackManager.success(message="\n✓ ")
+            + FeedbackManager.gray(message=f"Rebuild completed in {elapsed_time:.1f}s")
+        )
+        shell.reprint_prompt()
+
+    event_handler = FileChangeHandler(filenames, lambda f: asyncio.run(process_wrapper(f)), build_ok)
+    observer = Observer()
+
+    observer.schedule(event_handler, path=folder, recursive=True)
+
+    observer.start()
+
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        observer.stop()
+
+    observer.join()

{tinybird-0.0.1.dev22 → tinybird-0.0.1.dev23}/tinybird.egg-info/PKG-INFO

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

tinybird-0.0.1.dev22/tinybird/tb/modules/watch.py

@@ -1,72 +0,0 @@
-import asyncio
-import time
-from typing import Any, Callable, List
-
-import click
-from watchdog.events import FileSystemEventHandler
-from watchdog.observers import Observer
-
-from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.shell import Shell
-
-
-class FileChangeHandler(FileSystemEventHandler):
-    def __init__(self, filenames: List[str], process: Callable[[List[str]], None], build_ok: bool):
-        self.filenames = filenames
-        self.process = process
-        self.build_ok = build_ok
-
-    def on_modified(self, event: Any) -> None:
-        is_not_vendor = "vendor/" not in event.src_path
-        if (
-            is_not_vendor
-            and not event.is_directory
-            and any(event.src_path.endswith(ext) for ext in [".datasource", ".pipe", ".ndjson"])
-        ):
-            filename = event.src_path.split("/")[-1]
-            click.echo(FeedbackManager.highlight(message=f"\n\n⟲ Changes detected in {filename}\n"))
-            try:
-                to_process = [event.src_path] if self.build_ok else self.filenames
-                self.process(to_process)
-                self.build_ok = True
-            except Exception as e:
-                click.echo(FeedbackManager.error_exception(error=e))
-
-
-def watch_files(
-    filenames: List[str],
-    process: Callable,
-    shell: Shell,
-    folder: str,
-    build_ok: bool,
-) -> None:
-    # Handle both sync and async process functions
-    async def process_wrapper(files: List[str]) -> None:
-        click.echo("⚡ Rebuilding...")
-        time_start = time.time()
-        if asyncio.iscoroutinefunction(process):
-            await process(files, watch=True)
-        else:
-            process(files, watch=True)
-        time_end = time.time()
-        elapsed_time = time_end - time_start
-        click.echo(
-            FeedbackManager.success(message="\n✓ ")
-            + FeedbackManager.gray(message=f"Rebuild completed in {elapsed_time:.1f}s")
-        )
-        shell.reprint_prompt()
-
-    event_handler = FileChangeHandler(filenames, lambda f: asyncio.run(process_wrapper(f)), build_ok)
-    observer = Observer()
-
-    observer.schedule(event_handler, path=folder, recursive=True)
-
-    observer.start()
-
-    try:
-        while True:
-            time.sleep(1)
-    except KeyboardInterrupt:
-        observer.stop()
-
-    observer.join()