tinybird-cli 2.1.0.dev12__tar.gz → 2.1.0.dev14__tar.gz

{tinybird-cli-2.1.0.dev12 → tinybird-cli-2.1.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 2.1.0.dev12
+Version: 2.1.0.dev14
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+2.1.0.dev14
+************
+
+- `Changed` `tb release rollback` now requires double confirmation
+
+2.1.0.dev13
+************
+
+- `Fixed` Ignore .diff_tmp/ on `tb deploy`
+
 2.1.0.dev12
 ************
 

{tinybird-cli-2.1.0.dev12 → tinybird-cli-2.1.0.dev14}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://docs.tinybird.co/cli.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '2.1.0.dev12'
-__revision__ = '8032292'
+__version__ = '2.1.0.dev14'
+__revision__ = '579c3e5'

tinybird-cli-2.1.0.dev14/tinybird/connector_settings.py

@@ -0,0 +1,134 @@
+from __future__ import annotations
+
+from enum import Enum
+from typing import List, Optional
+
+from pydantic import BaseModel
+
+
+class DataConnectorType(str, Enum):
+    KAFKA = "kafka"
+    GCLOUD_SCHEDULER = "gcscheduler"
+    SNOWFLAKE = "snowflake"
+    BIGQUERY = "bigquery"
+    GCLOUD_STORAGE = "gcs"
+    GCLOUD_STORAGE_HMAC = "gcs_hmac"
+    AMAZON_S3 = "s3"
+
+    def __str__(self) -> str:
+        return self.value
+
+
+class DataConnectorSetting(BaseModel):
+    ...
+
+
+class KafkaConnectorSetting(DataConnectorSetting):
+    kafka_bootstrap_servers: str
+    kafka_sasl_plain_username: str
+    kafka_sasl_plain_password: str
+    cli_version: Optional[str] = None
+    tb_endpoint: Optional[str] = None
+    kafka_security_protocol: Optional[str] = None
+    kafka_sasl_mechanism: Optional[str] = None
+    kafka_schema_registry_url: Optional[str] = None
+
+
+class S3ConnectorSetting(DataConnectorSetting):
+    s3_access_key_id: str
+    s3_secret_access_key: str
+    s3_region: str
+
+
+class SnowflakeConnectorSetting(DataConnectorSetting):
+    account: str
+    username: str
+    password: str
+    role: str
+    warehouse: str
+    warehouse_size: Optional[str] = None
+    stage: Optional[str] = None
+    integration: Optional[str] = None
+
+
+class GCSchedulerConnectorSetting(DataConnectorSetting):
+    gcscheduler_region: Optional[str] = None
+
+
+class BigQueryConnectorSetting(DataConnectorSetting):
+    account: Optional[str] = None
+
+
+class GCSHmacConnectorSetting(DataConnectorSetting):
+    gcs_hmac_access_id: str
+    gcs_hmac_secret: str
+
+
+class GCSConnectorSetting(DataConnectorSetting):
+    gcs_private_key_id: str
+    gcs_client_x509_cert_url: str
+    gcs_project_id: str
+    gcs_client_id: str
+    gcs_client_email: str
+    gcs_private_key: str
+
+
+DATA_CONNECTOR_SETTINGS: dict[DataConnectorType, type[DataConnectorSetting]] = {
+    DataConnectorType.KAFKA: KafkaConnectorSetting,
+    DataConnectorType.GCLOUD_SCHEDULER: GCSchedulerConnectorSetting,
+    DataConnectorType.SNOWFLAKE: SnowflakeConnectorSetting,
+    DataConnectorType.BIGQUERY: BigQueryConnectorSetting,
+    DataConnectorType.GCLOUD_STORAGE: GCSConnectorSetting,
+    DataConnectorType.GCLOUD_STORAGE_HMAC: GCSHmacConnectorSetting,
+    DataConnectorType.AMAZON_S3: S3ConnectorSetting,
+}
+
+
+class DataLinkerSettings:
+    kafka = [
+        "tb_datasource",
+        "tb_token",
+        "kafka_topic",
+        "kafka_group_id",
+        "kafka_auto_offset_reset",
+        "kafka_store_raw_value",
+        "kafka_store_headers",
+    ]
+
+
+class DataSinkSettings:
+    gcscheduler = [
+        "cron",
+        "timezone",
+        "status",
+        "gcscheduler_target_url",
+        "gcscheduler_job_name",
+        "gcscheduler_region",
+    ]
+    gcs_hmac = [
+        "bucket_path",
+        "file_template",
+        "partition_node",
+        "format",
+        "compression",
+    ]
+    s3 = [
+        "bucket_path",
+        "file_template",
+        "partition_node",
+        "format",
+        "compression",
+    ]
+
+
+class DataSensitiveSettings:
+    kafka = ["kafka_sasl_plain_password"]
+    gcscheduler = [
+        "gcscheduler_target_url",
+        "gcscheduler_job_name",
+        "gcscheduler_region",
+    ]
+    bigquery: List[str] = []
+    snowflake: List[str] = []
+    gcs_hmac: List[str] = ["gcs_hmac_secret"]
+    s3: List[str] = ["s3_secret_access_key"]

{tinybird-cli-2.1.0.dev12 → tinybird-cli-2.1.0.dev14}/tinybird/datafile.py

@@ -260,7 +260,7 @@ def is_shared_datasource(ds_name: str) -> bool:
 
 
 class CLIGitRelease:
-    NO_DATAFILES_PATHS = ["vendor/", "tests/", "scripts/"]
+    NO_DATAFILES_PATHS = ["vendor/", "tests/", "scripts/", ".diff_tmp/"]
     DATAFILES_SUFFIXES = [".datasource", ".pipe", ".incl", ".token"]
 
     class ChangeType(Enum):

{tinybird-cli-2.1.0.dev12 → tinybird-cli-2.1.0.dev14}/tinybird/feedback_manager.py

@@ -419,6 +419,8 @@ Ready? """
     warning_confirm_delete_workspace = prompt_message("Do you want to remove {workspace_name} workspace?")
     warning_confirm_delete_branch = prompt_message("Do you want to remove '{branch}' Environment?")
     warning_confirm_delete_release = prompt_message("Do you want to remove Release {semver}?")
+    warning_confirm_rollback_release = prompt_message("Do you want to rollback current Release {semver} to {rollback}?")
+
     warning_confirm_delete_token = prompt_message("Do you want to delete Token {token}?")
     warning_confirm_refresh_token = prompt_message("Do you want to refresh Token {token}?")
     warning_datasource_is_connected = warning_message(
@@ -617,7 +619,10 @@ Ready? """
         "** {provider} CI/CD config files generated. Read this guide to learn how to run CI/CD pipelines: https://www.tinybird.co/docs/guides/continuous-integration.html"
     )
     info_release_rm_resources = info_message(
-        "** The following resources are not used in any other Release and would be deleted:"
+        "** The following resources IDs are only present in this Release and will be deleted:"
+    )
+    info_release_rollback = info_message(
+        "** The following resources IDs are present in the {semver} Release and will be restored:"
     )
 
     success_test_endpoint = info_message(
@@ -779,7 +784,7 @@ Ready? """
     success_release_rollback = success_message("** Workspace rolled back to Release {semver}")
     success_release_delete = success_message("** Release {semver} deleted")
     success_release_delete_dry_run = success_message(
-        "** Release {semver} delete (dry run). The following resources are not used in any other Release and would be deleted:"
+        "** Release {semver} delete (dry run). The following resources IDs are only present in this Release and will be deleted:"
     )
 
     success_delete_token = success_message("** Token '{token}' removed successfully")

{tinybird-cli-2.1.0.dev12 → tinybird-cli-2.1.0.dev14}/tinybird/tb_cli_modules/branch.py

@@ -32,6 +32,25 @@ from tinybird.tb_cli_modules.config import CLIConfig
 from tinybird.tb_cli_modules.exceptions import CLIBranchException, CLIException, CLIReleaseException
 
 
+async def print_release_summary(config: CLIConfig, semver: str):
+    try:
+        client = config.get_client()
+        response = await client.release_rm(config["id"], semver, confirmation=config["name"], dry_run=True)
+    except Exception as e:
+        raise CLIReleaseException(FeedbackManager.error_exception(error=str(e)))
+    else:
+        columns = ["name", "id"]
+        if len(response["datasources"]):
+            click.echo("\nDatasources:")
+            echo_safe_humanfriendly_tables_format_smart_table(
+                list(response["datasources"].items()), column_names=columns
+            )
+
+        if len(response["pipes"]):
+            click.echo("\nPipes:")
+            echo_safe_humanfriendly_tables_format_smart_table(list(response["pipes"].items()), column_names=columns)
+
+
 @cli.group(hidden=True)
 def release() -> None:
     """Release commands"""
@@ -45,6 +64,10 @@ async def release_ls() -> None:
     config = CLIConfig.get_project_config()
     _ = await try_update_config_with_remote(config, only_if_needed=True)
 
+    await print_releases(config)
+
+
+async def print_releases(config: CLIConfig):
     response = await config.get_client().releases(config["id"])
 
     table: List[Tuple[str, str, str, str, str]] = []
@@ -173,8 +196,9 @@ async def release_preview(semver: str) -> None:
 
 
 @release.command(name="rollback", short_help="Rollbacks to a previous Release")
+@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
 @coro
-async def release_rollback() -> None:
+async def release_rollback(yes: bool) -> None:
     config = CLIConfig.get_project_config()
     _ = await try_update_config_with_remote(config, only_if_needed=False)
 
@@ -183,14 +207,22 @@ async def release_rollback() -> None:
     releases_response = await config.get_client().releases(config["id"])
 
     try:
-        version_to_rollback = next(
-            (release["semver"] for release in releases_response["releases"] if release["status"] == "live"), None
+        release_to_rollback = next(
+            (release for release in releases_response["releases"] if release["status"] == "live"), None
         )
-        if not version_to_rollback:
+        if not release_to_rollback:
             raise CLIBranchException(FeedbackManager.error_release_rollback_live_not_found())
 
-        release = await client.release_rollback(config["id"], semver=version_to_rollback)
-        click.echo(FeedbackManager.success_release_rollback(semver=release["semver"]))
+        await print_releases(config)
+        semver = release_to_rollback.get("semver")
+        rollback_version = release_to_rollback.get("rollback")
+        click.echo(FeedbackManager.info_release_rollback(semver=rollback_version))
+        await print_release_summary(config, rollback_version)
+        if yes or click.confirm(
+            FeedbackManager.warning_confirm_rollback_release(semver=semver, rollback=rollback_version)
+        ):
+            release = await client.release_rollback(config["id"], semver=semver)
+            click.echo(FeedbackManager.success_release_rollback(semver=release["semver"]))
     except Exception as e:
         raise CLIReleaseException(FeedbackManager.error_exception(error=str(e)))
 
@@ -209,40 +241,26 @@ async def release_rollback() -> None:
 @coro
 async def release_rm(semver: str, force: bool, yes: bool, dry_run: bool) -> None:
     config = CLIConfig.get_project_config()
+    client = config.get_client()
     _ = await try_update_config_with_remote(config)
 
     if not force:
         raise CLIReleaseException(
             FeedbackManager.error_exception(
-                error="Use --force to delete a Release. Consider running first with --dry-run to see the resources being deleted with the Release."
+                error="Use --force to delete a Release. A summary of the resources to be deleted will be shown."
             )
         )
 
     click.echo(FeedbackManager.info_release_rm_resources())
-    try:
-        client = config.get_client()
-        response = await client.release_rm(config["id"], semver, confirmation=config["name"], dry_run=True)
-    except Exception as e:
-        raise CLIReleaseException(FeedbackManager.error_exception(error=str(e)))
-    else:
-        columns = ["name", "id"]
-        if len(response["datasources"]):
-            click.echo("\nDatasources:")
-            echo_safe_humanfriendly_tables_format_smart_table(
-                list(response["datasources"].items()), column_names=columns
-            )
-
-        if len(response["pipes"]):
-            click.echo("\nPipes:")
-            echo_safe_humanfriendly_tables_format_smart_table(list(response["pipes"].items()), column_names=columns)
+    await print_release_summary(config, semver)
 
     if dry_run or yes or click.confirm(FeedbackManager.warning_confirm_delete_release(semver=semver)):
         try:
-            if not dry_run:
-                await client.release_rm(config["id"], semver, confirmation=config["name"], dry_run=dry_run)
-                click.echo(FeedbackManager.success_release_delete(semver=semver))
-            else:
+            await client.release_rm(config["id"], semver, confirmation=config["name"], dry_run=dry_run)
+            if dry_run:
                 click.echo(FeedbackManager.success_release_delete_dry_run(semver=semver))
+            else:
+                click.echo(FeedbackManager.success_release_delete(semver=semver))
         except Exception as e:
             raise CLIReleaseException(FeedbackManager.error_exception(error=str(e)))
 

{tinybird-cli-2.1.0.dev12 → tinybird-cli-2.1.0.dev14}/tinybird/tb_cli_modules/connection.py

@@ -12,6 +12,7 @@ import click
 from click import Context
 
 from tinybird.client import DoesNotExistException, TinyB
+from tinybird.connector_settings import DATA_CONNECTOR_SETTINGS, DataConnectorType, DataSensitiveSettings
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.cli import cli
 from tinybird.tb_cli_modules.common import (
@@ -339,11 +340,8 @@ async def connection_rm(ctx: Context, connection_id: str, force: bool) -> None:
 @click.option("--connector", help="Filter by connector")
 @click.pass_context
 @coro
-async def connection_ls(ctx: Context, connector: str) -> None:
+async def connection_ls(ctx: Context, connector: Optional[DataConnectorType] = None) -> None:
     """List connections."""
-
-    from tinybird.connector_settings import DataConnectorSettings, DataSensitiveSettings
-
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     client: TinyB = obj["client"]
 
@@ -358,9 +356,9 @@ async def connection_ls(ctx: Context, connector: str) -> None:
         columns = ["service", "name", "id", "connected_datasources"]
     else:
         sensitive_settings = getattr(DataSensitiveSettings, connector)
-        columns = ["service", "name", "id", "connected_datasources"] + [
-            setting.replace("tb_", "") for setting in getattr(DataConnectorSettings, connector)
-        ]
+        columns = ["service", "name", "id", "connected_datasources"]
+        if connector_settings := DATA_CONNECTOR_SETTINGS.get(connector):
+            columns += [setting.replace("tb_", "") for setting in connector_settings.model_fields.keys()]
 
     for connection in connections:
         row = [_get_setting_value(connection, setting, sensitive_settings) for setting in columns]

{tinybird-cli-2.1.0.dev12 → tinybird-cli-2.1.0.dev14}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 2.1.0.dev12
+Version: 2.1.0.dev14
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+2.1.0.dev14
+************
+
+- `Changed` `tb release rollback` now requires double confirmation
+
+2.1.0.dev13
+************
+
+- `Fixed` Ignore .diff_tmp/ on `tb deploy`
+
 2.1.0.dev12
 ************
 

{tinybird-cli-2.1.0.dev12 → tinybird-cli-2.1.0.dev14}/tinybird_cli.egg-info/requires.txt

@@ -5,6 +5,7 @@ cryptography>=3.4.8
 croniter==1.3.8
 GitPython==3.1.29
 humanfriendly==8.2
+pydantic==2.5.2
 pyperclip==1.8.2
 pyyaml<6.1,>=6.0
 requests<3,>=2.28.1

tinybird-cli-2.1.0.dev12/tinybird/connector_settings.py

@@ -1,74 +0,0 @@
-from typing import List
-
-
-class DataConnectorSettings:
-    kafka = [
-        "cli_version",
-        "tb_endpoint",
-        "kafka_bootstrap_servers",
-        "kafka_sasl_plain_username",
-        "kafka_sasl_plain_password",
-        "kafka_security_protocol",
-        "kafka_sasl_mechanism",
-        "kafka_schema_registry_url",
-    ]
-    gcscheduler = ["gcscheduler_region"]
-    bigquery = ["account"]
-    snowflake = ["account", "username", "password", "warehouse", "warehouse_size", "role", "stage", "integration"]
-    gcs_hmac = ["gcs_hmac_access_id", "gcs_hmac_secret"]
-    s3 = [
-        "s3_access_key_id",
-        "s3_secret_access_key",
-        "s3_region",
-    ]
-    gcs = [
-        "gcs_private_key_id",
-        "gcs_client_x509_cert_url",
-        "gcs_project_id",
-        "gcs_client_id",
-        "gcs_client_email",
-        "gcs_private_key",
-    ]
-
-
-class DataLinkerSettings:
-    kafka = [
-        "tb_datasource",
-        "tb_token",
-        "kafka_topic",
-        "kafka_group_id",
-        "kafka_auto_offset_reset",
-        "kafka_store_raw_value",
-        "kafka_store_headers",
-    ]
-
-
-class DataSinkSettings:
-    gcscheduler = ["cron", "timezone", "status", "gcscheduler_target_url", "gcscheduler_job_name", "gcscheduler_region"]
-    gcs_hmac = [
-        "bucket_path",
-        "file_template",
-        "partition_node",
-        "format",
-        "compression",
-    ]
-    s3 = [
-        "bucket_path",
-        "file_template",
-        "partition_node",
-        "format",
-        "compression",
-    ]
-
-
-class DataSensitiveSettings:
-    kafka = ["kafka_sasl_plain_password"]
-    gcscheduler = [
-        "gcscheduler_target_url",
-        "gcscheduler_job_name",
-        "gcscheduler_region",
-    ]
-    bigquery: List[str] = []
-    snowflake: List[str] = []
-    gcs_hmac: List[str] = ["gcs_hmac_secret"]
-    s3: List[str] = ["s3_secret_access_key"]