tinybird-cli 6.5.5.dev0__py3-none-any.whl → 6.5.6.dev0__py3-none-any.whl

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__ = '6.5.5.dev0'
-__revision__ = '5d2bbc5'
+__version__ = '6.5.6.dev0'
+__revision__ = '5a6cd1d'

tinybird/feedback_manager.py

@@ -242,10 +242,11 @@ class FeedbackManager:
     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_classic_workspace_creation_deprecated = error_message(
+        "The Classic experience is deprecated. New workspaces should be created in Forward. "
+        "Migration guide: https://www.tinybird.co/docs/forward/guides/migrate-from-classic"
+    )
     error_deleted_include = error_message(
         "Related include file {include_file} was deleted and it's used in {filename}. Delete or remove dependency from {filename}."
     )

tinybird/tb_cli_modules/common.py

@@ -624,7 +624,14 @@ async def create_workspace_non_interactive(
             await fork_workspace(client, user_client, created_workspace)
 
     except Exception as e:
-        raise CLIWorkspaceException(FeedbackManager.error_exception(error=str(e)))
+        message = str(e)
+        # The server (POST /v0/workspaces) rejects Classic workspace creation for
+        # non-enterprise organizations with this deprecation error. The API is the
+        # source of truth; we only reformat its message so it isn't buried behind a
+        # generic "Forbidden:" prefix. Matched on the stable migration-guide URL.
+        if "migrate-from-classic" in message:
+            raise CLIWorkspaceException(FeedbackManager.error_classic_workspace_creation_deprecated())
+        raise CLIWorkspaceException(FeedbackManager.error_exception(error=message))
 
 
 async def create_workspace_interactive(
@@ -2014,6 +2021,35 @@ async def get_organizations_by_user(ctx: Context, user_token: str) -> List[Dict[
     return organizations
 
 
+CLASSIC_WORKSPACE_CREATION_ALLOWED_ORGANIZATION_BILLING_PLANS = {
+    "infrastructure_usage",
+    "shared_infrastructure_usage_commitment",
+    "mixed_infrastructure_usage",
+}
+
+
+def get_organization_billing_plan(organization: Dict[str, Any]) -> Optional[str]:
+    plan = organization.get("plan")
+    if isinstance(plan, dict):
+        billing = plan.get("billing")
+        return billing if isinstance(billing, str) else None
+
+    for field in ("billing", "commitment_billing"):
+        billing = organization.get(field)
+        if isinstance(billing, str):
+            return billing
+
+    return None
+
+
+def get_classic_workspace_creation_organizations(organizations: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
+    return [
+        organization
+        for organization in organizations
+        if get_organization_billing_plan(organization) in CLASSIC_WORKSPACE_CREATION_ALLOWED_ORGANIZATION_BILLING_PLANS
+    ]
+
+
 OrgType = Literal["tinybird", "domain", "admin", "member"]
 
 

tinybird/tb_cli_modules/workspace.py

@@ -22,6 +22,7 @@ from tinybird.tb_cli_modules.common import (
     create_workspace_interactive,
     create_workspace_non_interactive,
     echo_safe_humanfriendly_tables_format_smart_table,
+    get_classic_workspace_creation_organizations,
     get_current_main_workspace,
     get_organizations_by_user,
     is_valid_starterkit,
@@ -226,19 +227,22 @@ async def create_workspace(
 
     organization_name = None
     organizations = await get_organizations_by_user(ctx, user_token)
+    selectable_organizations = get_classic_workspace_creation_organizations(organizations)
 
     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")
-    elif 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")
+    elif len(selectable_organizations) == 0:
+        # Let the API return the Classic deprecation error without printing the
+        # old organizations-migration warning that claimed creation would proceed.
+        organization_id = None
+    elif len(selectable_organizations) == 1:
+        organization_id = selectable_organizations[0].get("id")
+        organization_name = selectable_organizations[0].get("name")
     else:
-        sorted_organizations = sort_organizations_by_user(organizations, user_email=config.get_user_email())
+        sorted_organizations = sort_organizations_by_user(selectable_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")

{tinybird_cli-6.5.5.dev0.dist-info → tinybird_cli-6.5.6.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.5.5.dev0
+Version: 6.5.6.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -43,6 +43,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.5.5
+***********
+
+- `Changed` `tb workspace create` is now limited to organization in Enterprise plans
+
 6.5.4
 ***********
 

{tinybird_cli-6.5.5.dev0.dist-info → tinybird_cli-6.5.6.dev0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-tinybird/__cli__.py,sha256=t0TBFIN-TpEtJYQeeRTnQNGNWW_YRGoPNoiQHhSGUyk,236
+tinybird/__cli__.py,sha256=PMxuorKe_Xy2j3umVAJ4ex9QkXGD2NqfgIn8SvmCbq8,236
 tinybird/check_pypi.py,sha256=_4NkharLyR_ELrAdit-ftqIWvOf7jZNPt3i76frlo9g,975
 tinybird/client.py,sha256=28AUgzb9zD7PqqMD8lrgXUEWIvZ0nZYuBO3stcG1iqw,53236
 tinybird/config.py,sha256=ltL9qIfY-tnFXeivrLLi7apS_OkzEJT_jRXAJu0SRQg,7164
 tinybird/context.py,sha256=o4yvlXPkMLmdh-XJl3wpmqPAMeRRz5ScKzKlHHKn_I8,1201
 tinybird/datafile_common.py,sha256=ntQ4tJWCIzqbIWctagi7B172KrA-JH8gAE7_kP2-AXo,237356
 tinybird/datatypes.py,sha256=DRScTI1-lgYjbC7u_4qxOLFleWL-vief_eBg_9WU37U,11304
-tinybird/feedback_manager.py,sha256=hbO4o16rleDxzfkv04fTeJIjAxlpn477qTK0QCuleTA,68274
+tinybird/feedback_manager.py,sha256=2n0s6AMbjtFsELJN9pJnG5JjhM3lUueXBgF4mZ0WiCw,68318
 tinybird/git_settings.py,sha256=mqWgeboOlOFsSo97qyv595UCR2R1QCAqT4GTawBNPBg,3935
 tinybird/sql.py,sha256=L3tTmm62iTrf6WQdcV8mmwrCMitLFUvJ3OfDzyRTMGw,47385
 tinybird/sql_template.py,sha256=rgZxmP8lhfUmHjL1Z5JT0NTDEtVxK_5xRRzKiu5A868,131917
@@ -20,7 +20,7 @@ tinybird/tb_cli_modules/auth.py,sha256=3xu8STgouOgLkqlBf9LWFg9Oto_NyuDKsUWF95-zG
 tinybird/tb_cli_modules/branch.py,sha256=vbjLxIHz5XOqfMGwjyEZ7gji8Jw3PWPKKrPXViWdiIc,39348
 tinybird/tb_cli_modules/cicd.py,sha256=i2Mw8AbmEVNBcEPYdio7liy3PGqh1ezVFZ0OmJ9ww5o,13809
 tinybird/tb_cli_modules/cli.py,sha256=KvgZfdYRvgKG5QAiFmlfLbVGI-xmuxbs-EdkAslqrEQ,60242
-tinybird/tb_cli_modules/common.py,sha256=OzXkQGTnlUtOfx3EOdSLreewFRu_zaTXLSYDG-MT1_I,77236
+tinybird/tb_cli_modules/common.py,sha256=uHlORodJBevn9fvIV02rUsB2P0nMOLjHG7OYDyPrKjw,78661
 tinybird/tb_cli_modules/config.py,sha256=lukiJeihI09blGeeS0FWeqVbKWhqzZmyoaJDIL0NkyQ,11182
 tinybird/tb_cli_modules/connection.py,sha256=JO2v2xTGoiMeThzCncvxMFUHLghyyGXNF0FcAvi5ZOk,24543
 tinybird/tb_cli_modules/datasource.py,sha256=dZShJUrNXEfj4160ix7G2KsIBim3n1fAxk5ryvmdmuA,38285
@@ -33,11 +33,11 @@ tinybird/tb_cli_modules/tag.py,sha256=S5x8uDW0rsJEI5lKH2mefro7tEzcHyDNWrV_ZWNyS1
 tinybird/tb_cli_modules/telemetry.py,sha256=W098H6jmS4kpE7hN3tadaREBTf7oMocel-lkKWN0pU8,10466
 tinybird/tb_cli_modules/test.py,sha256=Vf8oK96V81HdKGsT79y6MUz6oz_VrYIwTbRnzzJs4rQ,4350
 tinybird/tb_cli_modules/token.py,sha256=JXATKTlbXohP9ZDZjlz8E4VYG6zrknKZhuz_wh1zBBc,13793
-tinybird/tb_cli_modules/workspace.py,sha256=u8x-caZdRLYXIMdrFK9rtXZutMtd4T3exMRKg-pYBWw,12398
+tinybird/tb_cli_modules/workspace.py,sha256=-GW_XZHPc5atVFUkYpXsl1G8t36jZyZ1B0UWAZYwSaA,12709
 tinybird/tb_cli_modules/workspace_members.py,sha256=ksXsjd233y9-sNlz4Qb-meZbX4zn1B84e_bSm2i8rhg,8731
 tinybird/tb_cli_modules/tinyunit/tinyunit.py,sha256=JrZQTb9NA-1kcL2Vm0JuDRNFdH8jcYYOM3ovJDVs28E,11063
-tinybird_cli-6.5.5.dev0.dist-info/METADATA,sha256=Wlt3ts99ZTUQsNOqUlvy3biBooW6UySQuoBKbco0dv4,83548
-tinybird_cli-6.5.5.dev0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-tinybird_cli-6.5.5.dev0.dist-info/entry_points.txt,sha256=PKPKuPmA4IfJYnCFHHUiw-aAWZuBomFvwCklv1OyCjE,43
-tinybird_cli-6.5.5.dev0.dist-info/top_level.txt,sha256=ZIQJTPCzMqnfDzM_hEGZrJqDSEcKnIK_49T86DGWpyQ,78
-tinybird_cli-6.5.5.dev0.dist-info/RECORD,,
+tinybird_cli-6.5.6.dev0.dist-info/METADATA,sha256=Eb-1cwhtDSZVzIsf_DMwqy2NQ2_b_8Hht2vB7GnDlTo,83653
+tinybird_cli-6.5.6.dev0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+tinybird_cli-6.5.6.dev0.dist-info/entry_points.txt,sha256=PKPKuPmA4IfJYnCFHHUiw-aAWZuBomFvwCklv1OyCjE,43
+tinybird_cli-6.5.6.dev0.dist-info/top_level.txt,sha256=ZIQJTPCzMqnfDzM_hEGZrJqDSEcKnIK_49T86DGWpyQ,78
+tinybird_cli-6.5.6.dev0.dist-info/RECORD,,