tinybird 0.0.1.dev160__py3-none-any.whl → 0.0.1.dev162__py3-none-any.whl

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__ = '0.0.1.dev160'
-__revision__ = '8c1a42a'
+__version__ = '0.0.1.dev162'
+__revision__ = 'ccf549a'

tinybird/tb/modules/build.py

@@ -17,7 +17,6 @@ from tinybird.tb.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import push_data, sys_exit
 from tinybird.tb.modules.config import CLIConfig
-from tinybird.tb.modules.datafile.build import folder_build
 from tinybird.tb.modules.datafile.exceptions import ParseException
 from tinybird.tb.modules.datafile.fixture import FixtureExtension, get_fixture_dir, persist_fixture
 from tinybird.tb.modules.datafile.parse_datasource import parse_datasource
@@ -75,7 +74,7 @@ def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
     )
 
 
-def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str] = None, silent: bool = False) -> None:
+def build_project(project: Project, tb_client: TinyB, silent: bool = False) -> Optional[bool]:
     MULTIPART_BOUNDARY_DATA_PROJECT = "data_project://"
     DATAFILE_TYPE_TO_CONTENT_TYPE = {
         ".datasource": "text/plain",
@@ -95,7 +94,7 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
         project_files = project.get_project_files()
 
         if not project_files:
-            return
+            return False
 
         for file_path in project_files:
             relative_path = str(Path(file_path).relative_to(project_path))
@@ -118,37 +117,40 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
         build_result = result.get("result")
         if build_result == "success":
             build = result.get("build")
-            datasources = build.get("new_datasource_names", [])
-            pipes = build.get("new_pipe_names", [])
-            connections = build.get("new_data_connector_names", [])
-
-            if not file_changed and not silent:
-                for ds in datasources:
-                    ds_path_str: Optional[str] = next(
-                        (p for p in project_files if p.endswith(ds + ".datasource")), None
-                    )
-                    if ds_path_str:
-                        ds_path = Path(ds_path_str)
-                        ds_path_str = ds_path_str.replace(f"{project.folder}/", "")
-                        click.echo(FeedbackManager.info(message=f"✓ {ds_path_str} created"))
-                for pipe in pipes:
-                    pipe_name = pipe
-                    pipe_path_str: Optional[str] = next(
-                        (p for p in project_files if p.endswith(pipe_name + ".pipe")), None
-                    )
-                    if pipe_path_str:
-                        pipe_path_str = pipe_path_str.replace(f"{project.folder}/", "")
-                        click.echo(FeedbackManager.info(message=f"✓ {pipe_path_str} created"))
-
-                for connection in connections:
-                    connection_name = connection
-                    connection_path_str: Optional[str] = next(
-                        (p for p in project_files if p.endswith(connection_name + ".connection")), None
-                    )
-                    if connection_path_str:
-                        connection_path_str = connection_path_str.replace(f"{project.folder}/", "")
-                        click.echo(FeedbackManager.info(message=f"✓ {connection_path_str} created"))
-
+            new_datasources = build.get("new_datasource_names", [])
+            new_pipes = build.get("new_pipe_names", [])
+            new_connections = build.get("new_data_connector_names", [])
+            changed_datasources = build.get("changed_datasource_names", [])
+            changed_pipes = build.get("changed_pipe_names", [])
+            changed_connections = build.get("changed_data_connector_names", [])
+            deleted_datasources = build.get("deleted_datasource_names", [])
+            deleted_pipes = build.get("deleted_pipe_names", [])
+            deleted_connections = build.get("deleted_data_connector_names", [])
+
+            no_changes = (
+                not new_datasources
+                and not changed_datasources
+                and not new_pipes
+                and not changed_pipes
+                and not new_connections
+                and not changed_connections
+                and not deleted_datasources
+                and not deleted_pipes
+                and not deleted_connections
+            )
+            if no_changes:
+                return False
+            else:
+                if not silent:
+                    echo_changes(project, new_datasources, ".datasource", "created")
+                    echo_changes(project, changed_datasources, ".datasource", "changed")
+                    echo_changes(project, deleted_datasources, ".datasource", "deleted")
+                    echo_changes(project, new_pipes, ".pipe", "created")
+                    echo_changes(project, changed_pipes, ".pipe", "changed")
+                    echo_changes(project, deleted_pipes, ".pipe", "deleted")
+                    echo_changes(project, new_connections, ".connection", "created")
+                    echo_changes(project, changed_connections, ".connection", "changed")
+                    echo_changes(project, deleted_connections, ".connection", "deleted")
             try:
                 for filename in project_files:
                     if filename.endswith(".datasource"):
@@ -200,6 +202,8 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
     if error:
         raise click.ClickException(error)
 
+    return build_result
+
 
 def append_fixture(
     tb_client: TinyB,
@@ -285,6 +289,7 @@ def process(
     time_start = time.time()
     build_failed = False
     build_error: Optional[str] = None
+    build_result: Optional[bool] = None
     if build_status:
         if build_status.building:
             return build_status.error
@@ -296,7 +301,7 @@ def process(
         rebuild_fixture_sql(project, tb_client, file_changed)
     else:
         try:
-            build_project(project, tb_client, file_changed, silent)
+            build_result = build_project(project, tb_client, silent)
             if build_status:
                 build_status.building = False
                 build_status.error = None
@@ -305,10 +310,8 @@ def process(
             build_error = str(e)
             build_failed = True
         try:
-            if file_changed and not build_failed:
-                asyncio.run(folder_build(project, tb_client, filenames=[file_changed]))
-                if not build_status:
-                    show_data(tb_client, file_changed, diff)
+            if file_changed and not build_failed and not build_status:
+                show_data(tb_client, file_changed, diff)
         except Exception:
             pass
 
@@ -327,7 +330,10 @@ def process(
         return build_error
     else:
         if not silent:
-            click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
+            if build_result == False:  # noqa: E712
+                click.echo(FeedbackManager.info(message="No changes. Build skipped."))
+            else:
+                click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
 
     return None
 
@@ -473,3 +479,13 @@ async def build_and_print_resource(config: CLIConfig, tb_client: TinyB, filename
     node_sql = last_node["sql"]
     res = await tb_client.query(f"{node_sql} FORMAT JSON", playground=playground_id)
     print_table_formatted(res, name)
+
+
+def echo_changes(project: Project, changes: List[str], extension: str, status: str):
+    for resource in changes:
+        path_str = next(
+            (p for p in project.get_project_files() if p.endswith(resource + extension)), resource + extension
+        )
+        if path_str:
+            path_str = path_str.replace(f"{project.folder}/", "")
+            click.echo(FeedbackManager.info(message=f"✓ {path_str} {status}"))

tinybird/tb/modules/local_common.py

@@ -36,31 +36,7 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = Fal
     """
     path = config_obj.get("path")
     config = CLIConfig.get_project_config()
-
-    try:
-        # ruff: noqa: ASYNC210
-        tokens = requests.get(f"{TB_LOCAL_ADDRESS}/tokens").json()
-    except Exception:
-        try:
-            # Check if tinybird-local is running with docker, in case it's a config issue
-            output = subprocess.check_output(["docker", "ps"], text=True)  # noqa: ASYNC221
-            header_row = next((line for line in output.splitlines() if "CONTAINER ID" in line), "")
-            tb_local_row = next(
-                (line for line in output.splitlines() if TB_CONTAINER_NAME in line),
-                f"{TB_CONTAINER_NAME} not found in output",
-            )
-            add_telemetry_event(
-                "docker_debug",
-                data={
-                    "docker_ps_output": header_row + tb_local_row,
-                },
-            )
-        except Exception:
-            pass
-        raise CLILocalException(
-            FeedbackManager.error(message="Tinybird local is not running. Please run `tb local start` first.")
-        )
-
+    tokens = get_local_tokens()
     user_token = tokens["user_token"]
     admin_token = tokens["admin_token"]
     default_token = tokens["workspace_admin_token"]
@@ -118,3 +94,29 @@ def get_build_workspace_name(path: str) -> str:
 def get_test_workspace_name(path: str) -> str:
     folder_hash = hashlib.sha256(path.encode()).hexdigest()
     return f"Tinybird_Local_Test_{folder_hash}"
+
+
+def get_local_tokens() -> Dict[str, str]:
+    try:
+        # ruff: noqa: ASYNC210
+        return requests.get(f"{TB_LOCAL_ADDRESS}/tokens").json()
+    except Exception:
+        try:
+            # Check if tinybird-local is running with docker, in case it's a config issue
+            output = subprocess.check_output(["docker", "ps"], text=True)
+            header_row = next((line for line in output.splitlines() if "CONTAINER ID" in line), "")
+            tb_local_row = next(
+                (line for line in output.splitlines() if TB_CONTAINER_NAME in line),
+                f"{TB_CONTAINER_NAME} not found in output",
+            )
+            add_telemetry_event(
+                "docker_debug",
+                data={
+                    "docker_ps_output": header_row + tb_local_row,
+                },
+            )
+        except Exception:
+            pass
+        raise CLILocalException(
+            FeedbackManager.error(message="Tinybird local is not running. Please run `tb local start` first.")
+        )

tinybird/tb/modules/watch.py

@@ -30,7 +30,7 @@ class WatchProjectHandler(PatternMatchingEventHandler):
         self.project = project
         self.process = process
         self.datafiles = project.get_project_datafiles()
-        patterns = [f"{project.path}/**/*{ext}" for ext in self.valid_extensions]
+        patterns = [f"**/*{ext}" for ext in self.valid_extensions]
         super().__init__(patterns=patterns)
 
     def should_process(self, event: Any) -> Optional[str]:

tinybird/tb/modules/workspace.py

@@ -6,9 +6,10 @@
 from typing import Any, Dict, List, Optional
 
 import click
+import requests
 from click import Context
 
-from tinybird.tb.client import TinyB
+from tinybird.tb.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import (
     _get_workspace_plan_name,
@@ -26,6 +27,10 @@ from tinybird.tb.modules.common import (
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLIWorkspaceException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.local_common import (
+    TB_LOCAL_ADDRESS,
+    get_local_tokens,
+)
 
 
 @cli.group()
@@ -221,3 +226,57 @@ async def delete_workspace(
             click.echo(FeedbackManager.success_workspace_deleted(workspace_name=workspace_to_delete["name"]))
         except Exception as e:
             raise CLIWorkspaceException(FeedbackManager.error_exception(error=str(e)))
+
+
+@workspace.command(name="clear", short_help="Clear a workspace. Only available against Tinybird Local.")
+@click.option("--yes", is_flag=True, default=False, help="Don't ask for confirmation")
+@click.pass_context
+@coro
+async def workspace_clear(ctx: Context, yes: bool) -> None:
+    """Delete a workspace where you are an admin."""
+    is_cloud = ctx.ensure_object(dict)["env"] == "cloud"
+    if is_cloud:
+        raise CLIWorkspaceException(
+            FeedbackManager.error(
+                message="`tb workspace clear` is not available against Tinybird Cloud. Use `tb --cloud deploy` instead."
+            )
+        )
+    yes = yes or click.confirm(
+        FeedbackManager.warning(message="Are you sure you want to clear the workspace? [y/N]:"),
+        show_default=False,
+        prompt_suffix="",
+    )
+    if yes:
+        await clear_workspace()
+
+
+async def clear_workspace() -> None:
+    config = CLIConfig.get_project_config()
+    tokens = get_local_tokens()
+
+    user_token = tokens["user_token"]
+    admin_token = tokens["admin_token"]
+    user_client = config.get_client(host=TB_LOCAL_ADDRESS, token=user_token)
+    ws_name = config.get("name")
+    if not ws_name:
+        raise AuthNoTokenException()
+
+    user_workspaces = requests.get(  # noqa: ASYNC210
+        f"{TB_LOCAL_ADDRESS}/v1/user/workspaces?with_organization=true&token={admin_token}"
+    ).json()
+    user_org_id = user_workspaces.get("organization_id", {})
+    local_workspaces = user_workspaces.get("workspaces", [])
+
+    ws = next((ws for ws in local_workspaces if ws["name"] == ws_name), None)
+
+    if ws:
+        requests.delete(f"{TB_LOCAL_ADDRESS}/v1/workspaces/{ws['id']}?token={user_token}&hard_delete_confirmation=yes")  # noqa: ASYNC210
+        ws = None
+
+    if not ws:
+        await user_client.create_workspace(ws_name, assign_to_organization_id=user_org_id, version="v1")
+        user_workspaces = requests.get(f"{TB_LOCAL_ADDRESS}/v1/user/workspaces?token={admin_token}").json()  # noqa: ASYNC210
+        ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
+
+    if ws:
+        click.echo(FeedbackManager.success(message=f"\n✓ Workspace '{ws_name}' cleared"))

{tinybird-0.0.1.dev160.dist-info → tinybird-0.0.1.dev162.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev160
+Version: 0.0.1.dev162
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev160.dist-info → tinybird-0.0.1.dev162.dist-info}/RECORD

@@ -12,12 +12,12 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=BZuPM7MFS7vaEKK5tOMR2bwSAgJudPrJt27uVEwZmTY,40512
-tinybird/tb/__cli__.py,sha256=s6LSSQKjMUCbqgJA61muv1NTc64EeZdFL1buos31pag,247
+tinybird/tb/__cli__.py,sha256=P908zolGwSNV24cl38bwFAC73NFhZWghV4jlWXEyxDc,247
 tinybird/tb/check_pypi.py,sha256=rW4QmDRbtgKdUUwJCnBkVjmTjZSZGN-XgZhx7vMkC0w,1009
 tinybird/tb/cli.py,sha256=u3eGOhX0MHkuT6tiwaZ0_3twqLmqKXDAOxF7yV_Nn9Q,1075
 tinybird/tb/client.py,sha256=CSBl_JRuioPyY0H8Ac96dJ9wQXDXfrvK2lwqlOxKGoY,55715
 tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
-tinybird/tb/modules/build.py,sha256=sj77FyQRAtAQdifY8sqVzPzeIUKsxUDwPsz17NSRsVA,18517
+tinybird/tb/modules/build.py,sha256=zakH5812Lop-XHjGmDRdOPeofPtoeyb_2un_T6e50xw,19177
 tinybird/tb/modules/cicd.py,sha256=MnShTTJzKBYeajswF2jg7p7ZzupaeCgSriAN05MeEdg,7330
 tinybird/tb/modules/cli.py,sha256=jJ7vF05vppwqetaHiEyk_x2YFb6S53PS-PmYlNMRcTc,14274
 tinybird/tb/modules/common.py,sha256=_mNLBzC7zkveYXgJ02aMJ9L3LrxsAELx84GwEYdWNa0,82955
@@ -38,7 +38,7 @@ tinybird/tb/modules/job.py,sha256=n4dSSBgnA8NqD7srGahf2xRj6wxkmX9Vl0J-QJ_a2w0,29
 tinybird/tb/modules/llm.py,sha256=KfsCYmKeW1VQz0iDZhGKCRkQv_Y3kTHh6JuxvofOguE,1076
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
 tinybird/tb/modules/local.py,sha256=SUaGWH9TLDFFF9uCw4y7UW4NsKgnXG8uxTcxz1dbkCM,14230
-tinybird/tb/modules/local_common.py,sha256=OoBUFrMjXvQ3y8hHscpyVH9wMI7h0m79F7G6EiMSku0,4783
+tinybird/tb/modules/local_common.py,sha256=LutxdEG6AR1k5PrUPsDWGVPrr3mA7AbWKhj4Hlewlic,4837
 tinybird/tb/modules/login.py,sha256=fmXPSdvJnKPv03chptGuu3_Fm6LhP6kUsUKhrmT8rJc,8269
 tinybird/tb/modules/logout.py,sha256=ULooy1cDBD02-r7voZmhV7udA0ML5tVuflJyShrh56Y,1022
 tinybird/tb/modules/materialization.py,sha256=QJX5kCPhhm6IXBO1JsalVfbQdypCe_eOUDZ_WHJZWS8,5478
@@ -53,8 +53,8 @@ tinybird/tb/modules/table.py,sha256=4XrtjM-N0zfNtxVkbvLDQQazno1EPXnxTyo7llivfXk,
 tinybird/tb/modules/telemetry.py,sha256=X0p5AVkM8BNsK_Rhdcg4p2eIf6OHimHO_VLldBqHQ8o,11386
 tinybird/tb/modules/test.py,sha256=Yopg89cRwOQpgRzsb9nvu2Z-UR2as2vBjVa5PF3uiK0,13420
 tinybird/tb/modules/token.py,sha256=2fmKwu10_M0pqs6YmJVeILR9ZQB0ejRAET86agASbKM,13488
-tinybird/tb/modules/watch.py,sha256=_92co0BjTikQuy7MbHr4TDu9A75QdHsrAO8v7DlYLg4,8898
-tinybird/tb/modules/workspace.py,sha256=h4Re1_2DahZ9C-yF7vgquMrYiG7Gj62jNfbzkEJR2BY,8066
+tinybird/tb/modules/watch.py,sha256=H1FieLTVGRqmZ0hR0vELbQJ9l0CThrFCgGCta-MPuAY,8883
+tinybird/tb/modules/workspace.py,sha256=v9o4ImrEOxLhCYhVGtJ-slek8DGOW0cJGn7F91DMmj4,10390
 tinybird/tb/modules/workspace_members.py,sha256=RYLpyPM1ECCasHRg3uvpckzXplX0_KgNFsSPZn_i6qk,8744
 tinybird/tb/modules/datafile/build.py,sha256=d_h3pRFDPFrDKGhpFx2iejY25GuB2k8yfNouj6s8caw,50973
 tinybird/tb/modules/datafile/build_common.py,sha256=LU24kAQmxDJIyoIapDaYG-SU3P4FrMG9UBf8m9PgVSI,4565
@@ -80,8 +80,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 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=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev160.dist-info/METADATA,sha256=Chpz-yZJB3bxzzpn-NhpeLHWx_lb5E5grl70FLLx618,1607
-tinybird-0.0.1.dev160.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev160.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev160.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev160.dist-info/RECORD,,
+tinybird-0.0.1.dev162.dist-info/METADATA,sha256=MDkrGU1_u15k7sp6G7ZeL841SKRhXPq6tGYvPd5CfnY,1607
+tinybird-0.0.1.dev162.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev162.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev162.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev162.dist-info/RECORD,,