tinybird 0.0.1.dev103__tar.gz → 0.0.1.dev104__tar.gz

{tinybird-0.0.1.dev103 → tinybird-0.0.1.dev104}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev103
+Version: 0.0.1.dev104
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev103 → tinybird-0.0.1.dev104}/tinybird/sql_template.py

@@ -2427,6 +2427,20 @@ def render_template_with_secrets(name: str, content: str, secrets: Optional[Dict
         ... )
         'KAFKA_BOOTSTRAP_SERVERS localhost:9092'
 
+        >>> render_template_with_secrets(
+        ...     "my_kafka_connection",
+        ...     "KAFKA_BOOTSTRAP_SERVERS {{ tb_secret('MISSING_SECRET', '') }}",
+        ...     secrets = {}
+        ... )
+        'KAFKA_BOOTSTRAP_SERVERS ""'
+
+        >>> render_template_with_secrets(
+        ...     "my_kafka_connection",
+        ...     "KAFKA_BOOTSTRAP_SERVERS {{ tb_secret('MISSING_SECRET', 0) }}",
+        ...     secrets = {}
+        ... )
+        'KAFKA_BOOTSTRAP_SERVERS 0'
+
         >>> render_template_with_secrets(
         ...     "my_kafka_connection",
         ...     "KAFKA_BOOTSTRAP_SERVERS {{ tb_secret('MISSING_SECRET') }}",
@@ -2453,8 +2467,13 @@ def render_template_with_secrets(name: str, content: str, secrets: Optional[Dict
             SQLTemplateException: If the secret is not found and no default is provided
         """
         if secret_name in secrets:
-            return secrets[secret_name]
+            value = secrets[secret_name]
+            if isinstance(value, str) and len(value) == 0:
+                return '""'
+            return value
         elif default is not None:
+            if isinstance(default, str) and len(default) == 0:
+                return '""'
             return default
         else:
             raise SQLTemplateException(
@@ -2462,7 +2481,7 @@ def render_template_with_secrets(name: str, content: str, secrets: Optional[Dict
             )
 
     # Create the template
-    t = Template(content, name=name)
+    t = Template(content, name=name, autoescape=None)
 
     try:
         # Create namespace with our tb_secret function

{tinybird-0.0.1.dev103 → tinybird-0.0.1.dev104}/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.dev103'
-__revision__ = 'e2e3b60'
+__version__ = '0.0.1.dev104'
+__revision__ = 'f6c1941'

{tinybird-0.0.1.dev103 → tinybird-0.0.1.dev104}/tinybird/tb/modules/common.py

@@ -81,8 +81,6 @@ SUPPORTED_FORMATS = ["csv", "ndjson", "json", "parquet"]
 OLDEST_ROLLBACK = "oldest_rollback"
 MAIN_BRANCH = "main"
 
-CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
-
 
 def obfuscate_token(value: Optional[str]) -> Optional[str]:
     if not value:
@@ -2178,36 +2176,24 @@ async def ask_for_organization(
 
     if organization_id:
         if organizations and len(organizations) > 0:
-            organization = next(
-                (org for org in organizations if org.get("id") == organization_id), None
-            )
+            organization = next((org for org in organizations if org.get("id") == organization_id), None)
         if not organization:
-            raise CLIException(
-                FeedbackManager.error_organization_not_found(
-                    organization_id=organization_id
-                )
-            )
+            raise CLIException(FeedbackManager.error_organization_not_found(organization_id=organization_id))
         organization_name = organization.get("name")
         return organization_id, organization_name
 
     if organizations is None or len(organizations) == 0:
         organization_name = await ask_for_organization_name(config)
         user_token = await get_user_token(config, user_token)
-        organization = await create_organization_and_add_workspaces(
-            config, organization_name, user_token
-        )
+        organization = await create_organization_and_add_workspaces(config, organization_name, user_token)
         organization_id = organization.get("id")
     else:
         if len(organizations) == 1:
             organization_name = organizations[0]["name"]
             organization_id = organizations[0]["id"]
         else:
-            sorted_organizations = sort_organizations_by_user(
-                organizations, user_email=user_email
-            )
-            current_organization = await ask_for_organization_interactively(
-                sorted_organizations
-            )
+            sorted_organizations = sort_organizations_by_user(organizations, user_email=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")

{tinybird-0.0.1.dev103 → tinybird-0.0.1.dev104}/tinybird/tb/modules/datafile/common.py

@@ -1241,6 +1241,13 @@ def parse(
 
         return _f
 
+    def kafka_key_avro_deserialization(*args: str, **kwargs: Any):
+        raise DatafileSyntaxError(
+            f'{kwargs["cmd"].upper()} has been deprecated. Use "KAFKA_KEY_FORMAT avro" instead',
+            lineno=kwargs["lineno"],
+            pos=1,
+        )
+
     @deprecated
     def sources(x: str, **kwargs: Any) -> None:
         pass  # Deprecated
@@ -1459,7 +1466,7 @@ def parse(
         "kafka_store_raw_value": assign_var("kafka_store_raw_value"),
         "kafka_store_headers": assign_var("kafka_store_headers"),
         "kafka_store_binary_headers": assign_var("kafka_store_binary_headers"),
-        "kafka_key_avro_deserialization": assign_var("kafka_key_avro_deserialization"),
+        "kafka_key_avro_deserialization": kafka_key_avro_deserialization,
         "kafka_ssl_ca_pem": assign_var("kafka_ssl_ca_pem"),
         "kafka_security_protocol": assign_var("kafka_security_protocol"),
         "kafka_sasl_mechanism": assign_var("kafka_sasl_mechanism"),

{tinybird-0.0.1.dev103 → tinybird-0.0.1.dev104}/tinybird/tb/modules/deployment.py

@@ -19,6 +19,7 @@ from tinybird.tb.modules.project import Project
 def api_fetch(url: str, headers: dict) -> dict:
     r = requests.get(url, headers=headers)
     if r.status_code == 200:
+        logging.debug(json.dumps(r.json(), indent=2))
         return r.json()
     # Try to parse and print the error from the response
     try:
@@ -32,13 +33,33 @@ def api_fetch(url: str, headers: dict) -> dict:
         sys.exit(1)
 
 
+def api_post(
+    url: str,
+    headers: dict,
+    files: Optional[list] = None,
+    params: Optional[dict] = None,
+) -> dict:
+    r = requests.post(url, headers=headers, files=files, params=params)
+    if r.status_code == 200:
+        logging.debug(json.dumps(r.json(), indent=2))
+        return r.json()
+    # Try to parse and print the error from the response
+    try:
+        result = r.json()
+        logging.debug(json.dumps(result, indent=2))
+        error = result.get("error")
+        click.echo(FeedbackManager.error(message=f"Error: {error}"))
+        sys.exit(1)
+    except Exception:
+        click.echo(FeedbackManager.error(message="Error parsing response from API"))
+        sys.exit(1)
+
+
 # TODO(eclbg): This logic should be in the server, and there should be a dedicated endpoint for promoting a deployment
 # potato
 def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     TINYBIRD_API_URL = f"{host}/v1/deployments"
-    r = requests.get(TINYBIRD_API_URL, headers=headers)
-    result = r.json()
-    logging.debug(json.dumps(result, indent=2))
+    result = api_fetch(TINYBIRD_API_URL, headers)
 
     deployments = result.get("deployments")
     if not deployments:
@@ -64,12 +85,7 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
         click.echo(FeedbackManager.success(message="Setting candidate deployment as live"))
 
         TINYBIRD_API_URL = f"{host}/v1/deployments/{candidate_deployment.get('id')}/set-live"
-        r = requests.post(TINYBIRD_API_URL, headers=headers)
-        result = r.json()
-        logging.debug(json.dumps(result, indent=2))
-        if result.get("error"):
-            click.echo(FeedbackManager.error(message=result.get("error")))
-            sys.exit(1)
+        result = api_post(TINYBIRD_API_URL, headers=headers)
 
     click.echo(FeedbackManager.success(message="Removing old deployment"))
 
@@ -86,9 +102,7 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     if wait:
         while True:
             TINYBIRD_API_URL = f"{host}/v1/deployments/{last_deployment.get('id')}"
-            r = requests.get(TINYBIRD_API_URL, headers=headers)
-            result = r.json()
-            logging.debug(json.dumps(result, indent=2))
+            result = api_fetch(TINYBIRD_API_URL, headers=headers)
 
             last_deployment = result.get("deployment")
             if last_deployment.get("status") == "deleted":
@@ -102,9 +116,7 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
 # deployment
 def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     TINYBIRD_API_URL = f"{host}/v1/deployments"
-    r = requests.get(TINYBIRD_API_URL, headers=headers)
-    result = r.json()
-    logging.debug(json.dumps(result, indent=2))
+    result = api_fetch(TINYBIRD_API_URL, headers=headers)
 
     deployments = result.get("deployments")
     if not deployments:
@@ -130,12 +142,7 @@ def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
         click.echo(FeedbackManager.success(message="Promoting previous deployment"))
 
         TINYBIRD_API_URL = f"{host}/v1/deployments/{previous_deployment.get('id')}/set-live"
-        r = requests.post(TINYBIRD_API_URL, headers=headers)
-        result = r.json()
-        logging.debug(json.dumps(result, indent=2))
-        if result.get("error"):
-            click.echo(FeedbackManager.error(message=result.get("error")))
-            sys.exit(1)
+        result = api_post(TINYBIRD_API_URL, headers=headers)
 
     click.echo(FeedbackManager.success(message="Removing current deployment"))
 
@@ -152,9 +159,7 @@ def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     if wait:
         while True:
             TINYBIRD_API_URL = f"{host}/v1/deployments/{current_deployment.get('id')}"
-            r = requests.get(TINYBIRD_API_URL, headers=headers)
-            result = r.json()
-            logging.debug(json.dumps(result, indent=2))
+            result = api_fetch(TINYBIRD_API_URL, headers)
 
             current_deployment = result.get("deployment")
             if current_deployment.get("status") == "deleted":
@@ -219,7 +224,6 @@ def deployment_ls(ctx: click.Context) -> None:
     url = f"{client.host}/v1/deployments"
 
     result = api_fetch(url, HEADERS)
-    logging.debug(json.dumps(result, indent=2))
 
     status_map = {"data_ready": "Ready", "failed": "Failed"}
     columns = ["ID", "Status", "Created at", "Live"]
@@ -354,13 +358,13 @@ def create_deployment(
             params["check"] = "true"
         if allow_destructive_operations:
             params["allow_destructive_operations"] = "true"
-        r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS, params=params)
-        result = r.json()
-        logging.debug(json.dumps(result, indent=2))
+
+        result = api_post(TINYBIRD_API_URL, headers=HEADERS, files=files, params=params)
 
         print_changes(result, project)
 
-        feedback = result.get("deployment", {}).get("feedback", [])
+        deployment = result.get("deployment", {})
+        feedback = deployment.get("feedback", [])
         for f in feedback:
             if f.get("level", "").upper() == "ERROR":
                 feedback_func = FeedbackManager.error
@@ -372,7 +376,7 @@ def create_deployment(
             resource_bit = f"{resource}: " if resource else ""
             click.echo(feedback_func(message=f"{feedback_icon}{f.get('level')}: {resource_bit}{f.get('message')}"))
 
-        deploy_errors = result.get("deployment", {}).get("errors")
+        deploy_errors = deployment.get("errors")
         for deploy_error in deploy_errors:
             if deploy_error.get("filename", None):
                 click.echo(
@@ -380,19 +384,21 @@ def create_deployment(
                 )
             else:
                 click.echo(FeedbackManager.error(message=f"{deploy_error.get('error')}"))
+        click.echo()  # For spacing
 
         status = result.get("result")
         if check:
             if status == "success":
                 click.echo(FeedbackManager.success(message="\n✓ Deployment is valid"))
                 sys.exit(0)
+            elif status == "no_changes":
+                sys.exit(0)
 
             click.echo(FeedbackManager.error(message="\n✗ Deployment is not valid"))
             sys.exit(1)
 
         status = result.get("result")
         if status == "success":
-            deployment = result.get("deployment", {})
             # TODO: This is a hack to show the url in the case of region is public. The URL should be returned by the API
             if client.host == "https://api.europe-west2.gcp.tinybird.co":
                 click.echo(
@@ -406,10 +412,14 @@ def create_deployment(
                 click.echo(FeedbackManager.info(message="\n✓ Deployment submitted successfully"))
             else:
                 click.echo(FeedbackManager.success(message="\n✓ Deployment submitted successfully"))
+        elif status == "no_changes":
+            click.echo(FeedbackManager.highlight(message="Not deploying. No changes."))
+            sys.exit(0)
         elif status == "failed":
             click.echo(FeedbackManager.error(message="Deployment failed"))
+            sys.exit(1)
         else:
-            click.echo(FeedbackManager.error(message=f"Unknown build result {status}"))
+            click.echo(FeedbackManager.error(message=f"Unknown deployment result {status}"))
     except Exception as e:
         click.echo(FeedbackManager.error_exception(error=e))
     finally:
@@ -463,7 +473,7 @@ def print_changes(result: dict, project: Project) -> None:
         resources.append(["new", p, project.get_resource_path(p, "pipe")])
 
     for dc in deployment.get("new_data_connector_names", []):
-        resources.append(["new", dc, project.get_resource_path(dc, "data_connector")])
+        resources.append(["new", dc, project.get_resource_path(dc, "connection")])
 
     for ds in deployment.get("changed_datasource_names", []):
         resources.append(["modified", ds, project.get_resource_path(ds, "datasource")])
@@ -472,7 +482,7 @@ def print_changes(result: dict, project: Project) -> None:
         resources.append(["modified", p, project.get_resource_path(p, "pipe")])
 
     for dc in deployment.get("changed_data_connector_names", []):
-        resources.append(["modified", dc, project.get_resource_path(dc, "data_connector")])
+        resources.append(["modified", dc, project.get_resource_path(dc, "connection")])
 
     for ds in deployment.get("deleted_datasource_names", []):
         resources.append(["deleted", ds, project.get_resource_path(ds, "datasource")])
@@ -481,7 +491,7 @@ def print_changes(result: dict, project: Project) -> None:
         resources.append(["deleted", p, project.get_resource_path(p, "pipe")])
 
     for dc in deployment.get("deleted_data_connector_names", []):
-        resources.append(["deleted", dc, project.get_resource_path(dc, "data_connector")])
+        resources.append(["deleted", dc, project.get_resource_path(dc, "connection")])
 
     for token_change in deployment.get("token_changes", []):
         token_name = token_change.get("token_name")

{tinybird-0.0.1.dev103 → tinybird-0.0.1.dev104}/tinybird/tb/modules/infra.py

@@ -1,5 +1,7 @@
+import asyncio
 import json
 import subprocess
+import sys
 import time
 import uuid
 from pathlib import Path
@@ -15,7 +17,7 @@ from tinybird.tb.modules.common import coro, echo_safe_humanfriendly_tables_form
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
-from .common import CONTEXT_SETTINGS, ask_for_organization, get_organizations_by_user
+from .common import ask_for_organization, get_organizations_by_user
 
 K8S_YML = """
 ---
@@ -226,13 +228,9 @@ class Infrastructure:
     async def get_organizations_info(self, config: CLIConfig):
         self.orgs = await get_organizations_by_user(config)
 
-    async def create_infra(
-        self, name: str, host: str, organization_id: str
-    ) -> Dict[str, Any]:
+    async def create_infra(self, name: str, host: str, organization_id: str) -> Dict[str, Any]:
         """Create a new infrastructure."""
-        infra = await self.client.infra_create(
-            organization_id=organization_id, name=name, host=host
-        )
+        infra = await self.client.infra_create(organization_id=organization_id, name=name, host=host)
         return infra
 
     async def list_infras(self) -> None:
@@ -253,9 +251,7 @@ class Infrastructure:
             organization = infra["organization"]
 
             table_human_readable.append((name, host, organization))
-            table_machine_readable.append(
-                {"name": name, "host": host, "organization": organization}
-            )
+            table_machine_readable.append({"name": name, "host": host, "organization": organization})
 
         click.echo(FeedbackManager.info(message="\n** Infras:"))
         echo_safe_humanfriendly_tables_format_smart_table(table_human_readable, column_names=columns)
@@ -269,17 +265,13 @@ class Infrastructure:
             if not infra:
                 raise CLIException(f"Infrastructure '{name}' not found")
             await self.client.infra_delete(infra["id"], infra["organization_id"])
-            click.echo(
-                FeedbackManager.success(message=f"\n✓ Infrastructure '{name}' deleted")
-            )
+            click.echo(FeedbackManager.success(message=f"\n✓ Infrastructure '{name}' deleted"))
         except Exception as e:
             click.echo(FeedbackManager.error(message=f"✗ Error: {e}"))
 
     async def update(self, infra_name: str, name: str, host: str):
         infras_list = await self.get_infra_list()
-        infra = next(
-            (infra for infra in infras_list if infra["name"] == infra_name), None
-        )
+        infra = next((infra for infra in infras_list if infra["name"] == infra_name), None)
         if not infra:
             return None
         await self.client.infra_update(
@@ -312,30 +304,25 @@ class Infrastructure:
                         all_infras.append(infra)
                 except Exception as e:
                     click.echo(
-                        FeedbackManager.warning(
-                            message=f"Could not fetch infras for organization {org_name}: {str(e)}"
-                        )
+                        FeedbackManager.warning(message=f"Could not fetch infras for organization {org_name}: {str(e)}")
                     )
                     continue
             return all_infras
         except Exception as e:
-            click.echo(
-                FeedbackManager.error(
-                    message=f"Failed to list infrastructures: {str(e)}"
-                )
-            )
+            click.echo(FeedbackManager.error(message=f"Failed to list infrastructures: {str(e)}"))
             return []
 
 
-@cli.group(context_settings=CONTEXT_SETTINGS, hidden=True)
+@cli.group(hidden=True)
 @click.pass_context
-@coro
-async def infra(ctx: Context) -> None:
+def infra(ctx: Context) -> None:
     """Infra commands."""
+    if "--help" in sys.argv or "-h" in sys.argv:
+        return
     client: TinyB = ctx.ensure_object(dict)["client"]
     config = CLIConfig.get_project_config()
     infra = Infrastructure(client)
-    await infra.get_organizations_info(config)
+    asyncio.run(infra.get_organizations_info(config))
     ctx.ensure_object(dict)["infra"] = infra
 
 
@@ -732,24 +719,28 @@ async def infra_list(ctx: click.Context):
 @click.option("--host", type=str, help="Host for the self-managed region")
 @click.option("--organization-id", type=str, help="Organization ID for the self-managed region")
 @click.pass_context
-@coro
-async def infra_create(ctx: click.Context, name: str, host: str, organization_id: Optional[str] = None):
+def infra_add(ctx: click.Context, name: str, host: Optional[str] = None, organization_id: Optional[str] = None):
     """Creates a new self-managed region from an existing infrastructure URL."""
     infra: Infrastructure = ctx.ensure_object(dict)["infra"]
 
-    organization_id, organization_name = await ask_for_organization(
-        infra.orgs, organization_id
-    )
+    organization_id, organization_name = asyncio.run(ask_for_organization(infra.orgs, organization_id))
     if not organization_id:
         return
 
     name = name or click.prompt("Enter name", type=str)
-    host = host or click.prompt("Enter host", type=str)
+    host = host or click.prompt(
+        "Enter host URL (e.g., https://tinybird.example.com) (leave empty for None)",
+        type=str,
+        default="",
+        show_default=False,
+    )
 
     click.echo(FeedbackManager.highlight(message=f"» Adding self-managed region '{name}' in Tinybird..."))
-    new_infra = await infra.create_infra(name, host, organization_id)
+    new_infra = asyncio.run(infra.create_infra(name, host, organization_id))
     infra_token = new_infra["token"]
-    click.echo(FeedbackManager.success(message=f"\n✓ Self-managed region '{name}' added in '{organization_name}' Organization"))
+    click.echo(
+        FeedbackManager.success(message=f"\n✓ Self-managed region '{name}' added in '{organization_name}' Organization")
+    )
 
     # Get CLI config to access workspace and user information
     cli_config = CLIConfig.get_project_config()

{tinybird-0.0.1.dev103 → tinybird-0.0.1.dev104}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev103
+Version: 0.0.1.dev104
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird