tinybird 0.0.1.dev67__py3-none-any.whl → 0.0.1.dev69__py3-none-any.whl

tinybird/tb/modules/deployment.py

@@ -44,12 +44,15 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     if candidate_deployment.get("live"):
         click.echo(FeedbackManager.error(message="Candidate deployment is already live"))
     else:
-        click.echo(FeedbackManager.success(message="Promoting deployment"))
+        click.echo(FeedbackManager.success(message="Setting candidate deployment as live"))
 
         TINYBIRD_API_URL = f"{host}/v1/deployments/{candidate_deployment.get('id')}/set-live"
         r = requests.post(TINYBIRD_API_URL, headers=headers)
         result = r.json()
         logging.debug(json.dumps(result, indent=2))
+        if result.get("error"):
+            click.echo(FeedbackManager.error(message=result.get("error")))
+            sys.exit(1)
 
     click.echo(FeedbackManager.success(message="Removing old deployment"))
 
@@ -57,6 +60,11 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     r = requests.delete(TINYBIRD_API_URL, headers=headers)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
+    if result.get("error"):
+        click.echo(FeedbackManager.error(message=result.get("error")))
+        sys.exit(1)
+
+    click.echo(FeedbackManager.success(message="Deployment promotion successfully started"))
 
     if wait:
         while True:
@@ -67,12 +75,11 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
 
             last_deployment = result.get("deployment")
             if last_deployment.get("status") == "deleted":
+                click.echo(FeedbackManager.success(message="Deployment promoted successfully"))
                 break
 
             time.sleep(5)
 
-    click.echo(FeedbackManager.success(message="Deployment promoted successfully"))
-
 
 # TODO(eclbg): This logic should be in the server, and there should be a dedicated endpoint for rolling back a
 # deployment
@@ -109,6 +116,9 @@ def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
         r = requests.post(TINYBIRD_API_URL, headers=headers)
         result = r.json()
         logging.debug(json.dumps(result, indent=2))
+        if result.get("error"):
+            click.echo(FeedbackManager.error(message=result.get("error")))
+            sys.exit(1)
 
     click.echo(FeedbackManager.success(message="Removing current deployment"))
 
@@ -116,6 +126,11 @@ def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     r = requests.delete(TINYBIRD_API_URL, headers=headers)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
+    if result.get("error"):
+        click.echo(FeedbackManager.error(message=result.get("error")))
+        sys.exit(1)
+
+    click.echo(FeedbackManager.success(message="Deployment rollback successfully started"))
 
     if wait:
         while True:
@@ -126,11 +141,10 @@ def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
 
             current_deployment = result.get("deployment")
             if current_deployment.get("status") == "deleted":
+                click.echo(FeedbackManager.success(message="Deployment rolled back successfully"))
                 break
             time.sleep(5)
 
-    click.echo(FeedbackManager.success(message="Deployment rolled back successfully"))
-
 
 @cli.group(name="deployment")
 def deployment_group() -> None:
@@ -159,12 +173,18 @@ def deployment_group() -> None:
     default=False,
     help="Validate the deployment before creating it. Disabled by default.",
 )
+@click.option(
+    "--allow-remove-datasources/--no-allow-remove-datasources",
+    is_flag=True,
+    default=False,
+    help="Allow removing datasources. Disabled by default.",
+)
 @click.pass_context
-def deployment_create(ctx: click.Context, wait: bool, auto: bool, check: bool) -> None:
+def deployment_create(ctx: click.Context, wait: bool, auto: bool, check: bool, allow_remove_datasources: bool) -> None:
     """
     Validate and deploy the project server side.
     """
-    create_deployment(ctx, wait, auto, check)
+    create_deployment(ctx, wait, auto, check, allow_remove_datasources)
 
 
 @deployment_group.command(name="ls")
@@ -187,6 +207,9 @@ def deployment_ls(ctx: click.Context) -> None:
     columns = ["ID", "Status", "Created at", "Live"]
     table = []
     for deployment in result.get("deployments"):
+        if deployment.get("id") == "0":
+            continue
+
         table.append(
             [
                 deployment.get("id"),
@@ -258,15 +281,27 @@ def deployment_rollback(ctx: click.Context, wait: bool) -> None:
     default=False,
     help="Validate the deployment before creating it. Disabled by default.",
 )
+@click.option(
+    "--allow-remove-datasources/--no-allow-remove-datasources",
+    is_flag=True,
+    default=False,
+    help="Allow removing datasources. Disabled by default.",
+)
 @click.pass_context
-def deploy(ctx: click.Context, wait: bool, auto: bool, check: bool) -> None:
+def deploy(ctx: click.Context, wait: bool, auto: bool, check: bool, allow_remove_datasources: bool) -> None:
     """
     Deploy the project.
     """
-    create_deployment(ctx, wait, auto, check)
+    create_deployment(ctx, wait, auto, check, allow_remove_datasources)
 
 
-def create_deployment(ctx: click.Context, wait: bool, auto: bool, check: Optional[bool] = None) -> None:
+def create_deployment(
+    ctx: click.Context,
+    wait: bool,
+    auto: bool,
+    check: Optional[bool] = None,
+    allow_remove_datasources: Optional[bool] = None,
+) -> None:
     # TODO: This code is duplicated in build_server.py
     # Should be refactored to be shared
     MULTIPART_BOUNDARY_DATA_PROJECT = "data_project://"
@@ -297,21 +332,31 @@ def create_deployment(ctx: click.Context, wait: bool, auto: bool, check: Optiona
         if check:
             click.echo(FeedbackManager.highlight(message="\n» Validating deployment...\n"))
             params["check"] = "true"
+        if allow_remove_datasources:
+            params["allow_remove_datasources"] = "true"
         r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS, params=params)
         result = r.json()
         logging.debug(json.dumps(result, indent=2))
 
         if check:
             print_changes(result, project)
+            feedback = result.get("deployment", {}).get("feedback", [])
+            for f in feedback:
+                click.echo(
+                    FeedbackManager.warning(message=f"△ {f.get('level')}: {f.get('resource')}: {f.get('message')}")
+                )
+
             status = result.get("result")
             if status == "success":
                 click.echo(FeedbackManager.success(message="\n✓ Deployment is valid"))
             else:
                 click.echo(FeedbackManager.error(message="\n✗ Deployment is not valid"))
+
             return
 
         deploy_result = result.get("result")
         if deploy_result == "success":
+            print_changes(result, project)
             click.echo(FeedbackManager.success(message="Deployment submitted successfully"))
             deployment = result.get("deployment")
             feedback = deployment.get("feedback", [])
@@ -394,4 +439,8 @@ def print_changes(result: dict, project: Project) -> None:
     for p in deployment.get("deleted_pipe_names", []):
         resources.append(["deleted", p, project.get_resource_path(p, "pipe")])
 
-    echo_safe_humanfriendly_tables_format_smart_table(resources, column_names=columns)
+    if resources:
+        click.echo(FeedbackManager.highlight(message="\n» Changes to be deployed...\n"))
+        echo_safe_humanfriendly_tables_format_smart_table(resources, column_names=columns)
+    else:
+        click.echo(FeedbackManager.highlight(message="\n» No changes to be deployed\n"))

tinybird/tb/modules/endpoint.py

@@ -29,7 +29,7 @@ def endpoint(ctx):
 
 
 @endpoint.command(name="ls")
-@click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. eg --match _test")
+@click.option("--match", default=None, help="Retrieve any resource matching the pattern. For example, --match _test")
 @click.option(
     "--format",
     "format_",

tinybird/tb/modules/fmt.py

@@ -58,7 +58,7 @@ async def fmt(
         elif (".pipe" in extensions) or (".incl" in extensions):
             result = await format_pipe(filename, line_length, skip_eval=True)
         else:
-            click.echo("Unsupported file type. Supported files types are: .pipe, .incl and .datasource")
+            click.echo("Unsupported file type. Supported files types are: .pipe and .datasource")
             return None
 
         if diff:

tinybird/tb/modules/materialization.py

@@ -23,7 +23,7 @@ def materialization(ctx):
 
 
 @materialization.command(name="ls")
-@click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. eg --match _test")
+@click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. For example, --match _test")
 @click.option(
     "--format",
     "format_",
@@ -79,16 +79,16 @@ async def materialization_ls(ctx: click.Context, match: str, format_: str):
     "--sql-condition",
     type=str,
     default=None,
-    help="Populate with a SQL condition to be applied to the trigger Data Source of the Materialized View. For instance, `--sql-condition='date == toYYYYMM(now())'` it'll populate taking all the rows from the trigger Data Source which `date` is the current month. Use it together with --populate. --sql-condition is not taken into account if the --subset param is present. Including in the ``sql_condition`` any column present in the Data Source ``engine_sorting_key`` will make the populate job process less data.",
+    help="Populate with a SQL condition to be applied to the trigger data source of the materialized view. For instance, `--sql-condition='date == toYYYYMM(now())'` it'll populate taking all the rows from the trigger data source which `date` is the current month. Use it together with --populate. --sql-condition is not taken into account if the --subset param is present. Including in the ``sql_condition`` any column present in the data source ``engine_sorting_key`` will make the populate job process less data.",
 )
 @click.option(
-    "--truncate", is_flag=True, default=False, help="Truncates the materialized Data Source before populating it."
+    "--truncate", is_flag=True, default=False, help="Truncates the materialized data source before populating it."
 )
 @click.option(
     "--unlink-on-populate-error",
     is_flag=True,
     default=False,
-    help="If the populate job fails the Materialized View is unlinked and new data won't be ingested in the Materialized View. First time a populate job fails, the Materialized View is always unlinked.",
+    help="If the populate job fails the materialized view is unlinked and new data won't be ingested in the materialized view. First time a populate job fails, the materialized view is always unlinked.",
 )
 @click.option(
     "--wait",
@@ -107,7 +107,7 @@ async def pipe_populate(
     unlink_on_populate_error: bool,
     wait: bool,
 ):
-    """Populate the result of a Materialized Node into the target Materialized View"""
+    """Populate the result of a Materialized Node into the target materialized view"""
     cl = create_tb_client(ctx)
 
     pipe = await cl.pipe(pipe_name)

tinybird/tb/modules/mock.py

@@ -2,7 +2,6 @@ import glob
 import logging
 import os
 from pathlib import Path
-from typing import Optional
 
 import click
 
@@ -27,10 +26,9 @@ from tinybird.tb.modules.project import Project
     default="",
     help="Extra context to use for data generation",
 )
-@click.option("--skip", is_flag=True, default=False, help="Skip following up on the generated data")
 @click.pass_context
 @coro
-async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, skip: bool) -> None:
+async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str) -> None:
     """Generate sample data for a datasource.
 
     Args:
@@ -80,44 +78,17 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, skip
             return
         llm = LLM(user_token=user_token, host=user_client.host)
         prompt = f"<datasource_schema>{datasource_content}</datasource_schema>\n<user_input>{prompt}</user_input>"
-        iterations = 0
-        history = ""
-        fixture_path: Optional[Path] = None
         sql = ""
-        while iterations < 10:
-            feedback = ""
-            if iterations > 0:
-                feedback = click.prompt("\nFollow-up instructions or continue", default="continue")
-            if iterations > 0 and (not feedback or feedback in ("continue", "ok", "exit", "quit", "q")):
-                break
-            else:
-                if iterations > 0:
-                    if fixture_path:
-                        fixture_path.unlink()
-                    fixture_path = None
-                    click.echo(FeedbackManager.highlight(message=f"\n» Creating fixture for {datasource_name}..."))
 
-                response = llm.ask(system_prompt=mock_prompt(rows, feedback, history), prompt=prompt)
-                sql = extract_xml(response, "sql")
-                result = await tb_client.query(f"{sql} FORMAT JSON")
-                data = result.get("data", [])[:rows]
-                fixture_path = persist_fixture(datasource_name, data, folder)
-                click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}.ndjson created"))
+        response = llm.ask(system_prompt=mock_prompt(rows), prompt=prompt)
+        sql = extract_xml(response, "sql")
+        result = await tb_client.query(f"{sql} FORMAT JSON")
+        data = result.get("data", [])[:rows]
+        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)
-
-                history = (
-                    history
-                    + f"""
-                <result_iteration_{iterations}>
-                    {response}
-                </result_iteration_{iterations}>
-                """
-                )
-                if skip:
-                    break
-                iterations += 1
+        if os.environ.get("TB_DEBUG", "") != "":
+            logging.debug(sql)
 
         click.echo(FeedbackManager.success(message=f"✓ Sample data for {datasource_name} created with {rows} rows"))
 

tinybird/tb/modules/pipe.py

@@ -27,7 +27,7 @@ def pipe(ctx):
 
 
 @pipe.command(name="ls")
-@click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. eg --match _test")
+@click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. For example, --match _test")
 @click.option(
     "--format",
     "format_",

tinybird/tb/modules/project.py

@@ -40,17 +40,17 @@ class Project:
 
     def get_vendor_files(self) -> List[str]:
         vendor_files: List[str] = []
-        for project_file in glob.glob(f"{self.vendor_path}/**/*.datasource", recursive=True):
+        for project_file in glob.glob(f"{self.vendor_path}/**/*.datasource", recursive=False):
             vendor_files.append(project_file)
         return vendor_files
 
     @property
     def datasources(self) -> List[str]:
-        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.datasource", recursive=True)])
+        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.datasource", recursive=False)])
 
     @property
     def pipes(self) -> List[str]:
-        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.pipe", recursive=True)])
+        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.pipe", recursive=False)])
 
     def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
         try:

tinybird/tb/modules/shell.py

@@ -24,10 +24,17 @@ from tinybird.tb.modules.table import format_table
 class DynamicCompleter(Completer):
     def __init__(self, project: Project):
         self.project = project
-        self.static_commands = ["create", "mock", "test", "select"]
+        self.static_commands = [
+            "create",
+            "mock",
+            "test",
+            "select",
+            "datasource",
+            "pipe",
+            "endpoint",
+            "copy",
+        ]
         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"]
 
     def get_completions(self, document, complete_event):
@@ -114,20 +121,6 @@ class DynamicCompleter(Completer):
                     )
             return
 
-        if len(words) == 3 or len(words) == 4:
-            # After datasource or after a flag value, show available flags
-            available_flags = [f for f in self.mock_flags if f not in words]
-            for flag in available_flags:
-                yield Completion(flag, start_position=0, display=flag, style="class:completion.cmd")
-            return
-
-        last_word = words[-1]
-        if last_word == "--prompt":
-            yield Completion('""', start_position=0, display='"Enter your prompt..."', style="class:completion.cmd")
-        elif last_word == "--rows":
-            for rows in self.common_rows:
-                yield Completion(rows, start_position=0, display=rows, style="class:completion.cmd")
-
     def _handle_test_completions(self, words: List[str]):
         if len(words) == 1:
             for cmd in self.test_commands:
@@ -206,7 +199,6 @@ class Shell:
         self.project = project
         self.tb_client = tb_client
         self.prompt_message = "\ntb > "
-        self.commands = ["create", "mock", "test", "tb", "select"]
         self.session: PromptSession = PromptSession(
             completer=DynamicCompleter(project),
             complete_style=CompleteStyle.COLUMN,
@@ -274,7 +266,7 @@ class Shell:
     def handle_mock(self, arg):
         if "mock" in arg.strip().lower():
             arg = arg.replace("mock", "")
-        subprocess.run(f"tb --build mock {arg} --skip", shell=True, text=True)
+        subprocess.run(f"tb --build mock {arg}", shell=True, text=True)
 
     def handle_tb(self, argline):
         click.echo("")
@@ -290,7 +282,7 @@ class Shell:
         else:
             need_skip = ("mock", "test create", "create")
             if any(arg.startswith(cmd) for cmd in need_skip):
-                argline = f"{argline} --skip"
+                argline = f"{argline}"
             subprocess.run(f"tb --build {argline}", shell=True, text=True)
 
     def default(self, argline):
@@ -305,7 +297,7 @@ class Shell:
         else:
             need_skip = ("mock", "test create", "create")
             if any(arg.startswith(cmd) for cmd in need_skip):
-                argline = f"{argline} --skip"
+                argline = f"{argline}"
             subprocess.run(f"tb --build {argline}", shell=True, text=True)
 
     def run_sql(self, query, rows_limit=20):

tinybird/tb/modules/test.py

@@ -66,14 +66,9 @@ def test(ctx: click.Context) -> None:
 @click.option(
     "--prompt", type=str, default="Create a test for the selected pipe", help="Prompt to be used to create the test"
 )
-@click.option(
-    "--skip",
-    is_flag=True,
-    help="Skip the test creation process and only generate the test file",
-)
 @click.pass_context
 @coro
-async def test_create(ctx: click.Context, name_or_filename: str, prompt: str, skip: bool) -> None:
+async def test_create(ctx: click.Context, name_or_filename: str, prompt: str) -> None:
     """
     Create a test for an existing pipe
     """
@@ -114,74 +109,47 @@ async def test_create(ctx: click.Context, name_or_filename: str, prompt: str, sk
         user_token = config.get_user_token()
         if not user_token:
             raise CLIException(FeedbackManager.error(message="No user token found"))
+
         llm = LLM(user_token=user_token, host=config.get_client().host)
+        click.echo(FeedbackManager.highlight(message=f"\n» Creating test for {pipe_name} endpoint..."))
+        response_llm = llm.ask(system_prompt=system_prompt, prompt=prompt)
+        response_xml = extract_xml(response_llm, "response")
+        tests_content = parse_xml(response_xml, "test")
 
-        iterations = 0
-        history = ""
-        test_path: Optional[Path] = None
+        tests: List[Dict[str, Any]] = []
 
-        while iterations < 10:
-            feedback = ""
-            if iterations > 0:
-                feedback = click.prompt("\nFollow-up instructions or continue", default="continue")
-            if iterations > 0 and (not feedback or feedback in ("continue", "ok", "exit", "quit", "q")):
-                break
-            else:
-                if iterations > 0 and test_path:
-                    test_path.unlink()
-                    test_path = None
-                    click.echo(FeedbackManager.highlight(message=f"\n» Creating test for {pipe_name} endpoint..."))
-
-                response_llm = llm.ask(system_prompt=system_prompt, prompt=prompt)
-                response_xml = extract_xml(response_llm, "response")
-                tests_content = parse_xml(response_xml, "test")
-
-                tests: List[Dict[str, Any]] = []
-
-                for test_content in tests_content:
-                    test: Dict[str, Any] = {}
-                    test["name"] = extract_xml(test_content, "name")
-                    test["description"] = extract_xml(test_content, "description")
-                    parameters_api = extract_xml(test_content, "parameters")
-                    test["parameters"] = parameters_api.split("?")[1] if "?" in parameters_api else parameters_api
-                    test["expected_result"] = ""
-
-                    response = None
-                    try:
-                        response = await get_pipe_data(client, pipe_name=pipe_name, test_params=test["parameters"])
-                    except Exception:
-                        pass
-
-                    if response:
-                        if response.status_code >= 400:
-                            test["expected_http_status"] = response.status_code
-                            test["expected_result"] = response.json()["error"]
-                        else:
-                            if "expected_http_status" in test:
-                                del test["expected_http_status"]
-                            test["expected_result"] = response.text or ""
-
-                    tests.append(test)
-
-                if len(tests) > 0:
-                    test_path = generate_test_file(pipe_name, tests, folder, mode="a")
-                    for test in tests:
-                        test_name = test["name"]
-                        click.echo(FeedbackManager.info(message=f"✓ {test_name} created"))
-
-                    history = (
-                        history
-                        + f"""
-                    <result_iteration_{iterations}>
-                        {response_xml}
-                    </result_iteration_{iterations}>
-                    """
-                    )
-                    if skip:
-                        break
-                    iterations += 1
+        for test_content in tests_content:
+            test: Dict[str, Any] = {}
+            test["name"] = extract_xml(test_content, "name")
+            test["description"] = extract_xml(test_content, "description")
+            parameters_api = extract_xml(test_content, "parameters")
+            test["parameters"] = parameters_api.split("?")[1] if "?" in parameters_api else parameters_api
+            test["expected_result"] = ""
+
+            response = None
+            try:
+                response = await get_pipe_data(client, pipe_name=pipe_name, test_params=test["parameters"])
+            except Exception:
+                pass
+
+            if response:
+                if response.status_code >= 400:
+                    test["expected_http_status"] = response.status_code
+                    test["expected_result"] = response.json()["error"]
                 else:
-                    click.echo(FeedbackManager.info(message="* No tests created"))
+                    if "expected_http_status" in test:
+                        del test["expected_http_status"]
+                    test["expected_result"] = response.text or ""
+
+            tests.append(test)
+
+        if len(tests) > 0:
+            generate_test_file(pipe_name, tests, folder, mode="a")
+            for test in tests:
+                test_name = test["name"]
+                click.echo(FeedbackManager.info(message=f"✓ {test_name} created"))
+        else:
+            click.echo(FeedbackManager.info(message="* No tests created"))
 
         click.echo(FeedbackManager.success(message="✓ Done!\n"))
     except Exception as e:
@@ -239,7 +207,7 @@ async def test_update(ctx: click.Context, pipe: str) -> None:
 
 @test.command(
     name="run",
-    help="Run the test suite, a file, or a test.",
+    help="Run the test suite, a file, or a test",
 )
 @click.argument("name", nargs=-1)
 @click.pass_context

tinybird/tb/modules/token.py

@@ -24,7 +24,7 @@ def token(ctx: Context) -> None:
 
 
 @token.command(name="ls")
-@click.option("--match", default=None, help="Retrieve any token matching the pattern. eg --match _test")
+@click.option("--match", default=None, help="Retrieve any token matching the pattern. For example, --match _test")
 @click.pass_context
 @coro
 async def token_ls(
@@ -52,7 +52,7 @@ async def token_ls(
 
 @token.command(name="rm")
 @click.argument("token_id")
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
+@click.option("--yes", is_flag=True, default=False, help="Don't ask for confirmation")
 @click.pass_context
 @coro
 async def token_rm(ctx: Context, token_id: str, yes: bool) -> None:
@@ -74,7 +74,7 @@ async def token_rm(ctx: Context, token_id: str, yes: bool) -> None:
 
 @token.command(name="refresh")
 @click.argument("token_id")
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
+@click.option("--yes", is_flag=True, default=False, help="Don't ask for confirmation")
 @click.pass_context
 @coro
 async def token_refresh(ctx: Context, token_id: str, yes: bool) -> None:
@@ -347,4 +347,4 @@ async def create_static_token(ctx, name: str):
     except Exception as e:
         raise CLITokenException(FeedbackManager.error_exception(error=e))
 
-    click.echo("The token has been generated successfully.")
+    click.echo("Token has been generated successfully.")

tinybird/tb/modules/watch.py

@@ -7,7 +7,7 @@ import click
 from watchdog.events import (
     DirDeletedEvent,
     FileDeletedEvent,
-    PatternMatchingEventHandler,
+    FileSystemEventHandler,
 )
 from watchdog.observers import Observer
 
@@ -17,25 +17,23 @@ from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.shell import Shell
 
 
-class WatchProjectHandler(PatternMatchingEventHandler):
+class WatchProjectHandler(FileSystemEventHandler):
     def __init__(self, shell: Shell, project: Project, process: Callable):
         self.shell = shell
         self.project = project
         self.process = process
         self.datafiles = project.get_project_datafiles()
-        super().__init__(
-            patterns=[
-                f"{project.path}/**/*.datasource",
-                f"{project.path}/**/*.pipe",
-                f"{project.path}/fixtures/*.ndjson",
-            ],
-            ignore_patterns=[f"{project.path}/vendor/"],
-        )
+        super().__init__()
 
     def should_process(self, event: Any) -> Optional[str]:
         if event.is_directory:
             return None
 
+        valid_extensions = [".datasource", ".pipe", ".ndjson"]
+
+        if not any(event.src_path.endswith(ext) for ext in valid_extensions):
+            return None
+
         if os.path.exists(event.src_path):
             return event.src_path
 
@@ -91,13 +89,28 @@ class WatchProjectHandler(PatternMatchingEventHandler):
 
         return None
 
-    def on_modified(self, event: Any) -> None:
+    def on_any_event(self, event):
+        if str(event.src_path).endswith("~"):
+            return None
+
+        if event.event_type == "modified":
+            self.modified(event)
+        elif event.event_type == "deleted":
+            self.deleted(event)
+
+    def created(self, event: Any) -> None:
+        if path := self.should_process(event):
+            filename = Path(path).name
+            click.echo(FeedbackManager.highlight(message=f"\n\n⟲ New file detected: {filename}\n"))
+            self._process(path)
+
+    def 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(path)
 
-    def on_deleted(self, event: Union[DirDeletedEvent, FileDeletedEvent]) -> None:
+    def deleted(self, event: Union[DirDeletedEvent, FileDeletedEvent]) -> None:
         filename = Path(str(event.src_path)).name
         if event.is_directory:
             click.echo(FeedbackManager.highlight(message=f"\n\n⟲ Deleted directory: {filename}\n"))