tinybird 0.0.1.dev163__tar.gz → 0.0.1.dev165__tar.gz

{tinybird-0.0.1.dev163 → tinybird-0.0.1.dev165}/PKG-INFO

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

{tinybird-0.0.1.dev163 → tinybird-0.0.1.dev165}/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.dev163'
-__revision__ = 'dff38d5'
+__version__ = '0.0.1.dev165'
+__revision__ = '154a5d7'

{tinybird-0.0.1.dev163 → tinybird-0.0.1.dev165}/tinybird/tb/modules/common.py

@@ -303,7 +303,7 @@ line experience. To opt-out, set TB_CLI_TELEMETRY_OPTOUT to '1' or 'true'."""
             return rv
 
         # Get all available commands
-        commands: List[str] = self.list_commands(ctx)
+        commands: List[str] = list_commands(self, ctx)
 
         # Find closest matching command using thefuzz
         matches = process.extract(cmd_name, commands, limit=1)
@@ -358,6 +358,11 @@ line experience. To opt-out, set TB_CLI_TELEMETRY_OPTOUT to '1' or 'true'."""
         return None
 
 
+def list_commands(self, ctx: Context):
+    all_commands = self.list_commands(ctx)
+    return [cmd for cmd in all_commands if not self.get_command(ctx, cmd).hidden]
+
+
 def load_connector_config(ctx: Context, connector_name: str, debug: bool, check_uninstalled: bool = False):
     config_file = Path(getcwd()) / f".tinyb_{connector_name}"
     try:

{tinybird-0.0.1.dev163 → tinybird-0.0.1.dev165}/tinybird/tb/modules/datafile/common.py

@@ -156,7 +156,6 @@ INTERNAL_TABLES: Tuple[str, ...] = (
 )
 
 PREVIEW_CONNECTOR_SERVICES = ["s3", "s3_iamrole", "gcs"]
-TB_LOCAL_WORKSPACE_NAME = "Tinybird_Local_Testing"
 
 pp = pprint.PrettyPrinter()
 

{tinybird-0.0.1.dev163 → tinybird-0.0.1.dev165}/tinybird/tb/modules/deployment.py

@@ -611,6 +611,10 @@ def create_deployment(
             if deployment.get("status") == "data_ready":
                 break
 
+            if deployment.get("status") in ["deleting", "deleted"]:
+                click.echo(FeedbackManager.error(message="Deployment was deleted by another process"))
+                sys_exit("deployment_error", "Deployment was deleted by another process")
+
             time.sleep(5)
 
         click.echo(FeedbackManager.info(message="✓ Deployment is ready"))

{tinybird-0.0.1.dev163 → tinybird-0.0.1.dev165}/tinybird/tb/modules/local_common.py

@@ -18,6 +18,7 @@ TB_CONTAINER_NAME = "tinybird-local"
 TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 7181))
 TB_LOCAL_HOST = re.sub(r"^https?://", "", os.getenv("TB_LOCAL_HOST", "localhost"))
 TB_LOCAL_ADDRESS = f"http://{TB_LOCAL_HOST}:{TB_LOCAL_PORT}"
+TB_LOCAL_DEFAULT_WORKSPACE_NAME = "Tinybird_Local_Testing"
 
 
 async def get_tinybird_local_client(

{tinybird-0.0.1.dev163 → tinybird-0.0.1.dev165}/tinybird/tb/modules/workspace.py

@@ -29,6 +29,7 @@ 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,
+    TB_LOCAL_DEFAULT_WORKSPACE_NAME,
     get_local_tokens,
 )
 
@@ -183,7 +184,6 @@ async def create_workspace(
 
 @workspace.command(name="delete", short_help="Delete a workspace for your Tinybird user")
 @click.argument("workspace_name_or_id")
-@click.option("--user_token", is_flag=False, default=None, help="When passed, tb won't prompt asking for the token")
 @click.option(
     "--confirm_hard_delete",
     default=None,
@@ -194,14 +194,17 @@ async def create_workspace(
 @click.pass_context
 @coro
 async def delete_workspace(
-    ctx: Context, workspace_name_or_id: str, user_token: Optional[str], confirm_hard_delete: Optional[str], yes: bool
+    ctx: Context, workspace_name_or_id: str, confirm_hard_delete: Optional[str], yes: bool
 ) -> None:
     """Delete a workspace where you are an admin."""
 
+    is_cloud = ctx.ensure_object(dict)["env"] == "cloud"
     config = CLIConfig.get_project_config()
-    client = config.get_client()
-
-    user_token = await get_user_token(config, user_token)
+    if is_cloud:
+        user_token = await get_user_token(config)
+    else:
+        user_token = get_local_tokens()["user_token"]
+    client: TinyB = ctx.ensure_object(dict)["client"]
 
     workspaces = (await client.user_workspaces(version="v1")).get("workspaces", [])
     workspace_to_delete = next(
@@ -216,6 +219,11 @@ async def delete_workspace(
     if not workspace_to_delete:
         raise CLIWorkspaceException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
 
+    if workspace_to_delete.get("name") == TB_LOCAL_DEFAULT_WORKSPACE_NAME:
+        raise CLIWorkspaceException(
+            FeedbackManager.error(message="You cannot delete your default Tinybird Local workspace.")
+        )
+
     if yes or click.confirm(
         FeedbackManager.warning_confirm_delete_workspace(workspace_name=workspace_to_delete.get("name"))
     ):

{tinybird-0.0.1.dev163 → tinybird-0.0.1.dev165}/tinybird.egg-info/PKG-INFO

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