tinybird 0.0.1.dev154__py3-none-any.whl → 0.0.1.dev156__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.dev154'
-__revision__ = 'db74d7e'
+__version__ = '0.0.1.dev156'
+__revision__ = '888fa61'

tinybird/tb/modules/local.py

@@ -7,6 +7,7 @@ from typing import Optional
 
 import boto3
 import click
+import requests
 
 import docker
 from docker.client import DockerClient
@@ -15,7 +16,7 @@ from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import coro
 from tinybird.tb.modules.exceptions import CLIException, CLILocalException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.local_common import TB_CONTAINER_NAME, TB_IMAGE_NAME, TB_LOCAL_PORT
+from tinybird.tb.modules.local_common import TB_CONTAINER_NAME, TB_IMAGE_NAME, TB_LOCAL_ADDRESS, TB_LOCAL_PORT
 from tinybird.tb.modules.telemetry import add_telemetry_event
 
 
@@ -397,3 +398,10 @@ async def restart(use_aws_creds: bool) -> None:
     click.echo(FeedbackManager.info(message="✓ Tinybird Local stopped"))
     start_tinybird_local(docker_client, use_aws_creds)
     click.echo(FeedbackManager.success(message="✓ Tinybird Local is ready!"))
+
+
+@local.command()
+def version() -> None:
+    """Show Tinybird Local version"""
+    response = requests.get(f"{TB_LOCAL_ADDRESS}/version")
+    click.echo(FeedbackManager.success(message=f"✓ Tinybird Local version: {response.text}"))

tinybird/tb/modules/workspace.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 Optional
+from typing import Any, Dict, List, Optional
 
 import click
 from click import Context
@@ -21,8 +21,8 @@ from tinybird.tb.modules.common import (
     get_organizations_by_user,
     get_user_token,
     is_valid_starterkit,
-    print_current_workspace,
     switch_workspace,
+    try_update_config_with_remote,
 )
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLIWorkspaceException
@@ -70,21 +70,65 @@ async def workspace_ls(ctx: Context) -> None:
 
 @workspace.command(name="use")
 @click.argument("workspace_name_or_id")
+@click.pass_context
 @coro
-async def workspace_use(workspace_name_or_id: str) -> None:
+async def workspace_use(ctx: Context, workspace_name_or_id: str) -> None:
     """Switch to another workspace. Use 'tb workspace ls' to list the workspaces you have access to."""
     config = CLIConfig.get_project_config()
+    is_cloud = ctx.ensure_object(dict)["env"] == "cloud"
+    if not is_cloud:
+        raise CLIWorkspaceException(
+            FeedbackManager.error(
+                message="`tb workspace use` is not available in local mode. Use --cloud to switch to a cloud workspace and it will be used in Tinybird Local."
+            )
+        )
 
     await switch_workspace(config, workspace_name_or_id)
 
 
 @workspace.command(name="current")
+@click.pass_context
 @coro
-async def workspace_current():
+async def workspace_current(ctx: Context):
     """Show the workspace you're currently authenticated to"""
     config = CLIConfig.get_project_config()
+    env = ctx.ensure_object(dict)["env"]
+    client: TinyB = ctx.ensure_object(dict)["client"]
+    if env == "cloud":
+        _ = await try_update_config_with_remote(config, only_if_needed=True)
+
+    user_workspaces = await client.user_workspaces(version="v1")
+    current_workspace = await client.workspace_info(version="v1")
+
+    def _get_current_workspace(user_workspaces: Dict[str, Any], current_workspace_id: str) -> Optional[Dict[str, Any]]:
+        def get_workspace_by_name(workspaces: List[Dict[str, Any]], name: str) -> Optional[Dict[str, Any]]:
+            return next((ws for ws in workspaces if ws["name"] == name), None)
+
+        workspaces: Optional[List[Dict[str, Any]]] = user_workspaces.get("workspaces")
+        if not workspaces:
+            return None
+
+        current: Optional[Dict[str, Any]] = get_workspace_by_name(workspaces, current_workspace_id)
+        return current
 
-    await print_current_workspace(config)
+    current_main_workspace = _get_current_workspace(user_workspaces, config.get("name", current_workspace["name"]))
+
+    assert isinstance(current_main_workspace, dict)
+
+    columns = ["name", "id", "role", "plan", "current"]
+
+    table = [
+        (
+            current_main_workspace["name"],
+            current_main_workspace["id"],
+            current_main_workspace["role"],
+            _get_workspace_plan_name(current_main_workspace["plan"]),
+            True,
+        )
+    ]
+
+    click.echo(FeedbackManager.info_current_workspace())
+    echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
 
 
 @workspace.command(name="create", short_help="Create a new Workspace for your Tinybird user")

{tinybird-0.0.1.dev154.dist-info → tinybird-0.0.1.dev156.dist-info}/METADATA

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

{tinybird-0.0.1.dev154.dist-info → tinybird-0.0.1.dev156.dist-info}/RECORD

@@ -12,7 +12,7 @@ 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=OrWQsqWlL7qgpSbsPAJ-mQZxZnMtsVL0MZkOzFitD88,247
+tinybird/tb/__cli__.py,sha256=9Uom43LFpjyePOXqbI6-l2C6x4WEikJFuS8e2W83184,247
 tinybird/tb/check_pypi.py,sha256=rW4QmDRbtgKdUUwJCnBkVjmTjZSZGN-XgZhx7vMkC0w,1009
 tinybird/tb/cli.py,sha256=uPV6pvi4aYVfaiGs0DQO-eoi1g9dHlrgvhutkXkdJko,1075
 tinybird/tb/client.py,sha256=aaPKq5C77e72kR7IMv9WrvnvNki8mKMOTi9EsCp0eUc,55962
@@ -37,7 +37,7 @@ tinybird/tb/modules/infra.py,sha256=fve30Gj3mG9zbquGxS2e4ipcOYOxviWQCpNFfEzJN_Q,
 tinybird/tb/modules/job.py,sha256=n4dSSBgnA8NqD7srGahf2xRj6wxkmX9Vl0J-QJ_a2w0,2966
 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=bMrDxvhNuc3O1Gb2CL51IgoT1XXujs0NqwWpoE_bOS4,14299
+tinybird/tb/modules/local.py,sha256=4CJfqAyojnwj1fN2UuKMWO28DeOGrGJ9WkHUUDAfPas,14568
 tinybird/tb/modules/local_common.py,sha256=GMbA0aKaDXzOIHVCfi_IJyQ7ziWPUhTWk0I_CZm8nmQ,4763
 tinybird/tb/modules/login.py,sha256=fmXPSdvJnKPv03chptGuu3_Fm6LhP6kUsUKhrmT8rJc,8269
 tinybird/tb/modules/logout.py,sha256=ULooy1cDBD02-r7voZmhV7udA0ML5tVuflJyShrh56Y,1022
@@ -54,7 +54,7 @@ tinybird/tb/modules/telemetry.py,sha256=IHHks8-jnrkyQIY_Y6ZmU8hdVHMGSS0pkSUOgCPc
 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=SlK08psp0tu5t_URHyIczm696buW6KD6FPs9Lg1aNRE,6614
+tinybird/tb/modules/workspace.py,sha256=JIPfsh243gCiCkB3bw0Zx0VcivCeMq34xqlfuT3aURE,8518
 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.dev154.dist-info/METADATA,sha256=PnWxtxSIaHMNfsIBGjf2-dFk1zw2g1wx80rl_2u1Gw4,1607
-tinybird-0.0.1.dev154.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev154.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev154.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev154.dist-info/RECORD,,
+tinybird-0.0.1.dev156.dist-info/METADATA,sha256=aukxrlc7qfXhgKxSlMHSAOoWo15HAwKnXu2stIMf4bI,1607
+tinybird-0.0.1.dev156.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev156.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev156.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev156.dist-info/RECORD,,