tinybird 4.6.8.dev0__tar.gz → 4.6.9.dev0__tar.gz

{tinybird-4.6.8.dev0 → tinybird-4.6.9.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.8.dev0
+Version: 4.6.9.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,7 +52,12 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
-4.6.7.
+4.6.8
+*******
+
+- `Fixed` Tinybird Local CLI commands to respect Git branch local workspaces correctly.
+
+4.6.7
 *******
 
 - `Fixed` `tb login` now raises an actionable error when the CLI cannot complete the authentication.

{tinybird-4.6.8.dev0 → tinybird-4.6.9.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__ = '4.6.8.dev0'
-__revision__ = '1177944'
+__version__ = '4.6.9.dev0'
+__revision__ = '13f02ee'

{tinybird-4.6.8.dev0 → tinybird-4.6.9.dev0}/tinybird/tb/modules/cli.py

@@ -1153,15 +1153,17 @@ def create_ctx_client(
     if show_warnings and command:
         click.echo(FeedbackManager.gray(message="Running against Tinybird Local"))
     local_branch = None
-    if command in ("build", "dev") and not test:
+    if not test:
         git_branch = get_current_git_branch()
         if git_branch and not is_main_git_branch(git_branch):
             local_branch = get_tinybird_branch_name_from_git_branch(git_branch)
             ctx.ensure_object(dict)["git_branch"] = git_branch
     client, workspace_created = get_tinybird_local_client(config, test=test, staging=staging, branch=local_branch)
-    if local_branch:
+    if local_branch and config.get("local_workspace_name") == local_branch:
         ctx.ensure_object(dict)["local_branch"] = local_branch
         ctx.ensure_object(dict)["branch_created"] = workspace_created
+        if show_warnings and command not in ("build", "dev"):
+            click.echo(FeedbackManager.gray(message=f"Using Tinybird Local branch '{local_branch}'"))
     return client
 
 

{tinybird-4.6.8.dev0 → tinybird-4.6.9.dev0}/tinybird/tb/modules/local.py

@@ -9,7 +9,12 @@ import requests
 from docker.client import DockerClient
 
 from tinybird.tb.client import AuthNoTokenException
-from tinybird.tb.modules.cli import cli
+from tinybird.tb.modules.cli import (
+    cli,
+    get_current_git_branch,
+    get_tinybird_branch_name_from_git_branch,
+    is_main_git_branch,
+)
 from tinybird.tb.modules.common import (
     _get_workspace_plan_name,
     echo_json,
@@ -80,9 +85,6 @@ def clear_local_workspace() -> None:
     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(
         f"{TB_LOCAL_ADDRESS}/v1/user/workspaces?with_organization=true&token={admin_token}"
@@ -90,19 +92,30 @@ def clear_local_workspace() -> None:
     user_org_id = user_workspaces.get("organization_id", {})
     local_workspaces = user_workspaces.get("workspaces", [])
 
+    branch_ws_name = None
+    ws_name = config.get("name")
+    git_branch = get_current_git_branch()
+    if git_branch and not is_main_git_branch(git_branch):
+        branch_ws_name = get_tinybird_branch_name_from_git_branch(git_branch)
+        if branch_ws_name:
+            ws_name = branch_ws_name
+    if not ws_name:
+        raise AuthNoTokenException()
+
     ws = next((ws for ws in local_workspaces if ws["name"] == ws_name), None)
 
-    if not ws:
+    if not ws and ws_name != branch_ws_name:
         raise CLILocalException(FeedbackManager.error(message=f"Workspace '{ws_name}' not found."))
 
-    requests.delete(f"{TB_LOCAL_ADDRESS}/v1/workspaces/{ws['id']}?token={user_token}&hard_delete_confirmation=yes")
-    user_workspaces = user_client.user_workspaces(version="v1")
-    ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
-
     if ws:
-        raise CLILocalException(
-            FeedbackManager.error(message=f"Workspace '{ws_name}' was not cleared properly. Please try again.")
-        )
+        requests.delete(f"{TB_LOCAL_ADDRESS}/v1/workspaces/{ws['id']}?token={user_token}&hard_delete_confirmation=yes")
+        user_workspaces = user_client.user_workspaces(version="v1")
+        ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
+
+        if ws:
+            raise CLILocalException(
+                FeedbackManager.error(message=f"Workspace '{ws_name}' was not cleared properly. Please try again.")
+            )
 
     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()

{tinybird-4.6.8.dev0 → tinybird-4.6.9.dev0}/tinybird/tb/modules/local_common.py

@@ -79,7 +79,10 @@ def get_tinybird_local_client(
 
 
 def get_tinybird_local_config(
-    config_obj: Dict[str, Any], test: bool = False, silent: bool = False, branch: Optional[str] = None
+    config_obj: Dict[str, Any],
+    test: bool = False,
+    silent: bool = False,
+    branch: Optional[str] = None,
 ) -> tuple[CLIConfig, bool]:
     """Craft a client config with a workspace name based on the path of the project files.
 
@@ -143,6 +146,8 @@ def get_tinybird_local_config(
                 raise AuthNoTokenException()
             workspace_created = True
 
+        config_obj["local_workspace_name"] = ws_name
+
         ws_token = ws["token"]
         config.set_token(ws_token)
         config.set_token_for_host(TB_LOCAL_ADDRESS, ws_token)

{tinybird-4.6.8.dev0 → tinybird-4.6.9.dev0}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.8.dev0
+Version: 4.6.9.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,7 +52,12 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
-4.6.7.
+4.6.8
+*******
+
+- `Fixed` Tinybird Local CLI commands to respect Git branch local workspaces correctly.
+
+4.6.7
 *******
 
 - `Fixed` `tb login` now raises an actionable error when the CLI cannot complete the authentication.