tinybird 0.0.1.dev154__tar.gz → 0.0.1.dev156__tar.gz

{tinybird-0.0.1.dev154 → tinybird-0.0.1.dev156}/PKG-INFO

@@ -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 → tinybird-0.0.1.dev156}/tinybird/check_pypi.py

@@ -6,7 +6,7 @@ from tinybird.feedback_manager import FeedbackManager
 from tinybird.syncasync import sync_to_async
 from tinybird.tb_cli_modules.common import CLIException, getenv_bool
 
-PYPY_URL = "https://pypi.org/pypi/tinybird/json"
+PYPY_URL = "https://pypi.org/pypi/tinybird-cli/json"
 requests_get = sync_to_async(requests.get, thread_sensitive=False)
 
 

{tinybird-0.0.1.dev154 → tinybird-0.0.1.dev156}/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-0.0.1.dev154 → tinybird-0.0.1.dev156}/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-0.0.1.dev154 → tinybird-0.0.1.dev156}/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 → tinybird-0.0.1.dev156}/tinybird.egg-info/PKG-INFO

@@ -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