tinybird-cli 6.5.5.dev0__tar.gz → 6.5.7.dev0__tar.gz

{tinybird_cli-6.5.5.dev0 → tinybird_cli-6.5.7.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.5.5.dev0
+Version: 6.5.7.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -43,6 +43,17 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+
+6.5.6
+***********
+
+- `Changed` ``tb datasource append`` and ``tb datasource replace`` submit local CSV, NDJSON, and Parquet files through the v1 import endpoint by default. ``tb datasource append --events`` also submits its request body through v1. Commands wait for completion by default to preserve the existing output; pass ``--no-wait`` to print the queued job ID instead. Remote URL imports continue to use their existing route.
+
+6.5.5
+***********
+
+- `Changed` `tb workspace create` is now limited to organization in Enterprise plans
+
 6.5.4
 ***********
 

{tinybird_cli-6.5.5.dev0 → tinybird_cli-6.5.7.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__ = '6.5.5.dev0'
-__revision__ = '5d2bbc5'
+__version__ = '6.5.7.dev0'
+__revision__ = '532ee82'

{tinybird_cli-6.5.5.dev0 → tinybird_cli-6.5.7.dev0}/tinybird/client.py

@@ -411,7 +411,7 @@ class TinyB:
         sql_condition: Optional[str] = None,
         format: str = "csv",
         replace_options: Optional[Set[str]] = None,
-    ):
+    ) -> Dict[str, Any]:
         params = {"name": table_name, "url": url, "mode": mode, "debug": "blocks_block_log", "format": format}
 
         if sql_condition:
@@ -437,58 +437,37 @@ class TinyB:
         datasource_name: str,
         file: Union[str, Path],
         mode: str = "append",
-        status_callback=None,
+        status_callback=None,  # noqa: ARG002 - kept for v0 caller compatibility
         sql_condition: Optional[str] = None,
         format: str = "csv",
         replace_options: Optional[Set[str]] = None,
-        use_v1: bool = False,
     ):
-        params = {"name": datasource_name, "mode": mode, "format": format, "debug": "blocks_block_log"}
-
+        # V1 returns the import job immediately, so waiting and progress reporting
+        # belong to the caller.
+        async with aiofiles.open(file, "rb") as content:
+            file_content = await content.read()
+        v1_params = {"format": format}
         if sql_condition:
-            params["replace_condition"] = sql_condition
+            v1_params["replace_condition"] = sql_condition
         if replace_options:
             for option in list(replace_options):
-                params[option] = "true"
-
-        async with aiofiles.open(file, "rb") as content:
-            file_content = await content.read()
-
-        if use_v1:
-            v1_params = {"format": format}
-            if sql_condition:
-                v1_params["replace_condition"] = sql_condition
-            if replace_options:
-                for option in list(replace_options):
-                    v1_params[option] = "true"
-            content_types = {
-                "csv": "text/csv",
-                "ndjson": "application/x-ndjson",
-                "parquet": "application/vnd.apache.parquet",
-            }
-            headers = {"Content-Type": content_types[format]}
-            if str(file).endswith(".gz"):
-                headers["Content-Encoding"] = "gzip"
-            return await self._req(
-                f"/v1/datasources/{quote(datasource_name, safe='')}/{mode}?{urlencode(v1_params, safe='')}",
-                data=file_content,
-                headers=headers,
-                method="POST",
-            )
-
-        if format == "csv":
-            files = {"csv": ("csv", file_content)}
-        else:
-            files = {"ndjson": ("ndjson", file_content)}
-
+                v1_params[option] = "true"
+        content_types = {
+            "csv": "text/csv",
+            "ndjson": "application/x-ndjson",
+            "parquet": "application/vnd.apache.parquet",
+        }
+        headers = {"Content-Type": content_types[format]}
+        if str(file).endswith(".gz"):
+            headers["Content-Encoding"] = "gzip"
         res = await self._req(
-            f"v0/datasources?{urlencode(params, safe='')}",
-            files=files,
+            f"/v1/datasources/{quote(datasource_name, safe='')}/{mode}?{urlencode(v1_params, safe='')}",
+            data=file_content,
+            headers=headers,
             method="POST",
         )
-        if status_callback:
-            status_callback(res)
-
+        if not isinstance(res, dict):
+            raise RuntimeError("We couldn't confirm that your import started. Please try again.")
         return res
 
     async def datasource_truncate(self, datasource_name: str):

{tinybird_cli-6.5.5.dev0 → tinybird_cli-6.5.7.dev0}/tinybird/datafile_common.py

@@ -4868,12 +4868,16 @@ async def check_fixtures_data(
             )
             sys.stdout.flush()
             try:
-                await client.datasource_append_data(
+                import_job = await client.datasource_append_data(
                     datasource_name=resource["params"]["name"],
                     file=fixture_path,
                     mode=mode,
                     format=fixture_path.suffix[1:],
                 )
+                job_id = import_job.get("id") or import_job.get("import_id")
+                if not isinstance(job_id, str):
+                    raise RuntimeError("We couldn't confirm that your fixture import started. Please try again.")
+                await client.wait_for_job(job_id)
                 click.echo(FeedbackManager.success_processing_data())
             except Exception as e:
                 raise click.ClickException(FeedbackManager.error_processing_blocks(error=e))

{tinybird_cli-6.5.5.dev0 → tinybird_cli-6.5.7.dev0}/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_cli-6.5.5.dev0 → tinybird_cli-6.5.7.dev0}/tinybird/sql_template.py

@@ -2893,6 +2893,13 @@ def render_sql_template(
                 documentation="/cli/advanced-templates.html",
             )
         raise SQLTemplateException(str(e), documentation="/cli/advanced-templates.html")
+    except KeyError as e:
+        key = e.args[0] if e.args else "unknown"
+        raise SQLTemplateException(
+            f"Missing key '{key}' while rendering the template. "
+            "Ensure every object accessed in the template has this key.",
+            documentation="/cli/advanced-templates.html",
+        )
     except IndexError as e:
         # This happens when trying to access string indices on empty strings
         if "string index out of range" in str(e):

{tinybird_cli-6.5.5.dev0 → tinybird_cli-6.5.7.dev0}/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(
@@ -963,7 +970,7 @@ async def push_data(
     sql_condition: Optional[str] = None,
     replace_options=None,
     concurrency: int = 1,
-    use_v1: bool = False,
+    wait: bool = True,
 ) -> Optional[list[str]]:
     if url and type(url) is tuple:
         url = url[0]
@@ -1001,11 +1008,11 @@ async def push_data(
         datasource_name: str, url: str, mode: str, sql_condition: Optional[str], replace_options: Optional[Set[str]]
     ):
         parsed = urlparse(url)
-        if use_v1 and parsed.scheme in ("http", "https"):
-            raise CLIException("--experimental=use_v1 only supports local files.")
+        # Remote URL imports retain the v0 API; local files use v1 body imports.
+        is_remote_url = parsed.scheme in ("http", "https")
         # poor man's format detection
         _format = get_format_from_filename_or_url(url)
-        if parsed.scheme in ("http", "https"):
+        if is_remote_url:
             res = await client.datasource_create_from_url(
                 datasource_name,
                 url,
@@ -1023,13 +1030,12 @@ async def push_data(
                 sql_condition=sql_condition,
                 format=_format,
                 replace_options=replace_options,
-                use_v1=use_v1,
             )
 
-        if use_v1:
+        if not is_remote_url:
             job_id = res.get("id") or res.get("import_id")
             if not isinstance(job_id, str):
-                raise CLIException("The v1 import response did not include a job ID.")
+                raise CLIException("We couldn't confirm that your import started. Please try again.")
             return job_id
 
         datasource_name = res["datasource"]["name"]
@@ -1062,8 +1068,22 @@ async def push_data(
     try:
         tasks = [process_url(datasource_name, url, mode, sql_condition, replace_options) for url in urls]
         output = await gather_with_concurrency(concurrency, *tasks)
-        if use_v1:
-            return list(output)
+        v1_job_ids = [result for result in output if isinstance(result, str)]
+        if v1_job_ids:
+            if not wait:
+                return v1_job_ids
+            for job_id in v1_job_ids:
+                await wait_job_no_ui(client, job_id)
+            datasource = await client.get_datasource(datasource_name)
+            total_rows = (datasource.get("statistics", {}) or {}).get("row_count", 0)
+            click.echo(FeedbackManager.success_total_rows(datasource=datasource_name, total_rows=total_rows))
+            if mode == "replace":
+                click.echo(FeedbackManager.success_replaced_datasource(datasource=datasource_name))
+            else:
+                click.echo(FeedbackManager.success_appended_datasource(datasource=datasource_name))
+            click.echo(FeedbackManager.success_progress_blocks())
+            click.echo(FeedbackManager.info_data_pushed(datasource=datasource_name))
+            return None
         parser, total_rows, appended_rows = list(output)[-1]
     except AuthNoTokenException:
         raise
@@ -2014,6 +2034,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_cli-6.5.5.dev0 → tinybird_cli-6.5.7.dev0}/tinybird/tb_cli_modules/datasource.py

@@ -37,9 +37,7 @@ from tinybird.tb_cli_modules.common import (
     wait_job,
 )
 from tinybird.tb_cli_modules.config import CLIConfig
-from tinybird.tb_cli_modules.exceptions import CLIDatasourceException, CLIException
-
-EXPERIMENTAL_FEATURE_USE_V1 = "use_v1"
+from tinybird.tb_cli_modules.exceptions import CLIDatasourceException
 
 
 @cli.group()
@@ -54,28 +52,6 @@ def _echo_v1_import_jobs_queued(job_ids: list[str], operation: str) -> None:
         click.echo(FeedbackManager.info_import_job_status(job_id=job_id))
 
 
-async def _wait_for_v1_import_jobs(client: TinyB, job_ids: list[str], operation: str) -> None:
-    for job_id in job_ids:
-        try:
-            await wait_job(client, job_id, f"/v0/jobs/{job_id}", f"{operation} import")
-        except CLIException:
-            if await _echo_v1_import_job_details(client, job_id):
-                raise click.exceptions.Exit(1)
-            raise
-        click.echo(FeedbackManager.success_import_job_completed(operation=operation, job_id=job_id))
-
-
-async def _echo_v1_import_job_details(client: TinyB, job_id: str) -> bool:
-    try:
-        job = await client.job(job_id)
-    except Exception:
-        return False
-    click.echo(FeedbackManager.info_job(job=job_id))
-    echo_safe_humanfriendly_tables_format_smart_table([job.values()], column_names=job.keys())
-    click.echo("\n")
-    return True
-
-
 @datasource.command(name="ls")
 @click.option("--match", default=None, help="Retrieve any resources matching the pattern. eg --match _test")
 @click.option(
@@ -166,12 +142,10 @@ async def datasource_ls(ctx: Context, match: Optional[str], format_: str):
     hidden=True,
 )
 @click.option("--concurrency", help="How many files to submit concurrently", default=1, hidden=True)
-@click.option("--wait", is_flag=True, default=False, help="Wait for a v1 import job to finish.")
 @click.option(
-    "--experimental",
-    type=click.Choice([EXPERIMENTAL_FEATURE_USE_V1]),
-    multiple=True,
-    help="Enable an experimental feature. May be specified multiple times.",
+    "--wait/--no-wait",
+    default=True,
+    help="Wait for the import to finish (default); use --no-wait to only queue it.",
 )
 @click.pass_context
 @coro
@@ -183,7 +157,6 @@ async def datasource_append(
     incremental: Optional[str],
     ignore_empty: bool,
     concurrency: int,
-    experimental: tuple[str, ...],
     wait: bool,
 ):
     """
@@ -197,14 +170,9 @@ async def datasource_append(
 
     if not url:
         raise CLIDatasourceException(FeedbackManager.error_missing_url(datasource=datasource_name))
-    use_v1 = EXPERIMENTAL_FEATURE_USE_V1 in experimental
-    if wait and not use_v1:
-        raise CLIDatasourceException("--wait requires --experimental=use_v1.")
-    job_ids = await push_data(ctx, datasource_name, url, mode="append", concurrency=concurrency, use_v1=use_v1)
-    if use_v1:
-        _echo_v1_import_jobs_queued(job_ids or [], "Append")
-        if wait:
-            await _wait_for_v1_import_jobs(ctx.obj["client"], job_ids or [], "Append")
+    job_ids = await push_data(ctx, datasource_name, url, mode="append", concurrency=concurrency, wait=wait)
+    if job_ids:
+        _echo_v1_import_jobs_queued(job_ids, "Append")
 
 
 @datasource.command(name="replace")
@@ -212,12 +180,10 @@ async def datasource_append(
 @click.argument("url", nargs=-1)
 @click.option("--sql-condition", default=None, help="SQL WHERE condition to replace data", hidden=True)
 @click.option("--skip-incompatible-partition-key", is_flag=True, default=False, hidden=True)
-@click.option("--wait", is_flag=True, default=False, help="Wait for a v1 import job to finish.")
 @click.option(
-    "--experimental",
-    type=click.Choice([EXPERIMENTAL_FEATURE_USE_V1]),
-    multiple=True,
-    help="Enable an experimental feature. May be specified multiple times.",
+    "--wait/--no-wait",
+    default=True,
+    help="Wait for the import to finish (default); use --no-wait to only queue it.",
 )
 @click.pass_context
 @coro
@@ -227,7 +193,6 @@ async def datasource_replace(
     url,
     sql_condition,
     skip_incompatible_partition_key,
-    experimental: tuple[str, ...],
     wait: bool,
 ):
     """
@@ -245,9 +210,6 @@ async def datasource_replace(
     replace_options = set()
     if skip_incompatible_partition_key:
         replace_options.add("skip_incompatible_partition_key")
-    use_v1 = EXPERIMENTAL_FEATURE_USE_V1 in experimental
-    if wait and not use_v1:
-        raise CLIDatasourceException("--wait requires --experimental=use_v1.")
     job_ids = await push_data(
         ctx,
         datasource_name,
@@ -255,12 +217,10 @@ async def datasource_replace(
         mode="replace",
         sql_condition=sql_condition,
         replace_options=replace_options,
-        use_v1=use_v1,
+        wait=wait,
     )
-    if use_v1:
-        _echo_v1_import_jobs_queued(job_ids or [], "Replace")
-        if wait:
-            await _wait_for_v1_import_jobs(ctx.obj["client"], job_ids or [], "Replace")
+    if job_ids:
+        _echo_v1_import_jobs_queued(job_ids, "Replace")
 
 
 @datasource.command(name="analyze")

{tinybird_cli-6.5.5.dev0 → tinybird_cli-6.5.7.dev0}/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 → tinybird_cli-6.5.7.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.5.5.dev0
+Version: 6.5.7.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -43,6 +43,17 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+
+6.5.6
+***********
+
+- `Changed` ``tb datasource append`` and ``tb datasource replace`` submit local CSV, NDJSON, and Parquet files through the v1 import endpoint by default. ``tb datasource append --events`` also submits its request body through v1. Commands wait for completion by default to preserve the existing output; pass ``--no-wait`` to print the queued job ID instead. Remote URL imports continue to use their existing route.
+
+6.5.5
+***********
+
+- `Changed` `tb workspace create` is now limited to organization in Enterprise plans
+
 6.5.4
 ***********