tinybird 0.0.1.dev55__tar.gz → 0.0.1.dev57__tar.gz

{tinybird-0.0.1.dev55 → tinybird-0.0.1.dev57}/PKG-INFO

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

{tinybird-0.0.1.dev55 → tinybird-0.0.1.dev57}/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.dev55'
-__revision__ = 'cc01364'
+__version__ = '0.0.1.dev57'
+__revision__ = '0af16b9'

{tinybird-0.0.1.dev55 → tinybird-0.0.1.dev57}/tinybird/tb/modules/build.py

@@ -14,7 +14,7 @@ from tinybird.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import push_data
 from tinybird.tb.modules.datafile.build import folder_build
-from tinybird.tb.modules.datafile.fixture import build_fixture_name, get_fixture_dir
+from tinybird.tb.modules.datafile.fixture import get_fixture_dir
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.shell import Shell, print_table_formatted
@@ -31,13 +31,18 @@ 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())
-    time_start = time.time()
 
-    def process(file_changed: Optional[str] = None, diff: Optional[str] = None) -> None:
+    def process(watch: bool, file_changed: Optional[str] = None, diff: Optional[str] = None) -> None:
+        time_start = time.time()
+        build_failed = False
         if file_changed and file_changed.endswith(".ndjson"):
             rebuild_fixture(project, tb_client, file_changed)
         else:
-            build_project(project, tb_client, file_changed)
+            try:
+                build_project(project, tb_client, file_changed)
+            except click.ClickException as e:
+                click.echo(e)
+                build_failed = True
             try:
                 if file_changed:
                     asyncio.run(folder_build(project, tb_client, filenames=[file_changed]))
@@ -45,16 +50,18 @@ def build(ctx: click.Context, watch: bool) -> None:
             except Exception:
                 pass
 
-    try:
-        process()
-    except click.ClickException as e:
-        click.echo(e)
-        if not watch:
-            sys.exit(1)
-    else:
         time_end = time.time()
         elapsed_time = time_end - time_start
-        click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
+
+        rebuild_str = "Rebuild" if watch else "Build"
+        if build_failed:
+            click.echo(FeedbackManager.error(message=f"\n✗ {rebuild_str} failed"))
+            if not watch:
+                sys.exit(1)
+        else:
+            click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
+
+    process(watch=watch)
 
     if watch:
         shell = Shell(project=project, tb_client=tb_client)
@@ -134,18 +141,13 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
                     if filename.endswith(".datasource"):
                         ds_path = Path(filename)
                         ds_name = ds_path.stem
-                        name = build_fixture_name(filename, ds_name, ds_path.read_text())
                         fixture_folder = get_fixture_dir(project.folder)
-                        fixture_path = fixture_folder / f"{name}.ndjson"
-
-                        if not fixture_path.exists():
-                            fixture_path = fixture_folder / f"{ds_name}.ndjson"
-
+                        fixture_path = fixture_folder / f"{ds_name}.ndjson"
                         if fixture_path.exists():
                             append_fixture(tb_client, ds_name, str(fixture_path))
 
-            except Exception:
-                pass
+            except Exception as e:
+                click.echo(FeedbackManager.error_exception(error=f"Error appending fixtures for '{ds_name}': {e}"))
 
             feedback = result.get("feedback", [])
             for f in feedback:

{tinybird-0.0.1.dev55 → tinybird-0.0.1.dev57}/tinybird/tb/modules/create.py

@@ -12,7 +12,7 @@ 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_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.datafile.fixture import persist_fixture
 from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
@@ -108,11 +108,8 @@ async def create(
                 ds_name = os.path.basename(data.split(".")[0])
                 data_content = Path(data).read_text()
                 datasource_path = Path(folder) / "datasources" / f"{ds_name}.datasource"
-                fixture_name = build_fixture_name(
-                    datasource_path.absolute().as_posix(), ds_name, datasource_path.read_text()
-                )
                 click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}"))
-                persist_fixture(fixture_name, data_content, folder)
+                persist_fixture(ds_name, data_content, folder)
             elif prompt and user_token:
                 datasource_files = [f for f in os.listdir(Path(folder) / "datasources") if f.endswith(".datasource")]
                 for datasource_file in datasource_files:
@@ -128,11 +125,8 @@ async def create(
                         sql = sql.split("FORMAT")[0]
                         query_result = await local_client.query(f"{sql} FORMAT JSON")
                         data = query_result.get("data", [])
-                        fixture_name = build_fixture_name(
-                            datasource_path.absolute().as_posix(), datasource_name, datasource_content
-                        )
                         if data:
-                            persist_fixture(fixture_name, data, folder)
+                            persist_fixture(datasource_name, data, folder)
                             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}"))
     except Exception as e:
         click.echo(FeedbackManager.error(message=f"Error: {str(e)}"))

tinybird-0.0.1.dev57/tinybird/tb/modules/datafile/fixture.py

@@ -0,0 +1,30 @@
+from pathlib import Path
+from typing import Any, Dict, List, Union
+
+from tinybird.tb.modules.common import format_data_to_ndjson
+
+
+def get_fixture_dir(folder: str) -> Path:
+    fixture_dir = Path(folder) / "fixtures"
+    if not fixture_dir.exists():
+        fixture_dir.mkdir()
+    return fixture_dir
+
+
+def persist_fixture(fixture_name: str, data: Union[List[Dict[str, Any]], str], folder: str, format="ndjson") -> Path:
+    fixture_dir = get_fixture_dir(folder)
+    fixture_file = fixture_dir / f"{fixture_name}.{format}"
+    fixture_file.write_text(data if isinstance(data, str) else format_data_to_ndjson(data))
+    return fixture_file
+
+
+def load_fixture(
+    fixture_name: str,
+    folder: str,
+    format="ndjson",
+) -> Union[Path, None]:
+    fixture_dir = get_fixture_dir(folder)
+    fixture_file = fixture_dir / f"{fixture_name}.{format}"
+    if not fixture_file.exists():
+        return None
+    return fixture_file

{tinybird-0.0.1.dev55 → tinybird-0.0.1.dev57}/tinybird/tb/modules/login.py

@@ -21,11 +21,12 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
         self.send_response(200)
         self.send_header("Content-type", "text/html")
         self.end_headers()
-        self.wfile.write(b"""
+        self.wfile.write(
+            """
         <html>
         <head>
             <style>
-                body {
+                body {{
                     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
                     background: #f5f5f5;
                     display: flex;
@@ -33,7 +34,7 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
                     justify-content: center;
                     height: 100vh;
                     margin: 0;
-                }
+                }}
             </style>
         </head>
         <body>
@@ -41,14 +42,16 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
                 const searchParams = new URLSearchParams(window.location.search);
                 const code = searchParams.get('code');
                 const workspace = searchParams.get('workspace');
-                fetch('/?code=' + code, {method: 'POST'})
-                    .then(() => {
-                        window.location.href = "https://cloud.tinybird.co/cli-login?workspace=" + workspace;
-                    });
+                const host = "{auth_host}";
+                fetch('/?code=' + code, {{method: 'POST'}})
+                    .then(() => {{
+                        window.location.href = host + "/cli-login?workspace=" + workspace;
+                    }});
             </script>
         </body>
         </html>
-        """)
+        """.format(auth_host=self.server.auth_host).encode()  # type: ignore
+        )
 
     def do_POST(self):
         parsed_path = urllib.parse.urlparse(self.path)
@@ -75,13 +78,14 @@ AUTH_SERVER_PORT = 49160
 class AuthServer(socketserver.TCPServer):
     allow_reuse_address = True
 
-    def __init__(self, server_address, RequestHandlerClass, auth_callback):
+    def __init__(self, server_address, RequestHandlerClass, auth_callback, auth_host):
         self.auth_callback = auth_callback
+        self.auth_host = auth_host
         super().__init__(server_address, RequestHandlerClass)
 
 
-def start_server(auth_callback):
-    with AuthServer(("", AUTH_SERVER_PORT), AuthHandler, auth_callback) as httpd:
+def start_server(auth_callback, auth_host):
+    with AuthServer(("", AUTH_SERVER_PORT), AuthHandler, auth_callback, auth_host) as httpd:
         httpd.timeout = 30
         start_time = time.time()
         while time.time() - start_time < 60:  # Run for a maximum of 60 seconds
@@ -109,6 +113,9 @@ async def login(host: str, auth_host: str, workspace: str):
     auth_event = threading.Event()
     auth_code: list[str] = []  # Using a list to store the code, as it's mutable
 
+    if auth_host == "https://cloud.tinybird.co" and "wadus" in host:
+        auth_host = "https://cloud-wadus.tinybird.co"
+
     def auth_callback(code):
         auth_code.append(code)
         auth_event.set()
@@ -116,7 +123,7 @@ async def login(host: str, auth_host: str, workspace: str):
     click.echo(FeedbackManager.highlight(message="» Opening browser for authentication..."))
 
     # Start the local server in a separate thread
-    server_thread = threading.Thread(target=start_server, args=(auth_callback,))
+    server_thread = threading.Thread(target=start_server, args=(auth_callback, auth_host))
     server_thread.daemon = True
     server_thread.start()
 

{tinybird-0.0.1.dev55 → tinybird-0.0.1.dev57}/tinybird/tb/modules/mock.py

@@ -10,7 +10,7 @@ from tinybird.prompts import mock_prompt
 from tinybird.tb.modules.cli import cli
 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.datafile.fixture import persist_fixture
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml
@@ -99,9 +99,8 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, skip
                 sql = extract_xml(response, "sql")
                 result = await tb_client.query(f"{sql} FORMAT JSON")
                 data = result.get("data", [])[:rows]
-                fixture_name = build_fixture_name(str(datasource_path), datasource_name, datasource_content)
-                fixture_path = persist_fixture(fixture_name, data, folder)
-                click.echo(FeedbackManager.info(message=f"✓ /fixtures/{fixture_name}.ndjson created"))
+                fixture_path = persist_fixture(datasource_name, data, folder)
+                click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}.ndjson created"))
 
                 if os.environ.get("TB_DEBUG", "") != "":
                     logging.debug(sql)

{tinybird-0.0.1.dev55 → tinybird-0.0.1.dev57}/tinybird/tb/modules/token.py

@@ -301,7 +301,8 @@ async def create_static_token(ctx, name: str):
             if current_scope:
                 scopes.append(current_scope)
                 current_scope = {}
-            current_scope = {"scope": args[i + 1]}
+            unsafe_scope = args[i + 1]
+            current_scope = {"scope": unsafe_scope.upper() if isinstance(unsafe_scope, str) else unsafe_scope}
             i += 2
         elif args[i] == "--resource":
             if current_scope is None:

{tinybird-0.0.1.dev55 → tinybird-0.0.1.dev57}/tinybird/tb/modules/watch.py

@@ -1,16 +1,12 @@
-import asyncio
 import os
 import time
 from pathlib import Path
-from typing import Any, Callable, List, Optional, Union
+from typing import Any, Callable, Optional, Union
 
 import click
 from watchdog.events import (
     DirDeletedEvent,
-    DirMovedEvent,
     FileDeletedEvent,
-    FileMovedEvent,
-    FileSystemEventHandler,
     PatternMatchingEventHandler,
 )
 from watchdog.observers import Observer
@@ -21,113 +17,12 @@ from tinybird.tb.modules.project import Project
 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 None
-
-        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,
-    project: Project,
-    build_ok: bool,
-) -> None:
-    # Handle both sync and async process functions
-    async def process_wrapper(files: List[str]) -> None:
-        click.echo(FeedbackManager.highlight(message="» Rebuilding project..."))
-        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=str(project.path), recursive=True)
-
-    observer.start()
-
-    try:
-        while True:
-            time.sleep(1)
-    except KeyboardInterrupt:
-        observer.stop()
-
-    observer.join()
-
-
 class WatchProjectHandler(PatternMatchingEventHandler):
     def __init__(
         self,
         shell: Shell,
         project: Project,
-        process: Callable[[Optional[str], Optional[str]], None],
+        process: Callable[[bool, Optional[str], Optional[str]], None],
     ):
         self.shell = shell
         self.project = project
@@ -156,14 +51,7 @@ class WatchProjectHandler(PatternMatchingEventHandler):
 
     def _process(self, path: Optional[str] = None) -> None:
         click.echo(FeedbackManager.highlight(message="» Rebuilding project..."))
-        time_start = time.time()
-        self.process(path, self.diff(path))
-        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")
-        )
+        self.process(True, path, self.diff(path))
         self.shell.reprint_prompt()
 
     def diff(self, path: Optional[str] = None) -> Optional[str]:
@@ -225,7 +113,7 @@ class WatchProjectHandler(PatternMatchingEventHandler):
 
 def watch_project(
     shell: Shell,
-    process: Callable[[Optional[str], Optional[str]], None],
+    process: Callable[[bool, Optional[str], Optional[str]], None],
     project: Project,
 ) -> None:
     event_handler = WatchProjectHandler(shell=shell, project=project, process=process)

{tinybird-0.0.1.dev55 → tinybird-0.0.1.dev57}/tinybird.egg-info/PKG-INFO

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

tinybird-0.0.1.dev55/tinybird/tb/modules/datafile/fixture.py

@@ -1,57 +0,0 @@
-import hashlib
-from pathlib import Path
-from typing import Any, Dict, List, Union
-
-from tinybird.tb.modules.common import format_data_to_ndjson
-from tinybird.tb.modules.datafile.parse_datasource import parse_datasource
-
-
-def build_fixture_name(filename: str, datasource_name: str, datasource_content: str) -> str:
-    """Generate a unique fixture name based on datasource properties.
-
-    Args:
-        datasource_name: Name of the datasource
-        datasource_content: Content of the datasource file
-        row_count: Number of rows requested
-
-    Returns:
-        str: A unique fixture name combining a hash of the inputs with the datasource name
-    """
-
-    doc = parse_datasource(filename, content=datasource_content)
-    schema = doc.nodes[0].get("schema", "").strip()
-    # Combine all inputs into a single string
-    combined = f"{datasource_name}{schema}"
-
-    # Generate hash
-    hash_obj = hashlib.sha256(combined.encode())
-    hash_str = hash_obj.hexdigest()[:8]
-
-    # Return fixture name with hash
-    return f"{datasource_name}_{hash_str}"
-
-
-def get_fixture_dir(folder: str) -> Path:
-    fixture_dir = Path(folder) / "fixtures"
-    if not fixture_dir.exists():
-        fixture_dir.mkdir()
-    return fixture_dir
-
-
-def persist_fixture(fixture_name: str, data: Union[List[Dict[str, Any]], str], folder: str, format="ndjson") -> Path:
-    fixture_dir = get_fixture_dir(folder)
-    fixture_file = fixture_dir / f"{fixture_name}.{format}"
-    fixture_file.write_text(data if isinstance(data, str) else format_data_to_ndjson(data))
-    return fixture_file
-
-
-def load_fixture(
-    fixture_name: str,
-    folder: str,
-    format="ndjson",
-) -> Union[Path, None]:
-    fixture_dir = get_fixture_dir(folder)
-    fixture_file = fixture_dir / f"{fixture_name}.{format}"
-    if not fixture_file.exists():
-        return None
-    return fixture_file