tinybird 0.0.1.dev76__tar.gz → 0.0.1.dev77__tar.gz

{tinybird-0.0.1.dev76 → tinybird-0.0.1.dev77}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev76
+Version: 0.0.1.dev77
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 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: anthropic==0.42.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: colorama==0.4.6
 Requires-Dist: cryptography~=41.0.0
 Requires-Dist: croniter==1.3.8

{tinybird-0.0.1.dev76 → tinybird-0.0.1.dev77}/tinybird/client.py

@@ -709,6 +709,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")
 
@@ -718,10 +723,17 @@ 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],
+        assign_to_organization_id: Optional[str] = None,
+    ):
         url = f"/v0/workspaces?name={name}"
         if template:
             url += f"&starter_kit={template}"
+        if assign_to_organization_id:
+            url += f"&assign_to_organization_id={assign_to_organization_id}"
         return await self._req(url, method="POST", data=b"")
 
     async def create_workspace_branch(
@@ -856,6 +868,9 @@ class TinyB:
     async def workspace_info(self) -> Dict[str, Any]:
         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-0.0.1.dev76 → tinybird-0.0.1.dev77}/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}."
     )
@@ -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-0.0.1.dev76 → tinybird-0.0.1.dev77}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev76'
-__revision__ = '5ecf681'
+__version__ = '0.0.1.dev77'
+__revision__ = '44da91f'

{tinybird-0.0.1.dev76 → tinybird-0.0.1.dev77}/tinybird/tb/modules/build.py

@@ -132,7 +132,6 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
                 click.echo(
                     FeedbackManager.warning(message=f"△ {f.get('level')}: {f.get('resource')}: {f.get('message')}")
                 )
-
         elif build_result == "failed":
             build_errors = result.get("errors")
             error_msg = None

{tinybird-0.0.1.dev76 → tinybird-0.0.1.dev77}/tinybird/tb/modules/cicd.py

@@ -25,7 +25,7 @@ on:
     branches:
       - main
       - master
-    types: [opened, reopened, labeled, unlabeled, synchronize, closed]{% if data_project_dir != '.' %}
+    types: [opened, reopened, labeled, unlabeled, synchronize]{% if data_project_dir != '.' %}
     paths:
       - '{{ data_project_dir }}/**'{% end %}
 

{tinybird-0.0.1.dev76 → tinybird-0.0.1.dev77}/tinybird/tb/modules/cli.py

@@ -6,6 +6,7 @@
 import json
 import logging
 import os
+import sys
 from os import getcwd
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
@@ -123,6 +124,9 @@ async def cli(
 
     logging.debug("debug enabled")
 
+    if "--help" in sys.argv or "-h" in sys.argv:
+        return
+
     client = await create_ctx_client(ctx, config, cloud, build, staging)
 
     if client:
@@ -399,8 +403,8 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, b
     commands_always_local = ["create"]
     if (
         (cloud or command in commands_always_cloud)
-        and command not in commands_always_build
         and command not in commands_always_local
+        and command not in commands_always_build
     ):
         click.echo(
             FeedbackManager.gray(message=f"Running against Tinybird Cloud: Workspace {config.get('name', 'default')}")

{tinybird-0.0.1.dev76 → tinybird-0.0.1.dev77}/tinybird/tb/modules/create.py

@@ -50,6 +50,7 @@ async def create(ctx: click.Context, data: Optional[str], prompt: Optional[str],
         config = CLIConfig.get_project_config(str(project.path))
         tb_client = config.get_client()
         user_token: Optional[str] = None
+        created = False
         if prompt:
             try:
                 user_token = config.get_user_token()
@@ -68,24 +69,24 @@ async def create(ctx: click.Context, data: Optional[str], prompt: Optional[str],
             click.echo(FeedbackManager.highlight(message="\n» Creating new project structure..."))
             create_project_structure(folder)
             click.echo(FeedbackManager.success(message="✓ Scaffolding completed!\n"))
-
+            created = True
         result = ""
         if data or prompt:
             click.echo(FeedbackManager.highlight(message="\n» Creating resources..."))
             result = await create_resources(local_client, tb_client, user_token, data, prompt, folder)
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
-
+            created = True
         if not already_has_cicd(folder):
             click.echo(FeedbackManager.highlight(message="\n» Creating CI/CD files for GitHub and GitLab..."))
             init_git(folder)
             await init_cicd(data_project_dir=os.path.relpath(folder))
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
-
+            created = True
         if not already_has_cursor_rules(folder):
             click.echo(FeedbackManager.highlight(message="\n» Creating .cursorrules..."))
             create_rules(folder, source, "cursor")
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
-
+            created = True
         if should_generate_fixtures(result):
             click.echo(FeedbackManager.highlight(message="\n» Generating fixtures..."))
 
@@ -95,6 +96,7 @@ async def create(ctx: click.Context, data: Optional[str], prompt: Optional[str],
                 datasource_path = Path(folder) / "datasources" / f"{ds_name}.datasource"
                 click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}"))
                 persist_fixture(ds_name, data_content, folder)
+                created = True
             elif prompt and user_token:
                 datasource_files = [f for f in os.listdir(Path(folder) / "datasources") if f.endswith(".datasource")]
                 for datasource_file in datasource_files:
@@ -113,6 +115,9 @@ async def create(ctx: click.Context, data: Optional[str], prompt: Optional[str],
                         if data:
                             persist_fixture(datasource_name, data, folder)
                             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}"))
+                            created = True
+        if not created:
+            click.echo(FeedbackManager.warning(message="△ No resources created\n"))
     except Exception as e:
         click.echo(FeedbackManager.error(message=f"Error: {str(e)}"))
 
@@ -121,7 +126,15 @@ PROJECT_PATHS = ("datasources", "endpoints", "materializations", "copies", "pipe
 
 
 def validate_project_structure(folder: str) -> bool:
-    return all((Path(folder) / path).exists() for path in PROJECT_PATHS)
+    some_folder_created = any((Path(folder) / path).exists() for path in PROJECT_PATHS)
+    if some_folder_created:
+        return True
+
+    folder_path = Path(folder)
+    datasources = list(folder_path.glob("**/*.datasource"))
+    pipes = list(folder_path.glob("**/*.pipe"))
+
+    return len(datasources) > 0 or len(pipes) > 0
 
 
 def should_generate_fixtures(result: str) -> bool:

{tinybird-0.0.1.dev76 → tinybird-0.0.1.dev77}/tinybird/tb/modules/local_common.py

@@ -48,13 +48,16 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any], build: bool = Fa
 
         logging.debug(f"Workspace used for build: {ws_name}")
 
-        user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={admin_token}").json()
+        user_workspaces = requests.get(
+            f"{TB_LOCAL_HOST}/v0/user/workspaces?with_organization=true&token={admin_token}"
+        ).json()
+        user_org_id = user_workspaces.get("organization_id", {})
         local_workspaces = user_workspaces.get("workspaces", [])
 
         ws = next((ws for ws in local_workspaces if ws["name"] == ws_name), None)
 
         if not ws:
-            await user_client.create_workspace(ws_name, template=None)
+            await user_client.create_workspace(ws_name, template=None, assign_to_organization_id=user_org_id)
             user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={admin_token}").json()
             ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
             if not ws:

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

@@ -1,16 +1,16 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev76
+Version: 0.0.1.dev77
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 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: anthropic==0.42.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: colorama==0.4.6
 Requires-Dist: cryptography~=41.0.0
 Requires-Dist: croniter==1.3.8

{tinybird-0.0.1.dev76 → tinybird-0.0.1.dev77}/tinybird.egg-info/requires.txt

@@ -1,7 +1,7 @@
 aiofiles==24.1.0
 anthropic==0.42.0
 click<8.2,>=8.1.6
-clickhouse-toolset==0.33.dev0
+clickhouse-toolset==0.34.dev0
 colorama==0.4.6
 cryptography~=41.0.0
 croniter==1.3.8