tinybird-cli 5.15.2.dev1__tar.gz → 5.16.1.dev0__tar.gz

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 5.15.2.dev1
+Version: 5.16.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
 Author-email: support@tinybird.co
-Requires-Python: >=3.9, <3.13
+Requires-Python: >=3.9, <3.14
 Description-Content-Type: text/x-rst
 Requires-Dist: aiofiles==24.1.0
-Requires-Dist: click<8.2,>=8.1.6
-Requires-Dist: clickhouse-toolset==0.33.dev0
+Requires-Dist: clickhouse-toolset==0.34.dev0
+Requires-Dist: click<8.2,>=8.1.8
 Requires-Dist: colorama==0.4.6
 Requires-Dist: cryptography~=41.0.0
 Requires-Dist: croniter==1.3.15
@@ -61,11 +61,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
-5.15.2.dev1
+5.16.0
 ***********
 
+- `Added` support for organizations on `tb workspace create`
+- `Added` support for Python 3.13
 - `Updated` dependencies:
     - croniter: from 1.3.8 to 1.3.15
+    - clickhouse-driver: from 0.2.7 to 0.2.9
+    - clickhouse-toolset: from 0.33.dev0 to 0.34.dev0
+    - click: from 8.1.7 to 8.1.8
 
 5.15.1
 ***********

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '5.15.2.dev1'
-__revision__ = 'f29457c'
+__version__ = '5.16.1.dev0'
+__revision__ = '24d8376'

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/tinybird/client.py

@@ -667,6 +667,11 @@ class TinyB:
     async def user_workspaces_and_branches(self):
         return await self._req("/v0/user/workspaces/?with_environments=true")
 
+    async def user_workspaces_with_organization(self):
+        return await self._req(
+            "/v0/user/workspaces/?with_environments=false&with_organization=true&with_members_and_owner=false"
+        )
+
     async def user_workspace_branches(self):
         return await self._req("/v0/user/workspaces/?with_environments=true&only_environments=true")
 
@@ -676,10 +681,12 @@ class TinyB:
     async def releases(self, workspace_id):
         return await self._req(f"/v0/workspaces/{workspace_id}/releases")
 
-    async def create_workspace(self, name: str, template: Optional[str]):
+    async def create_workspace(self, name: str, template: Optional[str], organization_id: Optional[str]):
         url = f"/v0/workspaces?name={name}"
         if template:
             url += f"&starter_kit={template}"
+        if organization_id:
+            url += f"&assign_to_organization_id={organization_id}"
         return await self._req(url, method="POST", data=b"")
 
     async def create_workspace_branch(
@@ -814,6 +821,9 @@ class TinyB:
     async def workspace_info(self):
         return await self._req("/v0/workspace")
 
+    async def organization(self, organization_id: str):
+        return await self._req(f"/v0/organizations/{organization_id}")
+
     async def wait_for_job(
         self,
         job_id: str,

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/tinybird/feedback_manager.py

@@ -247,6 +247,14 @@ class FeedbackManager:
     error_connection_invalid_ca_pem = error_message("Invalid CA certificate in PEM format")
     error_connection_ca_pem_not_found = error_message("CA certificate in PEM format not found at {ca_pem}")
     error_workspace = error_message("Workspace {workspace} not found. use 'tb workspace ls' to list your workspaces")
+    error_organization_not_found = error_message("Organization with id '{organization_id}' not found")
+    error_organization_index = error_message(
+        "Error selecting organization '{organization_index}'. Select a valid index or 0 to cancel"
+    )
+    warning_none_organization = warning_message(
+        "Tinybird is now based on organizations. Please, go to the UI ({ui_host}) to follow the migration process. \nYour workspace will be created any way."
+    )
+    error_while_fetching_orgs = error_message("Error while fetching organizations: {error}")
     error_deleted_include = error_message(
         "Related include file {include_file} was deleted and it's used in {filename}. Delete or remove dependency from {filename}."
     )
@@ -458,7 +466,7 @@ class FeedbackManager:
     info_releases_detected = info_message("** Live Release: {current_semver} => New Release: {semver}")
     info_dry_releases_detected = info_message("** [DRY RUN] Live Release: {current_semver} => New Release: {semver}")
     info_pre_prompt_auth_login_user_token = info_message(
-        "ℹ️ In order to log into Tinybird, you need your user token. Please, go to {host}/tokens/ and paste your User Token here."
+        "ℹ️ In order to log into Tinybird, you need your user token. Please, go to {host}/tokens/ and paste your User Token here."  # noqa: RUF001
     )
     prompt_auth_login_user_token = prompt_message("❓ User token:")
 
@@ -609,7 +617,7 @@ Ready? """
     )
     warning_datasource_sync = warning_message("** Warning: Do you want to sync the Data Source {datasource}?")
     warning_datasource_sync_bucket = warning_message(
-        "** Warning: Do you want to ingest all the selected files (new and previous) from the {datasource} bucket? Be aware that data might be duplicated if you have previously ingested those files.\n"
+        "** Warning: Do you want to ingest all the selected files (new and previous) from the {datasource} bucket? Be aware that data might be duplicated if you have previously ingested those files.\n"
     )
     warning_users_dont_exist = warning_message(
         "** Warning: The following users do not exist in the workspace {workspace}: {users}"
@@ -981,6 +989,9 @@ Ready? """
     success_connection_using = success_message("** Using connection '{connection_name}'")
     success_using_host = success_message("** Using host: {host} ({name})")
     success_workspace_created = success_message("** Workspace '{workspace_name}' has been created")
+    success_workspace_created_with_organization = success_message(
+        "** Workspace '{workspace_name}' has been created in Organization '{organization_name}' (id: '{organization_id}')"
+    )
     success_workspace_branch_created = success_message(
         "** Branch '{branch_name}' from '{workspace_name}' has been created"
     )

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/tinybird/sql_template.py

@@ -2256,6 +2256,16 @@ def render_sql_template(
     Traceback (most recent call last):
     ...
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: Required parameter is not defined. Check the parameters test. Please provide a value or set a default value in the pipe code.
+    >>> render_sql_template("SELECT * FROM test WHERE {% for item in JSON(filters, '[{}]') %} {{item.get('operand')}} {% end %}")
+    Traceback (most recent call last):
+        ...
+    tinybird.sql_template.SQLTemplateException: Template Syntax Error: expression "item.get('operand')" evaluated to null
+    >>> render_sql_template("SELECT * FROM test WHERE {% for item in JSON(filters, '[{\\\"operand\\\":\\\"test\\\"}]') %} {{item.get('operand')}} {% end %}")
+    ("SELECT * FROM test WHERE  'test' ", {}, [])
+    >>> render_sql_template("SELECT * FROM test WHERE {% for item in JSON(filters, '[\\\"test\\\"]') %} {{item.get('operator')}} {% end %}")
+    Traceback (most recent call last):
+        ...
+    tinybird.sql_template.SQLTemplateException: Template Syntax Error: 'str' object has no attribute 'get'. Make sure you're using an object/dictionary where trying to use .get()
     """
     escape_split_to_array = ff_split_to_array_escape.get(False)
 
@@ -2323,6 +2333,14 @@ def render_sql_template(
     except SQLTemplateException as e:
         format_SQLTemplateException_message(e, vars_and_types=template_variables_with_types)
         raise
+    except AttributeError as e:
+        # This happens when trying to use `get` on a string or when the object is None
+        if "'str' object has no attribute 'get'" in str(e):
+            raise SQLTemplateException(
+                "'str' object has no attribute 'get'. Make sure you're using an object/dictionary where trying to use .get()",
+                documentation="/cli/advanced-templates.html",
+            )
+        raise SQLTemplateException(str(e), documentation="/cli/advanced-templates.html")
     except Exception as e:
         # errors might vary here, we need to support as much as possible
         # https://gitlab.com/tinybird/analytics/-/issues/943

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/tinybird/tb_cli_modules/common.py

@@ -18,7 +18,7 @@ from enum import Enum
 from functools import wraps
 from os import chmod, environ, getcwd, getenv
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Literal, Optional, Set, Tuple, TypedDict, Union
 from urllib.parse import urlparse
 
 import aiofiles
@@ -707,7 +707,13 @@ async def fork_workspace(client: TinyB, user_client: TinyB, created_workspace):
 
 
 async def create_workspace_non_interactive(
-    ctx: Context, workspace_name: str, starterkit: str, user_token: str, fork: bool
+    ctx: Context,
+    workspace_name: str,
+    starterkit: Optional[str],
+    user_token: str,
+    fork: bool,
+    organization_id: Optional[str],
+    organization_name: Optional[str],
 ):
     """Creates a workspace using the provided name and starterkit"""
     client: TinyB = ctx.ensure_object(dict)["client"]
@@ -716,8 +722,15 @@ async def create_workspace_non_interactive(
         user_client: TinyB = deepcopy(client)
         user_client.token = user_token
 
-        created_workspace = await user_client.create_workspace(workspace_name, starterkit)
-        click.echo(FeedbackManager.success_workspace_created(workspace_name=workspace_name))
+        created_workspace = await user_client.create_workspace(workspace_name, starterkit, organization_id)
+        if organization_id and organization_name:
+            click.echo(
+                FeedbackManager.success_workspace_created_with_organization(
+                    workspace_name=workspace_name, organization_name=organization_name, organization_id=organization_id
+                )
+            )
+        else:
+            click.echo(FeedbackManager.success_workspace_created(workspace_name=workspace_name))
 
         if fork:
             await fork_workspace(client, user_client, created_workspace)
@@ -727,7 +740,13 @@ async def create_workspace_non_interactive(
 
 
 async def create_workspace_interactive(
-    ctx: Context, workspace_name: Optional[str], starterkit: Optional[str], user_token: str, fork: bool
+    ctx: Context,
+    workspace_name: Optional[str],
+    starterkit: Optional[str],
+    user_token: str,
+    fork: bool,
+    organization_id: Optional[str],
+    organization_name: Optional[str],
 ):
     if not starterkit and not is_ci_environment():
         click.echo("\n")
@@ -744,8 +763,17 @@ async def create_workspace_interactive(
         click.echo(FeedbackManager.info_workspace_create_greeting())
         default_name = f"new_workspace_{uuid.uuid4().hex[0:4]}"
         workspace_name = click.prompt("\nWorkspace name", default=default_name, err=True, type=str)
-
-    await create_workspace_non_interactive(ctx, workspace_name, starterkit, user_token, fork)  # type: ignore
+    assert isinstance(workspace_name, str)
+
+    await create_workspace_non_interactive(
+        ctx,
+        workspace_name,
+        starterkit,
+        user_token,
+        fork,
+        organization_id=organization_id,
+        organization_name=organization_name,
+    )
 
 
 async def create_workspace_branch(
@@ -2080,3 +2108,99 @@ def get_ca_pem_content(ca_pem: Optional[str], filename: Optional[str] = None) ->
         raise CLIConnectionException(FeedbackManager.error_connection_invalid_ca_pem())
 
     return ca_pem_content
+
+
+async def get_organizations_by_user(ctx: Context, user_token: str) -> List[Dict[str, Any]]:
+    """Fetches all organizations by user using the provided user token"""
+    client: TinyB = ctx.ensure_object(dict)["client"]
+    organizations = []
+
+    try:
+        user_client: TinyB = deepcopy(client)
+        user_client.token = user_token
+        user_workspaces = await user_client.user_workspaces_with_organization()
+        admin_org_id = user_workspaces.get("organization_id")
+        seen_org_ids = set()
+
+        for workspace in user_workspaces.get("workspaces"):
+            org = workspace.get("organization")
+            if org and org.get("id") not in seen_org_ids:
+                org["is_admin"] = org.get("id") == admin_org_id
+                organizations.append(org)
+                seen_org_ids.add(org.get("id"))
+
+        # Case: user is admin of an organization but not a member of any workspace in it
+        if admin_org_id and admin_org_id not in seen_org_ids:
+            org = await user_client.organization(admin_org_id)
+            org["id"] = admin_org_id
+            org["is_admin"] = True
+            organizations.append(org)
+
+    except Exception as e:
+        raise CLIWorkspaceException(FeedbackManager.error_while_fetching_orgs(error=str(e)))
+    return organizations
+
+
+OrgType = Literal["tinybird", "domain", "admin", "member"]
+
+
+class Organization(TypedDict):
+    id: str
+    name: str
+    role: str
+    domains: Optional[List[str]]
+    type: OrgType
+
+
+def sort_organizations_by_user(organizations: List[Dict[str, Any]], user_email: Optional[str]) -> List[Organization]:
+    """Sort organizations based on type: tinybird > domain > admin > member"""
+    sorted_organizations: List[Organization] = []
+    user_domain = user_email.split("@")[1] if user_email else None
+    is_tinybird_user = user_domain == "tinybird.co"
+
+    for org in organizations:
+        domain = org.get("domain") or ""
+        domains = domain.split(",") if domain else None
+        role: OrgType = "admin" if org.get("is_admin") else "member"
+        type = role
+        if domains and user_domain and user_domain in domains:
+            type = "domain"
+        if org.get("name") == "Tinybird" and is_tinybird_user:
+            type = "tinybird"
+
+        sorted_organizations.append(
+            {
+                "id": org.get("id") or "",
+                "name": org.get("name") or "",
+                "role": role,
+                "domains": [domain.strip() for domain in domains] if domains else None,
+                "type": type,
+            }
+        )
+
+    type_priority: Dict[OrgType, int] = {"tinybird": 0, "domain": 1, "admin": 2, "member": 3}
+
+    sorted_organizations.sort(key=lambda x: type_priority[x["type"]])
+
+    return sorted_organizations
+
+
+async def ask_for_organization_interactively(organizations: List[Organization]) -> Optional[Organization]:
+    rows = [(index + 1, org["name"], org["role"], org["id"]) for index, org in enumerate(organizations)]
+
+    echo_safe_humanfriendly_tables_format_smart_table(rows, column_names=["Idx", "Name", "Role", "Id"])
+    click.echo("")
+    click.echo("   [0] to cancel")
+
+    org_index = -1
+    while org_index == -1:
+        org_index = click.prompt("\nSelect an organization to include the workspace in", default=1)
+        if org_index < 0 or org_index > len(organizations):
+            click.echo(FeedbackManager.error_organization_index(organization_index=org_index))
+            org_index = -1
+
+    if org_index == 0:
+        click.echo(FeedbackManager.info_cancelled_by_user())
+        return None
+
+    return organizations[org_index - 1]

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/tinybird/tb_cli_modules/config.py

@@ -259,6 +259,9 @@ class CLIConfig:
     def get_user_client(self, host: Optional[str] = None) -> tbc.TinyB:
         return self.get_client(self.get_user_token(), host)
 
+    def get_user_email(self) -> Optional[str]:
+        return self["user_email"]
+
     def set_workspace_token(self, workspace_id: str, token: str) -> None:
         pass
 

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/tinybird/tb_cli_modules/workspace.py

@@ -15,6 +15,7 @@ from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.cli import cli
 from tinybird.tb_cli_modules.common import (
     _get_workspace_plan_name,
+    ask_for_organization_interactively,
     ask_for_user_token,
     check_user_token,
     coro,
@@ -22,8 +23,10 @@ from tinybird.tb_cli_modules.common import (
     create_workspace_non_interactive,
     echo_safe_humanfriendly_tables_format_smart_table,
     get_current_main_workspace,
+    get_organizations_by_user,
     is_valid_starterkit,
     print_current_workspace,
+    sort_organizations_by_user,
     switch_workspace,
 )
 from tinybird.tb_cli_modules.config import CLIConfig
@@ -193,29 +196,69 @@ async def clear_workspace(ctx: Context, yes: bool, dry_run: bool) -> None:
     default=False,
     help="When enabled, we will share all datasource from the current workspace to the new created one",
 )
+@click.option(
+    "--organization-id",
+    "organization_id",
+    type=str,
+    required=False,
+    help="When passed, the workspace will be created in the specified organization",
+)
 @click.pass_context
 @coro
 async def create_workspace(
-    ctx: Context, workspace_name: str, starter_kit: str, user_token: Optional[str], fork: bool
+    ctx: Context,
+    workspace_name: str,
+    starter_kit: str,
+    user_token: Optional[str],
+    fork: bool,
+    organization_id: Optional[str],
 ) -> None:
     if starter_kit and not await is_valid_starterkit(ctx, starter_kit):
         raise CLIWorkspaceException(FeedbackManager.error_starterkit_name(starterkit_name=starter_kit))
 
+    config = CLIConfig.get_project_config()
+    host = config.get_host() or CLIConfig.DEFAULTS["host"]
+    ui_host = get_display_host(host)
+
     if not user_token:
-        config = CLIConfig.get_project_config()
-        host = config.get_host() or CLIConfig.DEFAULTS["host"]
-        ui_host = get_display_host(host)
         user_token = ask_for_user_token("create a new workspace", ui_host)
         if not user_token:
             return
     await check_user_token(ctx, user_token)
 
+    organization_name = None
+    organizations = await get_organizations_by_user(ctx, user_token)
+
+    if organization_id:
+        organization = next((org for org in organizations if org.get("id") == organization_id), None)
+        if not organization:
+            raise CLIWorkspaceException(FeedbackManager.error_organization_not_found(organization_id=organization_id))
+        organization_name = organization.get("name")
+    else:
+        if len(organizations) == 0:
+            click.echo(FeedbackManager.warning_none_organization(ui_host=ui_host))
+        elif len(organizations) == 1:
+            organization_id = organizations[0].get("id")
+            organization_name = organizations[0].get("name")
+        else:
+            sorted_organizations = sort_organizations_by_user(organizations, user_email=config.get_user_email())
+            current_organization = await ask_for_organization_interactively(sorted_organizations)
+            if current_organization:
+                organization_id = current_organization.get("id")
+                organization_name = current_organization.get("name")
+            else:
+                return
+
     # If we have at least workspace_name, we start the non interactive
     # process, creating an empty workspace
     if workspace_name:
-        await create_workspace_non_interactive(ctx, workspace_name, starter_kit, user_token, fork)
+        await create_workspace_non_interactive(
+            ctx, workspace_name, starter_kit, user_token, fork, organization_id, organization_name
+        )
     else:
-        await create_workspace_interactive(ctx, workspace_name, starter_kit, user_token, fork)
+        await create_workspace_interactive(
+            ctx, workspace_name, starter_kit, user_token, fork, organization_id, organization_name
+        )
 
 
 @workspace.command(name="delete", short_help="Delete a Workspace for your Tinybird user")

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,15 +1,15 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 5.15.2.dev1
+Version: 5.16.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
 Author-email: support@tinybird.co
-Requires-Python: >=3.9, <3.13
+Requires-Python: >=3.9, <3.14
 Description-Content-Type: text/x-rst
 Requires-Dist: aiofiles==24.1.0
-Requires-Dist: click<8.2,>=8.1.6
-Requires-Dist: clickhouse-toolset==0.33.dev0
+Requires-Dist: clickhouse-toolset==0.34.dev0
+Requires-Dist: click<8.2,>=8.1.8
 Requires-Dist: colorama==0.4.6
 Requires-Dist: cryptography~=41.0.0
 Requires-Dist: croniter==1.3.15
@@ -61,11 +61,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
-5.15.2.dev1
+5.16.0
 ***********
 
+- `Added` support for organizations on `tb workspace create`
+- `Added` support for Python 3.13
 - `Updated` dependencies:
     - croniter: from 1.3.8 to 1.3.15
+    - clickhouse-driver: from 0.2.7 to 0.2.9
+    - clickhouse-toolset: from 0.33.dev0 to 0.34.dev0
+    - click: from 8.1.7 to 8.1.8
 
 5.15.1
 ***********

{tinybird_cli-5.15.2.dev1 → tinybird_cli-5.16.1.dev0}/tinybird_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
 aiofiles==24.1.0
-click<8.2,>=8.1.6
-clickhouse-toolset==0.33.dev0
+clickhouse-toolset==0.34.dev0
+click<8.2,>=8.1.8
 colorama==0.4.6
 cryptography~=41.0.0
 croniter==1.3.15