tinybird 3.5.5.dev0__tar.gz → 4.0.1.dev0__tar.gz

{tinybird-3.5.5.dev0 → tinybird-4.0.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 3.5.5.dev0
+Version: 4.0.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -8,7 +8,6 @@ Author-email: support@tinybird.co
 Requires-Python: >=3.10, <3.14
 Description-Content-Type: text/x-rst
 Requires-Dist: aiofiles==24.1.0
-Requires-Dist: anthropic==0.55.0
 Requires-Dist: boto3
 Requires-Dist: click<8.2,>=8.1.6
 Requires-Dist: clickhouse-toolset==0.34.dev0
@@ -19,12 +18,9 @@ Requires-Dist: croniter==1.3.15
 Requires-Dist: docker==7.1.0
 Requires-Dist: GitPython~=3.1.32
 Requires-Dist: humanfriendly~=8.2
-Requires-Dist: plotext==5.3.2
 Requires-Dist: prompt_toolkit==3.0.48
 Requires-Dist: logfire-api==4.2.0
 Requires-Dist: pydantic~=2.11.7
-Requires-Dist: pydantic-ai-slim[anthropic]~=0.5.0
-Requires-Dist: pydantic-ai-slim[retries]~=0.5.0
 Requires-Dist: pyperclip==1.9.0
 Requires-Dist: pyyaml<6.1,>=6.0
 Requires-Dist: requests<3,>=2.28.1
@@ -36,7 +32,6 @@ Requires-Dist: urllib3<2,>=1.26.14
 Requires-Dist: watchdog==6.0.0
 Requires-Dist: wheel
 Requires-Dist: packaging<24,>=23.1
-Requires-Dist: llm>=0.19
 Requires-Dist: thefuzz==0.22.1
 Requires-Dist: python-dotenv==1.1.0
 Requires-Dist: pyjwt[crypto]==2.9.0
@@ -57,6 +52,14 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.0.0
+*******
+
+- `Removed` Tinybird Code entry points and AI-assisted command paths (`tb --prompt`, `tb datasource create --prompt`, `tb test create`, and `tb mock`).
+- `Changed` `tb init` is now the project scaffolding command.
+- `Changed` `tb build` now uses the `dev_mode` configuration from the project JSON config file.
+- `Changed` `tb deploy` now uses the `dev_mode` configuration from the project JSON config file.
+
 3.5.4
 *******
 

{tinybird-3.5.5.dev0 → tinybird-4.0.1.dev0}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '3.5.5.dev0'
-__revision__ = 'f879a5d'
+__version__ = '4.0.1.dev0'
+__revision__ = 'aaa17c7'

{tinybird-3.5.5.dev0 → tinybird-4.0.1.dev0}/tinybird/tb/cli.py

@@ -1,4 +1,3 @@
-import tinybird.tb.modules.agent
 import tinybird.tb.modules.branch
 import tinybird.tb.modules.build
 import tinybird.tb.modules.cli
@@ -18,9 +17,9 @@ import tinybird.tb.modules.local
 import tinybird.tb.modules.login
 import tinybird.tb.modules.logout
 import tinybird.tb.modules.materialization
-import tinybird.tb.modules.mock
 import tinybird.tb.modules.open
 import tinybird.tb.modules.pipe
+import tinybird.tb.modules.preview
 import tinybird.tb.modules.project_commands
 import tinybird.tb.modules.secret
 import tinybird.tb.modules.sink

{tinybird-3.5.5.dev0 → tinybird-4.0.1.dev0}/tinybird/tb/client.py

@@ -12,7 +12,6 @@ import requests.adapters
 from requests import Response
 from urllib3 import Retry
 
-from tinybird.ch_utils.constants import COPY_ENABLED_TABLE_FUNCTIONS
 from tinybird.tb.modules.telemetry import add_telemetry_event
 
 HOST = "https://api.tinybird.co"
@@ -1174,30 +1173,13 @@ class TinyB:
         return self._req(f"/v0/integrations/{service}/policies/read-access-policy?{urlencode(params)}")
 
     def sql_get_format(self, sql: str, with_clickhouse_format: bool = False) -> str:
-        try:
-            if with_clickhouse_format:
-                from tinybird.sql_toolset import format_sql
-
-                return format_sql(sql)
-            else:
-                return self._sql_get_format_remote(sql, with_clickhouse_format)
-        except ModuleNotFoundError:
-            return self._sql_get_format_remote(sql, with_clickhouse_format)
+        return self._sql_get_format_remote(sql, with_clickhouse_format)
 
     def _sql_get_format_remote(self, sql: str, with_clickhouse_format: bool = False) -> str:
         params = {"with_clickhouse_format": "true" if with_clickhouse_format else "false"}
         result = self._req(f"/v0/sql_format?q={quote(sql, safe='')}&{urlencode(params)}")
         return result["q"]
 
-    @staticmethod
-    def _sql_get_used_tables_local(sql: str, raising: bool = False, is_copy: Optional[bool] = False) -> List[str]:
-        from tinybird.sql_toolset import sql_get_used_tables
-
-        tables = sql_get_used_tables(
-            sql, raising, table_functions=False, function_allow_list=COPY_ENABLED_TABLE_FUNCTIONS if is_copy else None
-        )
-        return [t[1] if t[0] == "" else f"{t[0]}.{t[1]}" for t in tables]
-
     def _sql_get_used_tables_remote(
         self, sql: str, raising: bool = False, is_copy: Optional[bool] = False
     ) -> List[str]:
@@ -1212,16 +1194,7 @@ class TinyB:
 
     # Get used tables from a query. Does not include table functions
     def sql_get_used_tables(self, sql: str, raising: bool = False, is_copy: Optional[bool] = False) -> List[str]:
-        try:
-            return self._sql_get_used_tables_local(sql, raising, is_copy)
-        except ModuleNotFoundError:
-            return self._sql_get_used_tables_remote(sql, raising, is_copy)
-
-    @staticmethod
-    def _replace_tables_local(q: str, replacements):
-        from tinybird.sql_toolset import replace_tables, replacements_to_tuples
-
-        return replace_tables(q, replacements_to_tuples(replacements))
+        return self._sql_get_used_tables_remote(sql, raising, is_copy)
 
     def _replace_tables_remote(self, q: str, replacements):
         params = {
@@ -1232,10 +1205,7 @@ class TinyB:
         return result["query"]
 
     def replace_tables(self, q: str, replacements):
-        try:
-            return self._replace_tables_local(q, replacements)
-        except ModuleNotFoundError:
-            return self._replace_tables_remote(q, replacements)
+        return self._replace_tables_remote(q, replacements)
 
     def get_connection(self, **kwargs):
         result = self._req("/v0/connectors")

{tinybird-3.5.5.dev0 → tinybird-4.0.1.dev0}/tinybird/tb/modules/branch.py

@@ -3,7 +3,7 @@
 # - If it makes sense and only when strictly necessary, you can create utility functions in this file.
 # - But please, **do not** interleave utility functions and command definitions.
 
-from typing import List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import click
 
@@ -17,6 +17,7 @@ from tinybird.tb.modules.common import (
     get_workspace_member_email,
     switch_to_workspace_by_user_workspace_data,
     try_update_config_with_remote,
+    wait_job,
 )
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLIBranchException, CLIException
@@ -148,3 +149,91 @@ def delete_branch(branch_name_or_id: str, yes: bool) -> None:
                     switch_to_workspace_by_user_workspace_data(config, workspace_main)
                 else:
                     raise CLIException(FeedbackManager.error_switching_to_main())
+
+
+@branch.command(name="clear", short_help="Clear a branch by deleting and recreating it.")
+@click.argument("branch_name_or_id", required=False)
+@click.option(
+    "--last-partition",
+    is_flag=True,
+    default=False,
+    help="Attach the last modified partition from the current workspace to the new branch",
+)
+@click.option(
+    "-i",
+    "--ignore-datasource",
+    "ignore_datasources",
+    type=str,
+    multiple=True,
+    help="Ignore specified data source partitions",
+)
+@click.option(
+    "--wait/--no-wait",
+    is_flag=True,
+    default=True,
+    help="Wait for data branch jobs to finish, showing a progress bar. Disabled by default.",
+)
+@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
+def clear_branch(
+    branch_name_or_id: Optional[str],
+    last_partition: bool,
+    ignore_datasources: Tuple[str, ...],
+    wait: bool,
+    yes: bool,
+) -> None:
+    """Clear a branch by deleting and recreating it."""
+    config = CLIConfig.get_project_config()
+    _ = try_update_config_with_remote(config, only_if_needed=True)
+
+    current_main_workspace = get_current_main_workspace(config)
+    if not current_main_workspace:
+        raise CLIException(FeedbackManager.error_unable_to_identify_main_workspace())
+
+    workspace_branches = get_current_workspace_branches(config)
+    workspace_to_clear: Optional[Dict[str, Any]] = None
+
+    if branch_name_or_id:
+        if branch_name_or_id == MAIN_BRANCH:
+            raise CLIException(FeedbackManager.error_not_allowed_in_main_branch())
+        workspace_to_clear = next(
+            (
+                workspace
+                for workspace in workspace_branches
+                if workspace["name"] == branch_name_or_id or workspace["id"] == branch_name_or_id
+            ),
+            None,
+        )
+    else:
+        workspace_to_clear = next(
+            (workspace for workspace in workspace_branches if workspace["id"] == config["id"]), None
+        )
+        if not workspace_to_clear:
+            raise CLIBranchException(FeedbackManager.error_not_a_branch())
+
+    if not workspace_to_clear:
+        raise CLIBranchException(FeedbackManager.error_branch(branch=branch_name_or_id or ""))
+
+    branch_name = workspace_to_clear["name"]
+    if yes or click.confirm(FeedbackManager.warning_confirm_clear_workspace()):
+        was_current_branch = workspace_to_clear["id"] == config.get("id")
+        client = config.get_client(token=current_main_workspace.get("token"))
+        try:
+            client.delete_branch(workspace_to_clear["id"])
+            response = client.create_workspace_branch(branch_name, last_partition, False, list(ignore_datasources))
+            if wait and "job" in response:
+                job_id = response["job"]["job_id"]
+                job_url = response["job"]["job_url"]
+                wait_job(client, job_id, job_url, "Environment creation")
+        except Exception as e:
+            raise CLIBranchException(FeedbackManager.error_exception(error=str(e)))
+
+        recreated_branches = client.user_workspace_branches("v1").get("workspaces", [])
+        recreated_branch = next(
+            (workspace for workspace in recreated_branches if workspace.get("name") == branch_name), None
+        )
+        if not recreated_branch:
+            raise CLIBranchException(FeedbackManager.error_branch(branch=branch_name))
+
+        click.echo(FeedbackManager.success(message=f"✓ Branch '{branch_name}' cleared"))
+        if was_current_branch:
+            switch_to_workspace_by_user_workspace_data(config, recreated_branch)

{tinybird-3.5.5.dev0 → tinybird-4.0.1.dev0}/tinybird/tb/modules/build.py

@@ -1,4 +1,3 @@
-import threading
 import time
 from copy import deepcopy
 from functools import partial
@@ -17,10 +16,9 @@ from tinybird.tb.modules.build_common import process
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.playground import folder_playground
-from tinybird.tb.modules.dev_server import BuildStatus, start_server
 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
+from tinybird.tb.modules.query_output import print_table_formatted
 from tinybird.tb.modules.watch import watch_files, watch_project
 
 
@@ -68,7 +66,6 @@ def build(ctx: click.Context, watch: bool, with_connections: bool) -> None:
     if watch:
         run_watch(
             project=project,
-            tb_client=tb_client,
             config=config,
             process=partial(
                 process,
@@ -83,15 +80,13 @@ def build(ctx: click.Context, watch: bool, with_connections: bool) -> None:
 
 
 @cli.command("dev", help="Build the project server side and watch for changes.")
-@click.option("--data-origin", type=str, default="", help="Data origin: local or cloud")
-@click.option("--ui/--skip-ui", is_flag=True, default=True, help="Connect your local project to Tinybird UI")
 @click.option(
     "--with-connections/--no-connections",
     default=None,
     help="Create data linkers for connection datasources (S3, Kafka, GCS). Defaults to true for branches.",
 )
 @click.pass_context
-def dev(ctx: click.Context, data_origin: str, ui: bool, with_connections: Optional[bool]) -> None:
+def dev(ctx: click.Context, with_connections: Optional[bool]) -> None:
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     branch: Optional[str] = ctx.ensure_object(dict)["branch"]
     is_branch = bool(branch)
@@ -103,47 +98,26 @@ def dev(ctx: click.Context, data_origin: str, ui: bool, with_connections: Option
     if obj["env"] == "cloud" and not is_branch:
         raise click.ClickException(FeedbackManager.error_build_only_supported_in_local())
 
-    if data_origin == "cloud":
-        click.echo(
-            FeedbackManager.warning(
-                message="--data-origin=cloud is deprecated and will be removed in a future version. Create an branch and use `tb --branch <branch_name> dev`"
-            )
-        )
-        return dev_cloud(ctx)
-
     project: Project = ctx.ensure_object(dict)["project"]
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
     config: Dict[str, Any] = ctx.ensure_object(dict)["config"]
 
-    build_status = BuildStatus()
-    if ui:
-        server_thread = threading.Thread(
-            target=start_server, args=(project, tb_client, process, build_status, branch), daemon=True
-        )
-        server_thread.start()
-        # Wait for the server to start
-        time.sleep(0.5)
-
     click.echo(FeedbackManager.highlight_building_project())
     process(
         project=project,
         tb_client=tb_client,
         watch=True,
         config=config,
-        build_status=build_status,
         is_branch=is_branch,
         with_connections=with_connections,
     )
     run_watch(
         project=project,
-        tb_client=tb_client,
         config=config,
-        branch=branch,
         process=partial(
             process,
             project=project,
             tb_client=tb_client,
-            build_status=build_status,
             config=config,
             is_branch=is_branch,
             with_connections=with_connections,
@@ -151,18 +125,9 @@ def dev(ctx: click.Context, data_origin: str, ui: bool, with_connections: Option
     )
 
 
-def run_watch(
-    project: Project, tb_client: TinyB, process: Callable, config: dict[str, Any], branch: Optional[str] = None
-) -> None:
-    shell = Shell(project=project, tb_client=tb_client, branch=branch)
+def run_watch(project: Project, process: Callable, config: dict[str, Any]) -> None:
     click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
-    watcher_thread = threading.Thread(
-        target=watch_project,
-        args=(shell, process, project, config),
-        daemon=True,
-    )
-    watcher_thread.start()
-    shell.run()
+    watch_project(process=process, project=project, config=config)
 
 
 def is_vendor(f: Path) -> bool:
@@ -244,13 +209,8 @@ def dev_cloud(
 
     build_ok = build_once(filenames)
 
-    shell = Shell(project=project, tb_client=tb_client, playground=True)
     click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
-    watcher_thread = threading.Thread(
-        target=watch_files, args=(filenames, process, shell, project, build_ok), daemon=True
-    )
-    watcher_thread.start()
-    shell.run()
+    watch_files(filenames=filenames, process=process, project=project, build_ok=build_ok)
 
 
 def build_and_print_resource(config: CLIConfig, tb_client: TinyB, filename: str):

{tinybird-3.5.5.dev0 → tinybird-4.0.1.dev0}/tinybird/tb/modules/build_common.py

@@ -14,11 +14,10 @@ from tinybird.datafile.parse_datasource import parse_datasource
 from tinybird.tb.client import TinyB
 from tinybird.tb.modules.common import push_data, sys_exit
 from tinybird.tb.modules.datafile.fixture import FixtureExtension, get_fixture_dir, persist_fixture
-from tinybird.tb.modules.dev_server import BuildStatus
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_local_tokens
 from tinybird.tb.modules.project import Project
-from tinybird.tb.modules.shell import print_table_formatted
+from tinybird.tb.modules.query_output import print_table_formatted
 
 
 def process(
@@ -29,7 +28,6 @@ def process(
     file_changed: Optional[str] = None,
     diff: Optional[str] = None,
     silent: bool = False,
-    build_status: Optional[BuildStatus] = None,
     exit_on_error: bool = True,
     load_fixtures: bool = True,
     project_with_vendors: Optional[Project] = None,
@@ -49,25 +47,15 @@ def process(
     build_failed = False
     build_error: Optional[str] = None
     build_result: Optional[bool] = None
-    if build_status:
-        if build_status.building:
-            return build_status.error
-        else:
-            build_status.building = True
+
     if file_changed and file_changed.endswith((FixtureExtension.NDJSON, FixtureExtension.CSV)):
         rebuild_fixture(project, tb_client, file_changed)
-        if build_status:
-            build_status.building = False
-            build_status.error = None
+
     elif file_changed and file_changed.endswith(".sql"):
         rebuild_fixture_sql(project, tb_client, file_changed)
-        if build_status:
-            build_status.building = False
-            build_status.error = None
+
     elif file_changed and file_changed.endswith((".env.local", ".env")):
-        if build_status:
-            build_status.building = False
-            build_status.error = None
+        pass
     else:
         try:
             build_result = build_project(
@@ -78,16 +66,14 @@ def process(
                 project_with_vendors=project_with_vendors,
                 with_connections=with_connections,
             )
-            if build_status:
-                build_status.building = False
-                build_status.error = None
+
         except click.ClickException as e:
             if not silent:
                 click.echo(FeedbackManager.info(message=str(e)))
             build_error = str(e)
             build_failed = True
         try:
-            if file_changed and not build_failed and not build_status:
+            if file_changed and not build_failed:
                 show_data(tb_client, file_changed, diff)
         except Exception:
             pass
@@ -102,9 +88,7 @@ def process(
             if not watch and exit_on_error:
                 sys_exit("build_error", build_error or "Unknown error")
         build_error = build_error or "Unknown error"
-        if build_status:
-            build_status.error = build_error
-            build_status.building = False
+
         return build_error
 
     if not silent:

{tinybird-3.5.5.dev0 → tinybird-4.0.1.dev0}/tinybird/tb/modules/cicd.py

@@ -236,11 +236,25 @@ class GitLabCICDGenerator(CICDGeneratorBase):
 def init_cicd(
     path: Optional[str] = None,
     data_project_dir: Optional[str] = None,
+    provider: Optional[str] = None,
 ):
-    for provider in Provider:
+    providers: List[Provider]
+    if provider is None:
+        providers = list(Provider)
+    else:
+        provider_map = {
+            "github": Provider.GitHub,
+            "gitlab": Provider.GitLab,
+        }
+        provider_key = provider.strip().lower()
+        if provider_key not in provider_map:
+            raise ValueError(f"Unsupported CI/CD provider: {provider}")
+        providers = [provider_map[provider_key]]
+
+    for provider_item in providers:
         path = path or getcwd()
         data_project_dir = data_project_dir or "."
-        generator = CICDGeneratorBase.build_generator(provider.name)
+        generator = CICDGeneratorBase.build_generator(provider_item.name)
         params = {
             "data_project_dir": data_project_dir,
             "workflow_version": WORKFLOW_VERSION,
@@ -250,10 +264,23 @@ def init_cicd(
             click.echo(warning_message)
 
 
-def check_cicd_exists(path: Optional[str] = None) -> Optional[Provider]:
+def check_cicd_exists(path: Optional[str] = None, provider: Optional[str] = None) -> Optional[Provider]:
     path = path or getcwd()
-    for provider in Provider:
-        generator = CICDGeneratorBase.build_generator(provider.name)
+    providers: List[Provider]
+    if provider is None:
+        providers = list(Provider)
+    else:
+        provider_map = {
+            "github": Provider.GitHub,
+            "gitlab": Provider.GitLab,
+        }
+        provider_key = provider.strip().lower()
+        if provider_key not in provider_map:
+            raise ValueError(f"Unsupported CI/CD provider: {provider}")
+        providers = [provider_map[provider_key]]
+
+    for provider_item in providers:
+        generator = CICDGeneratorBase.build_generator(provider_item.name)
         if generator.is_already_generated(path):
-            return provider
+            return provider_item
     return None