tinybird 0.0.1.dev30__py3-none-any.whl → 0.0.1.dev31__py3-none-any.whl

tinybird/__cli__.py

@@ -1,6 +1,6 @@
-__name__ = "tinybird-cli"
+__name__ = "tinybird_cli"
 __description__ = "Tinybird Command Line Tool"
-__url__ = "https://www.tinybird.co/docs/cli/introduction.html"
+__url__ = "https://www.tinybird.co/docs/cli"
 __author__ = "Tinybird"
 __author_email__ = "support@tinybird.co"
 __version__ = "x.y.z"

tinybird/config.py

@@ -29,6 +29,7 @@ LEGACY_HOSTS = {
     "https://api.us-east.aws.tinybird.co": "https://app.tinybird.co/aws/us-east-1",
     "https://api.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/us-west-2",
     "https://api.eu-central-1.aws.tinybird.co": "https://app.tinybird.co/aws/eu-central-1",
+    "https://api.eu-west-1.aws.tinybird.co": "https://app.tinybird.co/aws/eu-west-1",
     "https://api.ap-east.aws.tinybird.co": "https://app.tinybird.co/aws/ap-east",
     "https://api.wadus1.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus1",
     "https://api.wadus2.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus2",

tinybird/context.py

@@ -21,3 +21,4 @@ wait_parameter: ContextVar[bool] = ContextVar("wait_parameter")
 api_host: ContextVar[str] = ContextVar("api_host")
 ff_split_to_array_escape: ContextVar[bool] = ContextVar("ff_split_to_array_escape")
 ff_preprocess_parameters_circuit_breaker: ContextVar[bool] = ContextVar("ff_preprocess_parameters_circuit_breaker")
+ff_column_json_backticks_circuit_breaker: ContextVar[bool] = ContextVar("ff_column_json_backticks_circuit_breaker")

tinybird/sql_template.py

@@ -12,7 +12,11 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 from tornado import escape
 from tornado.util import ObjectDict, exec_in, unicode_type
 
-from tinybird.context import ff_preprocess_parameters_circuit_breaker, ff_split_to_array_escape
+from tinybird.context import (
+    ff_column_json_backticks_circuit_breaker,
+    ff_preprocess_parameters_circuit_breaker,
+    ff_split_to_array_escape,
+)
 
 from .datatypes import testers
 from .tornado_template import VALID_CUSTOM_FUNCTION_NAMES, SecurityException, Template
@@ -271,6 +275,8 @@ def columns(x, default=None, fn=None):
 
 
 def column(x, default=None):
+    bypass_colunn_json_backticks = ff_column_json_backticks_circuit_breaker.get(False)
+
     if x is None or isinstance(x, Placeholder):
         if default is None:
             raise SQLTemplateException(
@@ -278,7 +284,18 @@ def column(x, default=None):
                 documentation="/cli/advanced-templates.html#column",
             )
         x = default
-    return Symbol("`" + sqlescape(x) + "`")
+
+    quote = "`"
+    if bypass_colunn_json_backticks:
+        return Symbol(quote + sqlescape(x) + quote)
+
+    try:
+        slices = x.split(".")
+        escaped_slices = [quote + sqlescape(s) + quote for s in slices]
+        escaped = ".".join(escaped_slices)
+        return Symbol(escaped)
+    except Exception:  # in case there's a problem with .split
+        return Symbol(quote + sqlescape(x) + quote)
 
 
 def symbol(x, quote="`"):
@@ -2109,6 +2126,8 @@ def render_sql_template(
     ('SELECT `foo`', {}, [])
     >>> render_sql_template("SELECT {{column(agg)}}", {'agg': '"foo"'})
     ('SELECT `foo`', {}, [])
+    >>> render_sql_template("SELECT {{column(agg)}}", {'agg': 'json.a'})
+    ('SELECT `json`.`a`', {}, [])
     >>> render_sql_template('{% if not defined(test) %}error("This is an error"){% end %}', {})
     ('error("This is an error")', {}, [])
     >>> render_sql_template('{% if not defined(test) %}custom_error({error: "This is an error"}){% end %}', {})

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.dev30'
-__revision__ = 'f7bc1dc'
+__version__ = '0.0.1.dev31'
+__revision__ = '0e056e8'

tinybird/tb/modules/build.py

@@ -2,18 +2,49 @@ import asyncio
 import glob
 import json
 import logging
+import threading
 from pathlib import Path
 from typing import List
 
 import click
 import requests
 
+from tinybird.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_tinybird_local_client
+from tinybird.tb.modules.shell import Shell
+from tinybird.tb.modules.watch import watch_project
 
 
-def project_files(project_path: Path) -> List[str]:
+@cli.command()
+@click.option("--folder", type=str, default=".")
+@click.option("--watch", is_flag=True, default=False, help="Watch for changes and rebuild automatically")
+def build(folder: str, watch: bool) -> None:
+    """
+    Validate and build the project server side.
+    """
+
+    tb_client = asyncio.run(get_tinybird_local_client(folder))
+
+    def process() -> None:
+        build_project(folder, tb_client)
+
+    process()
+
+    if watch:
+        shell = Shell(folder=folder, client=tb_client)
+        click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
+        watcher_thread = threading.Thread(
+            target=watch_project,
+            args=(shell, process, folder),
+            daemon=True,
+        )
+        watcher_thread.start()
+        shell.run()
+
+
+def get_project_files(project_path: Path) -> List[str]:
     project_file_extensions = ("datasource", "pipe")
     project_files = []
     for extension in project_file_extensions:
@@ -23,38 +54,32 @@ def project_files(project_path: Path) -> List[str]:
     return project_files
 
 
-@cli.command()
-@click.argument("project_path", type=click.Path(exists=True), default=Path.cwd())
-def build(project_path: Path) -> None:
-    """
-    Validate and build the project server side.
-    """
+def build_project(folder: str, tb_client: TinyB) -> None:
     MULTIPART_BOUNDARY_DATA_PROJECT = "data_project://"
     DATAFILE_TYPE_TO_CONTENT_TYPE = {
         ".datasource": "text/plain",
         ".pipe": "text/plain",
     }
-
-    tb_client = asyncio.run(get_tinybird_local_client(str(project_path)))
     TINYBIRD_API_URL = tb_client.host + "/v1/build"
     TINYBIRD_API_KEY = tb_client.token
-
-    files = [
-        ("context://", ("cli-version", "1.0.0", "text/plain")),
-    ]
-    fds = []
-    for file_path in project_files(project_path):
-        relative_path = str(Path(file_path).relative_to(project_path))
-        fd = open(file_path, "rb")
-        fds.append(fd)
-        content_type = DATAFILE_TYPE_TO_CONTENT_TYPE.get(Path(file_path).suffix, "application/unknown")
-        files.append((MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, fd.read().decode("utf-8"), content_type)))
-
     try:
+        files = [
+            ("context://", ("cli-version", "1.0.0", "text/plain")),
+        ]
+        fds = []
+        project_path = Path(folder)
+        project_files = get_project_files(project_path)
+        for file_path in project_files:
+            relative_path = str(Path(file_path).relative_to(project_path))
+            fd = open(file_path, "rb")
+            fds.append(fd)
+            content_type = DATAFILE_TYPE_TO_CONTENT_TYPE.get(Path(file_path).suffix, "application/unknown")
+            files.append((MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, fd.read().decode("utf-8"), content_type)))
         HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
         r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS)
         result = r.json()
+
         logging.debug(json.dumps(result, indent=2))
 
         build_result = result.get("result")
@@ -69,6 +94,8 @@ def build(project_path: Path) -> None:
                 click.echo(FeedbackManager.error(message=error_msg))
         else:
             click.echo(FeedbackManager.error(message=f"Unknown build result. Error: {result.get('error')}"))
+    except Exception as e:
+        click.echo(FeedbackManager.error_exception(error="Error building project: " + str(e)))
     finally:
         for fd in fds:
             fd.close()

tinybird/tb/modules/cli.py

@@ -210,7 +210,8 @@ async def cli(
 
     logging.debug("debug enabled")
 
-    client = await create_ctx_client(config, prod)
+    skip_client = ctx.invoked_subcommand in ["login", "workspace"]
+    client = await create_ctx_client(config, prod, skip_client)
 
     if client:
         ctx.ensure_object(dict)["client"] = client
@@ -529,7 +530,7 @@ async def ask(prompt: str, folder: str) -> None:
 
         client = config.get_client()
         llm = LLM(user_token=user_token, client=client)
-        click.echo(await llm.ask(prompt, system_prompt=ask_prompt(resources_xml)))
+        click.echo(await llm.ask(system_prompt=ask_prompt(resources_xml), prompt=prompt))
     except Exception as e:
         raise CLIException(FeedbackManager.error_exception(error=e))
 
@@ -571,11 +572,11 @@ def __unpatch_click_output():
     click.secho = __old_click_secho
 
 
-async def create_ctx_client(config: Dict[str, Any], prod: bool):
+async def create_ctx_client(config: Dict[str, Any], prod: bool, skip_client: bool):
+    if skip_client:
+        return None
+
     if prod:
         return _get_tb_client(config.get("token", None), config["host"])
 
-    try:
-        return await get_tinybird_local_client()
-    except Exception:
-        return None
+    return await get_tinybird_local_client()

tinybird/tb/modules/create.py

@@ -109,7 +109,7 @@ async def create(
                     has_json_path = "`json:" in datasource_content
                     if has_json_path:
                         prompt = f"<datasource_schema>{datasource_content}</datasource_schema>\n<user_input>{prompt}</user_input>"
-                        response = await llm.ask(prompt, system_prompt=mock_prompt(rows))
+                        response = await llm.ask(system_prompt=mock_prompt(rows), prompt=prompt)
                         sql = extract_xml(response, "sql")
                         sql = sql.split("FORMAT")[0]
                         result = await local_client.query(f"{sql} FORMAT JSON")
@@ -206,7 +206,7 @@ TYPE ENDPOINT
             ]
         )
         llm = LLM(user_token=user_token, client=tb_client)
-        result = await llm.ask(prompt, system_prompt=create_prompt(resources_xml))
+        result = await llm.ask(system_prompt=create_prompt(resources_xml), prompt=prompt)
         result = extract_xml(result, "response")
         resources = parse_xml(result, "resource")
         datasources = []

tinybird/tb/modules/llm.py

@@ -1,35 +1,9 @@
-import json
-import os
-import urllib.parse
 from copy import deepcopy
-from typing import Any, List
-
-from anthropic import AnthropicVertex
-from pydantic import BaseModel
+from typing import Optional
 
 from tinybird.client import TinyB
 
 
-class DataFile(BaseModel):
-    name: str
-    content: str
-
-
-class DataProject(BaseModel):
-    datasources: List[DataFile]
-    pipes: List[DataFile]
-
-
-class TestExpectation(BaseModel):
-    name: str
-    description: str
-    parameters: str
-
-
-class TestExpectations(BaseModel):
-    tests: List[TestExpectation]
-
-
 class LLM:
     def __init__(
         self,
@@ -39,82 +13,26 @@ class LLM:
         self.user_client = deepcopy(client)
         self.user_client.token = user_token
 
-    async def ask(self, prompt: str, system_prompt: str = "") -> str:
+    async def ask(self, system_prompt: str, prompt: Optional[str] = None) -> str:
         """
         Calls the model with the given prompt and returns the response.
 
         Args:
+            system_prompt (str): The system prompt to send to the model.
             prompt (str): The user prompt to send to the model.
 
         Returns:
             str: The response from the language model.
         """
-        messages: List[Any] = []
 
-        if system_prompt:
-            messages.append({"role": "user", "content": system_prompt})
+        data = {"system": system_prompt}
 
         if prompt:
-            messages.append({"role": "user", "content": prompt})
-
-        if gcloud_access_token := os.getenv("GCLOUD_ACCESS_TOKEN"):
-            client = AnthropicVertex(
-                region="europe-west1",
-                project_id="gen-lang-client-0705305160",
-                access_token=gcloud_access_token,
-            )
-            message = client.messages.create(
-                max_tokens=8000,
-                messages=messages,
-                model="claude-3-5-sonnet-v2@20241022",
-            )
-            return message.content[0].text or ""  # type: ignore
+            data["prompt"] = prompt
 
-        data = {
-            "model": "o1-mini",
-            "messages": messages,
-        }
         response = await self.user_client._req(
             "/v0/llm",
             method="POST",
-            data=json.dumps(data),
-            headers={"Content-Type": "application/json"},
+            data=data,
         )
         return response.get("result", "")
-
-    async def create_project(self, prompt: str) -> DataProject:
-        try:
-            prompt = (
-                prompt
-                + "\n#More extra context\n- If you add some array data type remember that the json path should be like this: `json:$.array_field[:]`"
-            )
-            response = await self.user_client._req(
-                "/v0/llm/create",
-                method="POST",
-                data=f'{{"prompt": {json.dumps(prompt)}}}',
-                headers={"Content-Type": "application/json"},
-            )
-
-            return DataProject.model_validate(response.get("result", {}))
-        except Exception:
-            return DataProject(datasources=[], pipes=[])
-
-    async def generate_sql_sample_data(self, schema: str, rows: int = 20, prompt: str = "") -> str:
-        response = await self.user_client._req(
-            "/v0/llm/mock",
-            method="POST",
-            data=f'{{"schema": "{urllib.parse.quote(schema)}", "rows": {rows}, "context": "{prompt}"}}',
-            headers={"Content-Type": "application/json"},
-        )
-        result = response.get("result", "")
-        return result.replace("elementAt", "arrayElement")
-
-    async def create_tests(self, pipe_content: str, pipe_params: set[str], prompt: str = "") -> TestExpectations:
-        response = await self.user_client._req(
-            "/v0/llm/create/tests",
-            method="POST",
-            data=json.dumps({"pipe_content": pipe_content, "pipe_params": list(pipe_params), "prompt": prompt}),
-            headers={"Content-Type": "application/json"},
-        )
-        result = response.get("result", "")
-        return TestExpectations.model_validate(result)

tinybird/tb/modules/local_common.py

@@ -8,7 +8,7 @@ from tinybird.client import TinyB
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLIException
 
-TB_IMAGE_NAME = "tinybirdco/tinybird-local:latest"
+TB_IMAGE_NAME = "tinybirdco/tinybird-local:beta"
 TB_CONTAINER_NAME = "tinybird-local"
 TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 80))
 TB_LOCAL_HOST = f"http://localhost:{TB_LOCAL_PORT}"

tinybird/tb/modules/mock.py

@@ -66,7 +66,7 @@ async def mock(datasource: str, rows: int, prompt: str, folder: str) -> None:
         llm = LLM(user_token=user_token, client=user_client)
         tb_client = await get_tinybird_local_client(os.path.abspath(folder))
         prompt = f"<datasource_schema>{datasource_content}</datasource_schema>\n<user_input>{prompt}</user_input>"
-        response = await llm.ask(prompt, system_prompt=mock_prompt(rows))
+        response = await llm.ask(system_prompt=mock_prompt(rows), prompt=prompt)
         sql = extract_xml(response, "sql")
         if os.environ.get("TB_DEBUG", "") != "":
             logging.debug(sql)

tinybird/tb/modules/shell.py

@@ -1,8 +1,10 @@
 import asyncio
 import concurrent.futures
+import glob
 import os
 import subprocess
 import sys
+from pathlib import Path
 from typing import List
 
 import click
@@ -21,17 +23,22 @@ from tinybird.tb.modules.table import format_table
 
 
 class DynamicCompleter(Completer):
-    def __init__(self, datasources: List[str], shared_datasources: List[str], endpoints: List[str], pipes: List[str]):
-        self.datasources = datasources
-        self.shared_datasources = shared_datasources
-        self.endpoints = endpoints
-        self.pipes = pipes
+    def __init__(self, folder: str):
+        self.folder = folder
         self.static_commands = ["create", "mock", "test", "select"]
         self.test_commands = ["create", "run", "update"]
         self.mock_flags = ["--prompt", "--rows"]
         self.common_rows = ["10", "50", "100", "500", "1000"]
         self.sql_keywords = ["select", "from", "where", "group by", "order by", "limit"]
 
+    @property
+    def datasources(self):
+        return [Path(f).stem for f in glob.glob(f"{self.folder}/**/*.datasource", recursive=True)]
+
+    @property
+    def pipes(self):
+        return [Path(f).stem for f in glob.glob(f"{self.folder}/**/*.pipe", recursive=True)]
+
     def get_completions(self, document, complete_event):
         text = document.text_before_cursor.strip()
         words = text.split()
@@ -75,9 +82,9 @@ class DynamicCompleter(Completer):
         if words[-1] == "from" or (
             "from" in words and len(words) > words.index("from") + 1 and text_lower.endswith(" ")
         ):
-            for x in self.datasources + self.shared_datasources:
+            for x in self.datasources:
                 yield Completion(x, start_position=0, display=x, style="class:completion.datasource")
-            for x in self.endpoints + self.pipes:
+            for x in self.pipes:
                 yield Completion(x, start_position=0, display=x, style="class:completion.pipe")
             return
 
@@ -116,7 +123,7 @@ class DynamicCompleter(Completer):
                 yield Completion(cmd, start_position=0, display=cmd, style="class:completion.cmd")
             return
         elif len(words) == 2:
-            for cmd in self.endpoints:
+            for cmd in self.pipes:
                 yield Completion(cmd, start_position=0, display=cmd, style="class:completion.pipe")
             return
 
@@ -130,7 +137,7 @@ class DynamicCompleter(Completer):
                     style="class:completion.cmd",
                 )
 
-        for cmd in self.datasources + self.shared_datasources:
+        for cmd in self.datasources:
             if cmd.startswith(current_word):
                 yield Completion(
                     cmd,
@@ -139,7 +146,7 @@ class DynamicCompleter(Completer):
                     style="class:completion.datasource",
                 )
 
-        for cmd in self.endpoints + self.pipes:
+        for cmd in self.pipes:
             if cmd.startswith(current_word):
                 yield Completion(
                     cmd,
@@ -176,26 +183,14 @@ def _(event):
 
 
 class Shell:
-    def __init__(
-        self,
-        folder: str,
-        client: TinyB,
-        datasources: List[str],
-        shared_datasources: List[str],
-        pipes: List[str],
-        endpoints: List[str],
-    ):
+    def __init__(self, folder: str, client: TinyB):
         self.history = self.get_history()
         self.folder = folder
         self.client = client
-        self.datasources = datasources
-        self.shared_datasources = shared_datasources
-        self.pipes = pipes
-        self.endpoints = endpoints
         self.prompt_message = "\ntb > "
         self.commands = ["create", "mock", "test", "tb", "select"]
         self.session: PromptSession = PromptSession(
-            completer=DynamicCompleter(self.datasources, self.shared_datasources, self.endpoints, self.pipes),
+            completer=DynamicCompleter(folder),
             complete_style=CompleteStyle.COLUMN,
             complete_while_typing=True,
             history=self.history,
@@ -283,7 +278,7 @@ class Shell:
             return
         if arg.startswith("with") or arg.startswith("select"):
             self.run_sql(argline)
-        elif len(arg.split()) == 1 and arg in self.endpoints + self.pipes + self.datasources + self.shared_datasources:
+        elif len(arg.split()) == 1 and arg in self.pipes + self.datasources:
             self.run_sql(f"select * from {arg}")
         else:
             subprocess.run(f"tb {arg}", shell=True, text=True)
@@ -310,16 +305,16 @@ class Shell:
             with concurrent.futures.ThreadPoolExecutor() as executor:
                 res = executor.submit(run_query_in_thread).result()
 
-        except Exception as e:
-            click.echo(FeedbackManager.error_exception(error=str(e)))
+                if isinstance(res, dict) and "error" in res:
+                    click.echo(FeedbackManager.error_exception(error=res["error"]))
 
-        if isinstance(res, dict) and "error" in res:
-            click.echo(FeedbackManager.error_exception(error=res["error"]))
+                if isinstance(res, dict) and "data" in res and res["data"]:
+                    print_table_formatted(res, "QUERY")
+                else:
+                    click.echo(FeedbackManager.info_no_rows())
 
-        if isinstance(res, dict) and "data" in res and res["data"]:
-            print_table_formatted(res, "QUERY")
-        else:
-            click.echo(FeedbackManager.info_no_rows())
+        except Exception as e:
+            click.echo(FeedbackManager.error_exception(error=str(e)))
 
     def reprint_prompt(self):
         click.echo(f"{bcolors.OKGREEN}{self.prompt_message}{bcolors.ENDC}", nl=False)

tinybird/tb/modules/test.py

@@ -111,7 +111,7 @@ async def test_create(name_or_filename: str, prompt: str, folder: str) -> None:
             raise CLIException(FeedbackManager.error(message="No user token found"))
         llm = LLM(user_token=user_token, client=config.get_client())
 
-        response_llm = await llm.ask(prompt, system_prompt=system_prompt)
+        response_llm = await llm.ask(system_prompt=system_prompt, prompt=prompt)
         response_xml = extract_xml(response_llm, "response")
         tests_content = parse_xml(response_xml, "test")
 

tinybird/tb/modules/update.py

@@ -71,7 +71,7 @@ async def update(
                 has_json_path = "`json:" in datasource_content
                 if has_json_path:
                     prompt = f"<datasource_schema>{datasource_content}</datasource_schema>\n<user_input>{prompt}</user_input>"
-                    response = await llm.ask(prompt, system_prompt=mock_prompt(rows=20))
+                    response = await llm.ask(system_prompt=mock_prompt(rows=20), prompt=prompt)
                     sql = extract_xml(response, "sql")
                     sql = sql.split("FORMAT")[0]
                     result = await local_client.query(f"{sql} FORMAT JSON")
@@ -117,7 +117,7 @@ async def update_resources(
         ]
     )
     llm = LLM(user_token=user_token, client=tb_client)
-    result = await llm.ask(prompt, system_prompt=update_prompt(resources_xml))
+    result = await llm.ask(system_prompt=update_prompt(resources_xml), prompt=prompt)
     result = extract_xml(result, "response")
     resources = parse_xml(result, "resource")
     datasources = []

tinybird/tb/modules/watch.py

@@ -1,10 +1,18 @@
 import asyncio
 import os
 import time
+from pathlib import Path
 from typing import Any, Callable, List, Optional, Union
 
 import click
-from watchdog.events import DirMovedEvent, FileMovedEvent, FileSystemEventHandler
+from watchdog.events import (
+    DirDeletedEvent,
+    DirMovedEvent,
+    FileDeletedEvent,
+    FileMovedEvent,
+    FileSystemEventHandler,
+    PatternMatchingEventHandler,
+)
 from watchdog.observers import Observer
 
 from tinybird.tb.modules.feedback_manager import FeedbackManager
@@ -110,3 +118,70 @@ def watch_files(
         observer.stop()
 
     observer.join()
+
+
+class WatchProjectHandler(PatternMatchingEventHandler):
+    def __init__(self, shell: Shell, folder: str, process: Callable[[List[str]], None]):
+        self.shell = shell
+        self.process = process
+        super().__init__(
+            patterns=[f"{folder}/**/*.datasource", f"{folder}/**/*.pipe"],
+            ignore_patterns=[f"{folder}/vendor/"],
+        )
+
+    def should_process(self, event: Any) -> Optional[str]:
+        if event.is_directory:
+            return None
+
+        if os.path.exists(event.src_path):
+            return event.src_path
+
+        if os.path.exists(event.dest_path):
+            return event.dest_path
+
+        return event.src_path
+
+    def _process(self) -> None:
+        click.echo(FeedbackManager.highlight(message="» Rebuilding..."))
+        time_start = time.time()
+        self.process()
+        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.shell.reprint_prompt()
+
+    def on_modified(self, event: Any) -> None:
+        if path := self.should_process(event):
+            filename = Path(path).name
+            click.echo(FeedbackManager.highlight(message=f"\n\n⟲ Changes detected in {filename}\n"))
+            self._process()
+
+    def on_deleted(self, event: Union[DirDeletedEvent, FileDeletedEvent]) -> None:
+        filename = Path(event.src_path).name
+        if event.is_directory:
+            click.echo(FeedbackManager.highlight(message=f"\n\n⟲ Deleted directory: {filename}\n"))
+        else:
+            click.echo(FeedbackManager.highlight(message=f"\n\n⟲ Deleted file: {filename}\n"))
+        self._process()
+
+
+def watch_project(
+    shell: Shell,
+    process: Callable,
+    folder: str,
+) -> None:
+    event_handler = WatchProjectHandler(shell=shell, folder=folder, process=process)
+    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.dev30.dist-info → tinybird-0.0.1.dev31.dist-info}/METADATA

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

{tinybird-0.0.1.dev30.dist-info → tinybird-0.0.1.dev31.dist-info}/RECORD

@@ -1,53 +1,53 @@
-tinybird/__cli__.py,sha256=pgYsVLcqL16wtSn6KtKweNZYoYJdEksTgSvQAW7hH64,250
+tinybird/__cli__.py,sha256=esPl5QDTzuQgHe5FuxWLm-fURFigGGwjnYLh9GuWUw4,232
 tinybird/client.py,sha256=P-bc7s7SbrnzkZkSsb_TO58q4Jxy-bBD5S5qpYiXiZg,51517
-tinybird/config.py,sha256=RRNb3Z1zkykTpusBTSyszuIySHGMsfL5aVxxt1kdr6w,6147
+tinybird/config.py,sha256=ENRNyEMXHj_P882o31iFz0hTveziLabVRrxiWE5RRBE,6233
 tinybird/connectors.py,sha256=lkpVSUmSuViEZBa4QjTK7YmPHUop0a5UFoTrSmlVq6k,15244
-tinybird/context.py,sha256=kutUQ0kCwparowI74_YLXx6wtTzGLRouJ6oGHVBPzBo,1291
+tinybird/context.py,sha256=eeFneyn_oTUoTIfst59CnSkskchvnWuRvyI7UKRFq14,1407
 tinybird/datatypes.py,sha256=XNypumfqNjsvLJ5iNXnbVHRvAJe0aQwI3lS6Cxox-e0,10979
 tinybird/feedback_manager.py,sha256=cNUbt0Jxim02UiIdlyP12DJfXfFFzxDCfJK9XRWZ9A0,67488
 tinybird/git_settings.py,sha256=Sw_8rGmribEFJ4Z_6idrVytxpFYk7ez8ei0qHULzs3E,3934
 tinybird/prompts.py,sha256=xrZMZykphO9DRfW5yvCJNZMhPq0v1zab3d9jKy9plhU,24064
 tinybird/sql.py,sha256=eulpRe05ZFrKFrxYawgxDxxrktFE8uL6hSL1gHIWKyg,46166
-tinybird/sql_template.py,sha256=IqYRfUxDYBCoOYjqqvn--_8QXLv9FSRnJ0bInx7q1Xs,93051
+tinybird/sql_template.py,sha256=GmMLAI10MTqjQo9qztuQHLRWs67teozsWDxUBdvkAn4,93668
 tinybird/sql_template_fmt.py,sha256=1z-PuqSZXtzso8Z_mPqUc-NxIxUrNUcVIPezNieZk-M,10196
 tinybird/sql_toolset.py,sha256=HAo6xtCjlbhikdpK6xfMC_RvEG6uzRropwhKSHEkIIc,14343
 tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=oflXyoL2LSCegvl6bAzqw2JIqRaN5WPjhYYDtQcfuOE,41869
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=OXkBhlzGjZotjD0vaT-rFIbSGV4tpiHxE8qO_ip0SyQ,40454
-tinybird/tb/__cli__.py,sha256=6hEdXKgx0nKv06KQFvgIz7SfdCIFDW1PO1n92A31kH4,251
+tinybird/tb/__cli__.py,sha256=SgyAWbfPDLAaYyoq9rFOPpcXyLPQqCPh2m8Bt_6lxaI,251
 tinybird/tb/cli.py,sha256=dmrf8O9cqBuOYUmVBbNDSNQpHUhBg6IkBPaISAj4kHo,923
 tinybird/tb/modules/auth.py,sha256=EzRWFmwRkXNhUmRaruEVFLdkbUg8xMSix0cAWl5D4Jg,9029
-tinybird/tb/modules/build.py,sha256=RRDOd887ym79BWqmLUQxwnjPfG4c4kEGEF2dUP255us,2769
+tinybird/tb/modules/build.py,sha256=J_YCaJIkvoM1CMpsYQ4gM1LinaqJmJmvfcmhxEmWq_g,3725
 tinybird/tb/modules/build_client.py,sha256=SoGaGPBYT_0BoRp2lxNyBBvQQ1GFAMpx_o62jb91DUI,8046
 tinybird/tb/modules/cicd.py,sha256=SjCyvvy0WUnsjFs2biwwXvcf0Ddpmghhd8-SnMyfsRM,5355
-tinybird/tb/modules/cli.py,sha256=qe1JwNqDVxKdk_vyZ3FWG5wRunGfFdgwQ0NSxUJDYC4,22032
+tinybird/tb/modules/cli.py,sha256=i5KQF1kJqd3lflYl0e3tnKrMZBIAOlMF1T5pxa6e7tM,22124
 tinybird/tb/modules/common.py,sha256=e4U7AT0dUBG6O-7Iq2CVN1UHPd6-ZCFucyW0L5gBi4g,70592
 tinybird/tb/modules/config.py,sha256=mie3oMVTf5YOUFEiLs88P16U4LkJafJjSpjwyAkFHog,10979
 tinybird/tb/modules/connection.py,sha256=FhDM-OAnLN2epbO2YonpjJQhHqBjyuanBsZmKlDXrqg,28679
-tinybird/tb/modules/create.py,sha256=Jmx89lgk1jk3rSx2jNzn5Xvr-L8oTetEvr1sEl76Lvw,10846
+tinybird/tb/modules/create.py,sha256=HclKekBKTaobVQeYq9ooSmuBwlrebi-YsFOFJJMGTZs,10860
 tinybird/tb/modules/datasource.py,sha256=PmIoDSLqBNHQvguX9t1T3z9lsG3HB67cmwhQO5_8Lc4,32918
 tinybird/tb/modules/deploy.py,sha256=j1MuiGsWplG1BQs8eG6-STcYyzvHqVESPCOo6P-dcF8,9242
 tinybird/tb/modules/exceptions.py,sha256=4A2sSjCEqKUMqpP3WI00zouCWW4uLaghXXLZBSw04mY,3363
 tinybird/tb/modules/feedback_manager.py,sha256=e8tqehRR0Buhs8O0n8N2Sg2vnnBVb1NLtnZqkPrYD_A,68379
 tinybird/tb/modules/fmt.py,sha256=poh6_cwVGSf-sBu6LKWuO2TANL_J8Sgm25sPpwxa3Aw,3558
 tinybird/tb/modules/job.py,sha256=956Pj8BEEsiD2GZsV9RKKVM3I_CveOLgS82lykO5ukk,2963
-tinybird/tb/modules/llm.py,sha256=C6piIQARMnuXA1OmZgngp6f5ehe2qHBunzemRgRQ4KI,3774
+tinybird/tb/modules/llm.py,sha256=mguBJaTJ74a5mQXcBQwbCjKugfvcFm_Wzg2e_hSkooQ,953
 tinybird/tb/modules/llm_utils.py,sha256=hIfBU7vMUHUt25pljim3WdZdJTNr9hDo3mHezqI5B7w,766
 tinybird/tb/modules/local.py,sha256=bSBBk2A0yj4fQHxsdzbZAH1Q_xrqT7vFOIPoz7TNabo,5260
-tinybird/tb/modules/local_common.py,sha256=fRHJrEix19lAOE4EpzRhWBJH8FUk7hCCvynP0Icf7Ww,2298
+tinybird/tb/modules/local_common.py,sha256=Na4zHQP2H9oE840KYUn69_f0PcqExQtaKFikaiNf43s,2296
 tinybird/tb/modules/login.py,sha256=0cS-f3MsQFHc6xjw8FRWJm4EJBH9C7Ri68EcO_tiwes,6508
-tinybird/tb/modules/mock.py,sha256=b0MqSVvJsaXdUKvagXfPGrh-XB8cYmuyXJ2D4P7uyB0,3658
+tinybird/tb/modules/mock.py,sha256=eSfD-m4w5NLGxjfGRlYplQhC0FKpanysIweG_8GsbNE,3665
 tinybird/tb/modules/pipe.py,sha256=eYmMBiSj1Ur_hXUs74YZ9mCSAyiICDmkuKuTemlxPUY,27018
 tinybird/tb/modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
-tinybird/tb/modules/shell.py,sha256=Ttb7DHjQoQJKLnVS2VObiIn5UwHOvtPZR2yDtvBF1Cc,13453
+tinybird/tb/modules/shell.py,sha256=84WiRppf4bLZSSEscSqFov-7RpDEQ8u0DFovqlnXauk,13093
 tinybird/tb/modules/table.py,sha256=4XrtjM-N0zfNtxVkbvLDQQazno1EPXnxTyo7llivfXk,11035
 tinybird/tb/modules/tag.py,sha256=anPmMUBc-TbFovlpFi8GPkKA18y7Y0GczMsMms5TZsU,3502
 tinybird/tb/modules/telemetry.py,sha256=iEGnMuCuNhvF6ln__j6X9MSTwL_0Hm-GgFHHHvhfknk,10466
-tinybird/tb/modules/test.py,sha256=AQMhVduVg1Oo98Ycla_-49G9nuPxedGwxWyMmkwa0h8,11570
+tinybird/tb/modules/test.py,sha256=2UhRiMRPP2vEsa2ayM_ujLc1cB8gHkKHCLJ50GbkQxc,11577
 tinybird/tb/modules/token.py,sha256=AePr-QMv_vtWwZDWQ92Zp0kPrCjze61i4npiPhoLMZg,12717
-tinybird/tb/modules/update.py,sha256=tQVnFG2yvEDHAwHHkJn_hCw06VBbOgMRJs226_uQjnQ,6813
-tinybird/tb/modules/watch.py,sha256=9D6NTo9cllyJfvObtOzZEbv3SJN42EgfVdYQPN1liZU,3964
+tinybird/tb/modules/update.py,sha256=wXzLhBzKD1kWEN1HejOVkKpFQqomZGfP1AiCvE-K04A,6827
+tinybird/tb/modules/watch.py,sha256=na1H0lVCyMTCgzm2h8FHyKWhWN5poAehWgJeXT2rLXg,6281
 tinybird/tb/modules/workspace.py,sha256=6icAgnTvfL3d1kx4L1Z1cGXCD_2Yx0fNRjbZHNxRbYc,10927
 tinybird/tb/modules/workspace_members.py,sha256=Ai6iCOzXX1zQ8q9iXIFSFHsBJlT-8Q28DaG5Ie-UweY,8726
 tinybird/tb/modules/datafile/build.py,sha256=pwgsIuvHwb2cdsl3IWOAPyj6S9vB3jn_BXGRcKT7I2Y,57577
@@ -73,8 +73,8 @@ tinybird/tb_cli_modules/config.py,sha256=6u6B5QCdiQLbJkCkwtnKGs9H3nP-KXXhC75mF7B
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=iEGnMuCuNhvF6ln__j6X9MSTwL_0Hm-GgFHHHvhfknk,10466
-tinybird-0.0.1.dev30.dist-info/METADATA,sha256=_ggPTXiep4YjUELu26U3P1pKAz2ieqGakQtVM-NlRhE,2482
-tinybird-0.0.1.dev30.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-tinybird-0.0.1.dev30.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev30.dist-info/top_level.txt,sha256=pgw6AzERHBcW3YTi2PW4arjxLkulk2msOz_SomfOEuc,45
-tinybird-0.0.1.dev30.dist-info/RECORD,,
+tinybird-0.0.1.dev31.dist-info/METADATA,sha256=nl0L_9CisXRnrHeEukw_5Z733F7vlRvHMVgHPdVrcL0,2482
+tinybird-0.0.1.dev31.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tinybird-0.0.1.dev31.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev31.dist-info/top_level.txt,sha256=pgw6AzERHBcW3YTi2PW4arjxLkulk2msOz_SomfOEuc,45
+tinybird-0.0.1.dev31.dist-info/RECORD,,